[Monotone-commits-diffs] net.venge.monotone.lua-5.2: aad657f04d0f21ece638434694aeabc833f37aa4

[code]

revision:            aad657f04d0f21ece638434694aeabc833f37aa4
date:                2012-05-08T09:14:09
author:              address@hidden
branch:              net.venge.monotone.lua-5.2
changelog:
Update windows build/install instructions

* .mtn-ignore: ignore autom4te.cache

* INSTALL_windows_cygwin.txt: update versions, improve.

* INSTALL_windows_native.txt: update versions, improve

* innosetup/README.txt: improve

manifest:
format_version "1"

new_manifest [3b8f0f6e4df24a95804f12637654a4b26e82504f]

old_revision [d8a7704a25f37b3d282eaa56730eb2b7a96b5dca]

patch ".mtn-ignore"
 from [bd2b1b11006b28d0b1fb079e6b9c77521c704508]
   to [be27b64d4938d68bb89fab2933c1c35d0cebf885]

patch "INSTALL_windows_cygwin.txt"
 from [46b16835478139759c0f52b531f16b6731e26314]
   to [155d548dd4bd91fa35deb7166c06a9353d615a23]

patch "INSTALL_windows_native.txt"
 from [d67a72a79605d8e65abc2529e06481fad204724f]
   to [a2eb4d25afc4f28d95fd62756e6527aab3ac88fa]

patch "innosetup/README.txt"
 from [a42923bdd0fcc96ba589bf5e3b4e229fc98ae598]
   to [ea1ad861438da89b7cf89f01c32a171ffd81ab11]
============================================================
--- .mtn-ignore	bd2b1b11006b28d0b1fb079e6b9c77521c704508
+++ .mtn-ignore	be27b64d4938d68bb89fab2933c1c35d0cebf885
@@ -2,6 +2,7 @@
 ^ABOUT-NLS$
 ^Makefile(\.in)?$
 ^aclocal\.m4$
+^autom4te\.cache$
 ^build-arch-stamp$
 ^build-indep-stamp$
 ^compile$
============================================================
--- INSTALL_windows_cygwin.txt	46b16835478139759c0f52b531f16b6731e26314
+++ INSTALL_windows_cygwin.txt	155d548dd4bd91fa35deb7166c06a9353d615a23
@@ -2,40 +2,29 @@
 
 on Windows using Cygwin:
 
-Monotone needs the following packages to compile:
-(newer releases are usually ok)
+An official Cygwin package for monotone and all its dependencies is
+usually available soon after release; just run the Cygwin installer
+and install the 'monotone' package.
 
- Runtime requirements:
-   cygwin-1.7.0-60
-   libgcc1-4.3.2-2
-   libidn11-1.9-1
-   libintl8-0.17-11
-   libpcre0-7.9-1
-   libsqlite3_0-3.6.2-1
-   libstdc++6-4.3.2-2
-   lua-5.1.4-11
-   zlib0-1.2.3-10
+To build Monotone on Cygwin for development and testing, the following
+packages are required (the versions listed are known to work; they may
+not be the exact versions used to build the official Cygwin package).
+Note that the monotone source code is compatible with Lua 5.2, but (as
+of 8 May 2012), Cygwin only has Lua 5.1.4.
 
- Build requirements:
-   gcc4-4.3.2
-   binutils-2.19.51
-   boost-devel-1.33.1
-   libsqlite3-devel-3.6.2
-   libidn-devel-1.9
-   gettext-devel-0.17
-   zlib-1.2.3
-   perl-5.10.0
-   botan-1.8.2
+   binutils-2.22.51
+   libboost-devel-1.48.0
+   botan-1.8.13
+   gcc4-g++-4.5.3
+   gettext-devel-0.18.1
+   libidn-devel-1.22
+   libpcre-devel-8.21
+   libsqlite3-devel-3.7.3
+   lua-5.1.4-11
+   zlib-devel-1.2.5
 
-currently every prerequisite is available as packages except
-lua and botan which are only available in Cygwin 1.7;
-an official Cygwin package for monotone and all its
-dependencies is usually available soon after release.
+No special options are needed for configure.
 
-The following is needed to succesfully configure:
-
- export CXXFLAGS="-I/usr/include/boost-1_33_1/ -g -O2"; configure
-
 There is a bug in the bash builtin 'pwd' in bash 4.1; it can return
 'c:/' syntax for absolute paths in some circumstances. See
 http://sourceware.org/ml/cygwin/2002-11/msg01111.html. In particular,
@@ -43,4 +32,4 @@
 configure creating Makefiles with some problems. A work-around is to
 put 'cd `/bin/pwd`' in your ~/.emacs_bash.
 
-See ../cygport/README for building a Cygwin package.
+See cygport/README for building a Cygwin package.
============================================================
--- INSTALL_windows_native.txt	d67a72a79605d8e65abc2529e06481fad204724f
+++ INSTALL_windows_native.txt	a2eb4d25afc4f28d95fd62756e6527aab3ac88fa
@@ -2,44 +2,44 @@
 
 on Windows (using MinGW):
 
-Many tools and packages are available on SourceForge:
+Here we give sources for the various packages needed. We give
+directions to the download, rather than an exact URL, to make it easy
+to check for new versions.
 
-https://sourceforge.net/projects/<project>/files/
-
-That site is organized into several hierarchical lists of files. We
-give the hierarchy names here, rather than a complete download URL, to
-make it easy to check for new versions.
-
 The versions given here may not be exactly the same versions as used to
 build the current release of monontone.
 
 These instructions work on a new computer, with only
 Windows XP installed.
 
+The most recent MinGW installer mingw-get-inst-20120426 contains g++
+4.6.2; this is broken for C++ exceptions on MinGW. So we use an
+earlier installer mingw-get-inst-20110211, containing g++ 4.5.2 and a
+catalog of other binary packages that are consistent with that runtime.
+
 Package       | Version | location
 --------------------------
-Python        | 2.7.1   | http://www.python.org/
-                        | "Windows Installer" under "Quick Links (2.7.1)"
-mingw-get-inst| latest  | http://sourceforge.net/projects/mingw/files/
-                        | -> Automated MinGW Installer
+Python        | 2.7.3   | http://www.python.org/
+                        | "Windows Installer" under "Quick Links (2.7.3)"
+                        | Used for the Botan install; that does not work with Python 3.2.3
+mingw-get-inst|20110211 | http://sourceforge.net/projects/mingw/files/
+                        | -> Installer
                         | -> mingw-get-inst
                         | -> mingw-get-inst-20110211
-                        | -> mingw-get-inst-20110211.exe
-boost         | 1.46.1  | http://sourceforge.net/projects/boost/files/
-                        | -> boost -> 1.46.1 -> boost_1_46_1.tar.gz
-Lua           | 5.1.4   | http://www.lua.org/
-                        | -> download
-                        | -> "...current release is >Lua 5.1.4<" under "Source"
+                        | -> mingw-get-inst-20110211.exe - _not_ the most recent; see above
+boost         | 1.49.0  | http://sourceforge.net/projects/boost/files/
+                        | -> boost -> 1.49.0 -> boost_1_49_0.tar.bz2
                         | lua-5.1.4.tar.gz
-pcre          | 8.12    | http://www.pcre.org/
+pcre          | 8.30    | http://www.pcre.org/
                         | -> ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
-                        | -> pcre-8.12.tar.gz
-botan         | 1.8.11  | http://botan.randombit.net/download.html
+                        | -> pcre-8.30.tar.bz2
+botan         | 1.10.1  | http://botan.randombit.net/download.html
                         | "Source: >tar/gzip<" under "Current Stable Release"
-sqlite3       | 3.7.5   | http://www.sqlite.org/download.html
-                        | -> sqlite-autoconf-3070500.tar.gz
-libidn        | 1.20    | ftp://ftp.gnu.org/gnu/libidn/
-                        | -> libidn-1.20.tar.gz
+                        | _not_ the "windows binary installer"
+sqlite3       | 3.7.11  | http://www.sqlite.org/download.html
+                        | -> sqlite-autoconf-3071100.tar.gz
+libidn        | 1.24    | ftp://ftp.gnu.org/gnu/libidn/
+                        | -> libidn-1.24.tar.gz
 Depends.exe   |         | http://www.dependencywalker.com/ ; also comes with Visual Studio
 
 In general, there are two versions of most tools on the
@@ -78,43 +78,49 @@
     command window run "echo %PATH%" and look for the Python directory in the output.
 
 02. MinGW
-  Run mingw-get-inst (graphical installer for mingw-get and the MinGW base system).
-  At the "Select Components" screen, add "C++ compiler" and "MinGW Developer Toolkit".
-    Other than this, accept all defaults.
+  Run mingw-get-inst-20110211.exe - note that later versions include
+  g++ 4.6.2, which is broken for C++ exceptions on MinGW.
+  At the "Select Components" screen, add:
+    C++ compiler
+    MinGW Developer Toolkit
+  Other than this, accept all defaults.
+  In particular, do _not_ update the catalog; use the built-in
+  catalog, to insure the binaries are consistent with the g++ 4.5.2
+  runtime.
   Open the MinGW shell (Start->All Programs->MinGW->MinGW Shell)
   Run the following:
-  $ mingw-get install msys-autoconf msys-automake mingw32-libiconv
+  $ mingw-get install msys-autoconf msys-automake
   $ mingw-get install mingw32-zlib mingw32-libz-dev mingw32-gettext
 
 03. boost; only need headers
   $ cd /usr
   $ mkdir src
   $ cd src
-  $ tar -zxf ../boost_1_46_1.tar.gz
+  $ tar -jxf ../boost_1_49_0.tar.bz2
   This may give errors about gid_t out of range, and then say
   "Exiting with failure status due to previous errors"; you can
   ignore this.
-  $ cd boost_1_46_1
+  $ cd boost_1_49_0
   $ cp -a boost /mingw/include
 
 04. Lua
    $ cd /usr/src
-   $ tar -zxf ../lua-5.1.4.tar.gz
-   $ cd lua-5.1.4
+   $ tar -zxf ../lua-5.20.tar.gz
+   $ cd lua-5.2.0
    $ make mingw INSTALL_TOP=/mingw
    $ make install INSTALL_TOP=/mingw
 
 05. pcre
    $ cd /usr/src
-   $ tar -zxf ../pcre-8.12.tar.gz
-   $ cd pcre-8.12
+   $ tar -jxf ../pcre-8.30.tar.bz2
+   $ cd pcre-8.30
    $ ./configure --prefix=/mingw
    $ make install
 
 06. botan
    $ cd /usr/src
-   $ tar -zxf ../Botan-1.8.11.tgz
-   $ cd Botan-1.8.11
+   $ tar -zxf ../Botan-1.10.1.tgz
+   $ cd Botan-1.10.1
    $ ./configure.py --cc=gcc --os=mingw
    The Botan configure script generates paths with Python's
    os.path.join(...), which in the case of the Windows Python
@@ -125,15 +131,15 @@
 
 07. sqlite3
    $ cd /usr/src
-   $ tar -zxf ../sqlite-autoconf-3070500.tar.gz
-   $ cd sqlite-autoconf-3070500
+   $ tar -zxf ../sqlite-autoconf-3071100.tar.gz
+   $ cd sqlite-autoconf-3071100
    $ ./configure --prefix=/mingw
    $ make install
 
 08. libidn
    $ cd /usr/src
-   $ tar -zxf ../libidn-1.20.tar.gz
-   $ cd libidn-1.20
+   $ tar -zxf ../libidn-1.24.tar.gz
+   $ cd libidn-1.24
    $ ./configure --prefix=/mingw
    $ make install
 
@@ -143,7 +149,7 @@
    unpack it someplace in your %PATH% (for example, C:\MinGW\bin\).
    This is only used by the testsuite, in particular the empty_environment test.
    If you just want to build monotone for your own use, you can skip this and
-   just ignore that that test fails.
+   just ignore that test failing.
 
 10. build monotone
    You can skip the CXXFLAGS and LDFLAGS if you really want to, but if you do that
@@ -153,6 +159,9 @@
    $ autoreconf -i # not needed if you use the distributed tarball
    $ export CXXFLAGS="-static-libgcc -static-libstdc++ -g -O2 -Wall"
    $ export LDFLAGS="-static-libgcc -static-libstdc++"
+   $ export botan_CFLAGS="-I/mingw/include/botan-1.10"
+   $ export botan_LIBS="-lbotan-1.10"
    $ ./configure
    $ make
 
+See innosetup/README.txt for instructions on building the native Win32 installer.
============================================================
--- innosetup/README.txt	a42923bdd0fcc96ba589bf5e3b4e229fc98ae598
+++ innosetup/README.txt	ea1ad861438da89b7cf89f01c32a171ffd81ab11
@@ -1,11 +1,12 @@
 This directory keeps the files needed to build the Windows native
-installer, using Inno Setup. 
+installer, using Inno Setup.
 
 Here are all the steps for creating a MinGW release, on a fresh
 Windows machine:
 
 Install Inno Setup and Inno Setup preprocessor; see
-http://www.jrsoftware.org/isinfo.php, get the Quick Start Pack isetup-5.4.2.exe
+http://www.jrsoftware.org/isinfo.php, isetup-5.4.3.exe. Install the
+preprocessor (we use it).
 
 Install MinGW tools; see ../INSTALL_windows_native.txt
 
@@ -26,9 +27,9 @@
 
 NOTE:
 
-  If ISCC (Inno setup compiler) is not in PATH, then you must specify
-  its location:
-  
+  If ISCC (Inno setup compiler) is not in PATH when monotone configure
+  is run, then you must specify its location:
+
     make win32-installer ISCC=/d/progs/InnoSetup5/ISCC.exe
 
 Publish the binary on the monotone website with proper permissions: