--- misc/trunk/win32_installer/linuxsampler_all.nsi	2007/12/07 17:52:39	1581
+++ misc/trunk/win32_installer/linuxsampler_all.nsi	2009/05/11 19:50:03	1900
@@ -1,17 +1,27 @@
 ; LinuxSampler Windows installer
 ;
-; Copyright (C) 2007, The LinuxSampler Developers
+; Copyright (C) 2007-2009, The LinuxSampler Developers
 ;
 ; All-in-one Installer for all subprojects / software components of the
 ; LinuxSampler Project.
+;
+; PREREQUISITES:
+;
+; -> You must install the file cpudesc\cpudesc.dll into the NSIS's
+;    plugin directory before being able to compile this installer!
+;
+; -> The compiled binaries must be placed into the respective directories
+;    under bin\ (you have to read this file in order to get those exact
+;    locations and expected file names).
 
 ; Probably the best compression ratio
 SetCompressor lzma
 
 ;Include Modern UI
 !include "MUI.nsh"
+!include "EnvVarUpdate.nsh"
 
-!define RELEASE_DATE "20071207"
+!define RELEASE_DATE "20090511"
 
 ; The name of the installer
 Name "LinuxSampler (${RELEASE_DATE})"
@@ -44,10 +54,14 @@
 VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "http://linuxsampler.org"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The LinuxSampler Project"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" ""
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2003-2007 The LinuxSampler Project"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2003-2009 The LinuxSampler Project"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "LinuxSampler Installer (${RELEASE_DATE})"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "0.0.0"
 
+!define BIN_TYPE_64BIT  "64 bit"
+!define BIN_TYPE_686SSE "686 SSE"
+!define BIN_TYPE_686    "686"
+
 ;--------------------------------
 ; Pages
 
@@ -76,6 +90,35 @@
   StrCpy $installinggigedit "0"
 FunctionEnd
 
+; detects CPU capabilities and determmines which native binary type to install
+Function DetectSystemType
+  Var /GLOBAL binType
+
+  ; check if this is a 64 bit windows
+  System::Call "kernel32::GetCurrentProcess() i .s"
+  System::Call "kernel32::IsWow64Process(i s, *i .r0)"
+  IntCmp $0 0 not64bit
+  StrCpy $binType BIN_TYPE_64BIT
+  DetailPrint "64 bit Windows detected."
+  Goto DetectSystemDone
+
+  not64bit: ; a 32 bit system
+
+  ; check if CPU supports SSE
+  cpudesc::tell
+  Pop $0                     ; full identification string in $0
+  StrCpy $1 $0 1, 34         ; pull out one character after SSE=
+  IntFmt $2 "%u" $1          ; and turn it into a number
+  IntCmpU $2 1 +1 +4 +4
+  StrCpy $binType BIN_TYPE_686SSE
+  DetailPrint "32 bit Windows, SSE CPU detected."
+  Goto DetectSystemDone
+  StrCpy $binType BIN_TYPE_686
+  DetailPrint "32 bit Windows (no SSE support) detected."
+
+  DetectSystemDone:
+FunctionEnd
+
 ; Check for the presence of gtkmm, and if false, ask the user whether to
 ; download and install gtkmm now from the internet.
 Function CheckForGtkmm
@@ -134,64 +177,285 @@
   done:
 FunctionEnd
 
+; Tries to find the location where VST plugins should be installed to
+Function DetectVstPath
+  Var /GLOBAL vstPluginPath
+
+  ClearErrors
+  ReadRegStr $0 HKCU "Software\VST" "VSTPluginsPath"
+  IfErrors check2ndRegistryKey 0
+  StrCpy $vstPluginPath $0
+  DetailPrint "Found VST plugin directory in HKCU registry."
+  Goto done
+
+  check2ndRegistryKey:
+  ClearErrors
+  ReadRegStr $0 HKLM "Software\VST" "VSTPluginsPath"
+  IfErrors noRegistryKeyExists 0
+  StrCpy $vstPluginPath $0
+  DetailPrint "Found VST plugin directory in HKLM registry."
+  Goto done
+
+  noRegistryKeyExists:
+  ClearErrors
+  DetailPrint "No VST plugin directory defined in registry."
+  StrCpy $vstPluginPath "$PROGRAMFILES\Steinberg\VstPlugins"
+
+  done:
+  DetailPrint "Using the following as VST plugin directory: $vstPluginPath"
+FunctionEnd
+
+;--------------------------------
+
+; primer things to do
+Section ""
+  Call DetectSystemType
+  Call DetectVstPath
+SectionEnd
+
 ;--------------------------------
 
 ; The stuff to install
-Section "LinuxSampler 0.5.1" SecLinuxSampler
+Section "LinuxSampler 0.5.1.12cvs" SecLinuxSampler
+  DetailPrint "Installing LinuxSampler binaries ..."
   StrCpy $installingLinuxSampler "1"
+
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
+
+  StrCmp $binType BIN_TYPE_64BIT linuxsampler64
+  StrCmp $binType BIN_TYPE_686SSE linuxsampler686sse
+  Goto linuxsampler686
+
   ; Files to install
-  File linuxsampler.exe
-  File liblinuxsampler-1.dll
+
+  linuxsampler64:
+  File bin\64\linuxsampler.exe
+  File bin\64\liblinuxsampler-1.dll
+  SetOutPath $vstPluginPath
+  File bin\64\LinuxSampler.dll
+  Goto done
+
+  linuxsampler686sse:
+  File bin\686sse\linuxsampler.exe
+  File bin\686sse\liblinuxsampler-1.dll
+  SetOutPath $vstPluginPath
+  File bin\686sse\LinuxSampler.dll
+  Goto done
+
+  linuxsampler686:
+  File bin\686\linuxsampler.exe
+  File bin\686\liblinuxsampler-1.dll
+  SetOutPath $vstPluginPath
+  File bin\686\LinuxSampler.dll
+  Goto done
+
+  done:
 SectionEnd
 
-Section "JSampler 'Fantasia' 0.8a" SecJSampler
+Section "JSampler 'Fantasia' 0.8a-cvs6" SecJSampler
+  DetailPrint "Installing JSampler binaries ..."
   ; make sure JRE is installed
   Call DetectJRE
   StrCpy $installingJSampler "1"
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
   ; Files to install
-  File Fantasia-0.8a.jar
+  File bin\Fantasia-0.8a-cvs6.jar
   File jsampler.ico
 SectionEnd
 
-Section "QSampler 0.2.1" SecQSampler
+Section "QSampler 0.2.1.26" SecQSampler
+  DetailPrint "Installing QSampler binaries ..."
   StrCpy $installingQSampler "1"
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
   ; Files to install
-  File qsampler.exe
-  File QtCore4.dll
-  File QtGui4.dll
-  File mingwm10.dll
+  File bin\686\qsampler.exe
+  File bin\686\QtCore4.dll
+  File bin\686\QtGui4.dll
+  File bin\686\mingwm10.dll
+  File qsampler.ico
+  SetOutPath $INSTDIR\share\locale
+  File bin\686\share\locale\qsampler_ru.qm
 SectionEnd
 
-Section "gigedit 0.1.1" Secgigedit
+Section "gigedit 0.1.1.x (cvs2009-05-10)" Secgigedit
+  DetailPrint "Installing gigedit binaries ..."
   StrCpy $installinggigedit "1"
+
   ; make sure gtkmm is installed
-  Call CheckForGtkmm
+  ; (commented out for now, since we include gtk(mm) DLLs with this
+  ; installer, so no check and no download necessary ATM)
+  ;Call CheckForGtkmm
+
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
+
+  StrCmp $binType BIN_TYPE_64BIT gigedit64
+  ; I think we don't need a SSE optimized 32 bit binary for gigedit, one 64bit and one simple 32 bit version should be sufficient
+  ;StrCmp $binType BIN_TYPE_686SSE gigedit686sse
+  Goto gigedit686
+
   ; Files to install
-  File gigedit.exe
-  File libsndfile-1.dll
+
+  gigedit64:
+  File bin\64\gigedit.exe
+  File bin\64\libgigedit-1.dll
   SetOutPath "$INSTDIR\plugins"
-  File libgigedit.dll
+  File bin\64\plugins\libgigeditlinuxsamplerplugin-1.dll
+  SetOutPath $INSTDIR
+  File bin\64\libatk-1.0-0.dll
+  File bin\64\libatkmm-1.6-1.dll
+  File bin\64\libcairo-2.dll
+  File bin\64\libcairomm-1.0-1.dll
+  File bin\64\libgdkmm-2.4-1.dll
+  File bin\64\libgdk_pixbuf-2.0-0.dll
+  File bin\64\libgdk-win32-2.0-0.dll
+  File bin\64\libgio-2.0-0.dll
+  File bin\64\libgiomm-2.4-1.dll
+  File bin\64\libglib-2.0-0.dll
+  File bin\64\libglibmm-2.4-1.dll
+  File bin\64\libgmodule-2.0-0.dll
+  File bin\64\libgobject-2.0-0.dll
+  File bin\64\libgthread-2.0-0.dll
+  File bin\64\libgtkmm-2.4-1.dll
+  File bin\64\libgtk-win32-2.0-0.dll
+  File bin\64\libintl-8.dll
+  File bin\64\libjpeg-62.dll
+  File bin\64\libpango-1.0-0.dll
+  File bin\64\libpangocairo-1.0-0.dll
+  File bin\64\libpangomm-1.4-1.dll
+  File bin\64\libpangowin32-1.0-0.dll
+  File bin\64\libpng12-0.dll
+  File bin\64\libsigc-2.0-0.dll
+  File bin\64\libtiff.dll
+  File bin\64\zlib1.dll
+  SetOutPath $INSTDIR\etc\gtk-2.0
+  File bin\64\etc\gtk-2.0\gtkrc
+  SetOutPath $INSTDIR\lib\gtk-2.0\2.10.0\engines
+  File bin\64\lib\gtk-2.0\2.10.0\engines\libwimp.dll
+  SetOutPath $INSTDIR\share\locale\de\LC_MESSAGES
+  File bin\64\share\locale\de\LC_MESSAGES\gigedit.mo
+  File bin\64\share\locale\de\LC_MESSAGES\gtk20.mo
+  SetOutPath $INSTDIR\share\locale\sv\LC_MESSAGES
+  File bin\64\share\locale\sv\LC_MESSAGES\gigedit.mo
+  File bin\64\share\locale\sv\LC_MESSAGES\gtk20.mo
+  SetOutPath $INSTDIR\share\themes\MS-Windows\gtk-2.0
+  File bin\64\share\themes\MS-Windows\gtk-2.0\gtkrc
+  Goto done
+
+  gigedit686:
+  File bin\686\gigedit.exe
+  File bin\686\libgigedit-1.dll
+  SetOutPath "$INSTDIR\plugins"
+  File bin\686\plugins\libgigeditlinuxsamplerplugin-1.dll
+  SetOutPath $INSTDIR
+  File bin\686\intl.dll
+  File bin\686\jpeg62.dll
+  File bin\686\libatk-1.0-0.dll
+  File bin\686\libatkmm-1.6-1.dll
+  File bin\686\libcairo-2.dll
+  File bin\686\libcairomm-1.0-1.dll
+  File bin\686\libgdkmm-2.4-1.dll
+  File bin\686\libgdk_pixbuf-2.0-0.dll
+  File bin\686\libgdk-win32-2.0-0.dll
+  File bin\686\libgio-2.0-0.dll
+  File bin\686\libgiomm-2.4-1.dll
+  File bin\686\libglib-2.0-0.dll
+  File bin\686\libglibmm-2.4-1.dll
+  File bin\686\libgmodule-2.0-0.dll
+  File bin\686\libgobject-2.0-0.dll
+  File bin\686\libgthread-2.0-0.dll
+  File bin\686\libgtkmm-2.4-1.dll
+  File bin\686\libgtk-win32-2.0-0.dll
+  File bin\686\libpango-1.0-0.dll
+  File bin\686\libpangocairo-1.0-0.dll
+  File bin\686\libpangomm-1.4-1.dll
+  File bin\686\libpangowin32-1.0-0.dll
+  File bin\686\libpng12-0.dll
+  File bin\686\libsigc-2.0-0.dll
+  File bin\686\libtiff3.dll
+  File bin\686\zlib1.dll
+  SetOutPath $INSTDIR\etc\gtk-2.0
+  File bin\686\etc\gtk-2.0\gdk-pixbuf.loaders
+  File bin\686\etc\gtk-2.0\gtkrc
+  SetOutPath $INSTDIR\lib\gtk-2.0\2.10.0\engines
+  File bin\686\lib\gtk-2.0\2.10.0\engines\libwimp.dll
+  SetOutPath $INSTDIR\lib\gtk-2.0\2.10.0\loaders
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-ani.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-bmp.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-gif.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-icns.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-ico.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-jpeg.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-pcx.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-png.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-pnm.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-ras.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-tga.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-tiff.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-wbmp.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-xbm.dll
+  File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-xpm.dll
+  SetOutPath $INSTDIR\share\locale\de\LC_MESSAGES
+  File bin\686\share\locale\de\LC_MESSAGES\gigedit.mo
+  File bin\686\share\locale\de\LC_MESSAGES\gtk20.mo
+  SetOutPath $INSTDIR\share\locale\sv\LC_MESSAGES
+  File bin\686\share\locale\sv\LC_MESSAGES\gigedit.mo
+  File bin\686\share\locale\sv\LC_MESSAGES\gtk20.mo
+  SetOutPath $INSTDIR\share\themes\MS-Windows\gtk-2.0
+  File bin\686\share\themes\MS-Windows\gtk-2.0\gtkrc
+  Goto done
+
+  done:
 SectionEnd
 
-Section "libgig 3.2.1" Seclibgig
+Section "libgig 3.2.1.x (cvs2009-05-03)" Seclibgig
+  DetailPrint "Installing libgig binaries ..."
   ; We make this a mandatory component
   SectionIn RO
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
+
+  StrCmp $binType BIN_TYPE_64BIT libgig64
+  StrCmp $binType BIN_TYPE_686SSE libgig686sse
+  Goto libgig686
+
   ; Files to install
-  File libgig-6.dll
-  File rifftree.exe
-  File dlsdump.exe
-  File gigdump.exe
-  File gigextract.exe
+
+  libgig64:
+  File bin\64\libgig-6.dll
+  File bin\64\rifftree.exe
+  File bin\64\dlsdump.exe
+  File bin\64\gigdump.exe
+  File bin\64\gigextract.exe
+  ; special dependency for the 64 bit version
+  File bin\64\libgcc_s_sjlj-1.dll
+  Goto done
+
+  libgig686sse:
+  File bin\686sse\libgig-6.dll
+  File bin\686sse\rifftree.exe
+  File bin\686sse\dlsdump.exe
+  File bin\686sse\gigdump.exe
+  File bin\686sse\gigextract.exe
+  Goto done
+
+  libgig686:
+  File bin\686\libgig-6.dll
+  File bin\686\rifftree.exe
+  File bin\686\dlsdump.exe
+  File bin\686\gigdump.exe
+  File bin\686\gigextract.exe
+  Goto done
+
+  done:
+
+  ; As this is a mandatory component, we add the common binary directory
+  ; of LinuxSampler and friends to the system's PATH variable here ...
+  ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR"
+
   ; As this is a mandatory component, we misuse it to install the uninstaller as well ...
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LinuxSampler" "DisplayName" "LinuxSampler ${RELEASE_DATE}"
@@ -203,24 +467,47 @@
   WriteRegStr HKCU "Software\LinuxSampler" "" $INSTDIR
 SectionEnd
 
+Section "libsndfile 1.0.19" Seclibsndfile
+  DetailPrint "Installing libsndfile binaries ..."
+  ; We make this a mandatory component
+  SectionIn RO
+  ; Set output path to the installation directory.
+  SetOutPath $INSTDIR
+
+  StrCmp $binType BIN_TYPE_64BIT libsndfile64
+  ; I think we don't need a SSE optimized 32 bit binary for libsndfile, one 64bit and one simple 32 bit DLL should be sufficient
+  ;StrCmp $binType BIN_TYPE_686SSE libsndfile686sse
+  Goto libsndfile686
+
+  ; Files to install
+
+  libsndfile64:
+  File bin\64\libsndfile-1.dll
+  Goto done
+
+  libsndfile686:
+  File bin\686\libsndfile-1.dll
+  Goto done
+
+  done:
+SectionEnd
+
 Section "Start Menu Shortcuts" SecShortcuts
-  
   CreateDirectory "$SMPROGRAMS\LinuxSampler"
-  
+
   CreateShortCut "$SMPROGRAMS\LinuxSampler\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  
+
   StrCmp $installingLinuxSampler '1' 0 +2
-  CreateShortCut "$SMPROGRAMS\LinuxSampler\LinuxSampler 0.5.1 (backend).lnk" "$INSTDIR\linuxsampler.exe" "" "$INSTDIR\linuxsampler.exe" 0
-  
+  CreateShortCut "$SMPROGRAMS\LinuxSampler\LinuxSampler 0.5.1 (stand alone backend).lnk" "$INSTDIR\linuxsampler.exe" "" "$INSTDIR\linuxsampler.exe" 0
+
   StrCmp $installingJSampler '1' 0 +2
   CreateShortCut '$SMPROGRAMS\LinuxSampler\JSampler Fantasia 0.8a (frontend).lnk' 'javaw' '-jar "$INSTDIR\Fantasia-0.8a.jar"' '$INSTDIR\jsampler.ico' 0
-  
+
   StrCmp $installingQSampler '1' 0 +2
-  CreateShortCut "$SMPROGRAMS\LinuxSampler\QSampler 0.2.1 (frontend).lnk" "$INSTDIR\qsampler.exe" "" "$INSTDIR\qsampler.exe" 0
-  
+  CreateShortCut "$SMPROGRAMS\LinuxSampler\QSampler 0.2.1 (frontend).lnk" "$INSTDIR\qsampler.exe" "" "$INSTDIR\qsampler.ico" 0
+
   StrCmp $installinggigedit '1' 0 +2
   CreateShortCut "$SMPROGRAMS\LinuxSampler\gigedit 0.1.1 (stand alone).lnk" "$INSTDIR\gigedit.exe" "" "$INSTDIR\gigedit.exe" 0
-  
 SectionEnd
 
 ;--------------------------------
@@ -228,28 +515,33 @@
 ; Uninstaller
 
 Section "Uninstall"
-  ; Remove registry keys
+  DetailPrint "Removing LinuxSampler directory from PATH variable ..."
+  ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR"
+
+  DetailPrint "Removing registry keys ..."
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LinuxSampler"
-  ; Remove files and uninstaller
-  Delete $INSTDIR\*.*
-  Delete $INSTDIR\plugins\*.*
-  ; Remove shortcuts, if any
+
+  DetailPrint "Removing VST plugin ..."
+  Delete $vstPluginPath\LinuxSampler.dll
+
+  DetailPrint "Removing shortcuts (if any) ..."
   Delete "$SMPROGRAMS\LinuxSampler\*.*"
-  ; Remove directories used
+
+  DetailPrint "Removing directories used ..."
   RMDir "$SMPROGRAMS\LinuxSampler"
-  RMDir "$INSTDIR\plugins"
-  RMDir "$INSTDIR"
+  RMDir /r "$INSTDIR"
 SectionEnd
 
 ;--------------------------------
 ;Descriptions
 
 ;Language strings
-LangString DESC_SecLinuxSampler ${LANG_ENGLISH} "Sampler backend, including sampler engine, MIDI and audio drivers, native C++ API as well as network (LSCP) API. Use a frontend application like JSampler or QSampler to control the sampler."
+LangString DESC_SecLinuxSampler ${LANG_ENGLISH} "Sampler backend (stand-alone application and VST plugin), including sampler engine, MIDI and audio drivers, native C++ API as well as network (LSCP) API. Use a frontend application like JSampler or QSampler to control the sampler."
 LangString DESC_SecJSampler ${LANG_ENGLISH} "Graphical frontend (user interface) for LinuxSampler written in Java, supporting all current features of LinuxSampler. This is the 'Fantasia' distribution of JSampler, offering a modern skin based look."
 LangString DESC_SecQSampler ${LANG_ENGLISH} "Graphical light-weight frontend (user interface) for LinuxSampler written in C++, offering a fast native user interface. NOTE: QSampler doesn't support all LinuxSampler features yet!"
 LangString DESC_Secgigedit ${LANG_ENGLISH} "Graphical instrument editor for Gigasampler format v2 and v3 files. Can be used stand-alone or in conjunction with LinuxSampler. NOTE: this is yet an early development version!"
 LangString DESC_Seclibgig ${LANG_ENGLISH} "C++ program library for accessing DLS (Level 1 and Level 2) and Gigasampler format (v2 and v3) files. This library is required by LinuxSampler, gigedit and QSampler."
+LangString DESC_Seclibsndfile ${LANG_ENGLISH} "C program library for reading and writing files containing sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format), used by gigedit to import samples."
 LangString DESC_SecShortcuts ${LANG_ENGLISH} "Installs start menu shortcuts for all applications."
 
 ;Assign language strings to sections
@@ -259,5 +551,6 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecQSampler} $(DESC_SecQSampler)
   !insertmacro MUI_DESCRIPTION_TEXT ${Secgigedit} $(DESC_Secgigedit)
   !insertmacro MUI_DESCRIPTION_TEXT ${Seclibgig} $(DESC_Seclibgig)
+  !insertmacro MUI_DESCRIPTION_TEXT ${Seclibsndfile} $(DESC_Seclibsndfile)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} $(DESC_SecShortcuts)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END