[psybases] update AP sources to include python-glade dep and some other fixes in python-xml and python (apparently)
This commit is contained in:
parent
a3774c5747
commit
617f4de2c7
|
@ -0,0 +1,29 @@
|
||||||
|
# -*- shell-script-mode -*-
|
||||||
|
|
||||||
|
[Meta]
|
||||||
|
RootName: @gnome.org/pyglade
|
||||||
|
DisplayName: Python bindings for Glade
|
||||||
|
ShortName: pyglade
|
||||||
|
Skeleton-Author: Filippos Papadopoulos <filip@cs.uoi.gr>
|
||||||
|
Skeleton-Version: 1
|
||||||
|
|
||||||
|
[Notes]
|
||||||
|
Pyglade is bundled within pygtk sources so they have the same versions
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
testForPythonModule gtk.glade
|
||||||
|
if [[ "$?" != "0" ]]; then
|
||||||
|
INTERFACE_VERSIONS=""
|
||||||
|
else
|
||||||
|
INTERFACE_VERSIONS=`python - <<EOF
|
||||||
|
try:
|
||||||
|
import pygtk
|
||||||
|
import gtk.glade
|
||||||
|
print "%i.%i" % (gtk.pygtk_version[0], gtk.pygtk_version[1])
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
EOF
|
||||||
|
`
|
||||||
|
fi
|
||||||
|
|
||||||
|
SOFTWARE_VERSIONS="$INTERFACE_VERSIONS"
|
|
@ -8,16 +8,14 @@ Skeleton-Author: Filippos Papadopoulos <filip@cs.uoi.gr>
|
||||||
Skeleton-Version: 1
|
Skeleton-Version: 1
|
||||||
|
|
||||||
[Notes]
|
[Notes]
|
||||||
|
Distros like SuSE split some features of core python (like xml) to python-xml e.t.c
|
||||||
|
So python-xml must have the same versions as python
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
SOFTWARE_VERSIONS=$( locateCommand python -V 2>&1 | cut -f2 -d' ' )
|
||||||
SOFTWARE_VERSIONS=$( locateCommand python -V 2>&1 )
|
|
||||||
testForPythonModule xml
|
testForPythonModule xml
|
||||||
if [[ "$?" != "0" ]]; then
|
if [[ "$?" != "0" ]]; then
|
||||||
INTERFACE_VERSIONS=""
|
INTERFACE_VERSIONS=""
|
||||||
else
|
else
|
||||||
local v
|
INTERFACE_VERSIONS=$( echo $SOFTWARE_VERSIONS | awk -F. '{print $1 "." $2}' )
|
||||||
v=$( echo $SOFTWARE_VERSIONS | awk '{print $2}' | awk -F. '{print $1 "." $2}' )
|
|
||||||
INTERFACE_VERSIONS=$( countDownVersions $v )
|
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -11,12 +11,10 @@ For instance, python 2.2 causes INTERFACE_VERSIONS to contain "2.2 2.1 2.0". Thi
|
||||||
SOFTWARE_VERSIONS is set to the result of python -V
|
SOFTWARE_VERSIONS is set to the result of python -V
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
SOFTWARE_VERSIONS=$( locateCommand python -V 2>&1 )
|
SOFTWARE_VERSIONS=$( locateCommand python -V 2>&1 | cut -f2 -d' ' )
|
||||||
if [[ "$?" != "0" ]]; then
|
if [[ "$?" != "0" ]]; then
|
||||||
INTERFACE_VERSIONS=""
|
INTERFACE_VERSIONS=""
|
||||||
else
|
else
|
||||||
local v
|
INTERFACE_VERSIONS=$( echo $SOFTWARE_VERSIONS | awk -F. '{print $1 "." $2}' )
|
||||||
v=$( echo $SOFTWARE_VERSIONS | awk '{print $2}' | awk -F. '{print $1 "." $2}' )
|
|
||||||
INTERFACE_VERSIONS=$( countDownVersions $v )
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue