Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace SDL.dll with a stripped version for distribution. Upgrade the installer script to modern interface and add confirmation dialog for the uninstaller. Remove DTDs installation for the Windows build, since the gnustep-base-1_15.dll is already built to not require them. Tweak a little the installer so that it does not fail with some versions of NSIS (such as mine ;-) ).

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1859 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2008-11-15 14:21:56 +00:00
parent f65d5b21f0
commit 0a1117ba8e
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -54,9 +54,11 @@ pkg-debclean:
# And here are our Windows packager targets
#
NSIS="C:\Program Files\NSIS\makensis.exe"
NSIS_ARGS=-V1 -DVER=1.73-dev
# The args seem to cause failure with some versions of NSIS.
# Because of this, we set the version string on the installer script itself.
# NSIS_ARGS=-V1 -DVER=1.73-dev
pkg-win: release
$(NSIS) $(NSIS_ARGS) installers/win32/OOlite.nsi
$(NSIS) installers/win32/OOlite.nsi
help:
@echo "Use this Makefile to build Oolite:"

26
installers/win32/OOlite.nsi
View File

@ -1,17 +1,19 @@
!ifndef VER
!error "VER not defined."
!define VER 1.73-dev
!endif
!ifndef DST
!define DST ..\..\oolite.app
!endif
!include "MUI.nsh"
;!packhdr "Oolite.dat" "upx.exe --best Oolite.dat"
SetCompress auto
SetCompressor LZMA
SetCompressorDictSize 32
SetDatablockOptimize on
OutFile "..\..\..\OoliteInstall-${VER}.exe"
BrandingText "Oolite"
OutFile "OoliteInstall-${VER}.exe"
BrandingText "(C) 2003-2008 Giles Williams and contributors"
Name "Oolite"
Caption "Oolite ${VER}"
SubCaption 0 " "
@ -30,6 +32,19 @@ InstProgressFlags smooth
AutoCloseWindow false
SetOverwrite on
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP ".\OoliteInstallerHeaderBitmap_ModernUI.bmp"
!define MUI_HEADERIMAGE_UNBITMAP ".\OoliteInstallerHeaderBitmap_ModernUI.bmp"
!define MUI_ICON oolite.ico
!define MUI_UNICON oolite.ico
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
!insertmacro MUI_LANGUAGE "English"
Function RegSetup
FunctionEnd
@ -43,7 +58,6 @@ SetOutPath $INSTDIR
; Package files
CreateDirectory "$INSTDIR\AddOns"
CreateDirectory "$INSTDIR\GNUstep\Library\DTDs"
File "Oolite.ico"
File "RunOolite.bat"
@ -51,9 +65,6 @@ File "Oolite_Readme.txt"
File "OoliteRS.pdf"
File /r /x .svn /x *~ "${DST}"
SetOutPath $INSTDIR\GNUstep\Library\DTDs
File /r /x .svn /x *~ "..\..\deps\Cross-platform-deps\DTDs\*.*"
WriteUninstaller "$INSTDIR\UninstOolite.exe"
; Registry entries
@ -91,7 +102,6 @@ RMDir /r "$SMPROGRAMS\Oolite"
; Remove Package files (but leave any generated content behind)
RMDir /r "$INSTDIR\oolite.app"
RMDir /r "$INSTDIR\Logs"
RMDir /r "$INSTDIR\GNUstep\Library\DTDs"
Delete "$INSTDIR\GNUstep\Library\Caches\Oolite-cache.plist"
RMDir "$INSTDIR\GNUstep\Library\Caches"
RMDir "$INSTDIR\GNUstep\Library"