Author: cazfi
Date: Wed Jul  6 20:46:20 2016
New Revision: 33175

URL: http://svn.gna.org/viewcvs/freeciv?rev=33175&view=rev
Log:
Added snapshot.project that has storage directory different from regular
freeciv builds. Msys2 based installers use that project file for snapshot 
builds.

See patch #7375

Added:
    trunk/bootstrap/snapshot.project
Modified:
    trunk/bootstrap/Makefile.am
    trunk/win32/installer_msys2/Makefile

Modified: trunk/bootstrap/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/Makefile.am?rev=33175&r1=33174&r2=33175&view=diff
==============================================================================
--- trunk/bootstrap/Makefile.am (original)
+++ trunk/bootstrap/Makefile.am Wed Jul  6 20:46:20 2016
@@ -5,6 +5,7 @@
 ## it's in the list below.
 ## It should also install it automatically when running autogen.sh.
 EXTRA_DIST =   freeciv.project         \
+               snapshot.project        \
                fcgui.in                \
                fcser.in                \
                fcruledit.in            \

Added: trunk/bootstrap/snapshot.project
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/snapshot.project?rev=33175&view=auto
==============================================================================
--- trunk/bootstrap/snapshot.project    (added)
+++ trunk/bootstrap/snapshot.project    Wed Jul  6 20:46:20 2016
@@ -0,0 +1,7 @@
+# See freeciv.project for the documentation of the fields.
+
+# Load freeciv defaults
+. ${srcdir}/bootstrap/freeciv.project
+
+# Snapshot build specific storage dir
+FREECIV_STORAGE_DIR="~/.freeciv.snapshot"

Modified: trunk/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=33175&r1=33174&r2=33175&view=diff
==============================================================================
--- trunk/win32/installer_msys2/Makefile        (original)
+++ trunk/win32/installer_msys2/Makefile        Wed Jul  6 20:46:20 2016
@@ -75,7 +75,7 @@
        # create build directory
        mkdir -p build-$(WINARCH)-$(GUI)
        # configure
-       cd build-$(WINARCH)-$(GUI); ../../../configure 
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" 
--enable-client=$(GUI) --with-followtag="win32-S3_0" --without-readline 
--disable-sdl-mixer --without-libbz2 --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
+       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="win32-S3_0" --without-readline 
--disable-sdl-mixer --without-libbz2 --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
        # make
        make -C build-$(WINARCH)-$(GUI)
        make -C build-$(WINARCH)-$(GUI)/translations/core update-po
@@ -85,7 +85,7 @@
        # create build directory
        mkdir -p build-$(WINARCH)-ruledit
        # configure
-       cd build-$(WINARCH)-ruledit; ../../../configure 
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" 
--without-libbz2 --disable-client --disable-server --disable-fcmp 
--disable-freeciv-manual --enable-ruledit 
--with-qt5-includes=$(ARCHDIR)/include --with-qt5-libs=$(ARCHDIR)/lib
+       cd build-$(WINARCH)-ruledit; ../../../configure 
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" 
--with-project-definition=../../../bootstrap/snapshot.project --without-libbz2 
--disable-client --disable-server --disable-fcmp --disable-freeciv-manual 
--enable-ruledit --with-qt5-includes=$(ARCHDIR)/include 
--with-qt5-libs=$(ARCHDIR)/lib
        # make
        make -C build-$(WINARCH)-ruledit
        make -C build-$(WINARCH)-ruledit/translations/ruledit update-po


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to