Use subfolder names from <config_folders.h>

Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.

Change-Id: I91c95cd8e482818be67307e889ae6df887763f53

1 files changed, 84 insertions, 23 deletions

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 0ce9a7316bfb..939bd3caf395 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -18,6 +18,8 @@
 
 #include "macros.inc"
 
+#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+
 #include "AutoInstall/ure"
 
 Directory gid_Dir_Ure_Bin
@@ -63,9 +65,11 @@ Directory gid_Dir_Ure_Misc
     DosName = "misc";
 End
 
+#endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+
 // Public Executables:
 
-#ifndef WNT
+#if !defined WNT && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 Shortcut gid_Shortcut_Exe_Uno
     FileID = gid_File_Exe_StartupSh;
     Dir = gid_Dir_Ure_Bin;
@@ -76,7 +80,7 @@ End
 
 // Private Executables:
 
-#if !defined WNT
+#if !defined WNT && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 File gid_File_Exe_StartupSh
     BIN_FILE_BODY;
     Dir = gid_Dir_Ure_Bin;
@@ -180,12 +184,77 @@ End
 
 // Private Dynamic Libraries:
 
-File gid_File_Dl_Profile_Uno
-    LIB_FILE_BODY;
+// We set up the URE unorc/uno.ini in scp2 because then it is easy to
+// get the platform differences into it compared to constructing it in
+// Makefiles etc. With ENABLE_MACOSX_MACLIKE_APP_STRUCTURE it goes into
+// .app/Contents/Resources/ure/unorc, on Unix into .../ure/lib/unorc
+// and on Windows into .../ure/bin/unorc. The latter two locations
+// are factored out as SCP2_URE_DL_DIR.
+
+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;
+#else
     Dir = SCP2_URE_DL_DIR;
-    Name = PROFILENAME(/ure/uno);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "4681F5C1-8F64-486F-B804-03B4D8CEB41F";
+#endif
+    Name = PROFILENAME(uno);
+End
+
+ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir
+    ModuleID = gid_Module_Root_Ure_Hidden;
+    ProfileID = gid_Profile_Dl_Uno_Ini;
+    Section = "Bootstrap";
+    Key = "URE_INTERNAL_LIB_DIR";
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Value = "${ORIGIN}/../../Frameworks";
+#else
+    Value = "${ORIGIN}";
+#endif
+End
+
+ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir
+    ModuleID = gid_Module_Root_Ure_Hidden;
+    ProfileID = gid_Profile_Dl_Uno_Ini;
+    Section = "Bootstrap";
+    Key = "URE_INTERNAL_JAVA_DIR";
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Value = "${ORIGIN}/../java";
+#else
+    Value = "${ORIGIN}/../share/java";
+#endif
+End
+
+ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Classpath
+    ModuleID = gid_Module_Root_Ure_Hidden;
+    ProfileID = gid_Profile_Dl_Uno_Ini;
+    Section = "Bootstrap";
+    Key = "URE_INTERNAL_JAVA_CLASSPATH";
+    Value = "${URE_MORE_JAVA_TYPES}";
+End
+
+ProfileItem gid_Profileitem_Dl_Uno_Uno_Types
+    ModuleID = gid_Module_Root_Ure_Hidden;
+    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}";
+#else
+    Value = "${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}";
+#endif
+End
+
+ProfileItem gid_Profileitem_Dl_Uno_Uno_Services
+    ModuleID = gid_Module_Root_Ure_Hidden;
+    ProfileID = gid_Profile_Dl_Uno_Ini;
+    Section = "Bootstrap";
+    Key = "UNO_SERVICES";
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Value = "${ORIGIN}/services.rdb ${URE_MORE_SERVICES}";
+#else
+    Value = "${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}";
+#endif
 End
 
 #ifdef AIX
@@ -495,7 +564,7 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Java_UnoloaderJar
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
+    Dir = GID_DIR_URE_JAVA;
     Name = "unoloader.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "90F99ED3-814C-4B45-894B-D9248848CEB4";
@@ -505,7 +574,7 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Java_JuhJar
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
+    Dir = GID_DIR_URE_JAVA;
     Name = "juh.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "E77CC8B5-0345-4B7F-ABED-5EB9DC94E492";
@@ -515,7 +584,7 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Java_JurtJar
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
+    Dir = GID_DIR_URE_JAVA;
     Name = "jurt.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "EA63EDCC-9152-4560-AB7A-BFC367442E50";
@@ -525,7 +594,7 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Java_RidlJar
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
+    Dir = GID_DIR_URE_JAVA;
     Name = "ridl.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "4A915C83-6BE3-41B9-BAF9-13AA27034955";
@@ -537,7 +606,7 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Java_JavaUnoJar
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
+    Dir = GID_DIR_URE_JAVA;
     Name = "java_uno.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "ABDC8DDA-5D2B-424C-ABD8-FD22D59658FE";
@@ -548,7 +617,7 @@ End
 
 File gid_File_Misc_TypesRdb
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Misc;
+    Dir = GID_DIR_URE_SHARE_MISC;
     Name = "udkapi.rdb";
     InstallName = "types.rdb";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, SUBST_FILENAME);
@@ -557,7 +626,7 @@ End
 
 File gid_File_Misc_ServicesRdb
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Misc;
+    Dir = GID_DIR_URE_SHARE_MISC;
     Name = "/ure/services.rdb";
     Styles = (PACKED);
 End
@@ -567,21 +636,13 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Misc_JavavendorsXml
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Misc;
+    Dir = GID_DIR_URE_SHARE_MISC;
     Name = "javavendors.xml";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "403FCCFE-545B-44F6-91D1-5C75F846E587";
 End
 #endif
 
-#if defined MACOSX
-Unixlink gid_Unixlink_Ure_Bin_Urelibs
-    Dir = gid_Dir_Ure_Bin;
-    Name = "urelibs";
-    Target = "../lib";
-End
-#endif
-
 //Module
 
 Module gid_Module_Root_Ure_Hidden