[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - scp2/source

[Tor Lillqvist]

 scp2/source/ooo/common_brand.scp |    6 ++++++
 scp2/source/ooo/ure.scp          |   10 ++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit c8177f0fafe80d343e2cd48053fdadba641a08f8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 13 07:36:33 2014 +0300

    Fix issues with the URE unorc in the MACLIKE_APP_STRUCTURE case
    
    Not sure it it is cleaner to use relative paths from ${ORIGIN}, or
    paths below ${BRAND_BASE_DIR}. Now I use the former in the URE unorc
    constructed in scp2, and the latter in the one expanded from
    ure/source/unorc.in. (Whether these two really need to be separate or
    not, no idea. Historical reasons? Different use cases, unit tests and
    actual end-user install tree?)
    
    Change-Id: Ib5f11176de1d5d983cac8358d67788ebc20f2b13

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a6e9580..6267af8 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -45,6 +45,7 @@ Module gid_Module_Root_Brand
             gid_Brand_Dir_Share_Uno_Packages,
             gid_Brand_Dir_Share_Uno_Packages_Cache,
             gid_Brand_Dir_Share_Ure,
+            gid_Brand_Dir_Share_Ure_Etc,
             gid_Brand_Dir_Share_Ure_Share,
             gid_Brand_Dir_Share_Glade,
             gid_Brand_Dir_Share_Labels,
@@ -455,6 +456,11 @@ Directory gid_Brand_Dir_Share_Ure
     DosName = "ure";
 End
 
+Directory gid_Brand_Dir_Share_Ure_Etc
+    ParentID = gid_Brand_Dir_Share_Ure;
+    DosName = "etc";
+End
+
 Directory gid_Brand_Dir_Share_Ure_Share
     ParentID = gid_Brand_Dir_Share_Ure;
     DosName = "share";
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index cc10293..34e77b2 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -164,7 +164,7 @@ End
 Profile gid_Profile_Dl_Uno_Ini
     ModuleID = gid_Module_Root_Ure_Hidden;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-    Dir = gid_Brand_Dir_Share_Ure;
+    Dir = gid_Brand_Dir_Share_Ure_Etc;
 #else
     Dir = SCP2_URE_DL_DIR;
 #endif
@@ -177,7 +177,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir
     Section = "Bootstrap";
     Key = "URE_INTERNAL_LIB_DIR";
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-    Value = "${ORIGIN}/../../Frameworks";
+    Value = "${ORIGIN}/../../../Frameworks";
 #else
     Value = "${ORIGIN}";
 #endif
@@ -189,7 +189,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir
     Section = "Bootstrap";
     Key = "URE_INTERNAL_JAVA_DIR";
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-    Value = "${ORIGIN}/../java";
+    Value = "${ORIGIN}/../../java";
 #elif defined WNT
     Value = "${ORIGIN}/../java";
 #else
@@ -210,9 +210,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Types
     ProfileID = gid_Profile_Dl_Uno_Ini;
     Section = "Bootstrap";
     Key = "UNO_TYPES";
-#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-    Value = "${ORIGIN}/types.rdb ${URE_MORE_TYPES}";
-#elif defined WNT
+#if defined WNT
     Value = "${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}";
 #else
     Value = "${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}";