Author: cazfi
Date: Sun Jan 31 12:03:06 2016
New Revision: 31684

URL: http://svn.gna.org/viewcvs/freeciv?rev=31684&view=rev
Log:
Put 'win32' or 'win64' to the name of the msys2 based Installer Package 
depending on the architecture.

See patch #6871

Added:
    branches/S2_6/win32/installer_msys2/win_arch.sh
Modified:
    branches/S2_6/win32/installer_msys2/Makefile
    branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh
    branches/S2_6/win32/installer_msys2/create-freeciv-gtk2-nsi.sh
    branches/S2_6/win32/installer_msys2/create-freeciv-gtk3-nsi.sh
    branches/S2_6/win32/installer_msys2/create-freeciv-qt-nsi.sh
    branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh
    branches/S2_6/win32/installer_msys2/create-freeciv-sdl-nsi.sh

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=31684&r1=31683&r2=31684&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile        (original)
+++ branches/S2_6/win32/installer_msys2/Makefile        Sun Jan 31 12:03:06 2016
@@ -10,6 +10,8 @@
 
 # msys2 has dlls in...
 DLLPATH_PREFIX=/mingw32/bin/
+
+WINARCH=$(shell ./win_arch.sh)
 
 # by default build all installers
 all: gtk3-installer gtk2-installer sdl-installer qt-installer ruledit-installer
@@ -244,7 +246,7 @@
        # extract Freeciv version
        $(eval FREECIV_VERSION := $(shell ../../fc_version))
        # create NSIS script
-       ./create-freeciv-$(GUI)-nsi.sh install-$(GUI) $(FREECIV_VERSION) > 
Freeciv-$(FREECIV_VERSION)-$(GUI).nsi
+       ./create-freeciv-$(GUI)-nsi.sh install-$(GUI) $(FREECIV_VERSION) 
$(WINARCH) > Freeciv-$(FREECIV_VERSION)-$(GUI).nsi
        # create installer executable
        mkdir -p Output
        makensis Freeciv-$(FREECIV_VERSION)-$(GUI).nsi
@@ -253,7 +255,7 @@
        # extract Freeciv version
        $(eval FREECIV_VERSION := $(shell ../../fc_version))
        # create NSIS script
-       ./create-freeciv-ruledit-nsi.sh install-ruledit $(FREECIV_VERSION) > 
Freeciv-$(FREECIV_VERSION)-ruledit.nsi
+       ./create-freeciv-ruledit-nsi.sh install-ruledit $(FREECIV_VERSION) 
$(WINARCH) > Freeciv-$(FREECIV_VERSION)-ruledit.nsi
        # create installer executable
        mkdir -p Output
        makensis Freeciv-$(FREECIV_VERSION)-ruledit.nsi

Modified: branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh?rev=31684&r1=31683&r2=31684&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh    
(original)
+++ branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh    Sun Jan 
31 12:03:06 2016
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# ./create-freeciv-gtk-qt-nsi.sh <Freeciv files directory> <version> 
<gtk2|gtk3|qt> <GTK+2|GTK+3|Qt>
+# ./create-freeciv-gtk-qt-nsi.sh <Freeciv files directory> <version> 
<gtk2|gtk3|qt> <GTK+2|GTK+3|Qt> <win32|win64|win>
 
 cat <<EOF
 ; Freeciv Windows installer script
@@ -12,6 +12,7 @@
 !define VERSION $2
 !define GUI_ID $3
 !define GUI_NAME $4
+!define WIN_ARCH $5
 !define APPID "\${APPNAME}-\${VERSION}-\${GUI_ID}"
 
 !define MULTIUSER_EXECUTIONLEVEL Highest
@@ -30,7 +31,7 @@
 ;General
 
 Name "\${APPNAME} \${VERSION} (\${GUI_NAME} client)"
-OutFile "Output/\${APPNAME}-\${VERSION}-win32-\${GUI_ID}-setup.exe"
+OutFile "Output/\${APPNAME}-\${VERSION}-\${WIN_ARCH}-\${GUI_ID}-setup.exe"
 
 ;Variables
 

Modified: branches/S2_6/win32/installer_msys2/create-freeciv-gtk2-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-gtk2-nsi.sh?rev=31684&r1=31683&r2=31684&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/create-freeciv-gtk2-nsi.sh      
(original)
+++ branches/S2_6/win32/installer_msys2/create-freeciv-gtk2-nsi.sh      Sun Jan 
31 12:03:06 2016
@@ -2,4 +2,4 @@
 
 # ./create-freeciv-gtk2-nsi.sh <Freeciv files directory> <version>
 
-./create-freeciv-gtk-qt-nsi.sh $1 $2 "gtk2" "GTK+2"
+./create-freeciv-gtk-qt-nsi.sh $1 $2 "gtk2" "GTK+2" $3

Modified: branches/S2_6/win32/installer_msys2/create-freeciv-gtk3-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-gtk3-nsi.sh?rev=31684&r1=31683&r2=31684&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/create-freeciv-gtk3-nsi.sh      
(original)
+++ branches/S2_6/win32/installer_msys2/create-freeciv-gtk3-nsi.sh      Sun Jan 
31 12:03:06 2016
@@ -2,4 +2,4 @@
 
 # ./create-freeciv-gtk3-nsi.sh <Freeciv files directory> <version>
 
-./create-freeciv-gtk-qt-nsi.sh $1 $2 "gtk3" "GTK+3"
+./create-freeciv-gtk-qt-nsi.sh $1 $2 "gtk3" "GTK+3" $3

Modified: branches/S2_6/win32/installer_msys2/create-freeciv-qt-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-qt-nsi.sh?rev=31684&r1=31683&r2=31684&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/create-freeciv-qt-nsi.sh        
(original)
+++ branches/S2_6/win32/installer_msys2/create-freeciv-qt-nsi.sh        Sun Jan 
31 12:03:06 2016
@@ -2,4 +2,4 @@
 
 # ./create-freeciv-qt-nsi.sh <Freeciv files directory> <version>
 
-./create-freeciv-gtk-qt-nsi.sh $1 $2 "qt" "Qt"
+./create-freeciv-gtk-qt-nsi.sh $1 $2 "qt" "Qt" $3

Modified: branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh?rev=31684&r1=31683&r2=31684&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh   
(original)
+++ branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh   Sun Jan 
31 12:03:06 2016
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# ./create-freeciv-ruledit.sh <Freeciv files directory> <version>
+# ./create-freeciv-ruledit.sh <Freeciv files directory> <version> 
<win32|win64|win>
 
 cat <<EOF
 ; Freeciv Windows installer script
@@ -10,6 +10,7 @@
 
 !define APPNAME "Freeciv-ruledit"
 !define VERSION $2
+!define WIN_ARCH $3
 !define APPID "\${APPNAME}-\${VERSION}"
 
 !define MULTIUSER_EXECUTIONLEVEL Highest
@@ -28,7 +29,7 @@
 ;General
 
 Name "Freeciv Ruleset Editor \${VERSION}"
-OutFile "Output/\${APPNAME}-\${VERSION}-win32-setup.exe"
+OutFile "Output/\${APPNAME}-\${VERSION}-\${WIN_ARCH}-setup.exe"
 
 ;Variables
 

Modified: branches/S2_6/win32/installer_msys2/create-freeciv-sdl-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-sdl-nsi.sh?rev=31684&r1=31683&r2=31684&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/create-freeciv-sdl-nsi.sh       
(original)
+++ branches/S2_6/win32/installer_msys2/create-freeciv-sdl-nsi.sh       Sun Jan 
31 12:03:06 2016
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# ./create-freeciv-sdl-nsi.sh <Freeciv files directory> <version>
+# ./create-freeciv-sdl-nsi.sh <Freeciv files directory> <version> 
<win32|win64|win>
 
 cat <<EOF
 ; Freeciv Windows installer script
@@ -12,6 +12,7 @@
 !define VERSION $2
 !define GUI_ID sdl
 !define GUI_NAME SDL
+!define WIN_ARCH $3
 !define APPID "\${APPNAME}-\${VERSION}-\${GUI_ID}"
 
 !define MULTIUSER_EXECUTIONLEVEL Highest
@@ -30,7 +31,7 @@
 ;General
 
 Name "\${APPNAME} \${VERSION} (\${GUI_NAME} client)"
-OutFile "Output/\${APPNAME}-\${VERSION}-win32-\${GUI_ID}-setup.exe"
+OutFile "Output/\${APPNAME}-\${VERSION}-\${WIN_ARCH}-\${GUI_ID}-setup.exe"
 
 ;Variables
 

Added: branches/S2_6/win32/installer_msys2/win_arch.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/win_arch.sh?rev=31684&view=auto
==============================================================================
--- branches/S2_6/win32/installer_msys2/win_arch.sh     (added)
+++ branches/S2_6/win32/installer_msys2/win_arch.sh     Sun Jan 31 12:03:06 2016
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if ! test -f ../../bootstrap/config.guess ; then
+    echo "win"
+fi
+
+case $(../../bootstrap/config.guess 2>/dev/null) in
+    *i686*) echo "win32" ;;
+    *x86_64*) echo "win64" ;;
+    *) echo "win" ;;
+esac


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to