diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-02 16:57:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-02 17:25:36 +0100 |
| commit | 8524330a746da6bd26ca5676b48cdce6bb722380 (patch) | |
| tree | 3ab7235160fdc8e67b9f0436f4381d71757bf98c /scp2/source/ooo | |
| parent | 4ab6d2841dc47219d443e18f007f7b9893705966 (diff) | |
Simplify addition of optional components to URE_MORE_{SERVICES,TYPES}.
Those bootstrap variables now support <XXX>* syntax to include all files (non-
recursively) contained in the directory denoted by XXX. Optional components can
put their data simply into program/services/ and program/types/.
Diffstat (limited to 'scp2/source/ooo')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 10 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 6 |
3 files changed, 15 insertions, 5 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 9b75f369d578..710cdb8863ad 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1168,7 +1168,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types ProfileID = gid_Brand_Profile_Fundamental_Ini; Section = "Bootstrap"; Key = "URE_MORE_TYPES"; - Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$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(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}"; End ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services @@ -1176,7 +1176,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services ProfileID = gid_Brand_Profile_Fundamental_Ini; Section = "Bootstrap"; 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.rdb"; + Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} <$ORIGIN/services>*"; End ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index a25b2d7f67e4..afd11a98c910 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -1435,3 +1435,13 @@ Directory gid_Dir_Template_Common_Presnt ParentID = gid_Dir_Template_Common; DosName = "presnt"; End + +Directory gid_Brand_Dir_Program_Services + ParentID = gid_Brand_Dir_Program; + DosName = "services"; +End + +Directory gid_Brand_Dir_Program_Types + ParentID = gid_Brand_Dir_Program; + DosName = "types"; +End diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 34ed8a90a9a1..a8e0d88ebc47 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -629,14 +629,14 @@ End File gid_File_Rdb_Offapi TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; + Dir = gid_Brand_Dir_Program_Types; Styles = (PACKED); Name = "offapi.rdb"; End File gid_File_Rdb_TypesVba TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; + Dir = gid_Brand_Dir_Program_Types; Styles = (PACKED, OVERWRITE); Name = "oovbaapi.rdb"; End @@ -1142,7 +1142,7 @@ End File gid_Starregistry_Services_Rdb TXT_FILE_BODY; Name = "services.rdb"; - Dir = gid_Brand_Dir_Program; + Dir = gid_Brand_Dir_Program_Services; Styles = (PACKED); End |