diff options
author | Simon Clitherow <aphex@nildram.co.uk> | 2004-01-28 01:13:41 +0300 |
---|---|---|
committer | Simon Clitherow <aphex@nildram.co.uk> | 2004-01-28 01:13:41 +0300 |
commit | 9f170d9f75373bc90190d5818f2a4130852cb97b (patch) | |
tree | b0de681a89ea00e43ab0de1b2d81a1a924115a8e /release/windows | |
parent | e958ccafd285ac5b877f44093ae49e5560070390 (diff) |
- updated "make release" for windows to include new python files.
- updated win32 installer script.
Diffstat (limited to 'release/windows')
-rw-r--r-- | release/windows/installer/00.blender.nsi | 138 | ||||
-rw-r--r-- | release/windows/installer/00.checked.bmp | bin | 358 -> 2610 bytes | |||
-rw-r--r-- | release/windows/installer/00.header.bmp | bin | 0 -> 25818 bytes | |||
-rw-r--r-- | release/windows/installer/01.installer.bmp | bin | 29880 -> 32280 bytes | |||
-rwxr-xr-x | release/windows/specific.sh | 2 |
5 files changed, 99 insertions, 41 deletions
diff --git a/release/windows/installer/00.blender.nsi b/release/windows/installer/00.blender.nsi index d6e8ab2f6a9..d82000f15fd 100644 --- a/release/windows/installer/00.blender.nsi +++ b/release/windows/installer/00.blender.nsi @@ -6,31 +6,66 @@ ; 09.02.2003 aphex (mediocre@mixnmojo.com) ; -Name "Blender" -Caption "Blender VERSION Installer" -OutFile "DISTDIR\..\VERSION\blender-VERSION-windows.exe" -Icon "00.installer.ico" +!include "MUI.nsh" + +!define MUI_PRODUCT "Blender" ;Define your own software name here +!define MUI_VERSION "VERSION" ;Define your own software version here + +!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "This wizard will guide you through the installation of ${MUI_PRODUCT}.\r\n\r\nIt is recommended that you close all other applications before starting Setup.\r\n\r\n" + +!define MUI_WELCOMEPAGE +!define MUI_LICENSEPAGE +!define MUI_COMPONENTSPAGE + !define MUI_COMPONENTSPAGE_SMALLDESC + +!define MUI_DIRECTORYPAGE -EnabledBitmap "00.checked.bmp" -DisabledBitmap "00.unchecked.bmp" +!define MUI_ABORTWARNING -InstallDir "$PROGRAMFILES\Blender Foundation\Blender-VERSION" +!define MUI_FINISHPAGE + !define MUI_FINISHPAGE_RUN "$INSTDIR\blender.exe" + +!define MUI_UNINSTALLER +!define MUI_UNCONFIRMPAGE + +!define MUI_HEADERBITMAP "00.header.bmp" +!define MUI_SPECIALBITMAP "01.installer.bmp" +!define MUI_ICON "00.installer.ico" +!define MUI_UNICON "00.installer.ico" +!define MUI_CHECKBITMAP "00.checked.bmp" -LicenseText "Please read and agree to the license below:" -LicenseData "DISTDIR\Copyright.txt" +;-------------------------------- +;Languages + + !insertmacro MUI_LANGUAGE "English" + +;-------------------------------- +;Language Strings -Function .onInstSuccess - MessageBox MB_YESNO "Blender was successfully setup on your computer. $\rDo you wish to start Blender now ?" IDNO NoThanks - ExecShell "open" '"$INSTDIR\blender.exe"' - NoThanks: -FunctionEnd + ;Description + LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy all required files to the application folder." + LangString DESC_Section2 ${LANG_ENGLISH} "Add shortcut items to the Start Menu. (Recommended)" + LangString DESC_Section3 ${LANG_ENGLISH} "Add a shortcut to Blender on your desktop." + LangString DESC_Section4 ${LANG_ENGLISH} "Blender can register itself with .blend files to allow double-clicking from Explorer, etc." + +;-------------------------------- +;Data + + LicenseData "DISTDIR\Copyright.txt" + + +Caption "Blender VERSION Installer" +OutFile "DISTDIR\..\VERSION\blender-VERSION-windows.exe" + +InstallDir "$PROGRAMFILES\Blender Foundation\Blender" BrandingText "http://www.blender.org/bf" 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-VERSION (required)" +Section "Blender-VERSION (required)" SecCopyUI + SectionIn RO ; Set output path to the installation directory. SetOutPath $INSTDIR ; Put file there @@ -45,12 +80,21 @@ Section "Blender-VERSION (required)" File DISTDIR\Help.url SetOutPath $INSTDIR\.blender File DISTDIR\.blender\.bfont.ttf + SetOutPath $INSTDIR\.blender\scripts + File DISTDIR\.blender\scripts\ac3d_export.py + File DISTDIR\.blender\scripts\ac3d_import.py + File DISTDIR\.blender\scripts\blender2cal3d.py + File DISTDIR\.blender\scripts\directxexporter.py + SetOutPath $INSTDIR\.blender\bpydata + File DISTDIR\.blender\bpydata\readme.txt ; Additional Languages files SetOutPath $INSTDIR\.blender File DISTDIR\.blender\.Blanguages SetOutPath $INSTDIR\.blender\locale\ca\LC_MESSAGES File DISTDIR\.blender\locale\ca\LC_MESSAGES\blender.mo + SetOutPath $INSTDIR\.blender\locale\cs\LC_MESSAGES + File DISTDIR\.blender\locale\cs\LC_MESSAGES\blender.mo SetOutPath $INSTDIR\.blender\locale\de\LC_MESSAGES File DISTDIR\.blender\locale\de\LC_MESSAGES\blender.mo SetOutPath $INSTDIR\.blender\locale\fi\LC_MESSAGES @@ -63,8 +107,8 @@ Section "Blender-VERSION (required)" File DISTDIR\.blender\locale\it\LC_MESSAGES\blender.mo SetOutPath $INSTDIR\.blender\locale\ja\LC_MESSAGES File DISTDIR\.blender\locale\ja\LC_MESSAGES\blender.mo -; SetOutPath $INSTDIR\.blender\locale\nl\LC_MESSAGES -; File DISTDIR\.blender\locale\nl\LC_MESSAGES\blender.mo + SetOutPath $INSTDIR\.blender\locale\nl\LC_MESSAGES + File DISTDIR\.blender\locale\nl\LC_MESSAGES\blender.mo SetOutPath $INSTDIR\.blender\locale\sv\LC_MESSAGES File DISTDIR\.blender\locale\sv\LC_MESSAGES\blender.mo @@ -72,41 +116,46 @@ Section "Blender-VERSION (required)" ; 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\BlenderSHORTVERS" "DisplayName" "Blender VERSION (remove only)" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\BlenderSHORTVERS" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayName" "Blender (remove only)" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "UninstallString" '"$INSTDIR\uninstall.exe"' WriteUninstaller "uninstall.exe" SectionEnd -SectionDivider - -Section "Add Start Menu shortcuts" +Section "Add Start Menu shortcuts" Section2 SetOutPath $INSTDIR - 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\GPL-license.lnk" "$INSTDIR\GPL-license.txt" "" "$INSTDIR\GPL-license.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-VERSION.lnk" "$INSTDIR\blender.exe" "" "$INSTDIR\blender.exe" 0 - ; NoDeskShortcut: + 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.lnk" "$INSTDIR\Blender.exe" "" "$INSTDIR\blender.exe" 0 + CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Readme.lnk" "$INSTDIR\Readme.txt" "" "" 0 + CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Copyright.lnk" "$INSTDIR\Copyright.txt" "" "$INSTDIR\copyright.txt" 0 + CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\GPL-license.lnk" "$INSTDIR\GPL-license.txt" "" "$INSTDIR\GPL-license.txt" 0 + CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Help.lnk" "$INSTDIR\Help.url" SectionEnd -Section "Add Desktop Blender-VERSION shortcut" +Section "Add Desktop Blender-VERSION shortcut" Section3 SetOutPath $INSTDIR - CreateShortCut "$DESKTOP\Blender-VERSION.lnk" "$INSTDIR\blender.exe" "" "$INSTDIR\blender.exe" 0 + CreateShortCut "$DESKTOP\Blender.lnk" "$INSTDIR\blender.exe" "" "$INSTDIR\blender.exe" 0 SectionEnd -Section "Open .blend files with Blender-VERSION" - ExecShell "open" '"$INSTDIR\blender.exe"' "-R -b" +Section "Open .blend files with Blender-VERSION" Section4 + SetOutPath $INSTDIR + ;ExecShell "open" '"$INSTDIR\blender.exe"' "-R -b" + ;do it the manual way! ;) + + WriteRegStr HKCR ".blend" "" "blendfile" + WriteRegStr HKCR "blendfile" "" "Blender .blend File" + WriteRegStr HKCR "blendfile\shell" "" "open" + WriteRegStr HKCR "blendfile\DefaultIcon" "" $INSTDIR\blender.exe,1 + WriteRegStr HKCR "blendfile\shell\open\command" "" \ + '$INSTDIR\blender.exe "%1"' + SectionEnd UninstallText "This will uninstall Blender VERSION. Hit next to continue." Section "Uninstall" ; remove registry keys - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\BlenderSHORTVERS" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" DeleteRegKey HKLM SOFTWARE\BlenderFoundation ; remove files Delete $INSTDIR\blender.exe @@ -122,13 +171,22 @@ Section "Uninstall" Delete $INSTDIR\.blender\.bfont.ttf Delete $INSTDIR\.blender\.Blanguages ; remove shortcuts, if any. - Delete "$SMPROGRAMS\Blender Foundation\Blender-VERSION\*.*" - Delete "$DESKTOP\Blender-VERSION.lnk" + Delete "$SMPROGRAMS\Blender Foundation\Blender\*.*" + Delete "$DESKTOP\Blender.lnk" ; remove directories used. RMDir /r $INSTDIR\.blender\locale + RMDir /r $INSTDIR\.blender\scripts + RMDir /r $INSTDIR\.blender\bpydata RMDir $INSTDIR\.blender - RMDir "$SMPROGRAMS\Blender Foundation\Blender-VERSION" + RMDir "$SMPROGRAMS\Blender Foundation\Blender" RMDir "$SMPROGRAMS\Blender Foundation" RMDir "$INSTDIR" RMDir "$INSTDIR\.." SectionEnd + +!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI) + !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${Section4} $(DESC_Section4) +!insertmacro MUI_FUNCTIONS_DESCRIPTION_END diff --git a/release/windows/installer/00.checked.bmp b/release/windows/installer/00.checked.bmp Binary files differindex 17222dc26e9..6c2e98d361c 100644 --- a/release/windows/installer/00.checked.bmp +++ b/release/windows/installer/00.checked.bmp diff --git a/release/windows/installer/00.header.bmp b/release/windows/installer/00.header.bmp Binary files differnew file mode 100644 index 00000000000..b631ba73933 --- /dev/null +++ b/release/windows/installer/00.header.bmp diff --git a/release/windows/installer/01.installer.bmp b/release/windows/installer/01.installer.bmp Binary files differindex f5a4191b95a..61c2becbebd 100644 --- a/release/windows/installer/01.installer.bmp +++ b/release/windows/installer/01.installer.bmp diff --git a/release/windows/specific.sh b/release/windows/specific.sh index 2ae5f99b379..b81a5424a98 100755 --- a/release/windows/specific.sh +++ b/release/windows/specific.sh @@ -88,7 +88,7 @@ if (`test -x "$NSIS"`) then 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|$SHORTVERS|g" > $TEMPFILE + cat 00.blender.nsi | sed "s|VERSION|$VERSION|g" | sed "s|DISTDIR|$DISTDIR|g" | sed "s|SHORTVERS|$SHORTVERS|g" | sed "s|MUI_$VERSION|MUI_VERSION|g" > $TEMPFILE "$NSIS" $TEMPFILE rm $TEMPFILE fi |