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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1900 by schoenebeck,
Mon May 11 19:50:03 2009 UTC
+revision 1941 by senoner,
Mon Jul 13 17:48:43 2009 UTC
 Line 21 
 SetCompressor lzma
  !include "MUI.nsh"
  !include "EnvVarUpdate.nsh"
- !define RELEASE_DATE "20090511"
+ !define RELEASE_DATE "20090623"
  ; The name of the installer
  Name "LinuxSampler (${RELEASE_DATE})"
 Line 31 
 OutFile "linuxsampler_${RELEASE_DATE}_se
  ; Java Runtime Environment, needed for JSampler
  !define JRE_VERSION "1.6"
- !define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=11292"
+ !define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=31621"
+ !define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=31623"
  ; The default installation directory
- InstallDir $PROGRAMFILES\LinuxSampler
+ InstallDir "$PROGRAMFILES64\LinuxSampler"
+ !define SUBDIR_32_BIT "32"
+ !define SUBDIR_64_BIT "64"
+ !define DEFAULT_VST_DIR64 "$PROGRAMFILES64\Steinberg\VstPlugins"
+ !define DEFAULT_VST_DIR "$PROGRAMFILES\Steinberg\VstPlugins"
  ; Get installation folder from registry if available
- InstallDirRegKey HKCU "Software\LinuxSampler" ""
+ InstallDirRegKey HKLM "Software\LinuxSampler" "Main Directory"
  ;--------------------------------
  ;Interface Settings
-Line 62 
 VIAddVersionKey /LANG=${LANG_ENGLISH} "F
+Line 68 
 VIAddVersionKey /LANG=${LANG_ENGLISH} "F
  !define BIN_TYPE_686SSE "686 SSE"
  !define BIN_TYPE_686    "686"
+ Var /GLOBAL binType
  ;--------------------------------
  ; Pages
-Line 84 
 Function .onInit
+Line 92 
 Function .onInit
    Var /GLOBAL installingJSampler
    Var /GLOBAL installingQSampler
    Var /GLOBAL installinggigedit
+   Var /GLOBAL installing32BitToo
    StrCpy $installingLinuxSampler "0"
    StrCpy $installingJSampler "0"
    StrCpy $installingQSampler "0"
    StrCpy $installinggigedit "0"
+   StrCpy $installing32BitToo "0"
  FunctionEnd
- ; detects CPU capabilities and determmines which native binary type to install
+ !macro CreateInternetShortcut FILENAME URL ICONFILE ICONINDEX
- Function DetectSystemType
+ WriteINIStr "${FILENAME}.url" "InternetShortcut" "URL" "${URL}"
-   Var /GLOBAL binType
+ WriteINIStr "${FILENAME}.url" "InternetShortcut" "IconFile" "${ICONFILE}"
+ WriteINIStr "${FILENAME}.url" "InternetShortcut" "IconIndex" "${ICONINDEX}"
+ !macroend
+ ; detects CPU capabilities, determines which native binary type to install
+ ; and selects the appropriate windows registry view (32 bit or 64 bit)
+ !macro DetectSystemType un
+ Function ${un}DetectSystemType
    ; 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."
+   SetRegView 64
    Goto DetectSystemDone
    not64bit: ; a 32 bit system
+   SetRegView 32
    ; check if CPU supports SSE
    cpudesc::tell
    Pop $0                     ; full identification string in $0
-Line 118 
 Function DetectSystemType
+Line 137 
 Function DetectSystemType
    DetectSystemDone:
  FunctionEnd
+ !macroend
+ !insertmacro DetectSystemType ""
+ !insertmacro DetectSystemType "un."
  ; Check for the presence of gtkmm, and if false, ask the user whether to
  ; download and install gtkmm now from the internet.
+ ; (NOTE: this function is currently unused, since we include the gtk(mm)
+ ; DLLs with the installer ATM, this is the recommended way by the gtk
+ ; project)
  Function CheckForGtkmm
    Var /GLOBAL gtkmmSetupFile
-Line 153 
 FunctionEnd
+Line 178 
 FunctionEnd
  ; Downloads and launches the JRE installer from the internet
  Function GetJRE
-         MessageBox MB_OK "JSampler requires Java ${JRE_VERSION}, it will now \
+   Var /GLOBAL jreUri
-                          be downloaded and installed"
-         StrCpy $2 "$TEMP\Java Runtime Environment.exe"
+   StrCmp $binType BIN_TYPE_64BIT 0 +3
-         nsisdl::download /TIMEOUT=30000 ${JRE_URL} $2
+   StrCpy $jreUri ${JRE_64_URL}
-         Pop $R0 ;Get the return value
+   Goto +2
-                 StrCmp $R0 "success" +3
+   StrCpy $jreUri ${JRE_32_URL}
-                 MessageBox MB_OK "Download failed: $R0"
-                 Quit
+   DetailPrint "Downloading JRE from: $jreUri"
-         ExecWait $2
-         Delete $2
+   MessageBox MB_OK "JSampler requires Java ${JRE_VERSION}, it will now \
+                     be downloaded and installed"
+   StrCpy $2 "$TEMP\Java Runtime Environment.exe"
+   nsisdl::download /TIMEOUT=30000 "$jreUri" $2
+   Pop $R0  ; Get the return value
+   StrCmp $R0 "success" +3
+   MessageBox MB_OK "Download failed: $R0"
+   Quit
+   ExecWait $2
+   Delete $2
  FunctionEnd
  ; Checks if the JRE is already installed, if not it will download and install it from the internet
-Line 172 
 Function DetectJRE
+Line 206 
 Function DetectJRE
               "CurrentVersion"
    StrCmp $2 ${JRE_VERSION} done
+   StrCmp $binType BIN_TYPE_64BIT 0 downloadjre
+   ; on 64 bit systems also check the 32 bit view of the registry, maybe
+   ; a 32 bit JRE was already installed
+   SetRegView 32
+   ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \
+              "CurrentVersion"
+   SetRegView 64  ; restore 64 bit view
+   StrCmp $3 ${JRE_VERSION} done
+   downloadjre:
    Call GetJRE
    done:
-Line 180 
 FunctionEnd
+Line 225 
 FunctionEnd
  ; Tries to find the location where VST plugins should be installed to
  Function DetectVstPath
    Var /GLOBAL vstPluginPath
+   Var /GLOBAL vstPluginPath64
+   StrCmp $binType BIN_TYPE_64BIT 0 detectVst32
+   SetRegView 64 ; make sure we have the 64 bit registry view
+   ; ------- VST 64 bit detection -------
+   ClearErrors
+   ReadRegStr $0 HKCU "Software\VST" "VSTPluginsPath"
+   IfErrors check2ndRegistryKey64 0
+   StrCpy $vstPluginPath64 $0
+   DetailPrint "Found VST plugin (64 bit) directory in HKCU registry."
+   Goto done64
+   check2ndRegistryKey64:
+   ClearErrors
+   ReadRegStr $0 HKLM "Software\VST" "VSTPluginsPath"
+   IfErrors noRegistryKeyExists64 0
+   StrCpy $vstPluginPath64 $0
+   DetailPrint "Found VST plugin (64 bit) directory in HKLM registry."
+   Goto done64
+   noRegistryKeyExists64:
+   ClearErrors
+   DetailPrint "No VST plugin directory (64 bit) defined in registry."
+   StrCpy $vstPluginPath64 "${DEFAULT_VST_DIR64}"
+   done64:
+   SetRegView 32 ; make sure we have a 32 bit registry view
+   detectVst32: ; it follows the same thing for the 32 bit registry view
+   ; ------- VST 32 bit detection -------
    ClearErrors
    ReadRegStr $0 HKCU "Software\VST" "VSTPluginsPath"
    IfErrors check2ndRegistryKey 0
    StrCpy $vstPluginPath $0
-   DetailPrint "Found VST plugin directory in HKCU registry."
+   DetailPrint "Found VST plugin (32 bit) directory in HKCU registry."
    Goto done
    check2ndRegistryKey:
-Line 193 
 Function DetectVstPath
+Line 271 
 Function DetectVstPath
    ReadRegStr $0 HKLM "Software\VST" "VSTPluginsPath"
    IfErrors noRegistryKeyExists 0
    StrCpy $vstPluginPath $0
-   DetailPrint "Found VST plugin directory in HKLM registry."
+   DetailPrint "Found VST plugin (32 bit) directory in HKLM registry."
    Goto done
    noRegistryKeyExists:
    ClearErrors
-   DetailPrint "No VST plugin directory defined in registry."
+   DetailPrint "No VST plugin directory (32 bit) defined in registry."
-   StrCpy $vstPluginPath "$PROGRAMFILES\Steinberg\VstPlugins"
+   StrCpy $vstPluginPath "${DEFAULT_VST_DIR}"
-   done:
+   done: ; ------- summary of detection -------
-   DetailPrint "Using the following as VST plugin directory: $vstPluginPath"
+   StrCmp $binType BIN_TYPE_64BIT 0 summaryVst32
+   SetRegView 64  ; restore 64 bit view
+   DetailPrint "Using the following as VST (64 bit) plugin directory: $vstPluginPath64"
+   summaryVst32:
+   DetailPrint "Using the following as VST (32 bit) plugin directory: $vstPluginPath"
  FunctionEnd
  ;--------------------------------
- ; primer things to do
+ ; primer things to do (before installing, not called on uninstall)
  Section ""
    Call DetectSystemType
    Call DetectVstPath
-Line 220 
 Section "LinuxSampler 0.5.1.12cvs" SecLi
+Line 303 
 Section "LinuxSampler 0.5.1.12cvs" SecLi
    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
-Line 230 
 Section "LinuxSampler 0.5.1.12cvs" SecLi
+Line 310 
 Section "LinuxSampler 0.5.1.12cvs" SecLi
    ; Files to install
    linuxsampler64:
+   SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
    File bin\64\linuxsampler.exe
    File bin\64\liblinuxsampler-1.dll
-   SetOutPath $vstPluginPath
+   File bin\64\libsqlite3-0.dll
-   File bin\64\LinuxSampler.dll
+   SetOutPath $vstPluginPath64
-   Goto done
+   File /oname=LinuxSampler64.dll bin\64\LinuxSampler.dll
+   MessageBox MB_YESNO \
+     "It seems you are using a 64 bit Windows system. A native 64 bit version of LinuxSampler and its VST plugin version will be installed accordingly.$\r$\n$\r$\nShall a 32 bit version of the LinuxSampler VST be installed as well?" \
+     IDNO done
+   ; so the other sections install their 32 bit versions as well
+   StrCpy $installing32BitToo "1"
    linuxsampler686sse:
+   SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
    File bin\686sse\linuxsampler.exe
    File bin\686sse\liblinuxsampler-1.dll
+   File bin\686\libsqlite3-0.dll
    SetOutPath $vstPluginPath
-   File bin\686sse\LinuxSampler.dll
+   File /oname=LinuxSampler32.dll bin\686sse\LinuxSampler.dll
    Goto done
    linuxsampler686:
+   SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
    File bin\686\linuxsampler.exe
    File bin\686\liblinuxsampler-1.dll
+   File bin\686\libsqlite3-0.dll
    SetOutPath $vstPluginPath
-   File bin\686\LinuxSampler.dll
+   File /oname=LinuxSampler32.dll bin\686\LinuxSampler.dll
    Goto done
    done:
  SectionEnd
- Section "JSampler 'Fantasia' 0.8a-cvs6" SecJSampler
+ Section "JSampler 'Fantasia' 0.8a-cvs8" SecJSampler
    DetailPrint "Installing JSampler binaries ..."
    ; make sure JRE is installed
    Call DetectJRE
-Line 261 
 Section "JSampler 'Fantasia' 0.8a-cvs6"
+Line 352 
 Section "JSampler 'Fantasia' 0.8a-cvs6"
    ; Set output path to the installation directory.
    SetOutPath $INSTDIR
    ; Files to install
-   File bin\Fantasia-0.8a-cvs6.jar
+   File bin\Fantasia-0.8a-cvs8.jar
    File jsampler.ico
  SectionEnd
-Line 289 
 Section "gigedit 0.1.1.x (cvs2009-05-10)
+Line 380 
 Section "gigedit 0.1.1.x (cvs2009-05-10)
    ; 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
-Line 300 
 Section "gigedit 0.1.1.x (cvs2009-05-10)
+Line 388 
 Section "gigedit 0.1.1.x (cvs2009-05-10)
    ; Files to install
    gigedit64:
+   SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
    File bin\64\gigedit.exe
    File bin\64\libgigedit-1.dll
-   SetOutPath "$INSTDIR\plugins"
+   SetOutPath "$INSTDIR\${SUBDIR_64_BIT}\plugins"
    File bin\64\plugins\libgigeditlinuxsamplerplugin-1.dll
-   SetOutPath $INSTDIR
+   SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
    File bin\64\libatk-1.0-0.dll
    File bin\64\libatkmm-1.6-1.dll
    File bin\64\libcairo-2.dll
-Line 331 
 Section "gigedit 0.1.1.x (cvs2009-05-10)
+Line 420 
 Section "gigedit 0.1.1.x (cvs2009-05-10)
    File bin\64\libsigc-2.0-0.dll
    File bin\64\libtiff.dll
    File bin\64\zlib1.dll
-   SetOutPath $INSTDIR\etc\gtk-2.0
+   SetOutPath $INSTDIR\${SUBDIR_64_BIT}\etc\gtk-2.0
    File bin\64\etc\gtk-2.0\gtkrc
-   SetOutPath $INSTDIR\lib\gtk-2.0\2.10.0\engines
+   SetOutPath $INSTDIR\${SUBDIR_64_BIT}\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
+   SetOutPath $INSTDIR\${SUBDIR_64_BIT}\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
+   SetOutPath $INSTDIR\${SUBDIR_64_BIT}\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
+   SetOutPath $INSTDIR\${SUBDIR_64_BIT}\share\themes\MS-Windows\gtk-2.0
    File bin\64\share\themes\MS-Windows\gtk-2.0\gtkrc
-   Goto done
+   ; shall we install the 32 bit version as well?
+   StrCmp $installing32BitToo "1" gigedit686 done
    gigedit686:
+   SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
    File bin\686\gigedit.exe
    File bin\686\libgigedit-1.dll
-   SetOutPath "$INSTDIR\plugins"
+   SetOutPath "$INSTDIR\${SUBDIR_32_BIT}\plugins"
    File bin\686\plugins\libgigeditlinuxsamplerplugin-1.dll
-   SetOutPath $INSTDIR
+   SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
    File bin\686\intl.dll
    File bin\686\jpeg62.dll
    File bin\686\libatk-1.0-0.dll
-Line 377 
 Section "gigedit 0.1.1.x (cvs2009-05-10)
+Line 469 
 Section "gigedit 0.1.1.x (cvs2009-05-10)
    File bin\686\libsigc-2.0-0.dll
    File bin\686\libtiff3.dll
    File bin\686\zlib1.dll
-   SetOutPath $INSTDIR\etc\gtk-2.0
+   SetOutPath $INSTDIR\${SUBDIR_32_BIT}\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
+   SetOutPath $INSTDIR\${SUBDIR_32_BIT}\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
+   SetOutPath $INSTDIR\${SUBDIR_32_BIT}\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
-Line 398 
 Section "gigedit 0.1.1.x (cvs2009-05-10)
+Line 490 
 Section "gigedit 0.1.1.x (cvs2009-05-10)
    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
+   SetOutPath $INSTDIR\${SUBDIR_32_BIT}\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
+   SetOutPath $INSTDIR\${SUBDIR_32_BIT}\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
+   SetOutPath $INSTDIR\${SUBDIR_32_BIT}\share\themes\MS-Windows\gtk-2.0
    File bin\686\share\themes\MS-Windows\gtk-2.0\gtkrc
    Goto done
-Line 415 
 Section "libgig 3.2.1.x (cvs2009-05-03)"
+Line 507 
 Section "libgig 3.2.1.x (cvs2009-05-03)"
    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
-Line 425 
 Section "libgig 3.2.1.x (cvs2009-05-03)"
+Line 515 
 Section "libgig 3.2.1.x (cvs2009-05-03)"
    ; Files to install
    libgig64:
+   SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
    File bin\64\libgig-6.dll
    File bin\64\rifftree.exe
    File bin\64\dlsdump.exe
-Line 432 
 Section "libgig 3.2.1.x (cvs2009-05-03)"
+Line 523 
 Section "libgig 3.2.1.x (cvs2009-05-03)"
    File bin\64\gigextract.exe
    ; special dependency for the 64 bit version
    File bin\64\libgcc_s_sjlj-1.dll
-   Goto done
+   ; shall we install the 32 bit version as well?
+   StrCmp $installing32BitToo "1" libgig686sse done
    libgig686sse:
+   SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
    File bin\686sse\libgig-6.dll
    File bin\686sse\rifftree.exe
    File bin\686sse\dlsdump.exe
-Line 443 
 Section "libgig 3.2.1.x (cvs2009-05-03)"
+Line 537 
 Section "libgig 3.2.1.x (cvs2009-05-03)"
    Goto done
    libgig686:
+   SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
    File bin\686\libgig-6.dll
    File bin\686\rifftree.exe
    File bin\686\dlsdump.exe
-Line 452 
 Section "libgig 3.2.1.x (cvs2009-05-03)"
+Line 547 
 Section "libgig 3.2.1.x (cvs2009-05-03)"
    done:
-   ; As this is a mandatory component, we add the common binary directory
+   ; As this is a mandatory component, we misuse is for the following
-   ; of LinuxSampler and friends to the system's PATH variable here ...
+   ; common tasks as well ...
+   ; Add LinuxSampler and friends to the system's PATH variable
    ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR"
+   ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\${SUBDIR_64_BIT}"
+   ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\${SUBDIR_32_BIT}"
-   ; 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}"
    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LinuxSampler" "UninstallString" '"$INSTDIR\uninstall.exe"'
    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LinuxSampler" "NoModify" 1
    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LinuxSampler" "NoRepair" 1
    WriteUninstaller "uninstall.exe"
-   ;Store installation folder
-   WriteRegStr HKCU "Software\LinuxSampler" "" $INSTDIR
+   ; Store installation folders
+   WriteRegStr HKLM "Software\LinuxSampler" "Main Directory" $INSTDIR
+   StrCmp $binType BIN_TYPE_64BIT 0 +3
+   WriteRegStr HKLM "Software\LinuxSampler" "VST 64 Directory" $vstPluginPath64
+   StrCmp $installing32BitToo "1" 0 +2
+   WriteRegStr HKLM "Software\LinuxSampler" "VST 32 Directory" $vstPluginPath
+   ; Just for info, store the release date as well
+   WriteRegStr HKLM "Software\LinuxSampler" "Release Date" ${RELEASE_DATE}
  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
-Line 482 
 Section "libsndfile 1.0.19" Seclibsndfil
+Line 586 
 Section "libsndfile 1.0.19" Seclibsndfil
    ; Files to install
    libsndfile64:
+   SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
    File bin\64\libsndfile-1.dll
-   Goto done
+   ; shall we install the 32 bit version as well?
+   StrCmp $installing32BitToo "1" libsndfile686 done
    libsndfile686:
+   SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
    File bin\686\libsndfile-1.dll
    Goto done
-Line 493 
 Section "libsndfile 1.0.19" Seclibsndfil
+Line 601 
 Section "libsndfile 1.0.19" Seclibsndfil
  SectionEnd
  Section "Start Menu Shortcuts" SecShortcuts
+   Var /GLOBAL javawbin
+   Var /GLOBAL samplerDir
+   StrCmp $binType BIN_TYPE_64BIT 0 +3
+   StrCpy $samplerDir "$INSTDIR\${SUBDIR_64_BIT}"
+   Goto +2
+   StrCpy $samplerDir "$INSTDIR\${SUBDIR_32_BIT}"
+   ; Switch system variables to 'all users', to ensure we create the start
+   ; menu shortcuts for all users and not just for the current user.
+   SetShellVarContext all
+   ; try to resolve the full qualified path of the javaw binary
+   ClearErrors
+   SearchPath $javawbin javaw.exe
+   IfErrors 0 javawDetected
+   ClearErrors
+   ; if all fails, simply use SYSDIR (which should work almost always anyway)
+   DetailPrint "WRN: Could not resolve javaw.exe path, using SYSDIR."
+   StrCpy $javawbin "$SYSDIR\javaw.exe"
+   javawDetected:
    CreateDirectory "$SMPROGRAMS\LinuxSampler"
+   SetOutPath $INSTDIR
    CreateShortCut "$SMPROGRAMS\LinuxSampler\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-   StrCmp $installingLinuxSampler '1' 0 +2
+   StrCmp $installingLinuxSampler '1' 0 +3
-   CreateShortCut "$SMPROGRAMS\LinuxSampler\LinuxSampler 0.5.1 (stand alone backend).lnk" "$INSTDIR\linuxsampler.exe" "" "$INSTDIR\linuxsampler.exe" 0
+   SetOutPath $samplerDir
+   CreateShortCut "$SMPROGRAMS\LinuxSampler\LinuxSampler 0.5.1.12cvs (stand alone backend).lnk" "$samplerDir\linuxsampler.exe" "" "$samplerDir\linuxsampler.exe" 0
-   StrCmp $installingJSampler '1' 0 +2
+   StrCmp $installingJSampler '1' 0 +3
-   CreateShortCut '$SMPROGRAMS\LinuxSampler\JSampler Fantasia 0.8a (frontend).lnk' 'javaw' '-jar "$INSTDIR\Fantasia-0.8a.jar"' '$INSTDIR\jsampler.ico' 0
+   SetOutPath $INSTDIR
+   CreateShortCut '$SMPROGRAMS\LinuxSampler\JSampler Fantasia 0.8a-cvs8 (frontend).lnk' '$javawbin' '-jar "$INSTDIR\Fantasia-0.8a-cvs8.jar"' '$INSTDIR\jsampler.ico' 0
-   StrCmp $installingQSampler '1' 0 +2
+   StrCmp $installingQSampler '1' 0 +3
-   CreateShortCut "$SMPROGRAMS\LinuxSampler\QSampler 0.2.1 (frontend).lnk" "$INSTDIR\qsampler.exe" "" "$INSTDIR\qsampler.ico" 0
+   SetOutPath $INSTDIR
+   CreateShortCut "$SMPROGRAMS\LinuxSampler\QSampler 0.2.1.26 (frontend).lnk" "$INSTDIR\qsampler.exe" "" "$INSTDIR\qsampler.ico" 0
-   StrCmp $installinggigedit '1' 0 +2
+   StrCmp $installinggigedit '1' 0 +3
-   CreateShortCut "$SMPROGRAMS\LinuxSampler\gigedit 0.1.1 (stand alone).lnk" "$INSTDIR\gigedit.exe" "" "$INSTDIR\gigedit.exe" 0
+   SetOutPath $samplerDir
+   CreateShortCut "$SMPROGRAMS\LinuxSampler\gigedit 0.1.1.x cvs2009-05-10 (stand alone).lnk" "$samplerDir\gigedit.exe" "" "$samplerDir\gigedit.exe" 0
+   !insertmacro CreateInternetShortcut \
+   "$SMPROGRAMS\LinuxSampler\\Support LinuxSampler" \
+   "http://www.linuxsampler.org/donations.html" \
+   "" "0"
  SectionEnd
  ;--------------------------------
-Line 515 
 SectionEnd
+Line 655 
 SectionEnd
  ; Uninstaller
  Section "Uninstall"
-   DetailPrint "Removing LinuxSampler directory from PATH variable ..."
+   Var /GLOBAL vstdir32
+   Var /GLOBAL vstdir64
+   Call un.DetectSystemType
+   DetailPrint "Removing LinuxSampler directories from PATH variable ..."
    ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR"
+   ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\${SUBDIR_32_BIT}"
+   ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\${SUBDIR_64_BIT}"
+   StrCmp $binType BIN_TYPE_64BIT 0 uninstallVst32
+   DetailPrint "Searching for VST plugin (64 bit) ..."
+   ClearErrors
+   ReadRegStr $0 HKLM "Software\LinuxSampler" "VST 64 Directory"
+   IfErrors uninstallVst32 0
+   StrCpy $vstdir64 $0
+   DetailPrint "Removing VST plugin (64 bit) from: $vstdir64 ..."
+   Delete "$vstdir64\LinuxSampler64.dll"
+   uninstallVst32:
+   DetailPrint "Searching for VST plugin (32 bit) ..."
+   ClearErrors
+   ReadRegStr $0 HKLM "Software\LinuxSampler" "VST 32 Directory"
+   IfErrors uninstallVstDone 0
+   StrCpy $vstdir32 $0
+   DetailPrint "Removing VST plugin (32 bit) from: $vstdir32 ..."
+   Delete "$vstdir32\LinuxSampler32.dll"
+   uninstallVstDone:
+   ClearErrors
    DetailPrint "Removing registry keys ..."
    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LinuxSampler"
+   DeleteRegKey HKLM "Software\LinuxSampler"
-   DetailPrint "Removing VST plugin ..."
+   ; Workaround for Vista and younger: switch system variables to 'all users'
-   Delete $vstPluginPath\LinuxSampler.dll
+   ; otherwise e.g. we couldn't delete start menu shortcuts below on those
+   ; systems, as those variables would point to the current user.
+   SetShellVarContext all
-   DetailPrint "Removing shortcuts (if any) ..."
+   DetailPrint "Removing shortcuts (if any) from: $SMPROGRAMS ..."
    Delete "$SMPROGRAMS\LinuxSampler\*.*"
    DetailPrint "Removing directories used ..."
-   RMDir "$SMPROGRAMS\LinuxSampler"
+   RMDir /r "$SMPROGRAMS\LinuxSampler"
    RMDir /r "$INSTDIR"
  SectionEnd
-Line 536 
 SectionEnd
+Line 708 
 SectionEnd
  ;Descriptions
  ;Language strings
- 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_SecLinuxSampler ${LANG_ENGLISH} "Sampler backend (stand-alone and VST), 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_Secgigedit ${LANG_ENGLISH} "Graphical instrument editor for Gigasampler format v2 and v3 files. Can be used stand-alone or in conjunction with LinuxSampler."
  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."

 Legend:



Removed from v.1900
 


changed lines


 
Added in v.1941
 Legend:



Removed from v.1900
 


changed lines


 
Added in v.1941
-Removed from v.1900
+Added in v.1941

	ViewVC Help
Powered by ViewVC