Author: cazfi Date: Tue Feb 9 06:30:40 2016 New Revision: 31827 URL: http://svn.gna.org/viewcvs/freeciv?rev=31827&view=rev Log: Made msys2 based Installer build and temporary install directories arch-specific.
See patch #6910 Modified: trunk/win32/installer_msys2/Makefile Modified: trunk/win32/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=31827&r1=31826&r2=31827&view=diff ============================================================================== --- trunk/win32/installer_msys2/Makefile (original) +++ trunk/win32/installer_msys2/Makefile Tue Feb 9 06:30:40 2016 @@ -50,23 +50,23 @@ build-freeciv-common: # create build directory - mkdir -p build-$(GUI) + mkdir -p build-$(WINARCH)-$(GUI) # configure - cd build-$(GUI); ../../../configure CPPFLAGS="-D_WIN32_WINNT=0x0600" --enable-client=$(GUI) --with-followtag="win32-S3_0" --enable-fcdb=sqlite3 --without-readline --enable-fcmp=$(FCMP) $(EXTRA_CONFIG) + cd build-$(WINARCH)-$(GUI); ../../../configure CPPFLAGS="-D_WIN32_WINNT=0x0600" --enable-client=$(GUI) --with-followtag="win32-S3_0" --enable-fcdb=sqlite3 --without-readline --enable-fcmp=$(FCMP) $(EXTRA_CONFIG) # make - make -C build-$(GUI) - make -C build-$(GUI)/translations/freeciv update-po - make -C build-$(GUI)/bootstrap langstat_freeciv.txt + make -C build-$(WINARCH)-$(GUI) + make -C build-$(WINARCH)-$(GUI)/translations/freeciv update-po + make -C build-$(WINARCH)-$(GUI)/bootstrap langstat_freeciv.txt build-freeciv-ruledit: # create build directory - mkdir -p build-ruledit + mkdir -p build-$(WINARCH)-ruledit # configure - cd build-ruledit; ../../../configure CPPFLAGS="-D_WIN32_WINNT=0x0600" --disable-client --disable-server --disable-fcmp --disable-freeciv-manual + cd build-$(WINARCH)-ruledit; ../../../configure CPPFLAGS="-D_WIN32_WINNT=0x0600" --disable-client --disable-server --disable-fcmp --disable-freeciv-manual # make - make -C build-ruledit - make -C build-ruledit/translations/ruledit update-po - make -C build-ruledit/bootstrap langstat_ruledit.txt + make -C build-$(WINARCH)-ruledit + make -C build-$(WINARCH)-ruledit/translations/ruledit update-po + make -C build-$(WINARCH)-ruledit/bootstrap langstat_ruledit.txt build-freeciv-gtk3: build-freeciv-common @@ -80,24 +80,24 @@ install-freeciv-common: # make install - make -C build-$(GUI) DESTDIR=`pwd`/install-$(GUI) install + make -C build-$(WINARCH)-$(GUI) DESTDIR=`pwd`/install-$(WINARCH)-$(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-ruledit/doc/freeciv/installer - cp licenses/COPYING.installer install-ruledit/doc/freeciv/installer/ + mv install-$(WINARCH)-$(GUI)/usr/local/bin/* install-$(WINARCH)-$(GUI)/ + mv install-$(WINARCH)-$(GUI)/usr/local/etc install-$(WINARCH)-$(GUI)/ + mv install-$(WINARCH)-$(GUI)/usr/local/share/freeciv install-$(WINARCH)-$(GUI)/data + mkdir -p install-$(WINARCH)-$(GUI)/share + mv install-$(WINARCH)-$(GUI)/usr/local/share/locale install-$(WINARCH)-$(GUI)/share/ + mv install-$(WINARCH)-$(GUI)/usr/local/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-$(GUI)/usr + rm -r install-$(WINARCH)-$(GUI)/usr # strip 'freeciv-manual' and 'freeciv-mp-<gui>' executables - strip install-$(GUI)/freeciv-m* + strip install-$(WINARCH)-$(GUI)/freeciv-m* # add start menu files - cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(GUI).cmd Freeciv.url install-$(GUI)/ + cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(GUI).cmd Freeciv.url install-$(WINARCH)-$(GUI)/ install-freeciv-gtk3: install-freeciv-common @@ -105,40 +105,40 @@ 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 + cp /opt/fireflysung-1.3.0/fireflysung.ttf install-$(WINARCH)-sdl2/data/themes/gui-sdl2/human/ + cp /opt/fireflysung-1.3.0/COPYRIGHT install-$(WINARCH)-sdl2/data/themes/gui-sdl2/human/COPYING.fireflysung + cp /opt/sazanami-20040629/sazanami-gothic.ttf install-$(WINARCH)-sdl2/data/themes/gui-sdl2/human/ + cp /opt/sazanami-20040629/README install-$(WINARCH)-sdl2/data/themes/gui-sdl2/human/COPYING.sazanami + cp /opt/un-fonts/UnDotum.ttf install-$(WINARCH)-sdl2/data/themes/gui-sdl2/human/ + cp /opt/un-fonts/COPYING install-$(WINARCH)-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)/ + strip install-$(WINARCH)-$(GUI)/freeciv-ruledit.exe + cp freeciv-ruledit.cmd install-$(WINARCH)-$(GUI)/ install-ruledit-dir: - mkdir -p install-ruledit/share + mkdir -p install-$(WINARCH)-ruledit/share install-ruledit: install-ruledit-dir # make install - make -C build-ruledit DESTDIR=`pwd`/install-ruledit install + make -C build-$(WINARCH)-ruledit DESTDIR=`pwd`/install-$(WINARCH)-ruledit install # reorder directory layout - mv install-ruledit/usr/local/bin/* install-ruledit/ - mv install-ruledit/usr/local/etc 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/ + mv install-$(WINARCH)-ruledit/usr/local/bin/* install-$(WINARCH)-ruledit/ + mv install-$(WINARCH)-ruledit/usr/local/etc install-$(WINARCH)-ruledit/ + mv install-$(WINARCH)-ruledit/usr/local/share/freeciv install-$(WINARCH)-ruledit/data + mv install-$(WINARCH)-ruledit/usr/local/share/locale install-$(WINARCH)-ruledit/share/ + mv install-$(WINARCH)-ruledit/usr/local/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-ruledit/usr + rm -r install-$(WINARCH)-ruledit/usr # strip 'freeciv-ruledit' executable - strip install-ruledit/freeciv-ruledit.exe + strip install-$(WINARCH)-ruledit/freeciv-ruledit.exe # add start menu files - cp freeciv-ruledit.cmd Freeciv.url install-ruledit/ + cp freeciv-ruledit.cmd Freeciv.url install-$(WINARCH)-ruledit/ # install Freeciv environment @@ -202,8 +202,8 @@ install-env-common: # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-$(GUI) - cp -R $(addprefix /bin/msys-, $(COMMON_MSYS_DLLS)) install-$(GUI) + cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-$(WINARCH)-$(GUI) + cp -R $(addprefix /bin/msys-, $(COMMON_MSYS_DLLS)) install-$(WINARCH)-$(GUI) DEFAULT_FCMP_DLLS := \ libgdk-3-0.dll \ @@ -214,14 +214,14 @@ libpangoft2-1.0-0.dll install-env-default-fcmp: install-env-common - cp -R $(addprefix $(DLLPATH_PREFIX), $(DEFAULT_FCMP_DLLS)) install-$(GUI) + cp -R $(addprefix $(DLLPATH_PREFIX), $(DEFAULT_FCMP_DLLS)) install-$(WINARCH)-$(GUI) # add additional GTK+3 files - mkdir -p install-$(GUI)/etc - cp -R $(ARCHDIR)/etc/gtk-3.0 install-$(GUI)/etc/ - mkdir -p install-$(GUI)/lib/gtk-3.0/ - cp -R $(ARCHDIR)/lib/gtk-3.0/* install-$(GUI)/lib/gtk-3.0/ - cp -R /share/locale install-$(GUI)/share/ - find install-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -and -not -name gtk30.mo -delete + mkdir -p install-$(WINARCH)-$(GUI)/etc + cp -R $(ARCHDIR)/etc/gtk-3.0 install-$(WINARCH)-$(GUI)/etc/ + mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-3.0/ + cp -R $(ARCHDIR)/lib/gtk-3.0/* install-$(WINARCH)-$(GUI)/lib/gtk-3.0/ + cp -R /share/locale install-$(WINARCH)-$(GUI)/share/ + find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -and -not -name gtk30.mo -delete install-env-gtk3: install-env-default-fcmp @@ -231,14 +231,14 @@ install-env-gtk2: install-env-common # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(GTK2_DLLS)) install-$(GUI) + cp -R $(addprefix $(DLLPATH_PREFIX), $(GTK2_DLLS)) install-$(WINARCH)-$(GUI) # add additional GTK+2 files - mkdir -p install-$(GUI)/etc - cp -R /etc/gtk-2.0 install-$(GUI)/etc/ - mkdir -p install-$(GUI)/lib/gtk-2.0/ - cp -R /lib/gtk-2.0/2.10.0 install-$(GUI)/lib/gtk-2.0/ - cp -R /share/locale install-$(GUI)/share/ - find install-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -and -not -name gtk20.mo -delete + mkdir -p install-$(WINARCH)-$(GUI)/etc + cp -R /etc/gtk-2.0 install-$(WINARCH)-$(GUI)/etc/ + mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-2.0/ + cp -R /lib/gtk-2.0/2.10.0 install-$(WINARCH)-$(GUI)/lib/gtk-2.0/ + cp -R /share/locale install-$(WINARCH)-$(GUI)/share/ + find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -and -not -name gtk20.mo -delete SDL2_DLLS := \ libpng12-0.dll \ @@ -248,7 +248,7 @@ install-env-sdl2: install-env-default-fcmp # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(SDL2_DLLS)) install-$(GUI) + cp -R $(addprefix $(DLLPATH_PREFIX), $(SDL2_DLLS)) install-$(WINARCH)-$(GUI) QT_DLLS := \ libstdc++-6.dll \ @@ -267,21 +267,21 @@ install-env-qt: install-env-common # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-$(GUI) - cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(GUI) + cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-$(WINARCH)-$(GUI) + cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(WINARCH)-$(GUI) # add additional Qt files - cp -R $(ARCHDIR)/share/qt5/plugins install-$(GUI)/ - cp -R /share/locale install-$(GUI)/share/ - find install-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -delete + cp -R $(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-$(GUI)/ + cp -R /share/locale install-$(WINARCH)-$(GUI)/share/ + find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -delete install-env-ruledit: # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-ruledit - cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-ruledit + cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-$(WINARCH)-ruledit + cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-$(WINARCH)-ruledit # add additional Qt files - cp -R $(ARCHDIR)/share/qt5/plugins install-ruledit/ - cp -R /share/locale install-ruledit/share/ - find install-ruledit/share/locale -type f -not -name "freeciv-ruledit.mo" -delete + cp -R $(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-ruledit/ + cp -R /share/locale install-$(WINARCH)-ruledit/share/ + find install-$(WINARCH)-ruledit/share/locale -type f -not -name "freeciv-ruledit.mo" -delete # build installer @@ -289,7 +289,7 @@ # extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) # create NSIS script - ./create-freeciv-$(GUI)-nsi.sh install-$(GUI) $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(FREECIV_VERSION)-$(GUI).nsi + ./create-freeciv-$(GUI)-nsi.sh install-$(WINARCH)-$(GUI) $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(FREECIV_VERSION)-$(GUI).nsi # create installer executable mkdir -p Output makensis Freeciv-$(FREECIV_VERSION)-$(GUI).nsi @@ -298,7 +298,7 @@ # extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) # create NSIS script - ./create-freeciv-ruledit-nsi.sh install-ruledit $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(FREECIV_VERSION)-ruledit.nsi + ./create-freeciv-ruledit-nsi.sh install-$(WINARCH)-ruledit $(FREECIV_VERSION) $(WINARCH) > Freeciv-$(FREECIV_VERSION)-ruledit.nsi # create installer executable mkdir -p Output makensis Freeciv-$(FREECIV_VERSION)-ruledit.nsi @@ -317,16 +317,16 @@ # cleanup clean-build-common: - rm -rf build-$(GUI) + rm -rf build-*-$(GUI) clean-build-ruledit: - rm -rf build-ruledit + rm -rf build-*-ruledit clean-install-common: - rm -rf install-$(GUI) + rm -rf install-*-$(GUI) clean-install-ruledit: - rm -rf install-ruledit + rm -rf install-*-ruledit clean-installer-common: rm -f Output/Freeciv-*-$(GUI)-setup.exe _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits