/[svn]/misc/trunk/win32_installer/linuxsampler_all.nsi
ViewVC logotype

Diff of /misc/trunk/win32_installer/linuxsampler_all.nsi

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1903 by schoenebeck, Tue May 12 20:24:46 2009 UTC revision 1904 by schoenebeck, Tue May 12 21:45:54 2009 UTC
# Line 65  VIAddVersionKey /LANG=${LANG_ENGLISH} "F Line 65  VIAddVersionKey /LANG=${LANG_ENGLISH} "F
65  !define BIN_TYPE_686SSE "686 SSE"  !define BIN_TYPE_686SSE "686 SSE"
66  !define BIN_TYPE_686    "686"  !define BIN_TYPE_686    "686"
67    
68    Var /GLOBAL binType
69    
70  ;--------------------------------  ;--------------------------------
71  ; Pages  ; Pages
72    
# Line 91  Function .onInit Line 93  Function .onInit
93    StrCpy $installingJSampler "0"    StrCpy $installingJSampler "0"
94    StrCpy $installingQSampler "0"    StrCpy $installingQSampler "0"
95    StrCpy $installinggigedit "0"    StrCpy $installinggigedit "0"
   
   ; We call this here for the uninstaller, its also called in the ""  
   ; section (for installing) just for seeing the debug output, as ouput  
   ; this init handler wont make it into the "Details" list.  
   Call DetectSystemType  
96  FunctionEnd  FunctionEnd
97    
98  ; detects CPU capabilities, determmines which native binary type to install  ; detects CPU capabilities, determmines which native binary type to install
99  ; and selects the appropriate windows registry view (32 bit or 64 bit)  ; and selects the appropriate windows registry view (32 bit or 64 bit)
100  Function DetectSystemType  !macro DetectSystemType un
101    Var /GLOBAL binType  Function ${un}DetectSystemType
   
102    ; check if this is a 64 bit windows    ; check if this is a 64 bit windows
103    System::Call "kernel32::GetCurrentProcess() i .s"    System::Call "kernel32::GetCurrentProcess() i .s"
104    System::Call "kernel32::IsWow64Process(i s, *i .r0)"    System::Call "kernel32::IsWow64Process(i s, *i .r0)"
# Line 130  Function DetectSystemType Line 126  Function DetectSystemType
126    
127    DetectSystemDone:    DetectSystemDone:
128  FunctionEnd  FunctionEnd
129    !macroend
130    !insertmacro DetectSystemType ""
131    !insertmacro DetectSystemType "un."
132    
133  ; Check for the presence of gtkmm, and if false, ask the user whether to  ; Check for the presence of gtkmm, and if false, ask the user whether to
134  ; download and install gtkmm now from the internet.  ; download and install gtkmm now from the internet.
# Line 168  Function GetJRE Line 167  Function GetJRE
167    Var /GLOBAL jreUri    Var /GLOBAL jreUri
168    
169    StrCmp $binType BIN_TYPE_64BIT 0 +3    StrCmp $binType BIN_TYPE_64BIT 0 +3
170    StrCpy $jreUri JRE_64_URL    StrCpy $jreUri ${JRE_64_URL}
171    Goto +2    Goto +2
172    StrCpy $jreUri JRE_32_URL    StrCpy $jreUri ${JRE_32_URL}
173    
174      DetailPrint "Downloading JRE from: $jreUri"
175    
176    MessageBox MB_OK "JSampler requires Java ${JRE_VERSION}, it will now \    MessageBox MB_OK "JSampler requires Java ${JRE_VERSION}, it will now \
177                      be downloaded and installed"                      be downloaded and installed"
178    
179    StrCpy $2 "$TEMP\Java Runtime Environment.exe"    StrCpy $2 "$TEMP\Java Runtime Environment.exe"
180    nsisdl::download /TIMEOUT=30000 $jreUri $2    nsisdl::download /TIMEOUT=30000 "$jreUri" $2
181    Pop $R0  ; Get the return value    Pop $R0  ; Get the return value
182    StrCmp $R0 "success" +3    StrCmp $R0 "success" +3
183    MessageBox MB_OK "Download failed: $R0"    MessageBox MB_OK "Download failed: $R0"
# Line 237  FunctionEnd Line 238  FunctionEnd
238    
239  ;--------------------------------  ;--------------------------------
240    
241  ; primer things to do  ; primer things to do (before installing, not called on uninstall)
242  Section ""  Section ""
243    Call DetectSystemType    Call DetectSystemType
244    Call DetectVstPath    Call DetectVstPath
# Line 569  SectionEnd Line 570  SectionEnd
570  Section "Uninstall"  Section "Uninstall"
571    Var /GLOBAL vstdir    Var /GLOBAL vstdir
572    
573      Call un.DetectSystemType
574    
575    DetailPrint "Removing LinuxSampler directory from PATH variable ..."    DetailPrint "Removing LinuxSampler directory from PATH variable ..."
576    ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR"    ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR"
577    

Legend:
Removed from v.1903  
changed lines
  Added in v.1904

  ViewVC Help
Powered by ViewVC