Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bob
bob.io.image
Commits
371162f8
Commit
371162f8
authored
Nov 06, 2014
by
Manuel Günther
Browse files
Implemented versioning by version.txt
parent
7f342ead
Changes
3
Hide whitespace changes
Inline
Side-by-side
MANIFEST.in
View file @
371162f8
include LICENSE README.rst bootstrap.py buildout.cfg requirements.txt
include LICENSE README.rst bootstrap.py buildout.cfg requirements.txt
version.txt
recursive-include doc conf.py *.rst
recursive-include bob *.cpp *.h
recursive-include bob/io/image/data *.*
setup.py
View file @
371162f8
...
...
@@ -14,26 +14,28 @@ from bob.blitz.extension import Extension, build_ext
from
bob.extension.utils
import
load_requirements
build_requires
=
load_requirements
()
# Define package version
version
=
open
(
"version.txt"
).
read
().
rstrip
()
packages
=
[
'boost'
,
'libpng'
]
boost_modules
=
[
'system'
]
version
=
'2.0.0a0'
def
libjpeg_version
(
header
):
v
ersion
=
egrep
(
header
,
r
"#\s*define\s+JPEG_LIB_VERSION_(MINOR|MAJOR)\s+(\d+)"
)
if
not
len
(
v
ersion
):
return
None
v
v
=
egrep
(
header
,
r
"#\s*define\s+JPEG_LIB_VERSION_(MINOR|MAJOR)\s+(\d+)"
)
if
not
len
(
v
v
):
return
None
# we have a match, produce a string version of the version number
major
=
int
(
v
ersion
[
0
].
group
(
2
))
minor
=
int
(
v
ersion
[
1
].
group
(
2
))
major
=
int
(
v
v
[
0
].
group
(
2
))
minor
=
int
(
v
v
[
1
].
group
(
2
))
return
'%d.%d'
%
(
major
,
minor
)
def
libjpeg_turbo_version
(
header
):
v
ersion
=
egrep
(
header
,
r
"#\s*define\s+LIBJPEG_TURBO_VERSION\s+([\d\.]+)"
)
if
not
len
(
v
ersion
):
return
None
return
v
ersion
[
0
].
group
(
1
)
+
' (turbo)'
v
v
=
egrep
(
header
,
r
"#\s*define\s+LIBJPEG_TURBO_VERSION\s+([\d\.]+)"
)
if
not
len
(
v
v
):
return
None
return
v
v
[
0
].
group
(
1
)
+
' (turbo)'
class
jpeg
:
...
...
@@ -85,15 +87,15 @@ class jpeg:
# now check for user requirements
for
candidate
in
candidates
:
v
ersion
=
libjpeg_version
(
candidate
)
available
=
LooseVersion
(
v
ersion
)
v
v
=
libjpeg_version
(
candidate
)
available
=
LooseVersion
(
v
v
)
if
(
operator
==
'<'
and
available
<
required
)
or
\
(
operator
==
'<='
and
available
<=
required
)
or
\
(
operator
==
'>'
and
available
>
required
)
or
\
(
operator
==
'>='
and
available
>=
required
)
or
\
(
operator
==
'=='
and
available
==
required
):
self
.
include_directory
=
os
.
path
.
dirname
(
candidate
)
self
.
version
=
v
ersion
self
.
version
=
v
v
found
=
True
break
...
...
@@ -130,9 +132,9 @@ class jpeg:
def
libtiff_version
(
header
):
v
ersion
=
egrep
(
header
,
r
"#\s*define\s+TIFFLIB_VERSION_STR\s+\"LIBTIFF,\s+Version\s+([\d\.]+).*"
)
if
not
len
(
v
ersion
):
return
None
return
v
ersion
[
0
].
group
(
1
)
v
v
=
egrep
(
header
,
r
"#\s*define\s+TIFFLIB_VERSION_STR\s+\"LIBTIFF,\s+Version\s+([\d\.]+).*"
)
if
not
len
(
v
v
):
return
None
return
v
v
[
0
].
group
(
1
)
class
tiff
:
...
...
@@ -181,15 +183,15 @@ class tiff:
for
candidate
in
candidates
:
directory
=
os
.
path
.
dirname
(
candidate
)
version_header
=
os
.
path
.
join
(
directory
,
'tiffvers.h'
)
v
ersion
=
libtiff_version
(
version_header
)
available
=
LooseVersion
(
v
ersion
)
v
v
=
libtiff_version
(
version_header
)
available
=
LooseVersion
(
v
v
)
if
(
operator
==
'<'
and
available
<
required
)
or
\
(
operator
==
'<='
and
available
<=
required
)
or
\
(
operator
==
'>'
and
available
>
required
)
or
\
(
operator
==
'>='
and
available
>=
required
)
or
\
(
operator
==
'=='
and
available
==
required
):
self
.
include_directory
=
os
.
path
.
dirname
(
candidate
)
self
.
version
=
v
ersion
self
.
version
=
v
v
found
=
True
break
...
...
@@ -226,18 +228,18 @@ class tiff:
def
libgif_version
(
header
):
v
ersion
=
egrep
(
header
,
r
"#\s*define\s+GIFLIB_(RELEASE|MINOR|MAJOR)\s+(\d+)"
)
if
not
len
(
v
ersion
):
v
ersion
=
egrep
(
header
,
r
"#\s*define\s+GIF_LIB_VERSION\s+\"\s*Version\s+([\d\.]+).*\""
)
if
not
len
(
v
ersion
):
return
None
v
v
=
egrep
(
header
,
r
"#\s*define\s+GIFLIB_(RELEASE|MINOR|MAJOR)\s+(\d+)"
)
if
not
len
(
v
v
):
v
v
=
egrep
(
header
,
r
"#\s*define\s+GIF_LIB_VERSION\s+\"\s*Version\s+([\d\.]+).*\""
)
if
not
len
(
v
v
):
return
None
# old style
return
v
ersion
[
0
].
group
(
1
)
return
v
v
[
0
].
group
(
1
)
# we have a match, produce a string version of the version number
major
=
int
(
v
ersion
[
0
].
group
(
2
))
minor
=
int
(
v
ersion
[
1
].
group
(
2
))
release
=
int
(
v
ersion
[
2
].
group
(
2
))
major
=
int
(
v
v
[
0
].
group
(
2
))
minor
=
int
(
v
v
[
1
].
group
(
2
))
release
=
int
(
v
v
[
2
].
group
(
2
))
return
'%d.%d.%d'
%
(
major
,
minor
,
release
)
class
gif
:
...
...
@@ -283,15 +285,15 @@ class gif:
# now check for user requirements
for
candidate
in
candidates
:
v
ersion
=
libgif_version
(
candidate
)
available
=
LooseVersion
(
v
ersion
)
v
v
=
libgif_version
(
candidate
)
available
=
LooseVersion
(
v
v
)
if
(
operator
==
'<'
and
available
<
required
)
or
\
(
operator
==
'<='
and
available
<=
required
)
or
\
(
operator
==
'>'
and
available
>
required
)
or
\
(
operator
==
'>='
and
available
>=
required
)
or
\
(
operator
==
'=='
and
available
==
required
):
self
.
include_directory
=
os
.
path
.
dirname
(
candidate
)
self
.
version
=
v
ersion
self
.
version
=
v
v
found
=
True
break
...
...
version.txt
0 → 100644
View file @
371162f8
2.0.0a3
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment