innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.7.x] Fixed #23064 -- Added lib detection support for GDAL 1.10/1.11 

Note that GDAL 1.11 is not yet officially supported, until someone
has tested it and can confirm it has no issues with Django.
Backport of 3f1412ff7b from master.
This commit is contained in:
Claude Paroz 2014-07-21 19:02:25 +02:00
parent e2220c1c08
commit 6e41ae1a4e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/gis/gdal/libgdal.py
View File

@ -23,11 +23,11 @@ if lib_path:
lib_names = None lib_names = None
elif os.name == 'nt': elif os.name == 'nt':
# Windows NT shared libraries # Windows NT shared libraries
lib_names = ['gdal19', 'gdal18', 'gdal17', 'gdal16', 'gdal15'] lib_names = ['gdal111', 'gdal110', 'gdal19', 'gdal18', 'gdal17', 'gdal16']
elif os.name == 'posix': elif os.name == 'posix':
# *NIX library names. # *NIX library names.
lib_names = ['gdal', 'GDAL', 'gdal1.9.0', 'gdal1.8.0', 'gdal1.7.0', lib_names = ['gdal', 'GDAL', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0',
'gdal1.6.0', 'gdal1.5.0'] 'gdal1.8.0', 'gdal1.7.0', 'gdal1.6.0']
else: else:
raise OGRException('Unsupported OS "%s"' % os.name) raise OGRException('Unsupported OS "%s"' % os.name)

1
docs/ref/contrib/gis/install/geolibs.txt
View File

@ -28,6 +28,7 @@ Program Description Required
GDAL 1.8.0 2011-01-13 GDAL 1.8.0 2011-01-13
GDAL 1.9.0 2012-01-03 GDAL 1.9.0 2012-01-03
GDAL 1.10.0 2013-04-29 GDAL 1.10.0 2013-04-29
GDAL 1.11.0 2014-04-25 # To be tested!
PostGIS 1.3.0 2007-08-09 PostGIS 1.3.0 2007-08-09
PostGIS 1.4.0 2009-07-24 PostGIS 1.4.0 2009-07-24
PostGIS 1.5.0 2010-02-04 PostGIS 1.5.0 2010-02-04