[Libreoffice-commits] .: set_soenv.in
Tor Lillqvist
tml at kemper.freedesktop.org
Thu May 19 13:00:15 PDT 2011
set_soenv.in | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 0a577f22713dcd074619599d7dbe8567bcd593a7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu May 19 22:52:01 2011 +0300
Export NSIS_PATH also in the MinGW cross-compiling case
Actually NSIS_PATH is crack, it is actually the *directory* where the
makensis program is located, so why not simply just have a variable
with the full pathname to that instead (or just the command name, in
case it is in the default PATH anyway, like on openSUSE with
/usr/bin/makensis)? That would simplify the stuff in download.pm, too.
diff --git a/set_soenv.in b/set_soenv.in
index d03a9a8..1f10ca1 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1194,7 +1194,7 @@ elsif ($platform =~ m/cygwin/)
if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
$PATH .= $ps.$tmppath;
}
- # nsis path for Windows users.
+ # makensis directory
$NSIS_PATH = PathFormat('@NSIS_PATH@');
$tmppath = CygFormat($NSIS_PATH);
if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
@@ -1243,12 +1243,20 @@ elsif ($platform =~ m/cygwin/)
}
elsif ($platform =~ m/mingw32/)
{
+ my ( $tmppath );
+
$PATH = $cur_dir.
# $ps.CygFormat($SOLARVER).$ds.$INPATH.$BIN.
$ps.CygFormat($SOLARENV).$ds."bin".
$ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
- $PATH .= $ps.$oldPATH;
+ # makensis directory
+ $NSIS_PATH = PathFormat('@NSIS_PATH@');
+ $tmppath = CygFormat($NSIS_PATH);
+ if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
+ $PATH .= $ps.$tmppath;
+ }
+ $PATH .= $ps.$oldPATH;
}
elsif ($platform =~ m/darwin/)
{ $PATH = $cur_dir.
@@ -1679,6 +1687,10 @@ if ( $platform =~ m/cygwin/ )
ToFile( "TMP", "$ENV{'TMP'}", "e" );
}
}
+elsif ( $platform =~ m/mingw32/ )
+{ ToFile( "NSIS_PATH", $NSIS_PATH, "e" );
+}
+
if ("@WITH_VC_REDIST@" eq "TRUE") {
ToFile( "WITH_VC_REDIST", "TRUE", "e" );
}
@@ -1996,6 +2008,7 @@ ToFile( "SYSTEM_LIBTEXTCAT_DATA","@SYSTEM_LIBTEXTCAT_DATA@","e" );
ToFile( "XAU_LIBS", "@XAU_LIBS@", "e" );
ToFile( "GXX_INCLUDE_PATH", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
+
if ($platform !~ m/cygwin/) {
if ( !defined $ENV{"TMPDIR"} || $ENV{"TMPDIR"} eq "" ) {
ToFile( "TMPDIR", "/tmp", "e" );
More information about the Libreoffice-commits
mailing list