[Pingus-CVS] [windows-installer.pingus] 5 new revisions pushed by address@hidden on 2011-10-22 17:01 GMT

[pingus]

5 new revisions:

Revision: 0346e9f77bd3
Author:   Ingo Ruhnke <address@hidden>
Date:     Thu Oct 20 11:41:03 2011
Log:      Added some custom graphics to the windows installer
http://code.google.com/p/pingus/source/detail?r=0346e9f77bd3&repo=windows-installer

Revision: ceb6bace6903
Author:   Ingo Ruhnke <address@hidden>
Date:     Thu Oct 20 14:02:02 2011
Log:      Removed some unneeded exec permissions
http://code.google.com/p/pingus/source/detail?r=ceb6bace6903&repo=windows-installer

Revision: 2ecf44ce6e97
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 21 09:25:18 2011
Log:      Use a better icon
http://code.google.com/p/pingus/source/detail?r=2ecf44ce6e97&repo=windows-installer

Revision: e860ce5e5c85
Author:   Ingo Ruhnke <address@hidden>
Date:     Sat Oct 22 09:52:59 2011
Log:      Replaced brute force RmDir /r with more secure manual install of  
files...
http://code.google.com/p/pingus/source/detail?r=e860ce5e5c85&repo=windows-installer

Revision: 8b3d97469aa3
Author:   Ingo Ruhnke <address@hidden>
Date:     Sat Oct 22 10:01:11 2011
Log:      Delete uninstall.exe and SDL generated stdout.txt and stderr.txt
http://code.google.com/p/pingus/source/detail?r=8b3d97469aa3&repo=windows-installer

==============================================================================
Revision: 0346e9f77bd3
Author:   Ingo Ruhnke <address@hidden>
Date:     Thu Oct 20 11:41:03 2011
Log:      Added some custom graphics to the windows installer

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

Added:
 /walker.ico
 /win.bmp
Modified:
 /pingus.nsi

=======================================
--- /dev/null   
+++ /walker.ico Thu Oct 20 11:41:03 2011
Binary file, no diff available.
=======================================
--- /dev/null   
+++ /win.bmp    Thu Oct 20 11:41:03 2011
Binary file, no diff available.
=======================================
--- /pingus.nsi Wed Oct 19 18:48:31 2011
+++ /pingus.nsi Thu Oct 20 11:41:03 2011
@@ -9,8 +9,10 @@

 RequestExecutionLevel admin

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

 InstallDir "$PROGRAMFILES\${NAME}"
 InstallDirRegKey HKCU "Software\${NAME}" ""

==============================================================================
Revision: ceb6bace6903
Author:   Ingo Ruhnke <address@hidden>
Date:     Thu Oct 20 14:02:02 2011
Log:      Removed some unneeded exec permissions

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

Modified:
 /.gitignore
 /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/smpeg.dll
 /lib/zlib1.dll

=======================================
--- /.gitignore Wed Oct 19 18:48:31 2011
+++ /.gitignore Thu Oct 20 14:02:02 2011
@@ -1,4 +1,4 @@
 *~
 *.exe
 pingus
-
+.sconsign.dblite
=======================================
--- /lib/SDL.dll        Wed Oct 19 18:48:31 2011
+++ /lib/SDL.dll        Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/SDL_image.dll  Wed Oct 19 18:48:31 2011
+++ /lib/SDL_image.dll  Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/SDL_mixer.dll  Wed Oct 19 18:48:31 2011
+++ /lib/SDL_mixer.dll  Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/jpeg.dll       Wed Oct 19 18:48:31 2011
+++ /lib/jpeg.dll       Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/libboost_signals.dll   Wed Oct 19 18:48:31 2011
+++ /lib/libboost_signals.dll   Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/libogg-0.dll   Wed Oct 19 18:48:31 2011
+++ /lib/libogg-0.dll   Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/libpng12-0.dll Wed Oct 19 18:48:31 2011
+++ /lib/libpng12-0.dll Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/libpng14-14.dll        Wed Oct 19 18:48:31 2011
+++ /lib/libpng14-14.dll        Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/libtiff-3.dll  Wed Oct 19 18:48:31 2011
+++ /lib/libtiff-3.dll  Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/libvorbis-0.dll        Wed Oct 19 18:48:31 2011
+++ /lib/libvorbis-0.dll        Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/libvorbisfile-3.dll    Wed Oct 19 18:48:31 2011
+++ /lib/libvorbisfile-3.dll    Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/mikmod.dll     Wed Oct 19 18:48:31 2011
+++ /lib/mikmod.dll     Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/smpeg.dll      Wed Oct 19 18:48:31 2011
+++ /lib/smpeg.dll      Thu Oct 20 14:02:02 2011
Binary file, no diff available.
=======================================
--- /lib/zlib1.dll      Wed Oct 19 18:48:31 2011
+++ /lib/zlib1.dll      Thu Oct 20 14:02:02 2011
Binary file, no diff available.

==============================================================================
Revision: 2ecf44ce6e97
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 21 09:25:18 2011
Log:      Use a better icon

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

Added:
 /pingus.ico
Modified:
 /pingus.nsi

=======================================
--- /dev/null   
+++ /pingus.ico Fri Oct 21 09:25:18 2011
Binary file, no diff available.
=======================================
--- /pingus.nsi Thu Oct 20 11:41:03 2011
+++ /pingus.nsi Fri Oct 21 09:25:18 2011
@@ -11,8 +11,8 @@

 !define MUI_WELCOMEFINISHPAGE_BITMAP "win.bmp"

-!define MUI_ICON "walker.ico"
-!define MUI_UNICON "walker.ico"
+!define MUI_ICON "pingus.ico"
+!define MUI_UNICON "pingus.ico"

 InstallDir "$PROGRAMFILES\${NAME}"
 InstallDirRegKey HKCU "Software\${NAME}" ""

==============================================================================
Revision: e860ce5e5c85
Author:   Ingo Ruhnke <address@hidden>
Date:     Sat Oct 22 09:52:59 2011
Log:      Replaced brute force RmDir /r with more secure manual install of  
files and directories

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

Added:
 /generate_install_nsh.sh
Modified:
 /.gitignore
 /Makefile
 /pingus.nsi

=======================================
--- /dev/null
+++ /generate_install_nsh.sh    Sat Oct 22 09:52:59 2011
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -e
+
+DIR="pingus"
+OUTFILE="install_files.nsh"
+
+echo "# automatically generated by $0" > $OUTFILE
+
+find "$DIR" -type d -printf "%P\0" | \
+while read -d $'\0' -r filename; do
+    filename=${filename//\//\\}
+    echo "CreateDirectory \"\$INSTDIR\\${filename}\"" >> $OUTFILE
+done
+
+find "$DIR" -type f -printf "%P\0" | \
+while read -d $'\0' -r filename; do
+    filename=${filename//\//\\}
+     echo "File \"/oname=${filename}\" \"pingus\\${filename}\"" >> $OUTFILE
+done
+
+##########################################################
+
+OUTFILE="uninstall_files.nsh"
+
+echo "# automatically generated by $0" > $OUTFILE
+find "$DIR" -type f -printf "%P\0" | \
+while read -d $'\0' -r filename; do
+    filename=${filename//\//\\}
+    echo "Delete \"\$INSTDIR\\${filename}\"" >> $OUTFILE
+done
+
+find "$DIR" -depth -type d -printf "%P\0" | \
+while read -d $'\0' -r filename; do
+    filename=${filename//\//\\}
+    echo "RmDir \"\$INSTDIR\\${filename}\"" >> $OUTFILE
+done
+
+# EOF #
=======================================
--- /.gitignore Thu Oct 20 14:02:02 2011
+++ /.gitignore Sat Oct 22 09:52:59 2011
@@ -1,4 +1,6 @@
 *~
-*.exe
-pingus
-.sconsign.dblite
+/*.exe
+/pingus
+/.sconsign.dblite
+/install_files.nsh
+/uninstall_files.nsh
=======================================
--- /Makefile   Wed Oct 19 18:48:31 2011
+++ /Makefile   Sat Oct 22 09:52:59 2011
@@ -12,6 +12,8 @@
        cp -vi ../pingus/build-win32/pingus.exe pingus/
        cp -vi lib/*.dll pingus/

+       ./generate_install_nsh.sh
+
        makensis -NOCD $(NSISFLAGS) pingus.nsi

 .PHONY: all
=======================================
--- /pingus.nsi Fri Oct 21 09:25:18 2011
+++ /pingus.nsi Sat Oct 22 09:52:59 2011
@@ -47,7 +47,9 @@
 Section "${NAME}" SecDummy
   SectionIn RO
   SetOutPath "$INSTDIR"
-  File /r "${PINGUSDIR}/*.*"
+
+  !include "install_files.nsh"
+
   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}"
@@ -65,7 +67,7 @@


 Section "Uninstall"
-  RMDir /r "$INSTDIR"
+  !include "uninstall_files.nsh"

   !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP


==============================================================================
Revision: 8b3d97469aa3
Author:   Ingo Ruhnke <address@hidden>
Date:     Sat Oct 22 10:01:11 2011
Log:      Delete uninstall.exe and SDL generated stdout.txt and stderr.txt

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

Modified:
 /pingus.nsi

=======================================
--- /pingus.nsi Sat Oct 22 09:52:59 2011
+++ /pingus.nsi Sat Oct 22 10:01:11 2011
@@ -67,6 +67,10 @@


 Section "Uninstall"
+  Delete "$INSTDIR\Uninstall.exe"
+  Delete "$INSTDIR\stdout.txt"
+  Delete "$INSTDIR\stderr.txt"
+
   !include "uninstall_files.nsh"

   !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP