Skip to content

Commit 15100e1

Browse files
Use newest compatible exiv2 instead of oldest
For example, swig-0_27_0 was used for v0.27.{0,1,2,3}, now swig-0_27_3 is used. This allows non-API changes such as better docs to be included.
1 parent 4e1777e commit 15100e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+48
-41
lines changed

setup.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,18 @@ def get_version(inc_dir):
4747
parts = name.split('-')
4848
if parts[0] == 'swig' and parts[1] not in swigged_versions:
4949
swigged_versions.append([int(x) for x in parts[1].split('_')])
50-
swigged_versions.sort(reverse=True)
50+
swigged_versions.sort()
5151

5252
def get_mod_src_dir(exiv2_version):
53+
if len(exiv2_version) < 3:
54+
exiv2_version += [0]
55+
swigged_versions.sort()
5356
for v in swigged_versions:
54-
if exiv2_version + [0] >= v:
57+
if v >= exiv2_version and v[:2] == exiv2_version[:2]:
58+
return os.path.join('src', 'swig-{}_{}_{}'.format(*v))
59+
swigged_versions.sort(reverse=True)
60+
for v in swigged_versions:
61+
if v[:2] == exiv2_version[:2]:
5562
return os.path.join('src', 'swig-{}_{}_{}'.format(*v))
5663
return None
5764

0 commit comments

Comments
 (0)