Author: cazfi
Date: Sat Jan 23 15:28:30 2016
New Revision: 31556

URL: http://svn.gna.org/viewcvs/freeciv?rev=31556&view=rev
Log:
Moved documentation part from installer_msys2/Makefile to README.msys2

See patch #6834

Modified:
    branches/S2_6/doc/README.msys2
    branches/S2_6/win32/installer_msys2/Makefile

Modified: branches/S2_6/doc/README.msys2
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.msys2?rev=31556&r1=31555&r2=31556&view=diff
==============================================================================
--- branches/S2_6/doc/README.msys2      (original)
+++ branches/S2_6/doc/README.msys2      Sat Jan 23 15:28:30 2016
@@ -36,3 +36,28 @@
 3) Build Installers from Freeciv sources
 > cd win32/installer_msys2
 > make
+
+
+Instructions used with msys1 below. These need to be updated:
+- pacman used instead of hg
+- has two (win32 and win64) environments instead of just one
+- distribution method of official freeciv environments not decided,
+  currently using what ever versions upstream currently has
+
+
+ Usage:
+
+ 1. download and extract the MinGW build environment from
+    http://download.gna.org/freeciv/packages/windows/gnuwin32/
+    Current version is gnuwin32-2015-02-25.
+ 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 <path_to_freeciv_source>/win32/installer
+ 6. run make
+    $ make
+ 7. find the installer executables in the 'Output' directory

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=31556&r1=31555&r2=31556&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile        (original)
+++ branches/S2_6/win32/installer_msys2/Makefile        Sat Jan 23 15:28:30 2016
@@ -1,29 +1,12 @@
 #
 # Makefile for Freeciv Windows installer creation
 #
-# Usage:
-#
-# 1. download and extract the MinGW build environment from
-#    http://download.gna.org/freeciv/packages/windows/gnuwin32/
-#    Current version is gnuwin32-2015-02-25.
-# 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 <path_to_freeciv_source>/win32/installer
-# 6. run make
-#    $ make
-# 7. find the installer executables in the 'Output' directory
-#
-
+# See doc/README.msys2 for building instructions.
+#
 
 #
 # Make rules
 #
-
 
 # by default build all installers
 all: gtk3-installer gtk2-installer sdl-installer qt-installer ruledit-installer


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

Reply via email to