From 2e5af9dc4fe88fead050ebe08f2b2d044124e7ce Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Fri, 21 Jun 2013 22:29:38 +0200 Subject: properly generate rc files Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad --- config_host.mk.in | 1 + configure.ac | 1 + instsetoo_native/CustomTarget_setup.mk | 93 ++++++++++++++++++++++++++--- instsetoo_native/Module_instsetoo_native.mk | 1 - instsetoo_native/Package_config.mk | 20 ------- instsetoo_native/Package_setup.mk | 7 ++- instsetoo_native/config/bootstraprc | 14 ----- instsetoo_native/config/fundamentalrc | 27 --------- instsetoo_native/config/unorc | 20 ------- 9 files changed, 91 insertions(+), 93 deletions(-) delete mode 100644 instsetoo_native/Package_config.mk delete mode 100644 instsetoo_native/config/bootstraprc delete mode 100644 instsetoo_native/config/fundamentalrc delete mode 100644 instsetoo_native/config/unorc diff --git a/config_host.mk.in b/config_host.mk.in index f3d379b7a24c..586e2e073817 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -310,6 +310,7 @@ export LIBO_LIB_FOLDER=@LIBO_LIB_FOLDER@ export LIBO_LIB_PYUNO_FOLDER=@LIBO_LIB_PYUNO_FOLDER@ export LIBO_SHARE_FOLDER=@LIBO_SHARE_FOLDER@ export LIBO_SHARE_HELP_FOLDER=@LIBO_SHARE_HELP_FOLDER@ +export LIBO_SHARE_JAVA_FOLDER=@LIBO_SHARE_JAVA_FOLDER@ export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@ export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@ export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@ diff --git a/configure.ac b/configure.ac index 4c83e21e5f9e..57ce73fb4499 100644 --- a/configure.ac +++ b/configure.ac @@ -2964,6 +2964,7 @@ AC_SUBST(LIBO_LIB_FOLDER) AC_SUBST(LIBO_LIB_PYUNO_FOLDER) AC_SUBST(LIBO_SHARE_FOLDER) AC_SUBST(LIBO_SHARE_HELP_FOLDER) +AC_SUBST(LIBO_SHARE_JAVA_FOLDER) AC_SUBST(LIBO_SHARE_PRESETS_FOLDER) AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER) AC_SUBST(LIBO_URE_LIB_FOLDER) diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 9db16987612b..55624ce4f72d 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -10,11 +10,60 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/setup)) $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\ + $(call gb_Helper_get_rcfile,bootstrap) \ + $(call gb_Helper_get_rcfile,fundamental) \ ooenv \ - $(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \ - versionrc \ + $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ + $(call gb_Helper_get_rcfile,uno) \ + $(call gb_Helper_get_rcfile,version) \ )) +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) \ +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) \ +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv \ +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,pythonloader.uno) \ +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) \ + : $(SRCDIR)/instsetoo_native/CustomTarget_setup.mk + +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) : + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + ( \ + echo '[ErrorReport]' \ + && echo 'ErrorReportPort=80' \ + && echo 'ErrorReportServer=report.libreoffice.org' \ + && echo '[Bootstrap]' \ + && echo 'InstallMode=' \ + && echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \ + && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME))/$(LIBO_VERSION_MAJOR)' \ + ) > $@ + +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) : + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + ( \ + echo '[Bootstrap]' \ + && echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \ + && echo 'BRAND_BIN_SUBDIR=$(LIBO_BIN_FOLDER)' \ + && echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \ + && echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu' \ + && echo 'LO_JAVA_DIR=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)' \ + && echo 'LO_LIB_DIR=$${BRAND_BASE_DIR}/$(LIBO_LIB_FOLDER)' \ + && echo 'BAK_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):TMP_EXTENSIONS}' \ + && echo 'BUNDLED_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):BUNDLED_EXTENSIONS}' \ + && echo 'BUNDLED_EXTENSIONS_USER=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):BUNDLED_EXTENSIONS_USER}' \ + && echo 'SHARED_EXTENSIONS_USER=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):SHARED_EXTENSIONS_USER}' \ + && echo 'UNO_SHARED_PACKAGES_CACHE=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):UNO_SHARED_PACKAGES_CACHE}' \ + && echo 'TMP_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):TMP_EXTENSIONS}' \ + && echo 'UNO_USER_PACKAGES_CACHE=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):UNO_USER_PACKAGES_CACHE}' \ + && echo 'URE_BIN_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/ure-link/bin)' \ + && echo 'URE_MORE_JAVA_CLASSPATH_URLS=' \ + && echo 'URE_OVERRIDE_JAVA_JFW_SHARED_DATA=$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/config/javasettings_$${_OS}_$${_ARCH}.xml' \ + && echo 'URE_OVERRIDE_JAVA_JFW_USER_DATA=$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/config/javasettings_$${_OS}_$${_ARCH}.xml' \ + && echo 'URE_LIB_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/ure-link/lib)' \ + && echo 'URE_MORE_JAVA_TYPES=$$ORIGIN/classes/unoil.jar $$ORIGIN/classes/ScriptFramework.jar $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}' \ + && echo 'URE_MORE_SERVICES=$${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_UserUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_SharedUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_BundledUnoFile}:UNO_SERVICES} <$$ORIGIN/services>*' \ + && echo 'URE_MORE_TYPES=<$$ORIGIN/types>* $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_UserUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_SharedUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_BundledUnoFile}:UNO_TYPES}' \ + ) > $@ + $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ @@ -31,7 +80,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv : echo 'export OOO_DISABLE_RECOVERY=1' \ ) > $@ -$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/pythonloader.unorc : +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,pythonloader.uno) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ echo '[Bootstrap]' && \ @@ -42,14 +91,40 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/pythonloader.unorc : ) \ ) > $@ -$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/versionrc : +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) : + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + ( \ + echo '[Bootstrap]' \ + && echo 'PKG_BundledUnoFile=$$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call gb_Helper_get_rcfile,uno)' \ + && echo 'PKG_SharedUnoFile=$$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call gb_Helper_get_rcfile,uno)' \ + && echo 'PKG_UserUnoFile=$$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call gb_Helper_get_rcfile,uno)' \ + && echo 'BAK_EXTENSIONS=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/bak' \ + && echo 'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/$(LIBO_SHARE_FOLDER)/extensions' \ + && echo 'BUNDLED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/bundled' \ + && echo 'TMP_EXTENSIONS=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/tmp' \ + && echo 'SHARED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/shared' \ + && echo 'UNO_SHARED_PACKAGES=$$BRAND_BASE_DIR/$(LIBO_SHARE_FOLDER)/uno_packages' \ + && echo 'UNO_SHARED_PACKAGES_CACHE=$$UNO_SHARED_PACKAGES/cache' \ + && echo 'UNO_USER_PACKAGES=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/uno_packages' \ + && echo 'UNO_USER_PACKAGES_CACHE=$$UNO_USER_PACKAGES/cache' \ + ) > $@ + +.PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version) +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ - echo '[Version]' && \ - echo 'AllLanguages=en-US' && \ - echo 'buildid=$(shell git log -1 --format=%H)' && \ - echo 'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)' && \ - echo 'ProductMinor=$(LIBO_VERSION_PATCH)' \ + echo '[Version]' \ + && echo 'AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)' \ + && echo 'BuildVersion=$(BUILD_VER_STRING)' \ + && echo 'buildid=$(shell git log -1 --format=%H)' \ + && echo 'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update' \ + && echo 'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)' \ + && echo 'ProductMinor=$(LIBO_VERSION_PATCH)' \ + && echo 'ReferenceOOoMajorMinor=3.4' \ + && echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \ + && echo 'UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \ + && echo 'UpdateUserAgent= ($${buildid}; $${_OS}; $${_ARCH}; BundledLanguages=$${AllLanguages})' \ + && echo 'Vendor=$(OOO_VENDOR)' \ ) > $@ # vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk index 49bcb128d31d..2ee18e586a77 100644 --- a/instsetoo_native/Module_instsetoo_native.mk +++ b/instsetoo_native/Module_instsetoo_native.mk @@ -20,7 +20,6 @@ endif ifneq ($(gb_RUNNABLE_INSTDIR),) $(eval $(call gb_Module_add_targets,instsetoo_native,\ CustomTarget_setup \ - Package_config \ Package_setup \ )) endif diff --git a/instsetoo_native/Package_config.mk b/instsetoo_native/Package_config.mk deleted file mode 100644 index 128b653a78b1..000000000000 --- a/instsetoo_native/Package_config.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,instsetoo_native_config,$(SRCDIR)/instsetoo_native/config)) - -$(eval $(call gb_Package_set_outdir,instsetoo_native_config,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,instsetoo_native_config,$(gb_PROGRAMDIRNAME),\ - bootstraprc \ - fundamentalrc \ - unorc \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index 03590e2a2249..f75dc84e1997 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -12,9 +12,12 @@ $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g $(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTDIR))) $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\ + $(call gb_Helper_get_rcfile,bootstrap) \ + $(call gb_Helper_get_rcfile,fundamental) \ ooenv \ - $(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \ - versionrc \ + $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ + $(call gb_Helper_get_rcfile,uno) \ + $(call gb_Helper_get_rcfile,version) \ )) # vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/config/bootstraprc b/instsetoo_native/config/bootstraprc deleted file mode 100644 index 09cb1fd49783..000000000000 --- a/instsetoo_native/config/bootstraprc +++ /dev/null @@ -1,14 +0,0 @@ -= This file is part of the LibreOffice project. -= -= This Source Code Form is subject to the terms of the Mozilla Public -= License, v. 2.0. If a copy of the MPL was not distributed with this -= file, You can obtain one at http://mozilla.org/MPL/2.0/. -= - -[ErrorReport] -ErrorReportPort=80 -ErrorReportServer=report.libreoffice.org -[Bootstrap] -InstallMode= -ProductKey=LibreOffice 4.1 -UserInstallation=$ORIGIN/../.config diff --git a/instsetoo_native/config/fundamentalrc b/instsetoo_native/config/fundamentalrc deleted file mode 100644 index 9f992f29091b..000000000000 --- a/instsetoo_native/config/fundamentalrc +++ /dev/null @@ -1,27 +0,0 @@ -= This file is part of the LibreOffice project. -= -= This Source Code Form is subject to the terms of the Mozilla Public -= License, v. 2.0. If a copy of the MPL was not distributed with this -= file, You can obtain one at http://mozilla.org/MPL/2.0/. -= - -[Bootstrap] -BRAND_BASE_DIR=${ORIGIN}/.. -CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/program/unorc: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/unorc:TMP_EXTENSIONS} -BUNDLED_EXTENSIONS=${$ORIGIN/unorc:BUNDLED_EXTENSIONS} -BUNDLED_EXTENSIONS_USER=${$ORIGIN/unorc:BUNDLED_EXTENSIONS_USER} -SHARED_EXTENSIONS_USER=${$ORIGIN/unorc:SHARED_EXTENSIONS_USER} -UNO_SHARED_PACKAGES_CACHE=${$ORIGIN/unorc:UNO_SHARED_PACKAGES_CACHE} -TMP_EXTENSIONS=${$ORIGIN/unorc:TMP_EXTENSIONS} -UNO_USER_PACKAGES_CACHE=${$ORIGIN/unorc:UNO_USER_PACKAGES_CACHE} -URE_BIN_DIR=${BRAND_BASE_DIR}/ure-link/bin -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_LIB_DIR=${BRAND_BASE_DIR}/ure-link/lib -URE_MORE_JAVA_TYPES=$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/unorc:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/unorc:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/unorc:PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH} -URE_MORE_SERVICES=${${$ORIGIN/unorc:PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/unorc:PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/unorc:PKG_BundledUnoFile}:UNO_SERVICES} <$ORIGIN/services>* -URE_MORE_TYPES=<$ORIGIN/types>* ${${$ORIGIN/unorc:PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/unorc:PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/unorc:PKG_BundledUnoFile}:UNO_TYPES} diff --git a/instsetoo_native/config/unorc b/instsetoo_native/config/unorc deleted file mode 100644 index 387c4a305187..000000000000 --- a/instsetoo_native/config/unorc +++ /dev/null @@ -1,20 +0,0 @@ -= This file is part of the LibreOffice project. -= -= This Source Code Form is subject to the terms of the Mozilla Public -= License, v. 2.0. If a copy of the MPL was not distributed with this -= file, You can obtain one at http://mozilla.org/MPL/2.0/. -= - -[Bootstrap] -PKG_BundledUnoFile=$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc -PKG_SharedUnoFile=$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc -PKG_UserUnoFile=$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc -BAK_EXTENSIONS=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bak -BUNDLED_EXTENSIONS=$BRAND_BASE_DIR/share/extensions -BUNDLED_EXTENSIONS_USER=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bundled -TMP_EXTENSIONS=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/tmp -SHARED_EXTENSIONS_USER=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/shared -UNO_SHARED_PACKAGES=$BRAND_BASE_DIR/share/uno_packages -UNO_SHARED_PACKAGES_CACHE=$UNO_SHARED_PACKAGES/cache -UNO_USER_PACKAGES=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/uno_packages -UNO_USER_PACKAGES_CACHE=$UNO_USER_PACKAGES/cache -- cgit