[Libreoffice-commits] .: 2 commits - solenv/bin

[Michael Meeks]

 solenv/bin/ooinstall |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f3d9913a902ac6018bfc9129913150f313c5fba5
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Feb 22 09:44:37 2012 +0000

    add cleaned up / improved warning for broken environment

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 4dcbe13..693397a 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -16,6 +16,9 @@ $do_link = 0;
 $is_windows = 0;
 my $tmp_dir;
 
+# FIXME: really we should hunt and parse / source the config_host.mk magic I guess.
+die "You need your environment setup right, eg. run make cmd cmd='ooinstall /path/to/install'" if (!defined $ENV{SRC_ROOT});
+
 if ($ENV{GUI} eq 'WNT') {
     $is_windows = 1;
 }
commit 81fc5e9208a9c5b5c3df9ea3fedb62ea6499b981
Author: Cor Nouws <oolst at nouenoff.nl>
Date:   Wed Feb 22 09:29:31 2012 +0100

    removed check on need to run Env.Host.sh first

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index b7a5d94..4dcbe13 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -16,8 +16,6 @@ $do_link = 0;
 $is_windows = 0;
 my $tmp_dir;
 
-die "You need to source Env.Host.sh first " if (!defined $ENV{SRC_ROOT});
-
 if ($ENV{GUI} eq 'WNT') {
     $is_windows = 1;
 }