Author: cazfi
Date: Thu Feb 18 11:39:36 2016
New Revision: 31972
URL: http://svn.gna.org/viewcvs/freeciv?rev=31972&view=rev
Log:
Added support for building gtk3x-client Installer in msys2 environment.
See patch #6953
Added:
trunk/win32/installer_msys2/create-freeciv-gtk3x-nsi.sh
trunk/win32/installer_msys2/freeciv-gtk3x.cmd
Modified:
trunk/win32/Makefile.am
trunk/win32/installer_msys2/Makefile
Modified: trunk/win32/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/Makefile.am?rev=31972&r1=31971&r2=31972&view=diff
==============================================================================
--- trunk/win32/Makefile.am (original)
+++ trunk/win32/Makefile.am Thu Feb 18 11:39:36 2016
@@ -29,11 +29,13 @@
installer_msys2/create-freeciv-gtk-qt-nsi.sh \
installer_msys2/create-freeciv-gtk2-nsi.sh \
installer_msys2/create-freeciv-gtk3-nsi.sh \
+ installer_msys2/create-freeciv-gtk3x-nsi.sh \
installer_msys2/create-freeciv-qt-nsi.sh \
installer_msys2/create-freeciv-sdl2-nsi.sh \
installer_msys2/create-freeciv-ruledit-nsi.sh \
installer_msys2/freeciv-gtk2.cmd \
installer_msys2/freeciv-gtk3.cmd \
+ installer_msys2/freeciv-gtk3x.cmd \
installer_msys2/freeciv-mp-gtk2.cmd \
installer_msys2/freeciv-mp-gtk3.cmd \
installer_msys2/freeciv-mp-qt.cmd \
Modified: trunk/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=31972&r1=31971&r2=31972&view=diff
==============================================================================
--- trunk/win32/installer_msys2/Makefile (original)
+++ trunk/win32/installer_msys2/Makefile Thu Feb 18 11:39:36 2016
@@ -25,6 +25,9 @@
# by default build all installers
all: gtk3-installer gtk2-installer sdl2-installer qt-installer
ruledit-installer
+
+gtk3x-installer:
+ make GUI=gtk3x FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit
$(EXTRA_CONFIG)" wrap-gtk3x
gtk3-installer:
make GUI=gtk3 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit
$(EXTRA_CONFIG)" wrap-gtk3
@@ -67,6 +70,8 @@
make -C build-$(WINARCH)-ruledit
make -C build-$(WINARCH)-ruledit/translations/ruledit update-po
make -C build-$(WINARCH)-ruledit/bootstrap langstat_ruledit.txt
+
+build-freeciv-gtk3x: build-freeciv-common
build-freeciv-gtk3: build-freeciv-common
@@ -98,6 +103,8 @@
strip install-$(WINARCH)-$(GUI)/freeciv-m*
# add start menu files
cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(GUI).cmd
Freeciv.url install-$(WINARCH)-$(GUI)/
+
+install-freeciv-gtk3x: install-freeciv-common
install-freeciv-gtk3: install-freeciv-common
@@ -222,6 +229,8 @@
cp -R /share/locale install-$(WINARCH)-$(GUI)/share/
find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name
"freeciv*.mo" -and -not -name gtk30.mo -delete
+install-env-gtk3x: install-env-default-fcmp
+
install-env-gtk3: install-env-default-fcmp
GTK2_DLLS := \
@@ -355,6 +364,8 @@
mkdir -p Output
makensis Freeciv-$(FREECIV_VERSION)-ruledit.nsi
+wrap-gtk3x: build-freeciv-gtk3x installer-common
+
wrap-gtk3: build-freeciv-gtk3 installer-common
wrap-gtk2: build-freeciv-gtk2 installer-common
@@ -390,6 +401,7 @@
clean:
make GUI=gtk3 clean-build-common clean-install-common
clean-installer-common
+ make GUI=gtk3x clean-build-common clean-install-common
clean-installer-common
make GUI=gtk2 clean-build-common clean-install-common
clean-installer-common
make GUI=sdl2 clean-build-common clean-install-common
clean-installer-common
make GUI=qt clean-build-common clean-install-common
clean-installer-common
Added: trunk/win32/installer_msys2/create-freeciv-gtk3x-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/create-freeciv-gtk3x-nsi.sh?rev=31972&view=auto
==============================================================================
--- trunk/win32/installer_msys2/create-freeciv-gtk3x-nsi.sh (added)
+++ trunk/win32/installer_msys2/create-freeciv-gtk3x-nsi.sh Thu Feb 18
11:39:36 2016
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# ./create-freeciv-gtk3x-nsi.sh <Freeciv files directory> <version>
+
+./create-freeciv-gtk-qt-nsi.sh $1 $2 "gtk3x" "GTK+3x" $3
Added: trunk/win32/installer_msys2/freeciv-gtk3x.cmd
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/freeciv-gtk3x.cmd?rev=31972&view=auto
==============================================================================
--- trunk/win32/installer_msys2/freeciv-gtk3x.cmd (added)
+++ trunk/win32/installer_msys2/freeciv-gtk3x.cmd Thu Feb 18 11:39:36 2016
@@ -0,0 +1,3 @@
+@echo off
+if %1 NEQ auto set LANG=%1
+start freeciv-gtk3x.exe %2 %3 %4 %5 %6 %7 %8 %9
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
