From b76cb9ab43d840d1dcd278fd6b8709a56c6db0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>
Date: Mon, 21 Jun 2010 10:02:24 +0200
Subject: [PATCH] Removed old Windows Installer Added new Windows NSI Installer
Added script to cross compile Windows 32/64 bit version
---
build-win32-cross.sh | 15 +++++++++
contrib/installer/Bitmap1.bmp | Bin 358 -> 0 bytes
contrib/installer/Bitmap2.bmp | Bin 358 -> 0 bytes
contrib/installer/stratagus.ico | Bin 1990 -> 0 bytes
contrib/installer/stratagus.nsi | 54 --------------------------------
stratagus.nsi | 53 +++++++++++++++++++++++++++++++
6 files changed, 68 insertions(+), 54 deletions(-)
create mode 100755 build-win32-cross.sh
delete mode 100644 contrib/installer/Bitmap1.bmp
delete mode 100644 contrib/installer/Bitmap2.bmp
delete mode 100644 contrib/installer/stratagus.ico
delete mode 100644 contrib/installer/stratagus.nsi
create mode 100644 stratagus.nsi
diff --git a/build-win32-cross.sh b/build-win32-cross.sh
new file mode 100755
index 000000000..8963a67eb
--- /dev/null
+++ b/build-win32-cross.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+make distclean || exit 1
+./autogen.sh || exit 1
+./configure --enable-win32 --host=i586-mingw32msvc --prefix=/usr/i586-mingw32msvc --enable-static --without-bzip2 || exit 1
+make || exit 1
+makensis stratagus.nsi || exit 1
+mv stratagus-install.exe stratagus-install-i586.exe || exit 1
+
+make distclean || exit 1
+./autogen.sh || exit 1
+./configure --enable-win32 --host=amd64-mingw32msvc --prefix=/usr/amd64-mingw32msvc --enable-static --without-bzip2 || exit 1
+make || exit 1
+makensis stratagus.nsi || exit 1
+mv stratagus-install.exe stratagus-install-amd64.exe || exit 1
diff --git a/contrib/installer/Bitmap1.bmp b/contrib/installer/Bitmap1.bmp
deleted file mode 100644
index b4228314f33522926347a8fd475e03c5d1160b29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 358
zcmZ?rO=DyLgEAng0mLFu%*en37XJVwUvojQ0FVvBKYsjR;ONj`;D}IQ;P8-O;3xpn
z3xNCz1qJ~F2?hZRpjZM>EJJ~TVS@n!#|)s!2Mib(P5|)@3!n)&0pp~J8=#Vm&6;k4
zP|oz`DTy-CU<sBAqh&JDyFY+9>=l-dNB7>l0AjmWXeCD9`~M!qE^pQnjDG+BKZLD<
z#6}WFQtu8i=RQb1JH&jj#Vq9@dqctIGpK{yBMnl*z`#~vG|LUF1ju1jRtW%$;vxVF
C6GZL+
diff --git a/contrib/installer/Bitmap2.bmp b/contrib/installer/Bitmap2.bmp
deleted file mode 100644
index 6b86e72ce1b382a8d96e24bffa7d5cdb175e6efb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 358
zcmZ?rO=DyLgEAng0mLFu%*en37XJVwUvojQ0FVvBKYsjR;NWNg;s^!-0Sh2q02EyS
zq$_}Y10d}I#0fy00TkZ=q&tB00U$mB#5aH#C*YYhaRXG6(L&Qr2FjV<G)3l2G+2VA
zxM|s$=-m%M9QF!LpQC&4T>!D&E3|T=@BM!dVwYQJ$wa^Z{~y9uk=YGrgT?=W#Ubk7
yf!OX4bMArI>=5(87PFLt><tB*&!7%+&uNen1_rj`rde)Kw=pm(n*>0FagYEl#zp@C
diff --git a/contrib/installer/stratagus.ico b/contrib/installer/stratagus.ico
deleted file mode 100644
index 87300ad17565f0af8e83911e6897cf2754e5c9c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1990
zcmeH|Jxtp`6vtoUBewJ5ToQl8vZ*hZ*giXs7^xVlilGuJD?^3E%)-FTl7X3lg&B#V
zVnt$OMU1S7krh@}`rak&g4C)zFR~N)_wIfC@0|ls!;cW4?WYCc<1dAm!0RhsHNb~x
zbEd!E-QM2bU_PJ2^z#q6xw(Pe-CdYWCh++92<PYLu(`PjFE209@Au*0-~difPvQRl
z9@f^@;OgoMwzs$8_4O5O+lJfQTe!TuggB1j>FEj9*VkcZX9vE1`wnMkXRyD&4@XBw
zu(9z4PEJnX`1lwO4-a8wr2*I1*RZv<1s4|=u(!7d%~l(_yax{t4{&#P2U(WE^Yb$d
z27`A!d_4G2;6s7`S3v&D{vJ}wS+}cr=`!wFQBq%BnMtLjYz(_(4GF7#r)QdlQ!<{S
zgAn#W8Ge`5(E3geqGm@yfDZ21ixQDUR=q0?!w=D%fcP{(Gcf@1j^%OQMhAMqapcLk
zUR6~PU;u6<BJwz6ZdYjs%~!o9aT60*Nn&y4md*$R82Mto7dFYkEXr}JdFd1^_t8P>
z^-ilm2TV}5d-iHNcAdgBCz!xc#KlN<n&e<QA;?KOE*&!nI+VbOk+-L6$Xv#-{kl}G
zXj~S^iy0+olnOrihLre5leuc;xy&@LsyIjPM>E-?Kxm4&Sl=k&F2=8_Oebjj5*9db
z2WC08M90%Sl~kY+{^q`4V1W!9^cb#pe2oozwp=e0YJhnikrKCcbmI?K!+^NUM`1jw
zi)@*c;_LcUyiky%1T-)>11iT9ZJ+wXMy9kL6;6<d$Vxpl-^cz?A1V~3UhKdymmO*l
zCCzfuM~sMLdzimuX*|foB~O9$O$uto@9G&tg+#>5BA@`~Oz%%kw<<Y~ASo!UrNYf-
zXjL>{iloj*h#5_gg*%KpR8>tYG&Ki|pc*(=oF>r19iRkN<@GejKO=O={e+GH4zS1c
i2n4~<!usm9;dDBs2!jky2ys0^K~VP@%?}-fn)3@~X^D*h
diff --git a/contrib/installer/stratagus.nsi b/contrib/installer/stratagus.nsi
deleted file mode 100644
index b0bec501f..000000000
--- a/contrib/installer/stratagus.nsi
+++ /dev/null
@@ -1,54 +0,0 @@
-; The name of the installer
-Name "Stratagus"
-
-OutFile "stratagus-030311-win32.exe"
-Icon "stratagus.ico"
-
-InstallDir $PROGRAMFILES\Stratagus
-
-DirText "Stratagus will be installed to the specified location"
-
-ComponentText "This will install Stratagus. Select what you want installed."
-EnabledBitmap bitmap1.bmp
-DisabledBitmap bitmap2.bmp
-InstType "WC2"
-InstType "Base Only"
-
-; Base Files
-Section "Base (required)"
- SectionIn RO
- SetOutPath $INSTDIR
- File /r "C:\projects\stratagus-030311\*.*"
- WriteUninstaller $INSTDIR\uninst.exe
-SectionEnd
-
-Section "Use WC2 Data"
- SectionIn 1
- StrCpy $1 "1"
- SetOutPath $INSTDIR
-; Exec "command /c set cdrom=e:"
-; Exec $INSTDIR\build.bat
- MessageBox MB_OK "To use WC2 data:$\n\
-First edit build.bat, insert the WC2 CDRom, and then run build.bat."
-SectionEnd
-
-Section "Start Menu Shortcuts"
- SectionIn 1
- SectionIn 2
- CreateDirectory "$SMPROGRAMS\Stratagus"
- StrCmp $1 "1" 0 NoWC2Shortcut
- CreateShortCut "$SMPROGRAMS\Stratagus\Stratagus (WC2).lnk" "$INSTDIR\stratagus.exe" ""
- CreateShortCut "$SMPROGRAMS\Stratagus\Edit build.bat.lnk" "notepad.exe" "$INSTDIR\build.bat" ""
- CreateShortCut "$SMPROGRAMS\Stratagus\Run build.bat.lnk" "$INSTDIR\build.bat" ""
-NoWC2Shortcut:
- CreateShortCut "$SMPROGRAMS\Stratagus\Uninstall Stratagus.lnk" "$INSTDIR\uninst.exe" ""
-SectionEnd
-
-Uninstalltext "This will uninstall Stratagus."
-
-Section "Uninstall"
- RMDir /r $SMPROGRAMS\Stratagus
- RMDir /r $INSTDIR
-SectionEnd
-
-
diff --git a/stratagus.nsi b/stratagus.nsi
new file mode 100644
index 000000000..0b7a4e076
--- /dev/null
+++ b/stratagus.nsi
@@ -0,0 +1,53 @@
+;--------------------------------
+
+Name "Stratagus"
+OutFile "stratagus-install.exe"
+Icon "contrib/stratagus.ico"
+InstallDir $PROGRAMFILES\Stratagus
+BrandingText " "
+
+;--------------------------------
+
+Function .onInit
+
+ ReadRegStr $R0 HKLM "Software\Stratagus" "InstallDir"
+ StrCmp $R0 "" done
+
+ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "Stratagus is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." IDOK uninstall
+ Abort
+
+uninstall:
+
+ ClearErrors
+ ExecWait "$R0\uninstall.exe _?=$R0"
+ RMDir /r $INSTDIR
+
+done:
+
+FunctionEnd
+
+;--------------------------------
+
+Page directory
+Page instfiles
+
+;--------------------------------
+
+Section ""
+
+ SetOutPath $INSTDIR
+ File "stratagus.exe"
+ WriteRegStr HKLM "Software\Stratagus" "InstallDir" $INSTDIR
+ WriteUninstaller $INSTDIR\uninstall.exe
+
+SectionEnd
+
+;--------------------------------
+
+Section "Uninstall"
+
+ RMDir /r $INSTDIR
+ DeleteRegKey /ifempty HKLM "Software\Stratagus"
+
+SectionEnd
+