/[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 2348 by persson, Sun Jun 10 16:05:52 2012 UTC revision 2350 by persson, Sun Jun 17 15:48:12 2012 UTC
# Line 23  SetCompressor lzma Line 23  SetCompressor lzma
23  ;Include Modern UI  ;Include Modern UI
24  !include "MUI.nsh"  !include "MUI.nsh"
25  !include "EnvVarUpdate.nsh"  !include "EnvVarUpdate.nsh"
26    !include "WordFunc.nsh"
27    
28  !define /date RELEASE_DATE "%Y%m%d"  !define /date RELEASE_DATE "%Y%m%d"
29  !searchparse /file bin/686/linuxsampler.pc `Version: ` LINUXSAMPLER_VERSION  !searchparse /file bin/686/linuxsampler.pc `Version: ` LINUXSAMPLER_VERSION
# Line 40  OutFile "linuxsampler_${RELEASE_DATE}_se Line 41  OutFile "linuxsampler_${RELEASE_DATE}_se
41    
42  ; Java Runtime Environment, needed for JSampler  ; Java Runtime Environment, needed for JSampler
43  !define JRE_VERSION "1.6"  !define JRE_VERSION "1.6"
44  ; jre-6u32-windows-i586.exe:  ; jre-7u5-windows-i586.exe:
45  !define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=63258"  !define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=64152"
46  ; jre-6u32-windows-x64.exe:  ; jre-7u5-windows-x64.exe:
47  !define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=63259"  !define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=64153"
48    
49  ; The default installation directory  ; The default installation directory
50  InstallDir "$PROGRAMFILES64\LinuxSampler"  InstallDir "$PROGRAMFILES64\LinuxSampler"
# Line 163  Function GetJRE Line 164  Function GetJRE
164    
165    DetailPrint "Downloading JRE from: $jreUri"    DetailPrint "Downloading JRE from: $jreUri"
166    
167    MessageBox MB_OK "JSampler requires Java ${JRE_VERSION}, it will now \    MessageBox MB_OK "JSampler requires Java ${JRE_VERSION} or later, \
168                      be downloaded and installed"                      it will now be downloaded and installed"
169    
170    StrCpy $2 "$TEMP\Java Runtime Environment.exe"    StrCpy $2 "$TEMP\Java Runtime Environment.exe"
171    nsisdl::download /TIMEOUT=30000 "$jreUri" $2    nsisdl::download /TIMEOUT=30000 "$jreUri" $2
# Line 180  FunctionEnd Line 181  FunctionEnd
181  Function DetectJRE  Function DetectJRE
182    ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \    ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \
183               "CurrentVersion"               "CurrentVersion"
184    StrCmp $2 ${JRE_VERSION} done    ${VersionCompare} $2 ${JRE_VERSION} $R0
185      IntCmp $R0 1 done done
186    
187    StrCmp $binType BIN_TYPE_64BIT 0 downloadjre    StrCmp $binType BIN_TYPE_64BIT 0 downloadjre
188    
# Line 190  Function DetectJRE Line 192  Function DetectJRE
192    ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \    ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \
193               "CurrentVersion"               "CurrentVersion"
194    SetRegView 64  ; restore 64 bit view    SetRegView 64  ; restore 64 bit view
195    StrCmp $3 ${JRE_VERSION} done    ${VersionCompare} $3 ${JRE_VERSION} $R0
196      IntCmp $R0 1 done done
197    
198    downloadjre:    downloadjre:
199    Call GetJRE    Call GetJRE
Legend:
Removed from v.2348  
changed lines
  Added in v.2350
  ViewVC Help
Powered by ViewVC