From 39742d02bb1bd823eaba9bf9f9f92c822c52967e Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sat, 9 Oct 2010 01:16:55 +1300
Subject: [PATCH] Produce a windows installer (untested).

---
 packaging/osx/buildpackage.sh |  1 +
 packaging/package-all.sh      | 26 ++++++++++++++------------
 packaging/windows/OpenRA.nsi  |  8 ++------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh
index 9d9cb58fbd..6980233742 100755
--- a/packaging/osx/buildpackage.sh
+++ b/packaging/osx/buildpackage.sh
@@ -20,6 +20,7 @@ cp -R "$2/" "OpenRA.app/Contents/Resources/" || exit 3
 # Remove the tao and WindowsBase dlls (which are shipped with the deps package)
 rm OpenRA.app/Contents/Resources/Tao.*
 rm OpenRA.app/Contents/Resources/WindowsBase.dll
+rm OpenRA.app/Contents/Resources/OpenRA.ico
 
 # Package app bundle into a zip and clean up
 zip OpenRA-$1 -r -9 OpenRA.app
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index 5ec7996b2c..2883074d7d 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -21,7 +21,7 @@ mkdir packaging/built/mods
 # List of files that are packaged on all platforms
 # Note that the Tao dlls are shipped on all platforms except osx
 # and that they are now installed to the game directory instead of being placed in the gac
-FILES="OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Gl.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf shaders mods/ra mods/cnc VERSION"
+FILES="OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Gl.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf shaders mods/ra mods/cnc VERSION COPYING HACKING INSTALL"
 
 # Files that match the above patterns, that should be excluded
 EXCLUDE="*.mdb"
@@ -39,21 +39,23 @@ cp thirdparty/Tao/* packaging/built
 # Copy WindowsBase.dll for linux packages
 cp thirdparty/WindowsBase.dll packaging/built
 
+# Copy game icon for windows package
+cp OpenRA.Game/OpenRA.ico packaging/built
+
 # Change into packaging directory and run the platform-dependant packaging in parallel
 cd packaging
 
 # ####### Windows #######
-# (
-#     msg "\E[34m" "Building Windows package."
-#     pushd windows/ &> /dev/null
-#     makensis -DSRCDIR="$SRCDIR" OpenRA.nsi &> package.log
-#     if [ $? -eq 0 ]; then
-#         mv OpenRA.exe "$PACKAGEDIR"OpenRA-$VERSION.exe
-#     else
-#         msg "\E[31m" "Windows package build failed, refer to $PWD/package.log."  
-#     fi
-#     popd &> /dev/null
-# ) &
+(
+    echo "Building Windows package."
+    cd windows
+    makensis -DSRCDIR="$BUILTDIR" OpenRA.nsi &> package.log
+    if [ $? -eq 0 ]; then
+        mv OpenRA.exe "$PACKAGEDIR"/OpenRA-$VERSION.exe
+    else
+        echo "Windows package build failed, refer to $PWD/package.log."  
+    fi
+) &
 
 ####### OSX #######
 (
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index 85a5f1274b..88523a54fc 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -83,10 +83,8 @@ Section "Client" Client
 	File "${SRCDIR}\INSTALL"
 	File "${SRCDIR}\*.ttf"
 	File "${SRCDIR}\VERSION"
-	
-	File "${SRCDIR}\OpenRA.Game\OpenRA.ico"
-	
-	File "${SRCDIR}\thirdparty\Tao\*.dll"
+	File "${SRCDIR}\OpenRA.ico"
+	File "${SRCDIR}\Tao.*.dll"
 		
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 		CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
@@ -98,8 +96,6 @@ Section "Client" Client
 	
 	SetOutPath "$INSTDIR\shaders"
 	File "${SRCDIR}\shaders\*.fx"
-	SetOutPath "$INSTDIR\maps"
-	File "${SRCDIR}\maps\README"
 SectionEnd
 
 Section "Editor" Editor