From 03562cedea2f0c4cc0bbeeddce8224de7c23386d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 5 Dec 2012 12:17:05 +0100 Subject: Drop support for long-gone share/registry/modules layer Support for "module" layers in configmgr/source/components.cxx is still needed for gb_CppunitTest_use_filter_configuration in solenv/gbuild/CppunitTest.mk. Change-Id: I0563145bdfc31e8024a9025e1e390e3c0c4394bb (cherry picked from commit f4d8090a484f99970f00bab2aa9b9f8d6cbe4fdc) --- scp2/source/ooo/common_brand.scp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scp2') diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 53299c9b4409..ebfb49f80fa5 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1278,7 +1278,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers ModuleID = gid_Module_Root_Brand; Section = "Bootstrap"; Key = "CONFIGURATION_LAYERS"; - Value = "xcsxcu:${BRAND_BASE_DIR}/share/registry module:${BRAND_BASE_DIR}/share/registry/modules res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini xcsxcu:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry userext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu"; + Value = "xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini xcsxcu:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry userext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu"; // "xcsxcu:${${BRAND_BASE_DIR}/program/"PROFILENAME(uno) // ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment." // "configuration.PackageRegistryBackend/registry" can be dropped once -- cgit v1.2.3