From 43b7efdb1acbdcbdba061b9698aa1bd8b2cd0968 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 29 Sep 2021 02:36:29 +0300 Subject: [PATCH 38/38] Drop obsolete windows/installer_legacy from git See osdn #42945 Signed-off-by: Marko Lindqvist --- windows/installer_legacy/Freeciv.url | 2 - windows/installer_legacy/Makefile | 295 --------------- windows/installer_legacy/cleanup_checkout.sh | 5 - .../create-freeciv-gtk-qt-nsi.sh | 331 ----------------- .../create-freeciv-gtk3-nsi.sh | 5 - .../installer_legacy/create-freeciv-qt-nsi.sh | 5 - .../create-freeciv-ruledit-nsi.sh | 328 ---------------- .../create-freeciv-sdl2-nsi.sh | 349 ------------------ windows/installer_legacy/freeciv-gtk3.cmd | 3 - windows/installer_legacy/freeciv-mp-gtk3.cmd | 3 - windows/installer_legacy/freeciv-mp-qt.cmd | 4 - windows/installer_legacy/freeciv-qt.cmd | 4 - windows/installer_legacy/freeciv-ruledit.cmd | 4 - windows/installer_legacy/freeciv-sdl2.cmd | 3 - windows/installer_legacy/freeciv-server.cmd | 3 - .../licenses/COPYING.installer | 346 ----------------- 16 files changed, 1690 deletions(-) delete mode 100644 windows/installer_legacy/Freeciv.url delete mode 100644 windows/installer_legacy/Makefile delete mode 100755 windows/installer_legacy/cleanup_checkout.sh delete mode 100644 windows/installer_legacy/create-freeciv-gtk-qt-nsi.sh delete mode 100644 windows/installer_legacy/create-freeciv-gtk3-nsi.sh delete mode 100644 windows/installer_legacy/create-freeciv-qt-nsi.sh delete mode 100644 windows/installer_legacy/create-freeciv-ruledit-nsi.sh delete mode 100644 windows/installer_legacy/create-freeciv-sdl2-nsi.sh delete mode 100644 windows/installer_legacy/freeciv-gtk3.cmd delete mode 100644 windows/installer_legacy/freeciv-mp-gtk3.cmd delete mode 100644 windows/installer_legacy/freeciv-mp-qt.cmd delete mode 100644 windows/installer_legacy/freeciv-qt.cmd delete mode 100644 windows/installer_legacy/freeciv-ruledit.cmd delete mode 100644 windows/installer_legacy/freeciv-sdl2.cmd delete mode 100644 windows/installer_legacy/freeciv-server.cmd delete mode 100644 windows/installer_legacy/licenses/COPYING.installer diff --git a/windows/installer_legacy/Freeciv.url b/windows/installer_legacy/Freeciv.url deleted file mode 100644 index 3d37dff2d5..0000000000 --- a/windows/installer_legacy/Freeciv.url +++ /dev/null @@ -1,2 +0,0 @@ -[InternetShortcut] -URL=http://www.freeciv.org diff --git a/windows/installer_legacy/Makefile b/windows/installer_legacy/Makefile deleted file mode 100644 index 56290b971d..0000000000 --- a/windows/installer_legacy/Makefile +++ /dev/null @@ -1,295 +0,0 @@ -# -# Makefile for Freeciv Windows installer creation -# -# Usage: -# -# 1. download and extract the MinGW build environment from -# https://sourceforge.net/projects/freeciv/files/dependencies/gnuwin32/ -# Current version is gnuwin32-2020-01-02. -# 2. double click on "gnuwin32/msys.bat" -# 3. install the development packages: -# $ hg qpush -a -# 4. close current session and restart msys.bat. This is required -# for PATH to be set correctly after development packages -# installation. -# 5. change into the Freeciv directory where this Makefile resides -# $ cd /win32/installer -# 6. run make -# $ make -# 7. find the installer executables in the 'Output' directory -# - -# -# Variable setup -# - -ifeq ($(MIN_WIN_VER),) -MIN_WIN_VER=0x0600 -endif - -# -# Make rules -# - - -# by default build all installers -all: sdl2-installer qt-installer ruledit-installer - -sdl2-installer: - make GUI=sdl2 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit $(EXTRA_CONFIG)" wrap-sdl2 - -qt-installer: - make GUI=qt FCMP=qt wrap-qt - -ruledit-installer: - make wrap-ruledit - -snapshot: - cd ../.. ; ./autogen.sh --no-configure-run - make VERSION_REVTYPE="git" EXTRA_CONFIG="--enable-gitrev" all - - -# build Freeciv - -build-freeciv-common: - # create build directory - mkdir -p build-$(GUI) - # configure - cd build-$(GUI); ../../../configure CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --enable-client=$(GUI) --with-followtag="windows-S3_2" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP) --with-cacert-path="./ssl/certs/ca-bundle.crt" $(EXTRA_CONFIG) - # make - make -C build-$(GUI) - make -C build-$(GUI)/translations/core update-po - make -C build-$(GUI)/bootstrap langstat_core.txt - -build-freeciv-ruledit: - # create build directory - mkdir -p build-ruledit - # configure - cd build-ruledit; ../../../configure CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --disable-client --disable-server --disable-fcmp --disable-freeciv-manual --enable-ruledit --enable-ai-static=stub --with-cacert-path="./ssl/certs/ca-bundle.crt" $(EXTRA_CONFIG) - # make - make -C build-ruledit - make -C build-ruledit/translations/ruledit update-po - make -C build-ruledit/bootstrap langstat_ruledit.txt - -build-freeciv-sdl2: build-freeciv-common - -build-freeciv-qt: build-freeciv-common - -# install Freeciv - -install-freeciv-common: - # make install - make -C build-$(GUI) DESTDIR=`pwd`/install-$(GUI) install - # reorder directory layout - mv install-$(GUI)/usr/local/bin/* install-$(GUI)/ - mv install-$(GUI)/usr/local/etc install-$(GUI)/ - mv install-$(GUI)/usr/local/share/freeciv install-$(GUI)/data - mkdir -p install-$(GUI)/share - mv install-$(GUI)/usr/local/share/locale install-$(GUI)/share/ - mv install-$(GUI)/usr/local/share/doc install-$(GUI)/doc - mkdir -p install-$(GUI)/debuginfo - cp build-$(GUI)/gen_headers/fc_config.h install-$(GUI)/debuginfo - mkdir -p install-$(GUI)/doc/freeciv/installer - cp licenses/COPYING.installer install-$(GUI)/doc/freeciv/installer/ - # delete unneeded files - rm -r install-$(GUI)/usr - # strip 'freeciv-manual' and 'freeciv-mp-' executables - strip install-$(GUI)/freeciv-m* - # add start menu files - cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(GUI).cmd Freeciv.url install-$(GUI)/ - -install-freeciv-sdl2: install-freeciv-common - # add CJK fonts - cp /opt/fireflysung-1.3.0/fireflysung.ttf install-sdl2/data/themes/gui-sdl2/human/ - cp /opt/fireflysung-1.3.0/COPYRIGHT install-sdl2/data/themes/gui-sdl2/human/COPYING.fireflysung - cp /opt/sazanami-20040629/sazanami-gothic.ttf install-sdl2/data/themes/gui-sdl2/human/ - cp /opt/sazanami-20040629/README install-sdl2/data/themes/gui-sdl2/human/COPYING.sazanami - cp /opt/un-fonts/UnDotum.ttf install-sdl2/data/themes/gui-sdl2/human/ - cp /opt/un-fonts/COPYING install-sdl2/data/themes/gui-sdl2/human/COPYING.UnDotum - -install-freeciv-qt: install-freeciv-common - # strip 'freeciv-ruledit' executable - strip install-$(GUI)/freeciv-ruledit.exe - cp freeciv-ruledit.cmd install-$(GUI)/ - -install-ruledit-dir: - mkdir -p install-ruledit/share - -install-ruledit: install-ruledit-dir - # make install - make -C build-ruledit DESTDIR=`pwd`/install-ruledit install - # reorder directory layout - mv install-ruledit/usr/local/bin/* install-ruledit/ - mv install-ruledit/usr/local/share/freeciv install-ruledit/data - mv install-ruledit/usr/local/share/locale install-ruledit/share/ - mv install-ruledit/usr/local/share/doc install-ruledit/doc - mkdir -p install-ruledit/debuginfo - cp build-ruledit/gen_headers/fc_config.h install-ruledit/debuginfo - mkdir -p install-ruledit/doc/freeciv/installer - cp licenses/COPYING.installer install-ruledit/doc/freeciv/installer/ - # delete unneeded files - rm -r install-ruledit/usr - # strip 'freeciv-ruledit' executable - strip install-ruledit/freeciv-ruledit.exe - # add start menu files - cp freeciv-ruledit.cmd Freeciv.url install-ruledit/ - -# install Freeciv environment - -COMMON_DLLS := \ - exchndl.dll \ - freetype6.dll \ - intl.dll \ - libMagickCore-6.Q16-1.dll \ - libMagickWand-6.Q16-1.dll \ - libatk-1.0-0.dll \ - libbz2-2.dll \ - libcurl.dll \ - libcairo-2.dll \ - libcairo-gobject-2.dll \ - libeay32.dll \ - libffi-6.dll \ - libfontconfig-1.dll \ - libfreetype-6.dll \ - libgcc_s_dw2-1.dll \ - libgdk_pixbuf-2.0-0.dll \ - libgio-2.0-0.dll \ - libglib-2.0-0.dll \ - libgmodule-2.0-0.dll \ - libgobject-2.0-0.dll \ - libgthread-2.0-0.dll \ - libiconv-2.dll \ - libidn-11.dll \ - libintl-8.dll \ - liblzma-5.dll \ - libogg-0.dll \ - libpango-1.0-0.dll \ - libpangocairo-1.0-0.dll \ - libpangowin32-1.0-0.dll \ - libpixman-1-0.dll \ - libpng14-14.dll \ - libpng15-15.dll \ - libpthread-2.dll \ - libsqlite3-0.dll \ - libvorbis-0.dll \ - libvorbisfile-3.dll \ - libxml2-2.dll \ - mgwhelp.dll \ - pthreadGC2.dll \ - ssleay32.dll \ - zlib1.dll \ - SDL2.dll \ - SDL2_mixer.dll - -install-env-common: - # add DLLs - cp -R $(addprefix /bin/, $(COMMON_DLLS)) install-$(GUI) - mkdir -p install-$(GUI)/ssl/certs - cp /mingw32/ssl/certs/ca-bundle.crt install-$(GUI)/ssl/certs/ - -DEFAULT_FCMP_DLLS := \ - libgdk-3-0.dll \ - libgtk-3-0.dll - -install-env-default-fcmp: install-env-common - cp -R $(addprefix /bin/, $(DEFAULT_FCMP_DLLS)) install-$(GUI) - # add additional GTK+3 files - mkdir -p install-$(GUI)/etc - cp -R /etc/gtk-3.0 install-$(GUI)/etc/ - mkdir -p install-$(GUI)/lib/gtk-3.0/ - cp -R /lib/gtk-3.0/3.0.0 install-$(GUI)/lib/gtk-3.0/ - mkdir -p install-$(GUI)/share/glib-2.0/schemas - cp /share/glib-2.0/schemas/gschemas.compiled install-$(GUI)/share/glib-2.0/schemas/ - cp -R /share/locale install-$(GUI)/share/ - find install-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -and -not -name gtk30.mo -delete - -install-env-gtk3: install-env-default-fcmp - -SDL2_DLLS := \ - libpng16-16.dll \ - libSDL2_gfx-1-0-0.dll \ - SDL2_image.dll \ - SDL2_ttf.dll - -install-env-sdl2: install-env-default-fcmp - # add DLLs - cp -R $(addprefix /bin/, $(SDL2_DLLS)) install-$(GUI) - -QT_DLLS := \ - libstdc++-6.dll \ - Qt5Core.dll \ - Qt5Gui.dll \ - Qt5Widgets.dll - -install-env-qt: install-env-common - # add DLLs - cp -R $(addprefix /bin/, $(QT_DLLS)) install-$(GUI) - # add additional Qt files - cp -R /plugins install-$(GUI)/ - cp -R /share/locale install-$(GUI)/share/ - find install-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -delete - -install-env-ruledit: - # add DLLs - cp -R $(addprefix /bin/, $(COMMON_DLLS)) install-ruledit - cp -R $(addprefix /bin/, $(QT_DLLS)) install-ruledit - # add additional Qt files - cp -R /plugins install-ruledit/ - cp -R /share/locale install-ruledit/share/ - find install-ruledit/share/locale -type f -not -name "freeciv-ruledit.mo" -delete - -# build installer - -installer-common: clean-install-common install-freeciv-$(GUI) install-env-$(GUI) - # 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 installer executable - mkdir -p Output - makensis Freeciv-$(FREECIV_VERSION)-$(GUI).nsi - -installer-ruledit: clean-install-ruledit install-ruledit install-env-ruledit - # 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 installer executable - mkdir -p Output - makensis Freeciv-$(FREECIV_VERSION)-ruledit.nsi - -wrap-sdl2: build-freeciv-sdl2 installer-common - -wrap-qt: build-freeciv-qt installer-common - -wrap-ruledit: build-freeciv-ruledit installer-ruledit - - -# cleanup - -clean-build-common: - rm -rf build-$(GUI) - -clean-build-ruledit: - rm -rf build-ruledit - -clean-install-common: - rm -rf install-$(GUI) - ./cleanup_checkout.sh ../.. - -clean-install-ruledit: - rm -rf install-ruledit - ./cleanup_checkout.sh ../.. - -clean-installer-common: - rm -f Output/Freeciv-*-$(GUI)-setup.exe - rm -f Freeciv-*-$(GUI).nsi - -clean-installer-ruledit: - rm -f Output/Freeciv-ruledit-*-setup.exe - rm -f Freeciv-*-ruledit.nsi - -clean: - make GUI=sdl2 clean-build-common clean-install-common clean-installer-common - make GUI=qt clean-build-common clean-install-common clean-installer-common - make clean-build-ruledit clean-install-ruledit clean-installer-ruledit diff --git a/windows/installer_legacy/cleanup_checkout.sh b/windows/installer_legacy/cleanup_checkout.sh deleted file mode 100755 index dd0fd0836f..0000000000 --- a/windows/installer_legacy/cleanup_checkout.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if test "x$VERSION_REVTYPE" = "xgit" ; then - git checkout $1/translations -fi diff --git a/windows/installer_legacy/create-freeciv-gtk-qt-nsi.sh b/windows/installer_legacy/create-freeciv-gtk-qt-nsi.sh deleted file mode 100644 index cd0afc77fc..0000000000 --- a/windows/installer_legacy/create-freeciv-gtk-qt-nsi.sh +++ /dev/null @@ -1,331 +0,0 @@ -#!/bin/sh - -# ./create-freeciv-gtk-qt-nsi.sh - -cat < - -./create-freeciv-gtk-qt-nsi.sh $1 $2 "gtk3" "GTK+3" diff --git a/windows/installer_legacy/create-freeciv-qt-nsi.sh b/windows/installer_legacy/create-freeciv-qt-nsi.sh deleted file mode 100644 index 5bcf480be7..0000000000 --- a/windows/installer_legacy/create-freeciv-qt-nsi.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# ./create-freeciv-qt-nsi.sh - -./create-freeciv-gtk-qt-nsi.sh $1 $2 "qt" "Qt" diff --git a/windows/installer_legacy/create-freeciv-ruledit-nsi.sh b/windows/installer_legacy/create-freeciv-ruledit-nsi.sh deleted file mode 100644 index 93bb48a0bd..0000000000 --- a/windows/installer_legacy/create-freeciv-ruledit-nsi.sh +++ /dev/null @@ -1,328 +0,0 @@ -#!/bin/sh - -# ./create-freeciv-ruledit.sh - -cat < - -cat < - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. -- 2.33.0