scp2/inc/macros.inc | 2 --
scp2/source/ooo/common_brand.scp | 8 ++++++++
scp2/source/ooo/ure.scp | 22 ++++++++++++----------
scp2/source/python/file_python.scp | 3 +++
solenv/bin/macosx-codesign-app-bundle | 9 ++++++---
5 files changed, 29 insertions(+), 15 deletions(-)
New commits:
commit 26cfc797fa0b1809cd0c01d5546ba97856bc8143
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Aug 15 08:39:49 2014 +0300
When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE put only binaries in the MacOS dir
The new code signing is more strict and enforces bundle structure
harder, it seems.
When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE bypass the unoinfo and python
shell scripts. If they actually are needed, will have to put them
somewhere under Resources.
Change-Id: I14a34936b78195746d2b88d25603952ce5309380
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 365fb7b..935238e 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -560,12 +560,14 @@ File gid_Brand_File_Desktophelper_Txt
End
#endif
+#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
File gid_Brand_File_Bin_Unoinfo
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(unoinfo);
Styles = (PACKED);
End
+#endif
#ifdef WNT
File gid_Brand_File_Bin_Unopkgcom
diff --git a/scp2/source/python/file_python.scp
b/scp2/source/python/file_python.scp
index b2595ce..32b0d36 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -42,6 +42,8 @@ File gid_File_Pyuno_Rdb
End
#ifndef SYSTEM_PYTHON
+
+#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
File gid_File_Py_Bin_Python
BIN_FILE_BODY;
#ifdef WNT
@@ -54,6 +56,7 @@ File gid_File_Py_Bin_Python
Styles = (FILELIST, PACKED);
#endif
End
+#endif
#ifndef MACOSX
Directory gid_Dir_Py_PythonCore
commit 41f2ebfbaa9fb06f56530b4a330fc029df87ecfd
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Aug 15 01:52:17 2014 +0300
The --resource-rules option in being deprecated
The documentation is a bit unclear yet, but I think it is safe to
assume that Apple strongly wants sandboxed apps to have what we call
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE and to be signed without any
special resource rules.
Change-Id: I1409ccb6a3f9086d01af6ff318fe28536c1cebef
diff --git a/solenv/bin/macosx-codesign-app-bundle
b/solenv/bin/macosx-codesign-app-bundle
index 2f22618..cdaa8e8 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -89,11 +89,14 @@ done
# (bootstraprc and similar that the user might adjust and image files)
# See also https://developer.apple.com/library/mac/technotes/tn2206/
-if test "$ENABLE_MACOSX_SANDBOX" = "TRUE"; then
+id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'`
+
+if test -n "$ENABLE_MACOSX_SANDBOX"; then
entitlements="--entitlements $BUILDDIR/lo.xcent"
+else
+ resource_rules="--resource-rules
$SRCDIR/setup_native/source/mac/CodesignRules.plist"
fi
-id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'`
-codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$id"
--resource-rules "$SRCDIR/setup_native/source/mac/CodesignRules.plist" --sign
"$MACOSX_CODESIGNING_IDENTITY" $entitlements $APP_BUNDLE
+codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$id"
$resource_rules --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements $APP_BUNDLE
exit 0
commit 88be7b54c5be57c7ecabe200731262e24c0ca0a4
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Aug 15 01:51:05 2014 +0300
Fixes for the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case
Change-Id: Ic3d27298264df9aa4e3e976fbca477106dbe180a
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 2952eff..dd9b4b3 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -83,7 +83,6 @@
#define GID_DIR_URE_JAVA gid_Dir_Classes
#define GID_DIR_URE_LIB gid_Dir_Frameworks
#define GID_DIR_URE_SHARE gid_Brand_Dir_Share_Ure
- #define GID_DIR_URE_SHARE_MISC gid_Brand_Dir_Share_Ure
#else
#define GID_BRAND_DIR_ETC gid_Brand_Dir_Program
#define GID_DIR_PY gid_Brand_Dir_Program
@@ -92,7 +91,6 @@
#define GID_DIR_URE_JAVA gid_Dir_Ure_Java
#define GID_DIR_URE_LIB gid_Dir_Ure_Lib
#define GID_DIR_URE_SHARE gid_Dir_Ure_Share
- #define GID_DIR_URE_SHARE_MISC gid_Dir_Ure_Misc
#endif
#define RESFILENAME(name,lang) STRING(CONCAT3(name,lang,.res))
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 562cad7..365fb7b 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_Share,
gid_Brand_Dir_Share_Glade,
gid_Brand_Dir_Share_Labels,
gid_Brand_Dir_Share_Registry,
@@ -452,6 +453,11 @@ Directory gid_Brand_Dir_Share_Ure
DosName = "ure";
End
+Directory gid_Brand_Dir_Share_Ure_Share
+ ParentID = gid_Brand_Dir_Share_Ure;
+ DosName = "share";
+End
+
#endif
Directory gid_Brand_Dir_Share_Registry
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index fb5aaba..173e669 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -85,13 +85,17 @@ Directory gid_Dir_Ure_Java
End
#endif
-Directory gid_Dir_Ure_Misc
- ParentID = SCP2_URE_SHARE_DIR;
+#endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+
+Directory gid_Dir_Ure_Share_Misc
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+ ParentID = gid_Brand_Dir_Share_Ure_Share;
+#else
+ ParentID = gir_Dir_Ure_Share;
+#endif
DosName = "misc";
End
-#endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-
// Public Dynamic Libraries:
#ifdef AIX
@@ -220,9 +224,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Services
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}";
-#elif defined WNT
+#if defined WNT
Value = "${ORIGIN}/../misc/services.rdb ${URE_MORE_SERVICES}";
#else
Value = "${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}";
@@ -410,14 +412,14 @@ End
File gid_File_Misc_TypesRdb
TXT_FILE_BODY;
- Dir = GID_DIR_URE_SHARE_MISC;
+ Dir = gid_Dir_Ure_Share_Misc;
Name = "types.rdb";
Styles = (PACKED);
End
File gid_File_Misc_ServicesRdb
TXT_FILE_BODY;
- Dir = GID_DIR_URE_SHARE_MISC;
+ Dir = gid_Dir_Ure_Share_Misc;
Name = "services.rdb";
Styles = (PACKED);
End
@@ -437,7 +439,7 @@ Module gid_Module_Root_Ure_Hidden
gid_Dir_Ure_Lib,
gid_Dir_Ure_Share,
gid_Dir_Ure_Java,
- gid_Dir_Ure_Misc);
+ gid_Dir_Ure_Share_Misc);
Files = (auto_ure_ALL,
gid_File_ThirdpartylicensereadmeHtml_Ure,
gid_File_Readme_Ure,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
