[Libreoffice-commits] core.git: Makefile.in solenv/bin

[Tor Lillqvist]

 Makefile.in          |    2 +-
 solenv/bin/ooinstall |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7826428cf80364099a3f351e7fec44043d88b05a
Author: Tor Lillqvist <tml at 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

diff --git a/Makefile.in b/Makefile.in
index 8379be5..3ec5622 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -294,7 +294,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: $!";