diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-31 16:51:35 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-31 16:51:35 +0100 |
| commit | a334403eb22f3d812549b5ce9b390fecdee9be31 (patch) | |
| tree | badbed131a228b1a8cbbfb50cde979884f0a2919 /scp2 | |
| parent | 983360d3bed84981650adfb30e2759bf6fa30e61 (diff) | |
Cleaned up configmgr initialization.
Added CONFIGURATION_LAYERS bootstrap variable.
Removed OOO_CONFIG_REGISTRY[_EXTRA]_DIR bootstrap variables.
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 01d0cecc5c77..d9baffadd402 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -927,6 +927,18 @@ ProfileItem gid_Brand_Profileitem_Soffice_Startlang End #endif +ProfileItem gid_Brand_Profileitem_Soffice_ConfigurationLayers + ProfileID = gid_Brand_Profile_Soffice_Ini; + 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"; + // "xcsxcu:${${BRAND_BASE_DIR}/program/"PROFILENAME(uno) + // ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment." + // "configuration.PackageRegistryBackend/registry" can be dropped once + // old UserInstallation format can no longer exist (probably OOo 4) +End + ProfileItem gid_Brand_Profileitem_Version_Buildid ProfileID = gid_Brand_Profile_Version_Ini; ModuleID = gid_Module_Root_Brand; |