[Monotone-commits-diffs] net.venge.monotone: b4e9daf8f43fb101a7c18d1222f5ba100dc696ec

[code]

revision:            b4e9daf8f43fb101a7c18d1222f5ba100dc696ec
date:                2011-03-27T14:07:32
author:              Richard Hopkins <address@hidden>
branch:              net.venge.monotone
changelog:
merge of '62b15381eb0bcb88bacea31bc6694e159a889d23'
     and 'bfb6dd7563e013411c2eae7508f801cadb4dce37'

manifest:
format_version "1"

new_manifest [5bbcb9dec5d1d40b4cb5c08e5b3899625cd0e154]

old_revision [62b15381eb0bcb88bacea31bc6694e159a889d23]

patch "INSTALL_windows_native.txt"
 from [720fd6b6c8f3696e572a3f2f5466b9518d1aadcf]
   to [d67a72a79605d8e65abc2529e06481fad204724f]

patch "innosetup/README.txt"
 from [86ad710152a8dcfa19b88adf1c1eb135e787454e]
   to [a42923bdd0fcc96ba589bf5e3b4e229fc98ae598]

patch "src/paths.cc"
 from [c724539af68eb71b98431d565eade79c2dcadf15]
   to [59d74d02bbdaaeda940843ab6d9f6cdd816e2caa]

patch "src/win32/get_system_flavour.cc"
 from [504a6ac65967da7d4b4a437d0beebc04ee8f969d]
   to [08c4e014bf680bd9396fe2a70571d215560337a6]

patch "test/func/schema_migration_new_db/__driver__.lua"
 from [b1ed03f18f2480f322746b2e142f21ad005ae9cf]
   to [3c9bd83bd39e98ced7d78a436143968717e11a0a]

old_revision [bfb6dd7563e013411c2eae7508f801cadb4dce37]

patch "notes/release-checklist.txt"
 from [7924280178406c7ec6b681886cf58d5b8b251e1a]
   to [854f5ee471e9eb2ad639c37370034f8326bbb47d]
============================================================
--- src/win32/get_system_flavour.cc	504a6ac65967da7d4b4a437d0beebc04ee8f969d
+++ src/win32/get_system_flavour.cc	08c4e014bf680bd9396fe2a70571d215560337a6
@@ -16,7 +16,7 @@ struct table_entry
 struct table_entry
 {
   unsigned long key;
-  char *val;
+  const char *val;
 };
 
 void key_to_string(unsigned long key,
============================================================
--- src/paths.cc	c724539af68eb71b98431d565eade79c2dcadf15
+++ src/paths.cc	59d74d02bbdaaeda940843ab6d9f6cdd816e2caa
@@ -1,5 +1,5 @@
 // Copyright (C) 2005 Nathaniel Smith <address@hidden>
-//               2008, 2010 Stephen Leake <address@hidden>
+//               2008, 2010 - 2011 Stephen Leake <address@hidden>
 //
 // This program is made available under the GNU GPL version 2.0 or
 // greater. See the accompanying file COPYING for details.
@@ -555,7 +555,7 @@ any_path::dirname() const
   // dirname() of a direct child of the root is the root
   if (sep == 0 || (sep == 1 && s[1] == '/')
 #ifdef WIN32
-      || (sep == 1 || sep == 2 && s[1] == ':')
+      || (sep == 1 || (sep == 2 && s[1] == ':'))
 #endif
       )
     return any_path(s, 0, sep+1);
@@ -593,7 +593,7 @@ system_path::dirname() const
   // dirname() of a direct child of the root is the root
   if (sep == 0 || (sep == 1 && s[1] == '/')
 #ifdef WIN32
-      || (sep == 1 || sep == 2 && s[1] == ':')
+      || (sep == 1 || (sep == 2 && s[1] == ':'))
 #endif
       )
     return system_path(s, 0, sep+1);
============================================================
--- INSTALL_windows_native.txt	720fd6b6c8f3696e572a3f2f5466b9518d1aadcf
+++ INSTALL_windows_native.txt	d67a72a79605d8e65abc2529e06481fad204724f
@@ -23,23 +23,23 @@
 mingw-get-inst| latest  | http://sourceforge.net/projects/mingw/files/
                         | -> Automated MinGW Installer
                         | -> mingw-get-inst
-                        | -> mingw-get-inst-20101030
-                        | -> mingw-get-inst-20101030.exe
-boost         | 1.45.1  | http://sourceforge.net/projects/boost/files/
-                        | -> boost -> 1.54.0 -> boost_1_45_0.tar.gz
+                        | -> 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"
                         | lua-5.1.4.tar.gz
-pcre          | 8.11    | http://www.pcre.org/
+pcre          | 8.12    | http://www.pcre.org/
                         | -> ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
-                        | -> pcre-8.11.tar.gz
+                        | -> pcre-8.12.tar.gz
 botan         | 1.8.11  | http://botan.randombit.net/download.html
                         | "Source: >tar/gzip<" under "Current Stable Release"
-sqlite3       | 3.7.4   | http://www.sqlite.org/download.html
-                        | -> sqlite-autoconf-3070400.tar.gz
-libidn        | 1.19    | ftp://ftp.gnu.org/gnu/libidn/
-                        | -> libidn-1.19.tar.gz
+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
 Depends.exe   |         | http://www.dependencywalker.com/ ; also comes with Visual Studio
 
 In general, there are two versions of most tools on the
@@ -90,11 +90,11 @@
   $ cd /usr
   $ mkdir src
   $ cd src
-  $ tar -zxf ../boost_1_45_1.tar.gz
+  $ tar -zxf ../boost_1_46_1.tar.gz
   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_45_1
+  $ cd boost_1_46_1
   $ cp -a boost /mingw/include
 
 04. Lua
@@ -106,8 +106,8 @@
 
 05. pcre
    $ cd /usr/src
-   $ tar -zxf ../pcre-8.11.tar.gz
-   $ cd pcre-8.11
+   $ tar -zxf ../pcre-8.12.tar.gz
+   $ cd pcre-8.12
    $ ./configure --prefix=/mingw
    $ make install
 
@@ -125,15 +125,15 @@
 
 07. sqlite3
    $ cd /usr/src
-   $ tar -zxf ../sqlite-autoconf-3070400.tar.gz
-   $ cd sqlite-autoconf-3070400
+   $ tar -zxf ../sqlite-autoconf-3070500.tar.gz
+   $ cd sqlite-autoconf-3070500
    $ ./configure --prefix=/mingw
    $ make install
 
 08. libidn
    $ cd /usr/src
-   $ tar -zxf ../libidn-1.19.tar.gz
-   $ cd libidn-1.19
+   $ tar -zxf ../libidn-1.20.tar.gz
+   $ cd libidn-1.20
    $ ./configure --prefix=/mingw
    $ make install
 
@@ -151,8 +151,8 @@
    monotone binary will take several extra seconds to start.
    $ cd /c/.../monotone
    $ autoreconf -i # not needed if you use the distributed tarball
-   $ CXXFLAGS="-static-libgcc -static-libstdc++ -O2 -Wall"; export CXXFLAGS
-   $ LDFLAGS="-static-libgcc -static-libstdc++"; export LDFLAGS
+   $ export CXXFLAGS="-static-libgcc -static-libstdc++ -g -O2 -Wall"
+   $ export LDFLAGS="-static-libgcc -static-libstdc++"
    $ ./configure
    $ make
 
============================================================
--- innosetup/README.txt	86ad710152a8dcfa19b88adf1c1eb135e787454e
+++ innosetup/README.txt	a42923bdd0fcc96ba589bf5e3b4e229fc98ae598
@@ -5,7 +5,7 @@
 Windows machine:
 
 Install Inno Setup and Inno Setup preprocessor; see
-http://www.jrsoftware.org/isinfo.php, get the Quick Start Pack ispack-5.3.3.exe
+http://www.jrsoftware.org/isinfo.php, get the Quick Start Pack isetup-5.4.2.exe
 
 Install MinGW tools; see ../INSTALL_windows_native.txt
 
@@ -15,12 +15,11 @@
 http://wiki.monotone.ca/MonotoneProjectServer/
 
 Check out the release version of monotone:
-mtn -d /path/to/monotone.db checkout -r t:monotone-<version> monotone-<version>
+mtn -d /path/to/monotone.db checkout -r t:monotone-<version> --branch net.venge.monotone.monotone-<version> monotone-<version>
 
-Build the release. In an MSYS shell:
-cd monotone-<version>
-autoreconf -i
-./configure 
+Build the release. See the last instruction in ../INSTALL_windows_native.txt
+Then build the installer:
+
 make win32-installer
 
 That builds "monotone-<version>-setup.exe" in the current directory.
@@ -37,4 +36,5 @@
 chmod a+r monotone-<version>-setup.exe
 scp -p monotone-<version>-setup.exe address@hidden:<version>
 
-Download from the web and test, both the installed mtn and the documentation.
+Download from the web (http://www.monotone.ca/downloads.php), install
+and test, both the installed mtn and the documentation.
============================================================
--- test/func/schema_migration_new_db/__driver__.lua	b1ed03f18f2480f322746b2e142f21ad005ae9cf
+++ test/func/schema_migration_new_db/__driver__.lua	3c9bd83bd39e98ced7d78a436143968717e11a0a
@@ -9,4 +9,5 @@ check(mtn("db", "migrate"), 0, false, tr
 
 check(get("expected-stderr.txt"))
 check(mtn("db", "migrate"), 0, false, true)
+canonicalize("stderr")
 check(samefile("stderr", "expected-stderr.txt"))
============================================================
--- notes/release-checklist.txt	7924280178406c7ec6b681886cf58d5b8b251e1a
+++ notes/release-checklist.txt	854f5ee471e9eb2ad639c37370034f8326bbb47d
@@ -140,19 +140,19 @@
     # The rest is done via monotone.
     #
     $ mtn -d DATABASE co -b net.venge.monotone.web.mainsite {WEBDIR}
-    $ cp monotone-{NEW VERSION}/NEWS	{WEBDIR}
-    $ cp monotone-{NEW VERSION}/INSTALL	{WEBDIR}
-    $ cp monotone-{NEW VERSION}/UPGRADE	{WEBDIR}
-    $ cp monotone-{NEW VERSION}/monotone.pdf	{WEBDIR}
-    $ cp monotone-{NEW VERSION}/monotone.html	{WEBDIR}
+    $ cp monotone-{NEW VERSION}/NEWS			{WEBDIR}
+    $ cp monotone-{NEW VERSION}/INSTALL			{WEBDIR}
+    $ cp monotone-{NEW VERSION}/UPGRADE			{WEBDIR}
+    $ cp monotone-{NEW VERSION}/doc/monotone.pdf	{WEBDIR}
+    $ cp monotone-{NEW VERSION}/doc/monotone.html	{WEBDIR}
     $ rm -rf {WEBDIR}/docs
-    $ cp -r monotone-{NEW VERSION}/html {WEBDIR}/docs
+    $ cp -r monotone-{NEW VERSION}/doc/html		{WEBDIR}/docs
 
-    Open {WEBDIR}/monotone.html, change the CSS include from "texinfo.css" to
-    "docs/texinfo.css" and hit save.
+    Open {WEBDIR}/monotone.html, change the CSS include from
+    "texinfo.css" to "docs/texinfo.css" and hit save.
 
     $ rm {WEBDIR}/figures/*
-    $ cp monotone-{NEW VERSION}/figures/*.png {WEBDIR}/figures/
+    $ cp monotone-{NEW VERSION}/doc/figures/*.png	{WEBDIR}/figures/
     $ cd {WEBDIR}
     $ mtn drop --missing
     $ mtn add --unknown