Author: cazfi
Date: Mon Jan  2 16:26:53 2017
New Revision: 34773

URL: http://svn.gna.org/viewcvs/freeciv?rev=34773&view=rev
Log:
Dropped Windows installer for gtk3-client, superceded by gtk3.22-client 
installer.

See patch #8056

Removed:
    branches/S3_0/windows/installer_msys2/create-freeciv-gtk3-nsi.sh
    branches/S3_0/windows/installer_msys2/freeciv-gtk3.cmd
Modified:
    branches/S3_0/windows/Makefile.am
    branches/S3_0/windows/installer_msys2/Makefile

Modified: branches/S3_0/windows/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/Makefile.am?rev=34773&r1=34772&r2=34773&view=diff
==============================================================================
--- branches/S3_0/windows/Makefile.am   (original)
+++ branches/S3_0/windows/Makefile.am   Mon Jan  2 16:26:53 2017
@@ -10,13 +10,11 @@
                installer_msys2/licenses/COPYING.installer      \
                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             \

Modified: branches/S3_0/windows/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_msys2/Makefile?rev=34773&r1=34772&r2=34773&view=diff
==============================================================================
--- branches/S3_0/windows/installer_msys2/Makefile      (original)
+++ branches/S3_0/windows/installer_msys2/Makefile      Mon Jan  2 16:26:53 2017
@@ -35,21 +35,18 @@
 
 # by default build all installers that are buildable with current msys2 
environment
 # gtk2-installer is not built.
-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
 
 gtk2-installer:
        make GUI=gtk2 FCMP=gtk2 EXTRA_CONFIG="--disable-ruledit 
$(EXTRA_CONFIG)" wrap-gtk2
@@ -95,8 +92,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-gtk2: build-freeciv-common
 
@@ -128,8 +123,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-gtk2: install-freeciv-common
 
@@ -252,8 +245,6 @@
 
 install-env-gtk3.22: install-env-default-fcmp
 
-install-env-gtk3: install-env-default-fcmp
-
 GTK2_DLLS := \
        libgdk-win32-2.0-0.dll \
        libgtk-win32-2.0-0.dll \
@@ -377,8 +368,6 @@
 
 wrap-gtk3.22: build-freeciv-gtk3.22 installer-common
 
-wrap-gtk3: build-freeciv-gtk3 installer-common
-
 wrap-gtk2: build-freeciv-gtk2 installer-common
 
 wrap-sdl2: build-freeciv-sdl2 installer-common
@@ -413,7 +402,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=gtk2 clean-build-common clean-install-common 
clean-installer-common
        make GUI=sdl2 clean-build-common clean-install-common 
clean-installer-common

Removed: branches/S3_0/windows/installer_msys2/create-freeciv-gtk3-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_msys2/create-freeciv-gtk3-nsi.sh?rev=34772&view=auto
==============================================================================
--- branches/S3_0/windows/installer_msys2/create-freeciv-gtk3-nsi.sh    
(original)
+++ branches/S3_0/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: branches/S3_0/windows/installer_msys2/freeciv-gtk3.cmd
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_msys2/freeciv-gtk3.cmd?rev=34772&view=auto
==============================================================================
--- branches/S3_0/windows/installer_msys2/freeciv-gtk3.cmd      (original)
+++ branches/S3_0/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

Reply via email to