[Pingus-CVS] r3005 - branches/pingus_sdl/contrib/windows_installer

[jsalmon3]

Author: jsalmon3
Date: 2007-08-19 23:20:27 +0200 (Sun, 19 Aug 2007)
New Revision: 3005

Added:
   branches/pingus_sdl/contrib/windows_installer/Microsoft.VC80.CRT.manifest
   branches/pingus_sdl/contrib/windows_installer/SDL.dll
   branches/pingus_sdl/contrib/windows_installer/SDL_mixer.dll
   branches/pingus_sdl/contrib/windows_installer/libiconv2.dll
   branches/pingus_sdl/contrib/windows_installer/msvcp80.dll
   branches/pingus_sdl/contrib/windows_installer/msvcr80.dll
   branches/pingus_sdl/contrib/windows_installer/ogg.dll
   branches/pingus_sdl/contrib/windows_installer/pingus.nsi
   branches/pingus_sdl/contrib/windows_installer/release.sh
   branches/pingus_sdl/contrib/windows_installer/smpeg.dll
   branches/pingus_sdl/contrib/windows_installer/vorbis.dll
   branches/pingus_sdl/contrib/windows_installer/vorbisfile.dll
Removed:
   branches/pingus_sdl/contrib/windows_installer/installer.exe
   branches/pingus_sdl/contrib/windows_installer/readme.txt
   branches/pingus_sdl/contrib/windows_installer/run.png
   branches/pingus_sdl/contrib/windows_installer/src/
   branches/pingus_sdl/contrib/windows_installer/start.png
Log:
Added nsis installer

Added: branches/pingus_sdl/contrib/windows_installer/Microsoft.VC80.CRT.manifest
===================================================================
--- branches/pingus_sdl/contrib/windows_installer/Microsoft.VC80.CRT.manifest   
2007-08-17 23:55:49 UTC (rev 3004)
+++ branches/pingus_sdl/contrib/windows_installer/Microsoft.VC80.CRT.manifest   
2007-08-19 21:20:27 UTC (rev 3005)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable/>
+    <assemblyIdentity
+        type="win32"
+        name="Microsoft.VC80.CRT"
+        version="8.0.50727.762"
+        processorArchitecture="x86"
+        publicKeyToken="1fc8b3b9a1e18e3b"
+    />
+    <file name="msvcr80.dll"/>
+    <file name="msvcp80.dll"/>
+</assembly>

Added: branches/pingus_sdl/contrib/windows_installer/SDL.dll
===================================================================
(Binary files differ)


Property changes on: branches/pingus_sdl/contrib/windows_installer/SDL.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/pingus_sdl/contrib/windows_installer/SDL_mixer.dll
===================================================================
(Binary files differ)


Property changes on: branches/pingus_sdl/contrib/windows_installer/SDL_mixer.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: branches/pingus_sdl/contrib/windows_installer/installer.exe
===================================================================
(Binary files differ)

Added: branches/pingus_sdl/contrib/windows_installer/libiconv2.dll
===================================================================
(Binary files differ)


Property changes on: branches/pingus_sdl/contrib/windows_installer/libiconv2.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/pingus_sdl/contrib/windows_installer/msvcp80.dll
===================================================================
(Binary files differ)


Property changes on: branches/pingus_sdl/contrib/windows_installer/msvcp80.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/pingus_sdl/contrib/windows_installer/msvcr80.dll
===================================================================
(Binary files differ)


Property changes on: branches/pingus_sdl/contrib/windows_installer/msvcr80.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/pingus_sdl/contrib/windows_installer/ogg.dll
===================================================================
(Binary files differ)


Property changes on: branches/pingus_sdl/contrib/windows_installer/ogg.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/pingus_sdl/contrib/windows_installer/pingus.nsi
===================================================================
--- branches/pingus_sdl/contrib/windows_installer/pingus.nsi    2007-08-17 
23:55:49 UTC (rev 3004)
+++ branches/pingus_sdl/contrib/windows_installer/pingus.nsi    2007-08-19 
21:20:27 UTC (rev 3005)
@@ -0,0 +1,65 @@
+!include "MUI.nsh"
+
+!define NAME "Pingus"
+
+Name "${NAME}"
+OutFile "Pingus-0.7.exe"
+
+#!define MUI_ICON "src/win32/icon1.ico"
+#!define MUI_UNICON "src/win32/icon1.ico"
+
+InstallDir "$PROGRAMFILES\${NAME}"
+InstallDirRegKey HKCU "Software\${NAME}" ""
+
+Var MUI_TEMP
+Var STARTMENU_FOLDER
+
+!define MUI_ABORTWARNING
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_DIRECTORY
+
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${NAME}"
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+
+!insertmacro MUI_PAGE_INSTFILES
+
+;!define MUI_FINISHPAGE_TEXT ""
+!define MUI_FINISHPAGE_RUN "$INSTDIR\pingus.exe"
+;!define MUI_FINISHPAGE_RUN_TEXT ""
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+
+Section "${NAME}" SecDummy
+  SectionIn RO
+  SetOutPath "$INSTDIR"
+  File /r "pingus\*.*"
+  WriteRegStr HKCU "Software\${NAME}" "" $INSTDIR
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\${NAME}.lnk" 
"$INSTDIR\pingus.exe"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" 
"$INSTDIR\uninstall.exe"
+  !insertmacro MUI_STARTMENU_WRITE_END
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+SectionEnd
+
+
+Section "Uninstall"
+  RMDir /r "$INSTDIR"
+
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+
+  Delete "$SMPROGRAMS\$MUI_TEMP\${NAME}.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+  RMDir "$SMPROGRAMS\$MUI_TEMP"
+
+  DeleteRegKey /ifempty HKCU "Software\${NAME}"
+SectionEnd
+

Deleted: branches/pingus_sdl/contrib/windows_installer/readme.txt
===================================================================
--- branches/pingus_sdl/contrib/windows_installer/readme.txt    2007-08-17 
23:55:49 UTC (rev 3004)
+++ branches/pingus_sdl/contrib/windows_installer/readme.txt    2007-08-19 
21:20:27 UTC (rev 3005)
@@ -1,13 +0,0 @@
-This is the Pingus Windows Installer
-
-The installer, when built in release mode, can be concatenated with a zip that 
you use to install and executed. The command line for doing this in DOS is:
-
-copy /b installer.exe + pingus.zip Pingus-Setup.exe
-
-Its not too badly written so it should be possible to tweak the code as 
required. The additional overhead of the installer is 20.5Kb
-
-The things the installer does not do:
-  Cancel an active install
-  Allow you to uninstall Pingus
-
-Written by Neil Mitchell,  ndmitchell -AT- gmail.com for help if required, or 
the Pingus mailing list.

Added: branches/pingus_sdl/contrib/windows_installer/release.sh
===================================================================
--- branches/pingus_sdl/contrib/windows_installer/release.sh    2007-08-17 
23:55:49 UTC (rev 3004)
+++ branches/pingus_sdl/contrib/windows_installer/release.sh    2007-08-19 
21:20:27 UTC (rev 3005)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+echo "Exporting svn"
+svn export . pingus
+rm -rf pingus/src
+rm -f pingus/pingus.sln
+rm -f pingus/pingus.vcproj
+rm -f pingus/SConstruct
+
+cp Release/pingus.exe pingus
+cp contrib/windows_installer/libiconv2.dll pingus
+cp contrib/windows_installer/msvcp80.dll pingus
+cp contrib/windows_installer/msvcr80.dll pingus
+cp contrib/windows_installer/ogg.dll pingus
+cp contrib/windows_installer/SDL.dll pingus
+cp contrib/windows_installer/SDL_mixer.dll pingus
+cp contrib/windows_installer/smpeg.dll pingus
+cp contrib/windows_installer/vorbis.dll pingus
+cp contrib/windows_installer/vorbisfile.dll pingus
+cp contrib/windows_installer/Microsoft.VC80.CRT.manifest pingus
+
+echo "Creating installer"
+"c:/Program Files/NSIS/makensis.exe" /NOCD contrib/windows_installer/pingus.nsi
+
+echo "Cleaning up"
+rm -rf pingus
+
+echo "Done"
+


Property changes on: branches/pingus_sdl/contrib/windows_installer/release.sh
___________________________________________________________________
Name: svn:executable
   + *

Deleted: branches/pingus_sdl/contrib/windows_installer/run.png
===================================================================
(Binary files differ)

Added: branches/pingus_sdl/contrib/windows_installer/smpeg.dll
===================================================================
(Binary files differ)


Property changes on: branches/pingus_sdl/contrib/windows_installer/smpeg.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: branches/pingus_sdl/contrib/windows_installer/start.png
===================================================================
(Binary files differ)

Added: branches/pingus_sdl/contrib/windows_installer/vorbis.dll
===================================================================
(Binary files differ)


Property changes on: branches/pingus_sdl/contrib/windows_installer/vorbis.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/pingus_sdl/contrib/windows_installer/vorbisfile.dll
===================================================================
(Binary files differ)


Property changes on: 
branches/pingus_sdl/contrib/windows_installer/vorbisfile.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream