- windows/specific.sh now creates a custom NSIS configuration file for this
authorFrank van Beek <frank@iae.nl>
Mon, 10 Feb 2003 11:07:14 +0000 (11:07 +0000)
committerFrank van Beek <frank@iae.nl>
Mon, 10 Feb 2003 11:07:14 +0000 (11:07 +0000)
  release and executes NSIS to build the Blender intaller

release/windows/installer/00.blender.nsi
release/windows/specific.sh

index 3e61bc6d79f5a2abeda0a51dd0c8417c8ba093c2..c459e1243b30c12dfc650e2833a652517436c0cd 100644 (file)
@@ -1,83 +1,84 @@
 ;
 ;
-; 00.blender.nsi
+; $Id$
 ;
 ; Blender Self-Installer for Windows (NSIS - http://nsis.sourceforge.net)
 ;
 ; 09.02.2003    aphex (mediocre@mixmojo.com)
 ;
 
 ;
 ; Blender Self-Installer for Windows (NSIS - http://nsis.sourceforge.net)
 ;
 ; 09.02.2003    aphex (mediocre@mixmojo.com)
 ;
 
-Name "Blender"
+Name "Blender VERSION"
 Caption "Blender Installer"
 Caption "Blender Installer"
-OutFile "blender-installer-win32-2.26.exe"
+OutFile "DISTDIR\..\VERSION\blender-VERSION-windows.exe"
 Icon "00.installer.ico"
 
 EnabledBitmap "00.checked.bmp"
 DisabledBitmap "00.unchecked.bmp"
 
 Icon "00.installer.ico"
 
 EnabledBitmap "00.checked.bmp"
 DisabledBitmap "00.unchecked.bmp"
 
-InstallDir "$PROGRAMFILES\Blender Foundation\Blender"
+InstallDir "$PROGRAMFILES\Blender Foundation\Blender-VERSION"
 
 LicenseText "Please read and agree to the license below:"
 
 LicenseText "Please read and agree to the license below:"
-LicenseData "..\..\text\copyright.txt"
+LicenseData "DISTDIR\Copyright.txt"
 
 Function .onInstSuccess
 
 Function .onInstSuccess
-       MessageBox MB_YESNO "Blender was successfully setup on your computer. Do you wish to start Blender now?" IDNO NoThanks
-               ExecShell "open" '"$INSTDIR\blender-2.26.exe"'
+       MessageBox MB_YESNO "Blender was successfully setup on your computer. Do you wish to start Blender now and register itself with .blend files?" IDNO NoThanks
+               ExecShell "open" '"$INSTDIR\blender.exe"' "-R"
        NoThanks:
 FunctionEnd
 
 BrandingText "http://www.blender.org/bf"
        NoThanks:
 FunctionEnd
 
 BrandingText "http://www.blender.org/bf"
-ComponentText "This will install Blender 2.26 on your computer."
+ComponentText "This will install Blender VERSION on your computer."
 
 DirText "Use the field below to specify the folder where you want Blender to be copied to. To specify a different folder, type a new name or use the Browse button to select an existing folder."
 
 
 DirText "Use the field below to specify the folder where you want Blender to be copied to. To specify a different folder, type a new name or use the Browse button to select an existing folder."
 
-Section "Blender-2.26 (required)"
+Section "Blender-VERSION (required)"
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
   ; Put file there
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
   ; Put file there
-  File ..\..\..\obj\windows\blender-2.26.exe
-  File ..\..\..\lib\windows\python\lib\python22.dll
-  File ..\..\text\copyright.txt
-  File ..\..\text\README
-  File ..\extra\help.url
+  File DISTDIR\blender.exe
+  File DISTDIR\python22.dll
+  File DISTDIR\Copyright.txt
+  File DISTDIR\Readme.txt
+  File DISTDIR\Help.url
   ; Write the installation path into the registry
   WriteRegStr HKLM SOFTWARE\BlenderFoundation "Install_Dir" "$INSTDIR"
   ; Write the uninstall keys for Windows
   ; Write the installation path into the registry
   WriteRegStr HKLM SOFTWARE\BlenderFoundation "Install_Dir" "$INSTDIR"
   ; Write the uninstall keys for Windows
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender226" "DisplayName" "Blender 2.26 (remove only)"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender226" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\BlenderSHORTVERS" "DisplayName" "Blender VERSION (remove only)"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\BlenderSHORTVERS" "UninstallString" '"$INSTDIR\uninstall.exe"'
   WriteUninstaller "uninstall.exe"
 SectionEnd
 
 SectionDivider
 
 Section "Start Menu Shortcuts"
   WriteUninstaller "uninstall.exe"
 SectionEnd
 
 SectionDivider
 
 Section "Start Menu Shortcuts"
-  CreateDirectory "$SMPROGRAMS\Blender Foundation\Blender\"
-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\blender-2.26.lnk" "$INSTDIR\blender-2.26.exe" "" "$INSTDIR\blender-2.26.exe" 0
-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\README.lnk" "$INSTDIR\README" "" "" 0
-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\copyright.lnk" "$INSTDIR\copyright.txt" "" "$INSTDIR\copyright.txt" 0
-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\help.lnk" "$INSTDIR\help.url"
+  CreateDirectory "$SMPROGRAMS\Blender Foundation\Blender-VERSION\"
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender-VERSION\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender-VERSION\Blender.lnk" "$INSTDIR\Blender.exe" "" "$INSTDIR\blender.exe" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender-VERSION\Readme.lnk" "$INSTDIR\Readme.txt" "" "" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender-VERSION\Copyright.lnk" "$INSTDIR\Copyright.txt" "" "$INSTDIR\copyright.txt" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender-VERSION\Help.lnk" "$INSTDIR\Help.url"
   MessageBox MB_YESNO "Do you wish to create a shortcut on your desktop?" IDNO NoDeskShortcut
   MessageBox MB_YESNO "Do you wish to create a shortcut on your desktop?" IDNO NoDeskShortcut
-      CreateShortCut "$DESKTOP\Blender-2.26.lnk" "$INSTDIR\blender-2.26.exe" "" "$INSTDIR\blender-2.26.exe" 0
+      CreateShortCut "$DESKTOP\Blender-VERSION.lnk" "$INSTDIR\blender.exe" "" "$INSTDIR\blender.exe" 0
   NoDeskShortcut:
 SectionEnd
 
   NoDeskShortcut:
 SectionEnd
 
-UninstallText "This will uninstall Blender 2.26. Hit next to continue."
+UninstallText "This will uninstall Blender VERSION. Hit next to continue."
 
 Section "Uninstall"
   ; remove registry keys
 
 Section "Uninstall"
   ; remove registry keys
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender226"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\BlenderSHORTVERS"
   DeleteRegKey HKLM SOFTWARE\BlenderFoundation
   ; remove files
   DeleteRegKey HKLM SOFTWARE\BlenderFoundation
   ; remove files
-  Delete $INSTDIR\blender-2.26.exe
+  Delete $INSTDIR\blender.exe
   Delete $INSTDIR\python22.dll
   Delete $INSTDIR\python22.dll
-  Delete $INSTDIR\copyright.txt
-  Delete $INSTDIR\README
+  Delete $INSTDIR\Copyright.txt
+  Delete $INSTDIR\Readme.txt
+  Delete $INSTDIR\Help.url
   Delete $INSTDIR\uninstall.exe
   ; remove shortcuts, if any.
   Delete $INSTDIR\uninstall.exe
   ; remove shortcuts, if any.
-  Delete "$SMPROGRAMS\Blender Foundation\Blender\*.*"
-  Delete "$DESKTOP\Blender-2.26.lnk"
+  Delete "$SMPROGRAMS\Blender Foundation\Blender-VERSION\*.*"
+  Delete "$DESKTOP\Blender-VERSION.lnk"
   ; remove directories used.
   ; remove directories used.
-  RMDir "$SMPROGRAMS\Blender Foundation\Blender"
+  RMDir "$SMPROGRAMS\Blender Foundation\Blender-VERSION"
   RMDir "$SMPROGRAMS\Blender Foundation"
   RMDir "$INSTDIR"
   RMDir "$SMPROGRAMS\Blender Foundation"
   RMDir "$INSTDIR"
-SectionEnd
\ No newline at end of file
+SectionEnd
index 11477ac0ac10f0332099ee20ae891a7aad04a2b3..314e3489f0244dc9bab7c1bee5a3bff2edbac4fa 100755 (executable)
@@ -55,7 +55,14 @@ chmod +x $DISTDIR/python$PVERS.dll
 # Add the Help.url to the ditribution
 cp -f extra/Help.url $DISTDIR/
 
 # Add the Help.url to the ditribution
 cp -f extra/Help.url $DISTDIR/
 
-# Copy $DISTDIR for the windows installer
-rm -fr $DISTDIR/../blender-windows
-cp -R $DISTDIR $DISTDIR/../blender-windows
-
+# make the installer package with NSIS
+NSIS="$PROGRAMFILES/NSIS/makensis.exe"
+if (`test -x "$NSIS"`) then
+    cd installer
+    TEMPFILE=00.blender_tmp.nsi
+    DISTDIR=`cygpath -m $DISTDIR`
+    # make a installer config for this release
+    cat 00.blender.nsi | sed "s|VERSION|$VERSION|g" | sed "s|DISTDIR|$DISTDIR|g" | sed "s|SHORTVERS|$PVERS|g" > $TEMPFILE
+    "$NSIS" $TEMPFILE
+    rm $TEMPFILE
+fi