Further work on the "Mac-like app structure" option

Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.

Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4

9 files changed, 44 insertions, 17 deletions

diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk
index 8d6c5ee26d23..219a0c9e27f7 100644
--- a/scp2/InstallModule_graphicfilter.mk
+++ b/scp2/InstallModule_graphicfilter.mk
@@ -11,6 +11,11 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter))
 
+$(eval $(call gb_InstallModule_define_if_set,scp2/graphicfilter,\
+	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
+	ENABLE_MACOSX_SANDBOX \
+))
+
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\
 	scp2/source/graphicfilter/file_graphicfilter \
 ))
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
index c84ac382c831..21bc3ef20f9b 100644
--- a/scp2/InstallModule_python.mk
+++ b/scp2/InstallModule_python.mk
@@ -27,6 +27,12 @@ $(eval $(call gb_InstallModule_add_defs,scp2/python,\
 endif
 
 else
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/python,\
+	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
+	ENABLE_MACOSX_SANDBOX \
+))
+
 $(eval $(call gb_InstallModule_add_defs,scp2/python,\
 	-DPYVERSION=$(PYTHON_VERSION) \
 	-DPYMAJMIN=$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \
diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk
index 6e5534f8db4e..1ed82fa64ce6 100644
--- a/scp2/InstallModule_ure.mk
+++ b/scp2/InstallModule_ure.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ure,ure))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ure,\
 	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
+	ENABLE_MACOSX_SANDBOX \
 	SYSTEM_LIBXML \
 ))
 
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index fabb82ddb4d8..4d588a4d0e69 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -492,7 +492,7 @@ End
 #define URE_EXECUTABLE(id,name) \
     File id \
         BIN_FILE_BODY; \
-        Dir = gid_Dir_Ure_Bin; \
+        Dir = GID_DIR_URE_BIN; \
         Name = name; \
         Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \
     End
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 8ea797982a77..665b8bfedf76 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -135,7 +135,9 @@ Directory gid_Brand_Dir_Program_Shell
 End
 
 Directory gid_Brand_Dir_Readme
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     ParentID = gid_Dir_Bundle_Contents;
 #else
     ParentID = gid_Dir_Brand_Root;
@@ -485,7 +487,9 @@ End
 
 File gid_Brand_File_Html_Thirdpartylicensereadme
     Name = "LICENSE.html";
-#ifdef MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
@@ -494,7 +498,7 @@ File gid_Brand_File_Html_Thirdpartylicensereadme
     TXT_FILE_BODY;
 End
 
-#if defined UNX && !defined ENABLE_MACOSX_SANDBOX
+#if defined UNX && !defined ENABLE_MACOSX_SANDBOX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
 File gid_Brand_File_Gdb_Trace
     TXT_FILE_BODY;
@@ -591,7 +595,7 @@ File gid_Brand_File_Script_Unopkg
 End
 #endif
 
-#if defined MACOSX && !defined ENABLE_MACOSX_SANDBOX
+#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 Unixlink gid_Brand_Unixlink_Unopkg
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -1400,7 +1404,9 @@ End
 
 File gid_License_Txt
   TXT_FILE_BODY;
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
@@ -1416,7 +1422,9 @@ End
 
 File gid_License_Odt
     BIN_FILE_BODY;
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
@@ -1427,7 +1435,9 @@ End
 
 File gid_Credits_Odt
     BIN_FILE_BODY;
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
@@ -1438,7 +1448,9 @@ End
 
 File gid_Apache_Notice
     BIN_FILE_BODY;
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 3a099a25293e..36d652290598 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -112,7 +112,9 @@ End
 #endif
 
 Directory gid_Dir_User
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     ParentID = gid_Dir_Bundle_Contents;
 #else
     ParentID = gid_Dir_Brand_Root;
@@ -357,7 +359,9 @@ Directory gid_Dir_Share_Fingerprint
 End
 
 Directory gid_Dir_Help
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     ParentID = gid_Dir_Bundle_Contents;
 #else
     ParentID = gid_Dir_Brand_Root;
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 99e65909239f..2df138ab3e7d 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -19,7 +19,6 @@
 #include "macros.inc"
 
 #ifdef UNX
-#ifndef ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 #ifndef SYSTEM_ICU
 
 Shortcut gid_Shortcut_Lib_Icudata
@@ -59,8 +58,6 @@ End
 
 #endif
 
-#endif
-
 #ifdef MACOSX
 
 #ifdef SOLAR_JAVA
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 939bd3caf395..08b60f66f38b 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -18,10 +18,10 @@
 
 #include "macros.inc"
 
-#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-
 #include "AutoInstall/ure"
 
+#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+
 Directory gid_Dir_Ure_Bin
 #if defined MACOSX
     ParentID = gid_Dir_UreLink;
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
index ee4dac62b9fa..e66eb1aa7602 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -38,8 +38,10 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome
     Section = "Bootstrap";
     Order = 1;
     Key = "PYUNO_LOADER_PYTHONHOME";
-  #ifdef MACOSX
+  #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
     Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework";
+  #elif defined MACOSX
+    Value = CONCAT2($ORIGIN,/LibreOfficePython.framework);
   #else
     Value = CONCAT2($ORIGIN/python-core-,PYVERSION);
   #endif