Author: cazfi Date: Mon Sep 26 05:43:23 2016 New Revision: 33895 URL: http://svn.gna.org/viewcvs/freeciv?rev=33895&view=rev Log: Updated Msys2 Windows Installer build environment to version 160922.
See patch #7654 Modified: trunk/doc/README.msys2 trunk/windows/installer_msys2/Makefile Modified: trunk/doc/README.msys2 URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=33895&r1=33894&r2=33895&view=diff ============================================================================== --- trunk/doc/README.msys2 (original) +++ trunk/doc/README.msys2 Mon Sep 26 05:43:23 2016 @@ -35,10 +35,10 @@ 1.2) Run it to install MSYS2 on build system 1.3) Launch msys2_shell to update packages -> update-core -> pacman -Su +> pacman -Syu 2) Install following packages with 'pacman -Su' + As of 22-Sep-16, one has to use also '--force' option. 2.1) Packages needed for building freeciv These packages are needed even if you don't plan to make installer, @@ -113,19 +113,14 @@ Premade msys2 environment is available for download from http://download.gna.org/freeciv/packages/windows/testing/cazfi/installer_msys2/envs/ -Current versions are +Current version is -win32: ------- -msys2-freeciv-win32-160821.7z, based on -https://sourceforge.net/projects/msys2/files/Base/i686/msys2-i686-20160205.exe -Replace <arch> with 'i686' in package names below +win64 host: +----------- +msys2-freeciv-win64-160922.7z, based on +https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20160921.exe -win64: ------- -msys2-freeciv-win64-160821.7z, based on -https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20160205.exe -Replace <arch> with 'x86_64' in package names below +Only win64 target is included - replace <arch> with 'x86_64' in package names below Following packages have been installed: @@ -148,6 +143,10 @@ - mingw-w64-<arch>-bzip2 - mingw-w64-<arch>-readline - mingw-w64-<arch>-SDL2_mixer +- mingw-w64-<arch>-SDL2_image +- mingw-w64-<arch>-SDL2_ttf +- mingw-w64-<arch>-SDL2_gfx +- mingw-w64-<arch>-qt5 Build Modified: trunk/windows/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=33895&r1=33894&r2=33895&view=diff ============================================================================== --- trunk/windows/installer_msys2/Makefile (original) +++ trunk/windows/installer_msys2/Makefile Mon Sep 26 05:43:23 2016 @@ -24,6 +24,8 @@ MIN_WIN_VER=0x0600 endif +INSTSUB=usr/local + # msys2 has dlls in... DLLPATH_PREFIX=/$(ARCHDIR)/bin/ @@ -107,18 +109,18 @@ # make install make -C build-$(WINARCH)-$(GUI) DESTDIR=`pwd`/install-$(WINARCH)-$(GUI) install # reorder directory layout - mv install-$(WINARCH)-$(GUI)/$(ARCHDIR)/bin/* install-$(WINARCH)-$(GUI)/ - mv install-$(WINARCH)-$(GUI)/$(ARCHDIR)/etc install-$(WINARCH)-$(GUI)/ - mv install-$(WINARCH)-$(GUI)/$(ARCHDIR)/share/freeciv install-$(WINARCH)-$(GUI)/data + mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/bin/* install-$(WINARCH)-$(GUI)/ + mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/etc install-$(WINARCH)-$(GUI)/ + mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/share/freeciv install-$(WINARCH)-$(GUI)/data mkdir -p install-$(WINARCH)-$(GUI)/share - mv install-$(WINARCH)-$(GUI)/$(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/ - mv install-$(WINARCH)-$(GUI)/$(ARCHDIR)/share/doc install-$(WINARCH)-$(GUI)/doc + mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/share/locale install-$(WINARCH)-$(GUI)/share/ + mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/share/doc install-$(WINARCH)-$(GUI)/doc mkdir -p install-$(WINARCH)-$(GUI)/debuginfo cp build-$(WINARCH)-$(GUI)/gen_headers/fc_config.h install-$(WINARCH)-$(GUI)/debuginfo mkdir -p install-$(WINARCH)-$(GUI)/doc/freeciv/installer cp licenses/COPYING.installer install-$(WINARCH)-$(GUI)/doc/freeciv/installer/ # delete unneeded files - rm -r install-$(WINARCH)-$(GUI)/$(ARCHDIR) + rm -r install-$(WINARCH)-$(GUI)/$(INSTSUB) # strip 'freeciv-manual' and 'freeciv-mp-<gui>' executables strip install-$(WINARCH)-$(GUI)/freeciv-m* # add start menu files @@ -144,16 +146,16 @@ # make install make -C build-$(WINARCH)-ruledit DESTDIR=`pwd`/install-$(WINARCH)-ruledit/ install # reorder directory layout - mv install-$(WINARCH)-ruledit/$(ARCHDIR)/bin/* install-$(WINARCH)-ruledit/ - mv install-$(WINARCH)-ruledit/$(ARCHDIR)/share/freeciv install-$(WINARCH)-ruledit/data - mv install-$(WINARCH)-ruledit/$(ARCHDIR)/share/locale install-$(WINARCH)-ruledit/share/ - mv install-$(WINARCH)-ruledit/$(ARCHDIR)/share/doc install-$(WINARCH)-ruledit/doc + mv install-$(WINARCH)-ruledit/$(INSTSUB)/bin/* install-$(WINARCH)-ruledit/ + mv install-$(WINARCH)-ruledit/$(INSTSUB)/share/freeciv install-$(WINARCH)-ruledit/data + mv install-$(WINARCH)-ruledit/$(INSTSUB)/share/locale install-$(WINARCH)-ruledit/share/ + mv install-$(WINARCH)-ruledit/$(INSTSUB)/share/doc install-$(WINARCH)-ruledit/doc mkdir -p install-$(WINARCH)-ruledit/debuginfo cp build-$(WINARCH)-ruledit/gen_headers/fc_config.h install-$(WINARCH)-ruledit/debuginfo mkdir -p install-$(WINARCH)-ruledit/doc/freeciv/installer cp licenses/COPYING.installer install-$(WINARCH)-ruledit/doc/freeciv/installer/ # delete unneeded files - rm -r install-$(WINARCH)-ruledit/$(ARCHDIR) + rm -r install-$(WINARCH)-ruledit/$(INSTSUB) # strip 'freeciv-ruledit' executable strip install-$(WINARCH)-ruledit/freeciv-ruledit.exe # add start menu files _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits