Author: cazfi
Date: Sun Apr 23 21:13:12 2017
New Revision: 35282
URL: http://svn.gna.org/viewcvs/freeciv?rev=35282&view=rev
Log:
Support multiple make jobs in msys2 installer build
See hrm Feature #653645
Modified:
branches/S3_0/doc/README.msys2
branches/S3_0/windows/installer_msys2/Makefile
Modified: branches/S3_0/doc/README.msys2
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/README.msys2?rev=35282&r1=35281&r2=35282&view=diff
==============================================================================
--- branches/S3_0/doc/README.msys2 (original)
+++ branches/S3_0/doc/README.msys2 Sun Apr 23 21:13:12 2017
@@ -177,6 +177,9 @@
list in: https://msdn.microsoft.com/en-us/library/6sehtctf.aspx
Current default is 0x0601 (Windows 7).
+ It's possible to set number of make jobs used in the build by
+ setting suitable make parameter to MAKE_PARAMS variable, e,g,
+ MAKE_PARAMS="-j3"
Problems
====================================
Modified: branches/S3_0/windows/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_msys2/Makefile?rev=35282&r1=35281&r2=35282&view=diff
==============================================================================
--- branches/S3_0/windows/installer_msys2/Makefile (original)
+++ branches/S3_0/windows/installer_msys2/Makefile Sun Apr 23 21:13:12 2017
@@ -77,7 +77,7 @@
# configure
cd build-$(WINARCH)-$(GUI); ../../../configure
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)"
--with-project-definition=../../../bootstrap/snapshot.project
--enable-client=$(GUI) --with-followtag="windows-S3_0" --with-tinycthread
--without-readline --enable-fcdb=sqlite3 --with-sqlite3-prefix=/$(ARCHDIR)
--enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
# make
- make -C build-$(WINARCH)-$(GUI)
+ make -C build-$(WINARCH)-$(GUI) $(MAKE_PARAMS)
make -C build-$(WINARCH)-$(GUI)/translations/core update-po
make -C build-$(WINARCH)-$(GUI)/bootstrap langstat_core.txt
@@ -87,7 +87,7 @@
# configure
cd build-$(WINARCH)-ruledit; ../../../configure
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)"
--with-project-definition=../../../bootstrap/snapshot.project --disable-client
--disable-server --disable-fcmp --disable-freeciv-manual --enable-ruledit
--with-qt5-includes=/$(ARCHDIR)/include --with-qt5-libs=/$(ARCHDIR)/lib
$(EXTRA_CONFIG)
# make
- make -C build-$(WINARCH)-ruledit
+ make -C build-$(WINARCH)-ruledit $(MAKE_PARAMS)
make -C build-$(WINARCH)-ruledit/translations/ruledit update-po
make -C build-$(WINARCH)-ruledit/bootstrap langstat_ruledit.txt
@@ -103,7 +103,7 @@
install-freeciv-common:
# make install
- make -C build-$(WINARCH)-$(GUI) DESTDIR=`pwd`/install-$(WINARCH)-$(GUI)
install
+ make -C build-$(WINARCH)-$(GUI) DESTDIR=`pwd`/install-$(WINARCH)-$(GUI)
$(MAKE_PARAMS) install
# reorder directory layout
mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/bin/* install-$(WINARCH)-$(GUI)/
mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/etc install-$(WINARCH)-$(GUI)/
@@ -138,7 +138,7 @@
install-ruledit: install-ruledit-dir
# make install
- make -C build-$(WINARCH)-ruledit
DESTDIR=`pwd`/install-$(WINARCH)-ruledit/ install
+ make -C build-$(WINARCH)-ruledit
DESTDIR=`pwd`/install-$(WINARCH)-ruledit/ $(MAKE_PARAMS) install
# reorder directory layout
mv install-$(WINARCH)-ruledit/$(INSTSUB)/bin/*
install-$(WINARCH)-ruledit/
mv install-$(WINARCH)-ruledit/$(INSTSUB)/share/freeciv
install-$(WINARCH)-ruledit/data
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
