Kaydet (Commit) 76e04aef authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Rename LO-specific uno ini-file (Linux: program/unorc) to "louno"

...to avoid confusion with the URE uno ini-file (Linux: ure/lib/unorc).

It might even work to get rid of the louno ini-file altogether and fold its
contents into the fundamental ini-file, but at least
desktop/source/deployment/misc/dp_misc.cxx accesses the louno ini-file directly,
so would need some inspection to avoid potential regressions.

Change-Id: Ib49bbc4c814d677c22e68d2dd0f11af6d8423bb6
üst 9bd221ab
...@@ -75,7 +75,7 @@ namespace { ...@@ -75,7 +75,7 @@ namespace {
struct UnoRc : public rtl::StaticWithInit< struct UnoRc : public rtl::StaticWithInit<
boost::shared_ptr<rtl::Bootstrap>, UnoRc> { boost::shared_ptr<rtl::Bootstrap>, UnoRc> {
const boost::shared_ptr<rtl::Bootstrap> operator () () { const boost::shared_ptr<rtl::Bootstrap> operator () () {
OUString unorc( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("uno") ); OUString unorc( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("louno") );
::rtl::Bootstrap::expandMacros( unorc ); ::rtl::Bootstrap::expandMacros( unorc );
::boost::shared_ptr< ::rtl::Bootstrap > ret( ::boost::shared_ptr< ::rtl::Bootstrap > ret(
new ::rtl::Bootstrap( unorc ) ); new ::rtl::Bootstrap( unorc ) );
......
...@@ -18,7 +18,7 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\ ...@@ -18,7 +18,7 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(call gb_Helper_get_rcfile,redirect))) \ $(call gb_Helper_get_rcfile,redirect))) \
$(call gb_Helper_get_rcfile,setup) \ $(call gb_Helper_get_rcfile,setup) \
$(call gb_Helper_get_rcfile,soffice) \ $(call gb_Helper_get_rcfile,soffice) \
$(call gb_Helper_get_rcfile,uno) \ $(call gb_Helper_get_rcfile,louno) \
$(call gb_Helper_get_rcfile,version) \ $(call gb_Helper_get_rcfile,version) \
)) ))
...@@ -26,7 +26,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ ...@@ -26,7 +26,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) \ $(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)/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,pythonloader.uno) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) \ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,louno) \
: $(SRCDIR)/instsetoo_native/CustomTarget_setup.mk : $(SRCDIR)/instsetoo_native/CustomTarget_setup.mk
$(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,bootstrap) :
...@@ -50,24 +50,24 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ ...@@ -50,24 +50,24 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \ && echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
&& echo 'BRAND_BIN_SUBDIR=$(LIBO_BIN_FOLDER)' \ && echo 'BRAND_BIN_SUBDIR=$(LIBO_BIN_FOLDER)' \
&& echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_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 '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,louno):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,louno):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,louno):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_JAVA_DIR=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)' \
&& echo 'LO_LIB_DIR=$${BRAND_BASE_DIR}/$(LIBO_LIB_FOLDER)' \ && echo 'LO_LIB_DIR=$${BRAND_BASE_DIR}/$(LIBO_LIB_FOLDER)' \
&& echo 'BAK_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):TMP_EXTENSIONS}' \ && echo 'BAK_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):TMP_EXTENSIONS}' \
&& echo 'BUNDLED_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):BUNDLED_EXTENSIONS}' \ && echo 'BUNDLED_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS}' \
&& echo 'BUNDLED_EXTENSIONS_USER=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):BUNDLED_EXTENSIONS_USER}' \ && echo 'BUNDLED_EXTENSIONS_USER=$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS_USER}' \
&& echo 'SHARED_EXTENSIONS_USER=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):SHARED_EXTENSIONS_USER}' \ && echo 'SHARED_EXTENSIONS_USER=$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):SHARED_EXTENSIONS_USER}' \
&& echo 'UNO_SHARED_PACKAGES_CACHE=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):UNO_SHARED_PACKAGES_CACHE}' \ && echo 'UNO_SHARED_PACKAGES_CACHE=$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):UNO_SHARED_PACKAGES_CACHE}' \
&& echo 'TMP_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):TMP_EXTENSIONS}' \ && echo 'TMP_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):TMP_EXTENSIONS}' \
&& echo 'UNO_USER_PACKAGES_CACHE=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):UNO_USER_PACKAGES_CACHE}' \ && echo 'UNO_USER_PACKAGES_CACHE=$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):UNO_USER_PACKAGES_CACHE}' \
&& echo 'URE_BIN_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/$(LIBO_URE_BIN_FOLDER))' \ && echo 'URE_BIN_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/$(LIBO_URE_BIN_FOLDER))' \
&& echo 'URE_MORE_JAVA_CLASSPATH_URLS=$(if $(SYSTEM_HSQLDB),$(HSQLDB_JAR))' \ && echo 'URE_MORE_JAVA_CLASSPATH_URLS=$(if $(SYSTEM_HSQLDB),$(HSQLDB_JAR))' \
&& echo 'URE_OVERRIDE_JAVA_JFW_SHARED_DATA=$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/config/javasettings_$${_OS}_$${_ARCH}.xml' \ && 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_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_LIB_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/ure-link/lib)' \
&& echo 'URE_MORE_JAVA_TYPES=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/unoil.jar $${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/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_JAVA_TYPES=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/unoil.jar $${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/ScriptFramework.jar $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):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_SERVICES=$${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):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}' \ && echo 'URE_MORE_TYPES=<$$ORIGIN/types>* $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_TYPES}' \
) > $@ ) > $@
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv : $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
...@@ -131,7 +131,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ ...@@ -131,7 +131,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \ && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \
) > $@ ) > $@
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) : $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,louno) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \ ( \
echo '[Bootstrap]' \ echo '[Bootstrap]' \
......
...@@ -18,7 +18,7 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\ ...@@ -18,7 +18,7 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
$(call gb_Helper_get_rcfile,redirect))) \ $(call gb_Helper_get_rcfile,redirect))) \
$(call gb_Helper_get_rcfile,setup) \ $(call gb_Helper_get_rcfile,setup) \
$(call gb_Helper_get_rcfile,soffice) \ $(call gb_Helper_get_rcfile,soffice) \
$(call gb_Helper_get_rcfile,uno) \ $(call gb_Helper_get_rcfile,louno) \
$(call gb_Helper_get_rcfile,version) \ $(call gb_Helper_get_rcfile,version) \
)) ))
......
...@@ -1081,7 +1081,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions ...@@ -1081,7 +1081,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions
ProfileID = gid_Brand_Profile_Fundamental_Ini; ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap"; Section = "Bootstrap";
Key = "BUNDLED_EXTENSIONS"; Key = "BUNDLED_EXTENSIONS";
Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS}"; Value = "${$ORIGIN/" PROFILENAME(louno) ":BUNDLED_EXTENSIONS}";
End End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User
...@@ -1089,7 +1089,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User ...@@ -1089,7 +1089,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User
ProfileID = gid_Brand_Profile_Fundamental_Ini; ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap"; Section = "Bootstrap";
Key = "BUNDLED_EXTENSIONS_USER"; Key = "BUNDLED_EXTENSIONS_USER";
Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}"; Value = "${$ORIGIN/" PROFILENAME(louno) ":BUNDLED_EXTENSIONS_USER}";
End End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
...@@ -1097,7 +1097,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache ...@@ -1097,7 +1097,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
ProfileID = gid_Brand_Profile_Fundamental_Ini; ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap"; Section = "Bootstrap";
Key = "UNO_SHARED_PACKAGES_CACHE"; Key = "UNO_SHARED_PACKAGES_CACHE";
Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_SHARED_PACKAGES_CACHE}"; Value = "${$ORIGIN/" PROFILENAME(louno) ":UNO_SHARED_PACKAGES_CACHE}";
End End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Extensions_User ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Extensions_User
...@@ -1105,7 +1105,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Extensions_User ...@@ -1105,7 +1105,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Extensions_User
ProfileID = gid_Brand_Profile_Fundamental_Ini; ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap"; Section = "Bootstrap";
Key = "SHARED_EXTENSIONS_USER"; Key = "SHARED_EXTENSIONS_USER";
Value = "${$ORIGIN/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}"; Value = "${$ORIGIN/" PROFILENAME(louno) ":SHARED_EXTENSIONS_USER}";
End End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache
...@@ -1113,7 +1113,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache ...@@ -1113,7 +1113,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache
ProfileID = gid_Brand_Profile_Fundamental_Ini; ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap"; Section = "Bootstrap";
Key = "UNO_USER_PACKAGES_CACHE"; Key = "UNO_USER_PACKAGES_CACHE";
Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}"; Value = "${$ORIGIN/" PROFILENAME(louno) ":UNO_USER_PACKAGES_CACHE}";
End End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
...@@ -1121,7 +1121,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions ...@@ -1121,7 +1121,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
ProfileID = gid_Brand_Profile_Fundamental_Ini; ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap"; Section = "Bootstrap";
Key = "TMP_EXTENSIONS"; Key = "TMP_EXTENSIONS";
Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}"; Value = "${$ORIGIN/" PROFILENAME(louno) ":TMP_EXTENSIONS}";
End End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bak_Extensions ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bak_Extensions
...@@ -1129,7 +1129,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bak_Extensions ...@@ -1129,7 +1129,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bak_Extensions
ProfileID = gid_Brand_Profile_Fundamental_Ini; ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap"; Section = "Bootstrap";
Key = "BAK_EXTENSIONS"; Key = "BAK_EXTENSIONS";
Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}"; Value = "${$ORIGIN/" PROFILENAME(louno) ":TMP_EXTENSIONS}";
End End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
...@@ -1137,7 +1137,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types ...@@ -1137,7 +1137,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
ProfileID = gid_Brand_Profile_Fundamental_Ini; ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap"; Section = "Bootstrap";
Key = "URE_MORE_TYPES"; Key = "URE_MORE_TYPES";
Value = "<$ORIGIN/types>* ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}"; Value = "<$ORIGIN/types>* ${${$ORIGIN/" PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_TYPES}";
End End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services
...@@ -1145,7 +1145,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services ...@@ -1145,7 +1145,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services
ProfileID = gid_Brand_Profile_Fundamental_Ini; ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap"; Section = "Bootstrap";
Key = "URE_MORE_SERVICES"; Key = "URE_MORE_SERVICES";
Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} <$ORIGIN/services>*"; Value = "${${$ORIGIN/" PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_SERVICES} <$ORIGIN/services>*";
End End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
...@@ -1153,7 +1153,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types ...@@ -1153,7 +1153,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
ProfileID = gid_Brand_Profile_Fundamental_Ini; ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap"; Section = "Bootstrap";
Key = "URE_MORE_JAVA_TYPES"; Key = "URE_MORE_JAVA_TYPES";
Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/unoil.jar ${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}"; Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/unoil.jar ${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
End End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data
...@@ -1213,9 +1213,9 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers ...@@ -1213,9 +1213,9 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers
Section = "Bootstrap"; Section = "Bootstrap";
Key = "CONFIGURATION_LAYERS"; Key = "CONFIGURATION_LAYERS";
#if defined WNT #if defined WNT
Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry winreg: res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu"; Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry winreg: res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu";
#else #else
Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu"; Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu";
#endif #endif
End End
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
#include "config_folders.h" #include "config_folders.h"
Profile gid_Profile_Uno_Ini Profile gid_Profile_Louno_ini
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Name = PROFILENAME(uno); Name = PROFILENAME(louno);
Dir = GID_BRAND_DIR_ETC; Dir = GID_BRAND_DIR_ETC;
Styles = (NETWORK); Styles = (NETWORK);
End End
...@@ -103,8 +103,8 @@ End ...@@ -103,8 +103,8 @@ End
#endif #endif
ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions ProfileItem gid_Profileitem_Louno_Uno_Bundled_Extensions
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 1; Order = 1;
...@@ -112,8 +112,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions ...@@ -112,8 +112,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions
Value = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/extensions"; Value = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/extensions";
End End
ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User ProfileItem gid_Profileitem_Louno_Uno_Bundled_Extensions_User
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 1; Order = 1;
...@@ -121,8 +121,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User ...@@ -121,8 +121,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User
Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled"; Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
End End
ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages ProfileItem gid_Profileitem_Louno_Uno_Shared_Packages
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 1; Order = 1;
...@@ -130,8 +130,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages ...@@ -130,8 +130,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
Value = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/uno_packages"; Value = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/uno_packages";
End End
ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages_Cache ProfileItem gid_Profileitem_Louno_Uno_Shared_Packages_Cache
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 2; Order = 2;
...@@ -139,8 +139,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages_Cache ...@@ -139,8 +139,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages_Cache
Value = "$UNO_SHARED_PACKAGES/cache"; Value = "$UNO_SHARED_PACKAGES/cache";
End End
ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User ProfileItem gid_Profileitem_Louno_Uno_Shared_Extensions_User
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 1; Order = 1;
...@@ -148,8 +148,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User ...@@ -148,8 +148,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User
Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared"; Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared";
End End
ProfileItem gid_Profileitem_Uno_Uno_User_Packages ProfileItem gid_Profileitem_Louno_Uno_User_Packages
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 3; Order = 3;
...@@ -157,8 +157,8 @@ ProfileItem gid_Profileitem_Uno_Uno_User_Packages ...@@ -157,8 +157,8 @@ ProfileItem gid_Profileitem_Uno_Uno_User_Packages
Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages"; Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages";
End End
ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions ProfileItem gid_Profileitem_Louno_Uno_Bundled_Tmp_Extensions
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 1; Order = 1;
...@@ -166,8 +166,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions ...@@ -166,8 +166,8 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp"; Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
End End
ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions ProfileItem gid_Profileitem_Louno_Uno_Bundled_Bak_Extensions
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 1; Order = 1;
...@@ -175,16 +175,16 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions ...@@ -175,16 +175,16 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions
Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak"; Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak";
End End
ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache ProfileItem gid_Profileitem_Louno_Uno_User_Packages_Cache
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 4; Order = 4;
Key = "UNO_USER_PACKAGES_CACHE"; Key = "UNO_USER_PACKAGES_CACHE";
Value = "$UNO_USER_PACKAGES/cache"; Value = "$UNO_USER_PACKAGES/cache";
End End
ProfileItem gid_Profileitem_Uno_Pkg_BundledUnoFile ProfileItem gid_Profileitem_Louno_Pkg_BundledUnoFile
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 5; Order = 5;
...@@ -192,8 +192,8 @@ ProfileItem gid_Profileitem_Uno_Pkg_BundledUnoFile ...@@ -192,8 +192,8 @@ ProfileItem gid_Profileitem_Uno_Pkg_BundledUnoFile
Value = "$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc"; Value = "$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
End End
ProfileItem gid_Profileitem_Uno_Pkg_SharedUnoFile ProfileItem gid_Profileitem_Louno_Pkg_SharedUnoFile
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 5; Order = 5;
...@@ -201,8 +201,8 @@ ProfileItem gid_Profileitem_Uno_Pkg_SharedUnoFile ...@@ -201,8 +201,8 @@ ProfileItem gid_Profileitem_Uno_Pkg_SharedUnoFile
Value = "$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc"; Value = "$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
End End
ProfileItem gid_Profileitem_Uno_Pkg_UserUnoFile ProfileItem gid_Profileitem_Louno_Pkg_UserUnoFile
ProfileID = gid_Profile_Uno_Ini; ProfileID = gid_Profile_Louno_ini;
ModuleID = gid_Module_Root; ModuleID = gid_Module_Root;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 6; Order = 6;
......
...@@ -67,7 +67,7 @@ Reference< XComponentContext > createInitialComponentContext( ...@@ -67,7 +67,7 @@ Reference< XComponentContext > createInitialComponentContext(
inst_dir.pData, &file_url.pData ); inst_dir.pData, &file_url.pData );
OSL_ASSERT( osl_File_E_None == rc ); OSL_ASSERT( osl_File_E_None == rc );
OUString unorc = file_url + ("/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("uno") ); OUString unorc = file_url + ("/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("louno") );
return defaultBootstrap_InitialComponentContext( unorc ); return defaultBootstrap_InitialComponentContext( unorc );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment