Author: cazfi
Date: Thu Oct 27 18:11:48 2016
New Revision: 34262
URL: http://svn.gna.org/viewcvs/freeciv?rev=34262&view=rev
Log:
Added gtk3.22-client installer target to msys2 makefile.
See patch #7870
Added:
branches/S2_6/win32/installer_msys2/create-freeciv-gtk3.22-nsi.sh
branches/S2_6/win32/installer_msys2/freeciv-gtk3.22.cmd (with props)
Modified:
branches/S2_6/doc/README.msys2
branches/S2_6/win32/Makefile.am
branches/S2_6/win32/installer_msys2/Makefile
Modified: branches/S2_6/doc/README.msys2
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.msys2?rev=34262&r1=34261&r2=34262&view=diff
==============================================================================
--- branches/S2_6/doc/README.msys2 (original)
+++ branches/S2_6/doc/README.msys2 Thu Oct 27 18:11:48 2016
@@ -11,8 +11,8 @@
- Msys1, not msys2, is still the official freeciv Windows Installer
build method
-- Buildable clients are gtk3, gtk2, sdl2, and Qt
- - Official pre-made msys2 environment supports only gtk3- and
+- Buildable clients are gtk3, gtk3.22, gtk2, sdl2, and Qt
+ - Official pre-made msys2 environment supports only gtk3-, gtk3.22- and
sdl2-client builds
@@ -79,7 +79,7 @@
- mingw-w64-i686-readline / mingw-w64-x86_64-readline
- mingw-w64-i686-SDL2_mixer / mingw-w64-x86_64-SDL2_mixer
-2.1.2.2) Arch-specific packages for building gtk3-client
+2.1.2.2) Arch-specific packages for building gtk3- and gtk3.22-client
- mingw-w64-i686-gtk3 / mingw-w64-x86_64-gtk3
2.1.2.3) Arch-specific packages for buildind Qt-client and/or Ruledit
@@ -166,6 +166,7 @@
Target can be:
- "<gui>-installer", where <gui> is
- gtk3
+ - gtk3.22
- gtk2
- sdl2
- qt
Modified: branches/S2_6/win32/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/Makefile.am?rev=34262&r1=34261&r2=34262&view=diff
==============================================================================
--- branches/S2_6/win32/Makefile.am (original)
+++ branches/S2_6/win32/Makefile.am Thu Oct 27 18:11:48 2016
@@ -32,11 +32,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-gtk3.22-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-gtk3.22.cmd \
installer_msys2/freeciv-mp-gtk2.cmd \
installer_msys2/freeciv-mp-gtk3.cmd \
installer_msys2/freeciv-mp-qt.cmd \
Modified: branches/S2_6/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=34262&r1=34261&r2=34262&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile (original)
+++ branches/S2_6/win32/installer_msys2/Makefile Thu Oct 27 18:11:48 2016
@@ -35,18 +35,21 @@
# by default build all installers that are buildable with current msys2
environment
# gtk2-installer and qt-installers are not built.
-all: gtk3-installer sdl2-installer ruledit-installer
+all: gtk3-installer sdl2-installer ruledit-installer gtk3.22-installer
# These are what can be built in current official environment version
-buildable-win32: gtk3-installer sdl2-installer ruledit-installer
-
-buildable-win64: gtk3-installer sdl2-installer ruledit-installer
+buildable-win32: gtk3-installer sdl2-installer ruledit-installer
gtk3.22-installer
+
+buildable-win64: gtk3-installer sdl2-installer ruledit-installer
gtk3.22-installer
# See comments on 'snapshot' target why this wrapping is needed
buildable: buildable-$(WINARCH)
gtk3-installer:
make GUI=gtk3 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit
$(EXTRA_CONFIG)" wrap-gtk3
+
+gtk3.22-installer:
+ make GUI=gtk3.22 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit
$(EXTRA_CONFIG)" wrap-gtk3
gtk2-installer:
make GUI=gtk2 FCMP=gtk2 EXTRA_CONFIG="--disable-ruledit
$(EXTRA_CONFIG)" wrap-gtk2
@@ -123,6 +126,8 @@
cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(GUI).cmd
Freeciv.url install-$(WINARCH)-$(GUI)/
install-freeciv-gtk3: install-freeciv-common
+
+install-freeciv-gtk3.22: install-freeciv-common
install-freeciv-gtk2: install-freeciv-common
@@ -243,6 +248,8 @@
install-env-gtk3: install-env-default-fcmp
+install-env-gtk3.22: install-env-default-fcmp
+
GTK2_DLLS := \
libgdk-win32-2.0-0.dll \
libgtk-win32-2.0-0.dll \
@@ -401,6 +408,7 @@
clean:
make GUI=gtk3 clean-build-common clean-install-common
clean-installer-common
+ make GUI=gtk3.22 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: branches/S2_6/win32/installer_msys2/create-freeciv-gtk3.22-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-gtk3.22-nsi.sh?rev=34262&view=auto
==============================================================================
--- branches/S2_6/win32/installer_msys2/create-freeciv-gtk3.22-nsi.sh (added)
+++ branches/S2_6/win32/installer_msys2/create-freeciv-gtk3.22-nsi.sh Thu Oct
27 18:11:48 2016
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# ./create-freeciv-gtk3.22-nsi.sh <Freeciv files directory> <version>
+
+./create-freeciv-gtk-qt-nsi.sh $1 $2 "gtk3.22" "GTK+3.22" $3
Added: branches/S2_6/win32/installer_msys2/freeciv-gtk3.22.cmd
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/freeciv-gtk3.22.cmd?rev=34262&view=auto
==============================================================================
--- branches/S2_6/win32/installer_msys2/freeciv-gtk3.22.cmd (added)
+++ branches/S2_6/win32/installer_msys2/freeciv-gtk3.22.cmd Thu Oct 27
18:11:48 2016
@@ -0,0 +1,3 @@
+@echo off
+if %1 NEQ auto set LANG=%1
+start freeciv-gtk3.22.exe %2 %3 %4 %5 %6 %7 %8 %9
Propchange: branches/S2_6/win32/installer_msys2/freeciv-gtk3.22.cmd
------------------------------------------------------------------------------
svn:eol-style = CRLF
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
