From ed275039085f66feafe00d9eb05e95d0d12ab352 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Tue, 10 Jun 2014 12:34:10 +0300
Subject: 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)
---
 solenv/bin/ooinstall | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv/bin')

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 70763c9762d6..cf4d3db24053 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: $!";
-- 
cgit v1.2.3