Makefile.in | 2 +-
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 ++++++---
solenv/bin/ooinstall | 2 +-
7 files changed, 31 insertions(+), 17 deletions(-)
New commits:
commit ed275039085f66feafe00d9eb05e95d0d12ab352
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jun 10 12:34:10 2014 +0300
Make test-install work also in the non-release-build case
In the (default) --disable-release-build case the -p option to
make_installer.pl should be "LibreOffice_Dev", not "LibreOffice". See
instsetoo_native/util/openoffice.lst.in.
Also, the pathname passed to solenv/bin/macosx-codesign-app-bundle
needs to adapt to ENABLE_RELEASE_BUILD, either LibreOffice.app or
LibreOfficeDev.app.
Change-Id: If2b8efee096339f9c0cf52e663826d0086b1e35e
(cherry picked from commit 7826428cf80364099a3f351e7fec44043d88b05a)
diff --git a/Makefile.in b/Makefile.in
index f356208..c688bbf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -291,7 +291,7 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
- @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice.app
+ @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELASE_BUILD),,Dev).app
endif
endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 70763c9..cf4d3db 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -98,7 +98,7 @@ system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl " .
(scalar keys(%DB::sub) ? "-d " : "") .
"-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
- "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p
LibreOffice " .
+ "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p
LibreOffice" . ($ENV{ENABLE_RELEASE_BUILD} ? "" : "_Dev") . " " .
"-u $tmp_dir " .
"-buildid $BUILD $destdir $strip $msi " .
"-simple $path") && die "Failed to install: $!";
commit 12b047165eef7bc48065ab6604f7705966a92586
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.
(cherry picked from commit 41f2ebfbaa9fb06f56530b4a330fc029df87ecfd)
diff --git a/solenv/bin/macosx-codesign-app-bundle
b/solenv/bin/macosx-codesign-app-bundle
index d21031a..de5ec79 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -84,11 +84,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 4867113c0078037d0549e635a6b93aa4ddfad99c
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Aug 15 09:01:00 2014 +0300
Typo
Change-Id: I9ba1a5679eb636103ccf7b34f120ed0d03903e76
(cherry picked from commit 5794fcad10df4d6ac8388627662ea830dde7e629)
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 6d4e84d..ab7e0fd 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -91,7 +91,7 @@ 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;
+ ParentID = gid_Dir_Ure_Share;
#endif
DosName = "misc";
End
commit d3a0971204c947e3540d72a750bf417cbc9564b4
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
(cherry picked from commit 88be7b54c5be57c7ecabe200731262e24c0ca0a4)
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d2514fb..dbd43cf 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -84,7 +84,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
@@ -93,7 +92,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 64b29bf..f683fc7 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,
@@ -454,6 +455,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 0fb18d9..6d4e84d 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}";
@@ -528,14 +530,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
@@ -566,7 +568,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,
commit c7555c20a61fe4c4236d4716baf41aa3e0638d64
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
(cherry picked from commit 26cfc797fa0b1809cd0c01d5546ba97856bc8143)
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 65ea681..64b29bf 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -565,12 +565,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 fda0ba5..399444a 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -57,6 +57,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
@@ -69,6 +71,7 @@ File gid_File_Py_Bin_Python
Styles = (FILELIST, PACKED);
#endif
End
+#endif
#ifndef MACOSX
Directory gid_Dir_Py_PythonCore
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
