summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-03-23 23:16:59 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2021-04-07 16:17:21 +0000
commit405c1d388d4551e3c630f3fe32f8be14bb12bbe4 (patch)
tree04fdb7e3d28e8dba066e46cc769f1ec94903ebef
parentcc90a52bffdca6da42247d6ec079f6c4af1db207 (diff)
Conf and install a few more configuration files.
Change-Id: I64339e83e30d9db4910b69936048368584db87cf
-rw-r--r--instsetoo_native/bootstraprc.in4
-rw-r--r--instsetoo_native/fundamentalrc.in22
-rw-r--r--instsetoo_native/meson.build24
-rw-r--r--instsetoo_native/sofficerc.in20
-rw-r--r--meson.build1
-rw-r--r--offapi/meson.build9
-rw-r--r--udkapi/meson.build14
7 files changed, 91 insertions, 3 deletions
diff --git a/instsetoo_native/bootstraprc.in b/instsetoo_native/bootstraprc.in
new file mode 100644
index 000000000000..daf9d5393a96
--- /dev/null
+++ b/instsetoo_native/bootstraprc.in
@@ -0,0 +1,4 @@
+[Bootstrap]
+InstallMode=<installmode>
+ProductKey=LibreOfficeDev 7.0
+UserInstallation=$ORIGIN/..
diff --git a/instsetoo_native/fundamentalrc.in b/instsetoo_native/fundamentalrc.in
new file mode 100644
index 000000000000..2626a1598c5b
--- /dev/null
+++ b/instsetoo_native/fundamentalrc.in
@@ -0,0 +1,22 @@
+[Bootstrap]
+BRAND_BASE_DIR=${ORIGIN}/..
+BRAND_INI_DIR=${ORIGIN}
+BRAND_SHARE_SUBDIR=share
+BRAND_SHARE_RESOURCE_SUBDIR=program/resource
+CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/lounorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/lounorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/program/lounorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:!${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu
+LO_JAVA_DIR=${BRAND_BASE_DIR}/program/classes
+LO_LIB_DIR=${BRAND_BASE_DIR}/program
+BAK_EXTENSIONS=${$ORIGIN/lounorc:TMP_EXTENSIONS}
+BUNDLED_EXTENSIONS=${$ORIGIN/lounorc:BUNDLED_EXTENSIONS}
+BUNDLED_EXTENSIONS_USER=${$ORIGIN/lounorc:BUNDLED_EXTENSIONS_USER}
+SHARED_EXTENSIONS_USER=${$ORIGIN/lounorc:SHARED_EXTENSIONS_USER}
+UNO_SHARED_PACKAGES_CACHE=${$ORIGIN/lounorc:UNO_SHARED_PACKAGES_CACHE}
+TMP_EXTENSIONS=${$ORIGIN/lounorc:TMP_EXTENSIONS}
+UNO_USER_PACKAGES_CACHE=${$ORIGIN/lounorc:UNO_USER_PACKAGES_CACHE}
+URE_BIN_DIR=${BRAND_BASE_DIR}/program
+URE_MORE_JAVA_CLASSPATH_URLS=
+URE_OVERRIDE_JAVA_JFW_SHARED_DATA=${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml
+URE_OVERRIDE_JAVA_JFW_USER_DATA=${${BRAND_BASE_DIR}/program/bootstraprc:UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml
+URE_MORE_JAVA_TYPES=${BRAND_BASE_DIR}/program/classes/unoil.jar ${BRAND_BASE_DIR}/program/classes/ScriptFramework.jar ${${$ORIGIN/lounorc:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/lounorc:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/lounorc:PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}
+URE_MORE_SERVICES=${${$ORIGIN/lounorc:PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/lounorc:PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/lounorc:PKG_BundledUnoFile}:UNO_SERVICES} <$ORIGIN/services>*
+URE_MORE_TYPES=<$ORIGIN/types>* ${${$ORIGIN/lounorc:PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/lounorc:PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/lounorc:PKG_BundledUnoFile}:UNO_TYPES}
diff --git a/instsetoo_native/meson.build b/instsetoo_native/meson.build
new file mode 100644
index 000000000000..6b66f2d99443
--- /dev/null
+++ b/instsetoo_native/meson.build
@@ -0,0 +1,24 @@
+instdata = configuration_data()
+
+# Add configuration data entries here and in the template.
+
+configure_file(input: 'sofficerc.in',
+ output: 'sofficerc',
+ configuration: cdata,
+ install: true,
+ install_dir: get_option('bindir')
+)
+
+configure_file(input: 'fundamentalrc.in',
+ output: 'fundamentalrc',
+ configuration: cdata,
+ install: true,
+ install_dir: get_option('bindir')
+)
+
+configure_file(input: 'bootstraprc.in',
+ output: 'bootstraprc',
+ configuration: cdata,
+ install: true,
+ install_dir: get_option('bindir')
+)
diff --git a/instsetoo_native/sofficerc.in b/instsetoo_native/sofficerc.in
new file mode 100644
index 000000000000..d16df2a4760c
--- /dev/null
+++ b/instsetoo_native/sofficerc.in
@@ -0,0 +1,20 @@
+[Bootstrap]
+CrashDirectory=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/crash
+CrashDumpEnable=true
+HideEula=1
+Logo=1
+NativeProgress=false
+ProgressBarColor=0,0,0
+ProgressFrameColor=102,102,102
+ProgressPosition=35,153
+ProgressSize=444,8
+ProgressPositionHigh=46,212
+ProgressSizeHigh=617,12
+ProgressTextBaseline=145
+ProgressTextColor=0,0,0
+SecureUserConfig=true
+SecureUserConfigCompress=true
+SecureUserConfigExtensions=true
+SecureUserConfigMode=1
+SecureUserConfigNumCopies=2
+URE_BOOTSTRAP=${ORIGIN}/fundamentalrc
diff --git a/meson.build b/meson.build
index cfd2cc73da33..b3b881f01426 100644
--- a/meson.build
+++ b/meson.build
@@ -261,3 +261,4 @@ subdir('lingucomponent')
subdir('scripting')
subdir('dtrans')
subdir('sdext')
+subdir('instsetoo_native')
diff --git a/offapi/meson.build b/offapi/meson.build
index bbf67e006208..c373947073d2 100644
--- a/offapi/meson.build
+++ b/offapi/meson.build
@@ -1,14 +1,17 @@
offapiurbcompiler = find_program('offapiurbcompiler.py')
offbuilder = find_program('offapihbuilder.py')
-offapi_rdb = custom_target('offapi_urb',
- output: 'offapi.urb',
+offapi_rdb = custom_target('offapi_rdb',
+ output: 'offapi.rdb',
command: [offapiurbcompiler,
unoidl_write_exe,
udkapi_rdb,
meson.current_source_dir(),
'@PRIVATE_DIR@',
- '@OUTPUT@'])
+ '@OUTPUT@'],
+ install: true,
+ install_dir: get_option('bindir') / 'types',
+)
off_fake_h = custom_target('offapi_h',
diff --git a/udkapi/meson.build b/udkapi/meson.build
index 17ec4b3c88b5..87ed016dd0b6 100644
--- a/udkapi/meson.build
+++ b/udkapi/meson.build
@@ -9,6 +9,20 @@ udkapi_rdb = custom_target('udkapi_rdb',
'@PRIVATE_DIR@',
'@OUTPUT@'])
+# udkapi.rdb seems to be installed as types.rdb.
+# Dunno why. The simplest thing here is to just gen it again.
+custom_target('types_rdb',
+ output: 'types.rdb',
+ command: [urbcompiler,
+ unoidl_write_exe,
+ meson.current_source_dir(),
+ '@PRIVATE_DIR@',
+ '@OUTPUT@'],
+ install: true,
+ install_dir: get_option('bindir')
+)
+
+
# FIXME, this only generates headers. There is no
# proper dependency tracking or dealing of the rdb file.
udk_fake_h = custom_target('udkapi_h',