summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-06-10 12:34:10 +0300
committerTor Lillqvist <tml@collabora.com>2014-06-10 12:54:52 +0300
commit7826428cf80364099a3f351e7fec44043d88b05a (patch)
tree2801470c89d2642437abdbfae49992560889d719 /solenv
parent16889f355d1f7157bad84b42ad5a1b2b715ae767 (diff)
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
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/bin/ooinstall2
1 files changed, 1 insertions, 1 deletions
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: $!";