[Libreoffice-commits] .: 3 commits - configure.ac Makefile.in solenv/bin

[Tor Lillqvist]

 Makefile.in          |    6 ++++++
 configure.ac         |    4 ++++
 solenv/bin/ooinstall |    4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 2b71c1a9b189e5cf9224d43e3bac4a26f2e0ff99
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jan 31 23:22:35 2013 +0200

    Sign the app bundle created by dev-install if an identity is available
    
    Change-Id: If7c61b203b3ca307831187778b951e8310381ca8

diff --git a/Makefile.in b/Makefile.in
index a4e5710..92b680f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -334,6 +334,12 @@ ifeq ($(OS_FOR_BUILD),WNT)
 else
 ifeq ($(DISABLE_LINKOO),TRUE)
 	@ooinstall $(DEVINSTALLDIR)/opt
+ifeq ($(OS),MACOSX)
+	identity=`security find-identity -p codesigning -v | grep 'Mac Developer:' | awk '{print $$2}'`; \
+	if test -n "$$identity"; then \
+		codesign --verbose --sign $$identity $(DEVINSTALLDIR)/opt/LibreOffice.app; \
+	fi
+endif
 	@install-gdb-printers -L
 else
 	@ooinstall -l $(DEVINSTALLDIR)/opt
commit f33c8056a856b20436206682ab72a34b08c15c88
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jan 31 23:20:28 2013 +0200

    Enforce DISABLE_LINKOO on OS X
    
    solenv/bin/linkoo doesn't do anything on OS X anyway, and even if it
    would do and it would work, it would interfere with signing the app
    bundle.
    
    Change-Id: If7a6cecea57cddf8a637a60872d0372eb5093f41

diff --git a/configure.ac b/configure.ac
index b2f7d5c..2c2d272 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4328,6 +4328,10 @@ AC_SUBST(ASSERT_ALWAYS_ABORT)
 dnl Determine whether to use linkoo for the smoketest installation
 dnl ===================================================================
 AC_MSG_CHECKING([whether to use linkoo for the smoketest installation])
+if test $_os = Darwin; then
+    enable_linkoo=no
+fi
+
 if test "$enable_linkoo" = "no"; then
     DISABLE_LINKOO="TRUE"
     AC_MSG_RESULT([no])
commit c84e417a0f71778a5d6e0fa1ad4b10844ebd7787
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jan 31 23:19:08 2013 +0200

    When debugging ooinstall, assume you want to debug make_installer.pl, too
    
    Change-Id: I80492249471c15778bfafe36e65fa183ccff58f8

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index c2959bc..bcc296c 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -118,7 +118,9 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") {
 
 print "Running LibreOffice installer\n";
 system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
-        "perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
+        "perl " .
+        (scalar keys(%DB::sub) ? "-d " : "") .
+        "-w $ENV{SOLARENV}/bin/make_installer.pl " .
         "-f openoffice.lst -l $langs -p LibreOffice " .
         "-u $tmp_dir " .
         "-buildid $BUILD $destdir $strip $msi " .