Author: cazfi
Date: Mon Jan 2 16:26:46 2017
New Revision: 34772
URL: http://svn.gna.org/viewcvs/freeciv?rev=34772&view=rev
Log:
Dropped Windows installer for gtk3-client, superceded by gtk3.22-client
installer.
See patch #8056
Removed:
trunk/windows/installer_msys2/create-freeciv-gtk3-nsi.sh
trunk/windows/installer_msys2/freeciv-gtk3.cmd
Modified:
trunk/windows/Makefile.am
trunk/windows/installer_msys2/Makefile
Modified: trunk/windows/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/Makefile.am?rev=34772&r1=34771&r2=34772&view=diff
==============================================================================
--- trunk/windows/Makefile.am (original)
+++ trunk/windows/Makefile.am Mon Jan 2 16:26:46 2017
@@ -9,12 +9,10 @@
servericon.rc \
installer_msys2/licenses/COPYING.installer \
installer_msys2/create-freeciv-gtk-qt-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-gtk3.cmd \
installer_msys2/freeciv-gtk3.22.cmd \
installer_msys2/freeciv-mp-gtk3.cmd \
installer_msys2/freeciv-mp-gtk3x.cmd \
Modified: trunk/windows/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=34772&r1=34771&r2=34772&view=diff
==============================================================================
--- trunk/windows/installer_msys2/Makefile (original)
+++ trunk/windows/installer_msys2/Makefile Mon Jan 2 16:26:46 2017
@@ -34,21 +34,18 @@
#
# by default build all installers that are buildable with current msys2
environment
-all: gtk3-installer gtk3.22-installer sdl2-installer ruledit-installer
qt-installer
+all: gtk3.22-installer sdl2-installer ruledit-installer qt-installer
gtk3.22-installer:
make GUI=gtk3.22 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit
$(EXTRA_CONFIG)" wrap-gtk3.22
# These are what can be built in current official environment version
-buildable-win32: gtk3-installer gtk3.22-installer sdl2-installer
ruledit-installer qt-installer
-
-buildable-win64: gtk3-installer gtk3.22-installer sdl2-installer
ruledit-installer qt-installer
+buildable-win32: gtk3.22-installer sdl2-installer ruledit-installer
qt-installer
+
+buildable-win64: gtk3.22-installer sdl2-installer ruledit-installer
qt-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
sdl2-installer:
make GUI=sdl2 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit
$(EXTRA_CONFIG)" wrap-sdl2
@@ -91,8 +88,6 @@
make -C build-$(WINARCH)-ruledit/bootstrap langstat_ruledit.txt
build-freeciv-gtk3.22: build-freeciv-common
-
-build-freeciv-gtk3: build-freeciv-common
build-freeciv-sdl2: build-freeciv-common
@@ -122,8 +117,6 @@
cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(GUI).cmd
Freeciv.url install-$(WINARCH)-$(GUI)/
install-freeciv-gtk3.22: install-freeciv-common
-
-install-freeciv-gtk3: install-freeciv-common
install-freeciv-sdl2: install-freeciv-common
@@ -244,8 +237,6 @@
install-env-gtk3.22: install-env-default-fcmp
-install-env-gtk3: install-env-default-fcmp
-
SDL2_DLLS := \
libSDL2_gfx-1-0-0.dll \
SDL2_image.dll \
@@ -350,8 +341,6 @@
wrap-gtk3.22: build-freeciv-gtk3.22 installer-common
-wrap-gtk3: build-freeciv-gtk3 installer-common
-
wrap-sdl2: build-freeciv-sdl2 installer-common
wrap-qt: build-freeciv-qt installer-common
@@ -384,7 +373,6 @@
rm -f Freeciv-*-ruledit.nsi
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=sdl2 clean-build-common clean-install-common
clean-installer-common
make GUI=qt clean-build-common clean-install-common
clean-installer-common
Removed: trunk/windows/installer_msys2/create-freeciv-gtk3-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/create-freeciv-gtk3-nsi.sh?rev=34771&view=auto
==============================================================================
--- trunk/windows/installer_msys2/create-freeciv-gtk3-nsi.sh (original)
+++ trunk/windows/installer_msys2/create-freeciv-gtk3-nsi.sh (removed)
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# ./create-freeciv-gtk3-nsi.sh <Freeciv files directory> <version>
-
-./create-freeciv-gtk-qt-nsi.sh $1 $2 "gtk3" "GTK+3" $3
Removed: trunk/windows/installer_msys2/freeciv-gtk3.cmd
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/freeciv-gtk3.cmd?rev=34771&view=auto
==============================================================================
--- trunk/windows/installer_msys2/freeciv-gtk3.cmd (original)
+++ trunk/windows/installer_msys2/freeciv-gtk3.cmd (removed)
@@ -1,3 +0,0 @@
-@echo off
-if %1 NEQ auto set LANG=%1
-start freeciv-gtk3.exe %2 %3 %4 %5 %6 %7 %8 %9
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
