diff options
| author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2011-10-23 14:45:09 +0200 |
|---|---|---|
| committer | Olivier Tilloy <olivier.tilloy@canonical.com> | 2011-10-23 14:45:09 +0200 |
| commit | f9003cb6278a74563136dfc1e6f1491b3a8643c7 (patch) | |
| tree | e23488472787ef7ae26c8237306e9a69cff45da6 | |
| parent | 8fc533518b205beea032fc2e545245bf681db78f (diff) | |
| parent | 855e5c30b78c363f2ee5c35c93b564a93cfbc06f (diff) | |
| download | pyexiv2-f9003cb6278a74563136dfc1e6f1491b3a8643c7.tar.gz | |
Updated windows build dependencies:
• exiv2 0.21.1 → 0.22
| -rw-r--r-- | README | 4 | ||||
| -rwxr-xr-x | cross-compile.sh | 8 | ||||
| -rw-r--r-- | doc/developers.rst | 6 |
3 files changed, 9 insertions, 9 deletions
@@ -47,7 +47,7 @@ The result of the build is a dynamic library, libexiv2python.so, in the build/ directory. This is the low-level binding. It is in turn used in a higher level module, pyexiv2. The install command installs the two modules in your site-specific directory for -Python modules (e.g. '/usr/lib/python2.6/dist-packages/' on Linux). +Python modules (e.g. '/usr/lib/python2.7/dist-packages/' on Linux). To use pyexiv2 in your scripts, simply import the pyexiv2 module. @@ -71,7 +71,7 @@ The generated documentation can be found in doc/_build/. License ======= -Copyright (C) 2006-2010 Olivier Tilloy <olivier@tilloy.net> +Copyright (C) 2006-2011 Olivier Tilloy <olivier@tilloy.net> pyexiv2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/cross-compile.sh b/cross-compile.sh index 7668ce5..06bddef 100755 --- a/cross-compile.sh +++ b/cross-compile.sh @@ -23,7 +23,7 @@ # 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: +# site-packages directory of a Python 2.7 windows setup: # - $BASE/pyexiv2/build/libexiv2python.pyd # - $BASE/pyexiv2/src/pyexiv2 # @@ -64,9 +64,9 @@ make -j3 install cd .. # exiv2 -wget http://www.exiv2.org/exiv2-0.21.1.tar.gz -tar xf exiv2-0.21.1.tar.gz -cd exiv2-0.21.1 +wget http://www.exiv2.org/exiv2-0.22.tar.gz +tar xf exiv2-0.22.tar.gz +cd exiv2-0.22 ./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 .. diff --git a/doc/developers.rst b/doc/developers.rst index 9bf3c67..df755c7 100644 --- a/doc/developers.rst +++ b/doc/developers.rst @@ -80,8 +80,8 @@ Building pyexiv2 is as simple as invoking ``scons`` in the top-level directory:: scons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... - g++ -o build/exiv2wrapper.os -c -fPIC -I/usr/include/python2.6 src/exiv2wrapper.cpp - g++ -o build/exiv2wrapper_python.os -c -fPIC -I/usr/include/python2.6 src/exiv2wrapper_python.cpp + g++ -o build/exiv2wrapper.os -c -fPIC -I/usr/include/python2.7 src/exiv2wrapper.cpp + g++ -o build/exiv2wrapper_python.os -c -fPIC -I/usr/include/python2.7 src/exiv2wrapper_python.cpp g++ -o build/libexiv2python.so -shared build/exiv2wrapper.os build/exiv2wrapper_python.os -lboost_python -lexiv2 scons: done building targets. @@ -123,7 +123,7 @@ From the top-level directory of the branch, run the following command:: makensis win32-installer.nsi This will generate a ready-to-distribute installer executable named -``pyexiv2-0.2-setup.exe``. +``pyexiv2-0.3-setup.exe``. Documentation ############# |