Makefile.in | 1 +
scp2/source/ooo/file_ooo.scp | 4 ++++
2 files changed, 5 insertions(+)
New commits:
commit 24e57283d98b6dcbb98c8fb59c09eee511b1a7f9
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Sep 9 10:54:26 2014 +0300
No point in including ui-previewer in the end-user app bundle
Change-Id: Ib6aa559081af051db429206ef3e6a415542b84cb
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 19916db..bb63013 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -135,6 +135,8 @@ File gid_File_Exe_Nsplugin
End
#endif
+#if !defined MACOSX
+
File gid_File_Bin_UIPreviewer
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
@@ -146,6 +148,8 @@ File gid_File_Bin_UIPreviewer
#endif
End
+#endif
+
#if defined UNX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
File gid_File_Script_Gengal
commit 6edc271641c3ca453b67296267b0cdd6ea2ab2ea
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Sep 9 10:35:51 2014 +0300
Remove potential old leftover before moving the app bundle
Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f
diff --git a/Makefile.in b/Makefile.in
index 4dd5555..f356208 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -298,6 +298,7 @@ endif
mac-app-store-package: test-install
ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),)
+ rm -rf "$(MACOSX_APP_NAME).app"
mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app"
productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign
$(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' '
'-').pkg
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
