diff options
-rw-r--r-- | release/windows/installer/00.blender.nsi | 36 | ||||
-rwxr-xr-x | release/windows/specific.sh | 20 |
2 files changed, 55 insertions, 1 deletions
diff --git a/release/windows/installer/00.blender.nsi b/release/windows/installer/00.blender.nsi index 7bae5030767..6ab6a53a4b3 100644 --- a/release/windows/installer/00.blender.nsi +++ b/release/windows/installer/00.blender.nsi @@ -36,10 +36,38 @@ Section "Blender-VERSION (required)" ; Put file there File DISTDIR\blender.exe File DISTDIR\python22.dll + File DISTDIR\gnu_gettext.dll File DISTDIR\Copyright.txt File DISTDIR\Readme.txt + File DISTDIR\Release_SHORTVERS.txt File DISTDIR\GPL-license.txt File DISTDIR\Help.url + SetOutPath $INSTDIR\.blender + File DISTDIR\.blender\.bfont.ttf + + ; 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\de\LC_MESSAGES + File DISTDIR\.blender\locale\de\LC_MESSAGES\blender.mo + SetOutPath $INSTDIR\.blender\locale\fi\LC_MESSAGES + File DISTDIR\.blender\locale\fi\LC_MESSAGES\blender.mo + SetOutPath $INSTDIR\.blender\locale\es\LC_MESSAGES + File DISTDIR\.blender\locale\es\LC_MESSAGES\blender.mo + SetOutPath $INSTDIR\.blender\locale\fr\LC_MESSAGES + File DISTDIR\.blender\locale\fr\LC_MESSAGES\blender.mo + SetOutPath $INSTDIR\.blender\locale\it\LC_MESSAGES + 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\sv\LC_MESSAGES + File DISTDIR\.blender\locale\sv\LC_MESSAGES\blender.mo + + SetOutPath $INSTDIR ; Write the installation path into the registry WriteRegStr HKLM SOFTWARE\BlenderFoundation "Install_Dir" "$INSTDIR" ; Write the uninstall keys for Windows @@ -51,6 +79,7 @@ SectionEnd SectionDivider Section "Add Start Menu shortcuts" + 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 @@ -64,6 +93,7 @@ Section "Add Start Menu shortcuts" SectionEnd Section "Add Desktop Blender-VERSION shortcut" + SetOutPath $INSTDIR CreateShortCut "$DESKTOP\Blender-VERSION.lnk" "$INSTDIR\blender.exe" "" "$INSTDIR\blender.exe" 0 SectionEnd @@ -80,15 +110,21 @@ Section "Uninstall" ; remove files Delete $INSTDIR\blender.exe Delete $INSTDIR\python22.dll + Delete $INSTDIR\gnu_gettext.dll Delete $INSTDIR\Copyright.txt Delete $INSTDIR\Readme.txt Delete $INSTDIR\GPL-license.txt + Delete $INSTDIR\Release_SHORTVERS.txt Delete $INSTDIR\Help.url Delete $INSTDIR\uninstall.exe + Delete $INSTDIR\.blender\.bfont.ttf + Delete $INSTDIR\.blender\.Blanguages ; remove shortcuts, if any. Delete "$SMPROGRAMS\Blender Foundation\Blender-VERSION\*.*" Delete "$DESKTOP\Blender-VERSION.lnk" ; remove directories used. + RMDir /r $INSTDIR\.blender\locale + RMDir $INSTDIR\.blender RMDir "$SMPROGRAMS\Blender Foundation\Blender-VERSION" RMDir "$SMPROGRAMS\Blender Foundation" RMDir "$INSTDIR" diff --git a/release/windows/specific.sh b/release/windows/specific.sh index a5729e6c353..8846271e00c 100755 --- a/release/windows/specific.sh +++ b/release/windows/specific.sh @@ -32,6 +32,8 @@ # # OS specific stuff for the package, only to be executed by ../Makefile +SHORTVERS=`echo $VERSION | sed 's/\.//'` + # Create ^M in readme.txt awk '{printf("%s\r\n", $0);}' $DISTDIR/README > $DISTDIR/Readme.txt rm -f $DISTDIR/README @@ -46,6 +48,11 @@ mv -f $DISTDIR/aCopyright.txt $DISTDIR/Copyright.txt awk '{printf("%s\r\n", $0);}' $DISTDIR/GPL-license.txt > $DISTDIR/temp.txt mv -f $DISTDIR/temp.txt $DISTDIR/GPL-license.txt +# Add Release info text +cp -f ../../Release_$SHORTVERS.txt $DISTDIR/Release_$SHORTVERS.txt +awk '{printf("%s\r\n", $0);}' $DISTDIR/Release_$SHORTVERS.txt > $DISTDIR/temp.txt +mv -f $DISTDIR/temp.txt $DISTDIR/Release_$SHORTVERS.txt + # Add Python DLL to package # Stupid windows needs the . removed : PVERS=`echo $NAN_PYTHON_VERSION | sed 's/\.//'` @@ -56,16 +63,27 @@ chmod +x $DISTDIR/python$PVERS.dll # cp -f $NAN_FMOD/lib/fmod.dll $DISTDIR/fmod.dll # chmod +x $DISTDIR/fmod.dll +# Add gettext DLL to package +cp -f $NAN_GETTEXT/lib/gnu_gettext.dll $DISTDIR/gnu_gettext.dll + # Add the Help.url to the ditribution cp -f extra/Help.url $DISTDIR/ +# Add the language files to package +cp -f -R $NAN_OBJDIR/windows/bin/.blender $DISTDIR/ +# Remove the pesky CVS dirs +find $DISTDIR/.blender -name CVS -prune -exec rm -rf {} \; + +# Add .bfont.ttf and .Blanguages +cp -f $NANBLENDERHOME/bin/.blender/.bfont.ttf $DISTDIR/.blender/.bfont.ttf +cp -f $NANBLENDERHOME/bin/.blender/.Blanguages $DISTDIR/.blender/.Blanguages + # 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` - SHORTVERS=`echo $VERSION | sed 's/\.//'` # 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 "$NSIS" $TEMPFILE |