From 3ae7008d0952a60aa62e047ac3b1a5b380296ab8 Mon Sep 17 00:00:00 2001 From: Frank van Beek Date: Mon, 10 Feb 2003 11:07:14 +0000 Subject: [PATCH] - windows/specific.sh now creates a custom NSIS configuration file for this release and executes NSIS to build the Blender intaller --- release/windows/installer/00.blender.nsi | 65 ++++++++++++------------ release/windows/specific.sh | 15 ++++-- 2 files changed, 44 insertions(+), 36 deletions(-) diff --git a/release/windows/installer/00.blender.nsi b/release/windows/installer/00.blender.nsi index 3e61bc6d79f..c459e1243b3 100644 --- a/release/windows/installer/00.blender.nsi +++ b/release/windows/installer/00.blender.nsi @@ -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) ; -Name "Blender" +Name "Blender VERSION" 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" -InstallDir "$PROGRAMFILES\Blender Foundation\Blender" +InstallDir "$PROGRAMFILES\Blender Foundation\Blender-VERSION" LicenseText "Please read and agree to the license below:" -LicenseData "..\..\text\copyright.txt" +LicenseData "DISTDIR\Copyright.txt" 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" -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." -Section "Blender-2.26 (required)" +Section "Blender-VERSION (required)" ; 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 - 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" - 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 - 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 -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 - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender226" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\BlenderSHORTVERS" DeleteRegKey HKLM SOFTWARE\BlenderFoundation ; remove files - Delete $INSTDIR\blender-2.26.exe + Delete $INSTDIR\blender.exe 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 "$SMPROGRAMS\Blender Foundation\Blender\*.*" - Delete "$DESKTOP\Blender-2.26.lnk" + Delete "$SMPROGRAMS\Blender Foundation\Blender-VERSION\*.*" + Delete "$DESKTOP\Blender-VERSION.lnk" ; remove directories used. - RMDir "$SMPROGRAMS\Blender Foundation\Blender" + RMDir "$SMPROGRAMS\Blender Foundation\Blender-VERSION" RMDir "$SMPROGRAMS\Blender Foundation" RMDir "$INSTDIR" -SectionEnd \ No newline at end of file +SectionEnd diff --git a/release/windows/specific.sh b/release/windows/specific.sh index 11477ac0ac1..314e3489f02 100755 --- a/release/windows/specific.sh +++ b/release/windows/specific.sh @@ -55,7 +55,14 @@ chmod +x $DISTDIR/python$PVERS.dll # 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