Issue 48294 - check for NSIS in configure
Summary: check for NSIS in configure
Status: CLOSED FIXED
Alias: None
Product: porting
Classification: Code
Component: code (show other issues)
Version: 680m97
Hardware: All Windows, all
: P3 Trivial (vote)
Target Milestone: OOo 2.0
Assignee: Martin Hollmichel
QA Contact: issues@porting
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-04-27 21:35 UTC by pavel
Modified: 2005-08-19 06:37 UTC (History)
4 users (show)

See Also:
Issue Type: DEFECT
Latest Confirmation in: ---
Developer Difficulty: ---

Attachments
Patch to detect NSIS. (untested) (2.79 KB, patch)
2005-04-28 21:09 UTC, quetschke 		no flags Details | Diff
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description pavel 2005-04-27 21:35:03 UTC 
Hi,

m97 integrated cws with support for NSIS. It is not checked in the configure
step and is only checked at the end of instsetoo_native module build.

We should check it at the beginning, in configure, set some variable and use
that variable later.
Comment 1 quetschke 2005-04-28 21:09:14 UTC 
Created attachment 25626 [details]
Patch to detect NSIS. (untested)
Comment 2 quetschke 2005-04-29 04:18:10 UTC 
Committed a fixed version of previous patch to configure10.

winenv.* now contains a variable named NSIS_PATH containing the path to the
nsis.exe.

vq->mh: Can you take over and adapt instsetoo_native?

P.S.: I needed the following patch and NSIS in my path to build with m97:

+++ solenv/bin/modules/installer/download.pm	29 Apr 2005 02:37:16 -0000
@@ -889,7 +890,7 @@
 	@paths = split(/:/, $ENV{'PATH'});
 	foreach $paths (@paths) {
 		$nsispath = $paths . "/nsis";
-		if ( -x $nsispath ) { $nsispath = $paths; break } else { $nsispath = ""; }
+		if ( -e $nsispath ) { $nsispath = $paths; last } else { $nsispath = ""; }
 	}
 
 	if ( $nsispath eq "" )
@@ -901,8 +904,8 @@
 	}
 	else
 	{
-		($vol, $dir, $file) = File::Spec->splitpath( $nsispath );
-		$nsispath = $dir;
+#		($vol, $dir, $file) = File::Spec->splitpath( $nsispath );
+#		$nsispath = $dir;
 	}
 
 	if ( $ENV{'NSISSDK_SOURCE'} ) { $nsispath = $ENV{'NSISSDK_SOURCE'}; }	#
overriding the NSIS SDK with NSISSDK_SOURCE
Comment 3 quetschke 2005-04-29 04:20:03 UTC 
I forgot to mention $NSIS_PATH is empty if NSIS is not found. This should disable
the build of the NSIS installation set.
Comment 4 pavel 2005-05-04 22:54:38 UTC 
Patch works for me.
Comment 5 rene 2005-05-12 17:00:11 UTC 
.
Comment 6 pavel 2005-05-12 22:37:28 UTC 
Verified.

pavel@drogo:~> grep NSIS_PATH ~/BuildDir/ooo_SRC680_m103_src/winenv.set
setenv NSIS_PATH "/cygdrive/c/PROGRA~1/NSIS"

Ie NSIS_PATH points to the directory where NSIS is installed.
Comment 7 Martin Hollmichel 2005-08-19 06:37:38 UTC 
close issue.