diff options
| author | Olivier Tilloy <olivier@tilloy.net> | 2011-08-22 20:31:00 +0200 |
|---|---|---|
| committer | Olivier Tilloy <olivier@tilloy.net> | 2011-08-22 20:31:00 +0200 |
| commit | 55d80dbb90b78e1da13dbcf90e7e0228edb2eddb (patch) | |
| tree | b682def2535709692da21984bd85c5346acd590a | |
| parent | 3fd39564b17accea6a7647a2249a0686adfae87c (diff) | |
| download | pyexiv2-55d80dbb90b78e1da13dbcf90e7e0228edb2eddb.tar.gz | |
Updated cross-compilation script: now using boost’s bootstrap script that compiles its own version of bjam.
This relaxes the dependency on bjam.
| -rwxr-xr-x | cross-compile.sh | 5 | ||||
| -rw-r--r-- | 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 ####################### |