/[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 2281 by persson, Sun Oct 30 17:14:27 2011 UTC revision 2508 by persson, Wed Jan 15 18:54:42 2014 UTC
# Line 1  Line 1 
1  ; LinuxSampler Windows installer  ; LinuxSampler Windows installer
2  ;  ;
3  ; Copyright (C) 2007-2011, The LinuxSampler Developers  ; Copyright (C) 2007-2013, The LinuxSampler Developers
4  ;  ;
5  ; All-in-one Installer for all subprojects / software components of the  ; All-in-one Installer for all subprojects / software components of the
6  ; LinuxSampler Project.  ; LinuxSampler Project.
# 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  !define JRE_32_URL "http://download.oracle.com/otn-pub/java/jdk/6u29-b11/jre-6u29-windows-i586.exe"  ; jre-7u51-windows-i586.exe:
45  !define JRE_64_URL "http://download.oracle.com/otn-pub/java/jdk/6u29-b11/jre-6u29-windows-x64.exe"  !define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83383"
46    ; jre-7u51-windows-x64.exe:
47    !define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=83385"
48    
49  ; The default installation directory  ; The default installation directory
50  InstallDir "$PROGRAMFILES64\LinuxSampler"  InstallDir "$PROGRAMFILES64\LinuxSampler"
# Line 90  VIAddVersionKey /LANG=${LANG_ENGLISH} "P Line 93  VIAddVersionKey /LANG=${LANG_ENGLISH} "P
93  VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "http://linuxsampler.org"  VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "http://linuxsampler.org"
94  VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The LinuxSampler Project"  VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The LinuxSampler Project"
95  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" ""  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" ""
96  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2003-2011 The LinuxSampler Project"  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2003-2013 The LinuxSampler Project"
97  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "LinuxSampler Installer (${RELEASE_DATE})"  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "LinuxSampler Installer (${RELEASE_DATE})"
98  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "0.0.0"  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "0.0.0"
99    
# Line 161  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 178  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 188  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
# Line 502  Section "libgig 3.3.0" Seclibgig Line 507  Section "libgig 3.3.0" Seclibgig
507    File bin\64\dlsdump.exe    File bin\64\dlsdump.exe
508    File bin\64\gigdump.exe    File bin\64\gigdump.exe
509    File bin\64\gigextract.exe    File bin\64\gigextract.exe
510      File bin\64\gigmerge.exe
511      File bin\64\gig2mono.exe
512    ; special dependencies for the 64 bit version    ; special dependencies for the 64 bit version
513    File bin\64\libgcc_s_sjlj-1.dll    File bin\64\libgcc_s_sjlj-1.dll
514    File bin\64\libstdc++-6.dll    File bin\64\libstdc++-6.dll
515    
516    ; shall we install the 32 bit version as well?    ; shall we install the 32 bit version as well?
517    StrCmp $installing32BitToo "1" libgig686sse done    StrCmp $installing32BitToo "1" libgig686sse
518      StrCmp $installingQSampler "1" libgigForQsampler done
519    
520      ; QSampler needs the 32 bit libgig dll
521      libgigForQsampler:
522      SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
523      File bin\686sse\libgig-6.dll
524      Goto done
525    
526    libgig686sse:    libgig686sse:
527    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
# Line 516  Section "libgig 3.3.0" Seclibgig Line 530  Section "libgig 3.3.0" Seclibgig
530    File bin\686sse\dlsdump.exe    File bin\686sse\dlsdump.exe
531    File bin\686sse\gigdump.exe    File bin\686sse\gigdump.exe
532    File bin\686sse\gigextract.exe    File bin\686sse\gigextract.exe
533      File bin\686sse\gigmerge.exe
534      File bin\686sse\gig2mono.exe
535    Goto done    Goto done
536    
537    libgig686:    libgig686:
# Line 525  Section "libgig 3.3.0" Seclibgig Line 541  Section "libgig 3.3.0" Seclibgig
541    File bin\686\dlsdump.exe    File bin\686\dlsdump.exe
542    File bin\686\gigdump.exe    File bin\686\gigdump.exe
543    File bin\686\gigextract.exe    File bin\686\gigextract.exe
544      File bin\686\gigmerge.exe
545      File bin\686\gig2mono.exe
546    Goto done    Goto done
547    
548    done:    done:

Legend:
Removed from v.2281  
changed lines
  Added in v.2508

  ViewVC Help
Powered by ViewVC