Skip to content

Commit

Permalink
Fix CRLF in nsis installer script template.
Browse files Browse the repository at this point in the history
  • Loading branch information
cournape committed Dec 4, 2008
1 parent 46983f8 commit 444a43e
Showing 1 changed file with 121 additions and 121 deletions.
242 changes: 121 additions & 121 deletions tools/win32/build_scripts/nsis_scripts/scipy-superinstaller.nsi.in
Original file line number Diff line number Diff line change
@@ -1,121 +1,121 @@
;--------------------------------
;Include Modern UI
!include "MUI2.nsh"
SetCompress off ; Useful to disable compression under development
;SetCompressor /Solid LZMA ; Useful to disable compression under development
;--------------------------------
;General
;Name and file
Name "Scipy super installer"
OutFile "@SCIPY_INSTALLER_NAME@"
;Default installation folder
InstallDir "$TEMP"
;--------------------------------
;Interface Settings
!define MUI_ABORTWARNING
;--------------------------------
;Pages
;!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
;!insertmacro MUI_PAGE_COMPONENTS
;!insertmacro MUI_PAGE_DIRECTORY
;!insertmacro MUI_PAGE_INSTFILES
;!insertmacro MUI_UNPAGE_CONFIRM
;!insertmacro MUI_UNPAGE_INSTFILES
;--------------------------------
;Languages
!insertmacro MUI_LANGUAGE "English"
;--------------------------------
;Component Sections
!include 'Sections.nsh'
!include LogicLib.nsh
Var HasSSE2
Var HasSSE3
Var CPUSSE
Section "Core" SecCore
;SectionIn RO
SetOutPath "$INSTDIR"
;Create uninstaller
;WriteUninstaller "$INSTDIR\Uninstall.exe"
DetailPrint "Install dir for actual installers is $INSTDIR"
StrCpy $CPUSSE "0"
CpuCaps::hasSSE2
Pop $0
StrCpy $HasSSE2 $0
CpuCaps::hasSSE3
Pop $0
StrCpy $HasSSE3 $0
; Debug
StrCmp $HasSSE2 "Y" include_sse2 no_include_sse2
include_sse2:
DetailPrint '"Target CPU handles SSE2"'
StrCpy $CPUSSE "2"
goto done_sse2
no_include_sse2:
DetailPrint '"Target CPU does NOT handle SSE2"'
goto done_sse2
done_sse2:
StrCmp $HasSSE3 "Y" include_sse3 no_include_sse3
include_sse3:
DetailPrint '"Target CPU handles SSE3"'
StrCpy $CPUSSE "3"
goto done_sse3
no_include_sse3:
DetailPrint '"Target CPU does NOT handle SSE3"'
goto done_sse3
done_sse3:
ClearErrors
; Install files conditionaly on detected cpu
${Switch} $CPUSSE
${Case} "3"
DetailPrint '"Install SSE 3"'
File "binaries\@SSE3_BINARY@"
ExecWait '"$INSTDIR\@SSE3_BINARY@"'
${Break}
${Case} "2"
DetailPrint '"Install SSE 2"'
File "binaries\@SSE2_BINARY@"
ExecWait '"$INSTDIR\@SSE2_BINARY@"'
${Break}
${Default}
DetailPrint '"Install NO SSE"'
File "binaries\@NOSSE_BINARY@"
ExecWait '"$INSTDIR\@NOSSE_BINARY@"'
${Break}
${EndSwitch}
; Handle errors when executing installers
IfErrors error no_error
error:
messageBox MB_OK "Executing scipy installer failed"
goto done
no_error:
goto done
done:
SectionEnd
;--------------------------------
;Include Modern UI

!include "MUI2.nsh"

SetCompress off ; Useful to disable compression under development
;SetCompressor /Solid LZMA ; Useful to disable compression under development

;--------------------------------
;General

;Name and file
Name "Scipy super installer"
OutFile "@SCIPY_INSTALLER_NAME@"

;Default installation folder
InstallDir "$TEMP"

;--------------------------------
;Interface Settings

!define MUI_ABORTWARNING

;--------------------------------
;Pages

;!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
;!insertmacro MUI_PAGE_COMPONENTS
;!insertmacro MUI_PAGE_DIRECTORY
;!insertmacro MUI_PAGE_INSTFILES

;!insertmacro MUI_UNPAGE_CONFIRM
;!insertmacro MUI_UNPAGE_INSTFILES

;--------------------------------
;Languages

!insertmacro MUI_LANGUAGE "English"

;--------------------------------
;Component Sections

!include 'Sections.nsh'
!include LogicLib.nsh

Var HasSSE2
Var HasSSE3
Var CPUSSE

Section "Core" SecCore

;SectionIn RO
SetOutPath "$INSTDIR"

;Create uninstaller
;WriteUninstaller "$INSTDIR\Uninstall.exe"

DetailPrint "Install dir for actual installers is $INSTDIR"

StrCpy $CPUSSE "0"
CpuCaps::hasSSE2
Pop $0
StrCpy $HasSSE2 $0

CpuCaps::hasSSE3
Pop $0
StrCpy $HasSSE3 $0

; Debug
StrCmp $HasSSE2 "Y" include_sse2 no_include_sse2
include_sse2:
DetailPrint '"Target CPU handles SSE2"'
StrCpy $CPUSSE "2"
goto done_sse2
no_include_sse2:
DetailPrint '"Target CPU does NOT handle SSE2"'
goto done_sse2
done_sse2:

StrCmp $HasSSE3 "Y" include_sse3 no_include_sse3
include_sse3:
DetailPrint '"Target CPU handles SSE3"'
StrCpy $CPUSSE "3"
goto done_sse3
no_include_sse3:
DetailPrint '"Target CPU does NOT handle SSE3"'
goto done_sse3
done_sse3:

ClearErrors

; Install files conditionaly on detected cpu
${Switch} $CPUSSE
${Case} "3"
DetailPrint '"Install SSE 3"'
File "binaries\@SSE3_BINARY@"
ExecWait '"$INSTDIR\@SSE3_BINARY@"'
${Break}
${Case} "2"
DetailPrint '"Install SSE 2"'
File "binaries\@SSE2_BINARY@"
ExecWait '"$INSTDIR\@SSE2_BINARY@"'
${Break}
${Default}
DetailPrint '"Install NO SSE"'
File "binaries\@NOSSE_BINARY@"
ExecWait '"$INSTDIR\@NOSSE_BINARY@"'
${Break}
${EndSwitch}

; Handle errors when executing installers
IfErrors error no_error

error:
messageBox MB_OK "Executing scipy installer failed"
goto done
no_error:
goto done
done:

SectionEnd

0 comments on commit 444a43e

Please sign in to comment.