[Libreoffice-commits] core.git: configmgr/source instsetoo_native/CustomTarget_setup.mk scp2/source

[Stephan Bergmann]

 configmgr/source/components.cxx        |   15 +++++++++------
 instsetoo_native/CustomTarget_setup.mk |    2 +-
 scp2/source/ooo/common_brand.scp       |    4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 53e3fb1d9337e450e926e163221fecaca13ea957
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Aug 21 11:05:32 2015 +0200

    Generalize CONFIGURATION_LAYERS "winreg:" notation
    
    ...after 097292feab4fc3c064983e1dd08ac4bebe1fe216 "Add HKEY_CURRENT_USER
    registry integration" added "winuserreg:".
    
    Even though changing from the exisiting "winreg:" to "winreg:LOCAL_MACHINE"
    should be compatible, as it only ends up in fundamental.ini included in the LO
    inst set, play it safe it keep treating "winreg" the same as
    "winreg:LOCAL_MACHINE".
    
    ("url" is a misnomer now in configmgr's Components ctor, and should eventually
    be renamed to something more accurate.)
    
    Change-Id: Ifbcf3284d904490891642599468470d03547f92a
    Reviewed-on: https://gerrit.libreoffice.org/17891
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 9e19ef9..6c2726e 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -537,15 +537,18 @@ Components::Components(
             ++layer; //TODO: overflow
 #endif
 #if defined WNT
-        } else if (type == "winreg" || type == "winuserreg") {
-            if (!url.isEmpty()) {
+        } else if (type == "winreg") {
+            WinRegType eType;
+            if (url == "LOCAL_MACHINE" || url.isEmpty()/*backwards comp.*/) {
+                eType = WinRegType::LOCAL_MACHINE;
+            } else if (url == "CURRENT_USER") {
+                eType = WinRegType::CURRENT_USER;
+            } else {
                 throw css::uno::RuntimeException(
-                    "CONFIGURATION_LAYERS: non-empty \"winreg\" URL");
+                    "CONFIGURATION_LAYERS: unknown \"winreg\" kind \"" + url
+                    + "\"");
             }
             OUString aTempFileURL;
-            WinRegType eType = WinRegType::LOCAL_MACHINE;
-            if (type == "winuserreg")
-                eType = WinRegType::CURRENT_USER;
             if (dumpWindowsRegistry(&aTempFileURL, eType)) {
                 parseFileLeniently(&parseXcuFile, aTempFileURL, layer, 0, 0, 0);
                 osl::File::remove(aTempFileURL);
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index cbc6971..8eb928e 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -52,7 +52,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
 		&& echo 'BRAND_INI_DIR=$${ORIGIN}' \
 		&& 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  $(if $(ENABLE_DCONF),dconf: )$(if $(filter WNT,$(OS)),winreg: )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 $(if $(filter WNT,$(OS)),winuserreg: )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  $(if $(ENABLE_DCONF),dconf: )$(if $(filter WNT,$(OS)),winreg:LOCAL_MACHINE )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 $(if $(filter WNT,$(OS)),winreg:CURRENT_USER )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,louno):TMP_EXTENSIONS}' \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5c83584..ca165b7 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1124,8 +1124,8 @@ End
 #define CONFIGURATION_LAYERS_DCONF
 #endif
 #if defined WNT
-#define CONFIGURATION_LAYERS_WINREG " winreg:"
-#define CONFIGURATION_LAYERS_WINUSERREG " winuserreg:"
+#define CONFIGURATION_LAYERS_WINREG " winreg:LOCAL_MACHINE"
+#define CONFIGURATION_LAYERS_WINUSERREG " winreg:CURRENT_USER"
 #else
 #define CONFIGURATION_LAYERS_WINREG
 #define CONFIGURATION_LAYERS_WINUSERREG