[Scipy-svn] r5218 - trunk/tools/win32/build_scripts/nsis_scripts
scipy-svn at scipy.org
scipy-svn at scipy.org
Wed Dec 3 21:51:11 EST 2008
Author: cdavid
Date: 2008-12-03 20:51:06 -0600 (Wed, 03 Dec 2008)
New Revision: 5218
Modified:
trunk/tools/win32/build_scripts/nsis_scripts/scipy-superinstaller.nsi.in
Log:
Start working on command line argument to force an arch.
Modified: trunk/tools/win32/build_scripts/nsis_scripts/scipy-superinstaller.nsi.in
===================================================================
--- trunk/tools/win32/build_scripts/nsis_scripts/scipy-superinstaller.nsi.in 2008-12-04 02:50:45 UTC (rev 5217)
+++ trunk/tools/win32/build_scripts/nsis_scripts/scipy-superinstaller.nsi.in 2008-12-04 02:51:06 UTC (rev 5218)
@@ -3,6 +3,11 @@
!include "MUI2.nsh"
+; Include FileFunc for command line parsing options
+!include "FileFunc.nsh"
+!insertmacro GetParameters
+!insertmacro GetOptions
+
SetCompress off ; Useful to disable compression under development
;SetCompressor /Solid LZMA ; Useful to disable compression under development
@@ -46,7 +51,35 @@
Var HasSSE2
Var HasSSE3
Var CPUSSE
+Var option_arch
+Function .onInit
+ ; Get parameters
+ var /GLOBAL cmdLineParams
+ Push $R0
+
+ ${GetParameters} $cmdLineParams
+
+ ; XXX; How to get a console output help ? GUI seems useless when using
+ ; command line help...
+ ; ; /? param (help)
+ ; ClearErrors
+ ; ${GetOptions} $cmdLineParams '/?' $R0
+ ; IfErrors +3 0
+ ; MessageBox MB_OK "list all command line options here!"
+ ; Abort
+
+ Pop $R0
+
+ ; Initialise options
+ StrCpy $option_arch 'native'
+
+ ; Parse Parameters
+ Push $R0
+ Call parseParameters
+ Pop $R0
+FunctionEnd
+
Section "Core" SecCore
;SectionIn RO
@@ -89,6 +122,18 @@
ClearErrors
+ ${Switch} $option_arch
+ ${Case} "native"
+ DetailPrint '"arch value: $option_arch - native install"'
+ ${Break}
+ ${Case} "nosse"
+ DetailPrint '"arch value: $option_arch - no-sse install"'
+ ${Break}
+ ${Default}
+ DetailPrint '"No option_arch value - native install, do not override detection"'
+ ${Break}
+ ${EndSwitch}
+
; Install files conditionaly on detected cpu
${Switch} $CPUSSE
${Case} "3"
@@ -119,3 +164,10 @@
done:
SectionEnd
+
+Function parseParameters
+ ; /arch option
+ ${GetOptions} $cmdLineParams '/arch' $R0
+ IfErrors +2 0
+ StrCpy $option_arch $R0
+FunctionEnd
More information about the Scipy-svn
mailing list