diff options
| author | Olivier Tilloy <olivier@tilloy.net> | 2010-05-26 16:12:27 +0200 |
|---|---|---|
| committer | Olivier Tilloy <olivier@tilloy.net> | 2010-05-26 16:12:27 +0200 |
| commit | 2a51445994b03cfeab83d3259d838fa3a0380fc1 (patch) | |
| tree | 1cac7bb6806c58fa9bf9d2b63fc8071590b385a7 | |
| parent | 7cb619dd961326bdf05c6cfe923a30698fc0e8a7 (diff) | |
| parent | de70b3c15aa0d03845320e9bd09eb4aa7a7a0d99 (diff) | |
| download | pyexiv2-2a51445994b03cfeab83d3259d838fa3a0380fc1.tar.gz | |
Update the install script and the windows build
to Python 2.6.5 and Boost 1.43.0.
| -rwxr-xr-x | cross-compile.sh | 10 | ||||
| -rw-r--r-- | src/SConscript | 2 | ||||
| -rw-r--r-- | win32-installer.nsi | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/cross-compile.sh b/cross-compile.sh index 473d965..26507ae 100755 --- a/cross-compile.sh +++ b/cross-compile.sh @@ -72,14 +72,14 @@ make -j3 install cd .. # python -wget http://www.python.org/ftp/python/2.6.4/python-2.6.4.msi -7z x python-2.6.4.msi -opython +wget http://www.python.org/ftp/python/2.6.5/python-2.6.5.msi +7z x python-2.6.5.msi -opython 7z x python/python -opython # boost-python -wget http://sourceforge.net/projects/boost/files/boost/1.42.0/boost_1_42_0.tar.bz2/download -tar xf boost_1_42_0.tar.bz2 -cd boost_1_42_0 +wget http://sourceforge.net/projects/boost/files/boost/1.43.0/boost_1_43_0.tar.bz2/download +tar xf boost_1_43_0.tar.bz2 +cd boost_1_43_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 .. diff --git a/src/SConscript b/src/SConscript index a19d287..92d554e 100644 --- a/src/SConscript +++ b/src/SConscript @@ -54,7 +54,7 @@ else: install_dir = os.path.join(dest_dir, python_lib_path[1:]) env.Install(install_dir, [libpyexiv2]) -modules = ['__init__', 'metadata', 'exif', 'iptc', 'xmp', 'utils'] +modules = ['__init__', 'metadata', 'exif', 'iptc', 'xmp', 'preview', 'utils'] env.Install(os.path.join(install_dir, 'pyexiv2'), ['pyexiv2/%s.py' % module for module in modules]) env.Alias('install', install_dir) diff --git a/win32-installer.nsi b/win32-installer.nsi index 0ac2449..b62f9c3 100644 --- a/win32-installer.nsi +++ b/win32-installer.nsi @@ -152,6 +152,7 @@ Section "pyexiv2" File src\pyexiv2\exif.py File src\pyexiv2\iptc.py File src\pyexiv2\xmp.py + File src\pyexiv2\preview.py File src\pyexiv2\utils.py ; Create the uninstaller and publish it in the registry |