[Pingus-CVS] [windows-installer.pingus] push by address@hidden - Adjusted nsis install script to be used in Linux in cross-compile envi... on 2011-10-20 01:49 GMT

[pingus]

Revision: e79225091226
Author:   Ingo Ruhnke <address@hidden>
Date:     Wed Oct 19 18:48:31 2011
Log:      Adjusted nsis install script to be used in Linux in cross-compile  
environment, old code is in branch 'msvc'

http://code.google.com/p/pingus/source/detail?r=e79225091226&repo=windows-installer

Added:
 /.gitignore
 /Makefile
 /lib/SDL.dll
 /lib/SDL_image.dll
 /lib/SDL_mixer.dll
 /lib/jpeg.dll
 /lib/libboost_signals.dll
 /lib/libogg-0.dll
 /lib/libpng12-0.dll
 /lib/libpng14-14.dll
 /lib/libtiff-3.dll
 /lib/libvorbis-0.dll
 /lib/libvorbisfile-3.dll
 /lib/mikmod.dll
 /lib/mingwm10.dll
 /lib/smpeg.dll
 /lib/zlib1.dll
Deleted:
 /Microsoft.VC80.CRT.manifest
 /SDL.dll
 /SDL_mixer.dll
 /libiconv2.dll
 /msvcp80.dll
 /msvcr80.dll
 /ogg.dll
 /pingus.exe.config
 /release.sh
 /smpeg.dll
 /vorbis.dll
 /vorbisfile.dll
Modified:
 /pingus.nsi

=======================================
--- /dev/null
+++ /.gitignore Wed Oct 19 18:48:31 2011
@@ -0,0 +1,4 @@
+*~
+*.exe
+pingus
+
=======================================
--- /dev/null
+++ /Makefile   Wed Oct 19 18:48:31 2011
@@ -0,0 +1,19 @@
+NSISFLAGS  = -DVERSION="$(shell cat ../pingus/VERSION)"  
-DPINGUSDIR="pingus"
+
+all:
+       rm -rf pingus/
+
+       mkdir pingus/
+       git --git-dir=../pingus/.git archive master | tar -x -C pingus/
+
+       mkdir pingus/windows-installer
+       git archive master | tar -x --exclude=lib  -C pingus/windows-installer
+
+       cp -vi ../pingus/build-win32/pingus.exe pingus/
+       cp -vi lib/*.dll pingus/
+
+       makensis -NOCD $(NSISFLAGS) pingus.nsi
+
+.PHONY: all
+
+# EOF #
=======================================
--- /dev/null   
+++ /lib/SDL.dll        Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/SDL_image.dll  Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/SDL_mixer.dll  Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/jpeg.dll       Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/libboost_signals.dll   Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/libogg-0.dll   Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/libpng12-0.dll Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/libpng14-14.dll        Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/libtiff-3.dll  Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/libvorbis-0.dll        Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/libvorbisfile-3.dll    Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/mikmod.dll     Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/mingwm10.dll   Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/smpeg.dll      Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /lib/zlib1.dll      Wed Oct 19 18:48:31 2011
Binary file, no diff available.
=======================================
--- /Microsoft.VC80.CRT.manifest        Sun Aug 19 14:20:27 2007
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
=======================================
--- /SDL.dll    Sun Aug 19 14:20:27 2007
+++ /dev/null   
Binary file, no diff available.
=======================================
--- /SDL_mixer.dll      Sun Aug 19 14:20:27 2007
+++ /dev/null   
Binary file, no diff available.
=======================================
--- /libiconv2.dll      Sun Aug 19 14:20:27 2007
+++ /dev/null   
Binary file, no diff available.
=======================================
--- /msvcp80.dll        Sun Aug 19 14:20:27 2007
+++ /dev/null   
Binary file, no diff available.
=======================================
--- /msvcr80.dll        Sun Aug 19 14:20:27 2007
+++ /dev/null   
Binary file, no diff available.
=======================================
--- /ogg.dll    Sun Aug 19 14:20:27 2007
+++ /dev/null   
Binary file, no diff available.
=======================================
--- /pingus.exe.config  Mon Sep 24 19:54:08 2007
+++ /dev/null
@@ -1,10 +0,0 @@
-<configuration>
- <windows>
-  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-   <dependentAssembly>
-    <assemblyIdentity type="win32" name="Microsoft.VC80.CRT"  
processorArchitecture="x86"  
publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
-    <bindingRedirect oldVersion="8.0.41204.256-8.0.50727.762"  
newVersion="8.0.50727.762"/>
-   </dependentAssembly>
-  </assemblyBinding>
- </windows>
-</configuration>
=======================================
--- /release.sh Mon Sep 24 19:54:08 2007
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-echo "Exporting svn"
-svn export . pingus
-rm -rf pingus/contrib
-rm -rf pingus/doc
-rm -rf pingus/lib
-rm -rf pingus/src
-rm -f pingus/pingus.sln
-rm -f pingus/pingus.vcproj
-rm -f pingus/SConstruct
-rm -f pingus/ChangeLog
-rm -f pingus/clanlib_2_sexpr.rb
-rm -f pingus/config.h
-rm -f pingus/INSTALL.unix
-rm -f pingus/INSTALL.Win32
-rm -f pingus/xml2sexpr.rb
-
-cp Release/pingus.exe pingus
-cp ../windows_installer/*.dll pingus
-cp ../windows_installer/Microsoft.VC80.CRT.manifest pingus
-cp ../windows_installer/pingus.exe.config pingus
-
-echo "Creating installer"
-"c:/Program Files/NSIS/makensis.exe" /NOCD ../windows_installer/pingus.nsi
-
-echo "Cleaning up"
-rm -rf pingus
-
-echo "Done"
-
=======================================
--- /smpeg.dll  Sun Aug 19 14:20:27 2007
+++ /dev/null   
Binary file, no diff available.
=======================================
--- /vorbis.dll Sun Aug 19 14:20:27 2007
+++ /dev/null   
File is too large to display a diff.
=======================================
--- /vorbisfile.dll     Sun Aug 19 14:20:27 2007
+++ /dev/null   
Binary file, no diff available.
=======================================
--- /pingus.nsi Sun Oct 28 23:36:57 2007
+++ /pingus.nsi Wed Oct 19 18:48:31 2011
@@ -1,15 +1,16 @@
 !include "MUI.nsh"

 !define NAME "Pingus"
-!define VERSION "0.7.2"
+# !define VERSION "0.7.5"
+# !define PINGUSDIR "pingus"

 Name "${NAME}"
 OutFile "${NAME}-${VERSION}.exe"

 RequestExecutionLevel admin

-#!define MUI_ICON "src/win32/icon1.ico"
-#!define MUI_UNICON "src/win32/icon1.ico"
+#!define MUI_ICON "${PINGUSDIR}/src/win32/icon1.ico"
+#!define MUI_UNICON "${PINGUSDIR}/src/win32/icon1.ico"

 InstallDir "$PROGRAMFILES\${NAME}"
 InstallDirRegKey HKCU "Software\${NAME}" ""
@@ -20,6 +21,7 @@
 !define MUI_ABORTWARNING

 !insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "${PINGUSDIR}/COPYING"
 !insertmacro MUI_PAGE_DIRECTORY

 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
@@ -43,7 +45,7 @@
 Section "${NAME}" SecDummy
   SectionIn RO
   SetOutPath "$INSTDIR"
-  File /r "pingus\*.*"
+  File /r "${PINGUSDIR}/*.*"
   WriteRegStr HKCU "Software\${NAME}" "" $INSTDIR
   WriteRegStr  
HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "DisplayName" "${NAME}"
   WriteRegStr  
HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}" "DisplayVersion" "${VERSION}"