diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-18 12:50:02 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-18 12:52:06 +0200 |
| commit | fd1db0b8eba8e86c5a7e1a3c685e76975d21d93c (patch) | |
| tree | 1c7843fbea76f3469eb9e9cbe7b28164753427fd /scp2 | |
| parent | d37209912b44f5accee73e7f774122b195fe2183 (diff) | |
Undo basis/brand split: move program/classes/ from basis to brand.
Also removed apparently unused UNO_JAVA_COMPPATH ProfileItem.
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/profileitem_ooo.scp | 11 |
3 files changed, 3 insertions, 12 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 830f7eaad68f..52611adc1a2a 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1231,7 +1231,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types ProfileID = gid_Brand_Profile_Fundamental_Ini; Section = "Bootstrap"; Key = "URE_MORE_JAVA_TYPES"; - Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_JAVA_TYPES}"; + Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_JAVA_TYPES}"; End ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 2d523951c7e5..726834a85025 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -152,7 +152,7 @@ Directory gid_Dir_Httphome End Directory gid_Dir_Classes - ParentID = gid_Dir_Program; + ParentID = gid_Brand_Dir_Program; DosName = "classes"; End diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp index 3c6dfefc1286..78b960685163 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -27,15 +27,6 @@ #include "macros.inc" -ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath - ProfileID = gid_Profile_Setup_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 1; - Key = "UNO_JAVA_COMPPATH"; - Value = "$ORIGIN/classes"; -End - ProfileItem gid_Profileitem_Setup_Uno_Services ProfileID = gid_Profile_Setup_Ini; ModuleID = gid_Module_Root; @@ -358,7 +349,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types ProfileID = gid_Profile_Fundamentalbasis_Ini; Section = "Bootstrap"; Key = "URE_MORE_JAVA_TYPES"; - Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/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 = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}"; End ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_Shared_Data |