strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ause079 (1.30.2); FILE MERGED

Browse source 
2007/06/26 12:37:00 rt 1.30.2.2: Typo
2007/05/23 08:14:25 hjs 1.30.2.1: #i75902# fix finding nsis
This commit is contained in:
Jens-Heiner Rechtien 2007-06-27 16:48:32 +00:00
parent 6846793637
commit 553215c44c
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
solenv/bin/modules/installer/download.pm
View file

@ -4,9 +4,9 @@
#
# $RCSfile: download.pm,v $
#
# $Revision: 1.30 $
# $Revision: 1.31 $
#
# last change: $Author: kz $ $Date: 2007-05-10 15:03:30 $
# last change: $Author: hr $ $Date: 2007-06-27 17:48:32 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -1209,11 +1209,10 @@ sub get_path_to_nsis_sdk
my $file;
my $nsispath = "";
if ( $ENV{'ENV_ROOT'} ) {
$nsispath = $ENV{'ENV_ROOT'} . $installer::globals::separator . "NSIS";
}
elsif ( $ENV{'NSIS_PATH'} ) {
if ( $ENV{'NSIS_PATH'} ) {
$nsispath = $ENV{'NSIS_PATH'};
} elsif ( $ENV{'SOLARROOT'} ) {
$nsispath = $ENV{'SOLARROOT'} . $installer::globals::separator . "NSIS";
} else {
# do we have nsis already in path ?
@paths = split(/:/, $ENV{'PATH'});
@ -1230,7 +1229,10 @@ sub get_path_to_nsis_sdk
}
}
}
if ( $ENV{'NSISSDK_SOURCE'} ) { $nsispath = $ENV{'NSISSDK_SOURCE'}; } # overriding the NSIS SDK with NSISSDK_SOURCE
if ( $ENV{'NSISSDK_SOURCE'} ) {
installer::logger::print_warning( "NSISSDK_SOURCE is deprecated. use NSIS_PATH instead.\n" );
$nsispath = $ENV{'NSISSDK_SOURCE'}; # overriding the NSIS SDK with NSISSDK_SOURCE
}
if( ($^O =~ /cygwin/i) and $nsispath =~ /\\/ ) {
# We need a POSIX path for W32-4nt-cygwin-perl
@ -1240,7 +1242,7 @@ sub get_path_to_nsis_sdk
if ( $nsispath eq "" )
{
installer::logger::print_message( "... no Environment variable \"ENV_ROOT\", \"NSIS_PATH\" or \"NSISSDK_SOURCE\" found and NSIS not found in path!", "get_path_to_nsis_sdk");
installer::logger::print_message( "... no Environment variable \"SOLARROOT\", \"NSIS_PATH\" or \"NSISSDK_SOURCE\" found and NSIS not found in path!", "get_path_to_nsis_sdk");
} elsif ( ! -d $nsispath )
{
installer::exiter::exit_program("ERROR: NSIS path $nsispath does not exist!", "get_path_to_nsis_sdk");