From 8b2a129294a8b389072728d6384cd89c11208a9c Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Thu, 31 May 2007 11:15:47 +0000 Subject: === SCons === * Finally cleaned up the NSIS installer creation process This is now a proper action and command, with simple printout The 'nsis' target (only on Windows) now properly depends on all the build process, and will be done as very last. * Make LZMA (Solid) default compressor for installer (= the best) --- release/windows/installer/00.sconsblender.nsi | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'release/windows') diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi index cd68312e69f..ff7a198d0b9 100644 --- a/release/windows/installer/00.sconsblender.nsi +++ b/release/windows/installer/00.sconsblender.nsi @@ -8,17 +8,19 @@ !include "FileFunc.nsh" !include "WordFunc.nsh" +SetCompressor /SOLID lzma + Name "Blender VERSION" !define MUI_ABORTWARNING !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Blender.\r\n\r\nIt is recommended that you close all other applications before starting Setup.\r\n\r\nNote to Win2k/XP users: You may require administrator privileges to install Blender successfully." -!define MUI_WELCOMEFINISHPAGE_BITMAP "01.installer.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP "RELDIR\01.installer.bmp" !define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "00.header.bmp" +!define MUI_HEADERIMAGE_BITMAP "RELDIR\00.header.bmp" !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_FINISHPAGE_RUN "$INSTDIR\blender.exe" -!define MUI_CHECKBITMAP "00.checked.bmp" +!define MUI_CHECKBITMAP "RELDIR\00.checked.bmp" !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "DISTDIR\Copyright.txt" @@ -38,8 +40,8 @@ Page custom DataLocation !insertmacro VersionCompare -Icon "00.installer.ico" -UninstallIcon "00.installer.ico" +Icon "RELDIR\00.installer.ico" +UninstallIcon "RELDIR\00.installer.ico" ;-------------------------------- ;Languages @@ -60,7 +62,6 @@ UninstallIcon "00.installer.ico" Caption "Blender VERSION Installer" OutFile "DISTDIR\..\blender-VERSION-windows.exe" - InstallDir "$PROGRAMFILES\Blender Foundation\Blender" BrandingText "http://www.blender.org/bf" @@ -208,7 +209,7 @@ Function .onInit Call GetWindowsVersion Pop $R0 Strcpy $winversion $R0 - !insertmacro MUI_INSTALLOPTIONS_EXTRACT "data.ini" + !insertmacro MUI_INSTALLOPTIONS_EXTRACT "RELDIR\data.ini" FunctionEnd !define DLL_VER "8.00.50727.42" -- cgit v1.2.3