From 3fd39564b17accea6a7647a2249a0686adfae87c Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier@tilloy.net>
Date: Mon, 22 Aug 2011 18:40:03 +0200
Subject: Updated windows build dependencies:  • iconv 1.13.1 → 1.14  • exiv2
 0.21 → 0.21.1  • python 2.7.1 → 2.7.2  • boost 1.45.0 → 1.47.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cross-compile.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/cross-compile.sh b/cross-compile.sh
index 5f9ce27..b3a597a 100755
--- a/cross-compile.sh
+++ b/cross-compile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2010 Olivier Tilloy <olivier@tilloy.net>
+# Copyright (C) 2010-2011 Olivier Tilloy <olivier@tilloy.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -48,9 +48,9 @@ wget --trust-server-names=on http://gnuwin32.sourceforge.net/downlinks/zlib-lib-
 unzip -d zlib zlib-*.zip
 
 # iconv (for exiv2)
-wget ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz
-tar xf libiconv-1.13.1.tar.gz
-cd libiconv-1.13.1
+wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
+tar xf libiconv-1.14.tar.gz
+cd libiconv-1.14
 ./configure --enable-static --disable-visibility --target=$PLATFORM --host=$PLATFORM --build=$BUILD --prefix=$BASE/libiconv
 make -j3 install
 cd ..
@@ -64,22 +64,22 @@ make -j3 install
 cd ..
 
 # exiv2
-wget http://exiv2.org/exiv2-0.21.tar.gz
-tar xf exiv2-0.21.tar.gz
-cd exiv2-0.21
+wget http://www.exiv2.org/exiv2-0.21.1.tar.gz
+tar xf exiv2-0.21.1.tar.gz
+cd exiv2-0.21.1
 ./configure --disable-shared --disable-visibility --target=$PLATFORM --host=$PLATFORM --build=$BUILD --disable-nls --with-zlib=$BASE/zlib --with-libiconv-prefix=$BASE/libiconv --with-expat=$BASE/expat --prefix=$BASE/exiv2
 make -j3 install
 cd ..
 
 # python
-wget http://python.org/ftp/python/2.7.1/python-2.7.1.msi
-7z x python-2.7.1.msi -opython
+wget http://python.org/ftp/python/2.7.2/python-2.7.2.msi
+7z x python-2.7.2.msi -opython
 7z x python/python -opython
 
 # boost-python
-wget --trust-server-names=on http://sourceforge.net/projects/boost/files/boost/1.45.0/boost_1_45_0.tar.bz2/download
-tar xf boost_1_45_0.tar.bz2
-cd boost_1_45_0
+wget --trust-server-names=on http://sourceforge.net/projects/boost/files/boost/1.47.0/boost_1_47_0.tar.bz2/download
+tar xf boost_1_47_0.tar.bz2
+cd boost_1_47_0
 echo "using gcc : : $COMPILER : <compileflags>-I$BASE/python <archiver>$ARCHIVER ;" >> tools/build/v2/user-config.jam
 bjam install -j 3 --prefix=$BASE/boost --with-python toolset=gcc link=static
 cd ..
-- 
cgit 


From 55d80dbb90b78e1da13dbcf90e7e0228edb2eddb Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier@tilloy.net>
Date: Mon, 22 Aug 2011 20:31:00 +0200
Subject: Updated cross-compilation script: now using boost’s bootstrap script
 that compiles its own version of bjam. This relaxes the dependency on bjam.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cross-compile.sh   | 5 +++--
 doc/developers.rst | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cross-compile.sh b/cross-compile.sh
index b3a597a..7668ce5 100755
--- a/cross-compile.sh
+++ b/cross-compile.sh
@@ -20,7 +20,7 @@
 # pyexiv2 for windows on a linux host.
 #
 # Typical dependencies (of this script) on an Ubuntu system:
-#  wget unzip tar build-essential mingw32 p7zip-full bjam
+#  wget unzip tar build-essential mingw32 p7zip-full
 #
 # After execution is complete, copy the following file and folder to the
 # site-packages directory of a Python 2.6 windows setup:
@@ -81,7 +81,8 @@ wget --trust-server-names=on http://sourceforge.net/projects/boost/files/boost/1
 tar xf boost_1_47_0.tar.bz2
 cd boost_1_47_0
 echo "using gcc : : $COMPILER : <compileflags>-I$BASE/python <archiver>$ARCHIVER ;" >> tools/build/v2/user-config.jam
-bjam install -j 3 --prefix=$BASE/boost --with-python toolset=gcc link=static
+./bootstrap.sh
+./bjam install -j 3 --prefix=$BASE/boost --with-python toolset=gcc link=static
 cd ..
 
 # pyexiv2
diff --git a/doc/developers.rst b/doc/developers.rst
index 15b18f6..c29f397 100644
--- a/doc/developers.rst
+++ b/doc/developers.rst
@@ -53,12 +53,11 @@ Windows installer, you will need the following dependencies:
 
 * `MinGW <http://www.mingw.org/>`_
 * `7-Zip <http://7-zip.org/>`_
-* `BJam <http://boost.org/boost-build2/doc/html/index.html>`_
 * `NSIS <http://nsis.sourceforge.net/>`_
 
 A typical list of packages to install on a Debian/Ubuntu system is::
 
-  mingw32 p7zip-full bjam nsis
+  mingw32 p7zip-full nsis
 
 Building and installing
 #######################
-- 
cgit