Salome HOME
projects
/
tools
/
sat_salome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
omniORB: bug fix in version
[tools/sat_salome.git]
/
products
/
compil_scripts
/
omniORB.sh
diff --git
a/products/compil_scripts/omniORB.sh
b/products/compil_scripts/omniORB.sh
index a9d941fa786a0690ebad76c8a7858d78757d9aab..3475c3860067f3f88254cc894dc751f4b82a4311 100755
(executable)
--- a/
products/compil_scripts/omniORB.sh
+++ b/
products/compil_scripts/omniORB.sh
@@
-9,7
+9,7
@@
echo "##########################################################################
PYTHON_HOME=$PYTHONHOME
echo
PYTHON_HOME=$PYTHONHOME
echo
-echo "*** configure --disable-ipv6"
+echo "*** configure --
prefix=$PRODUCT_INSTALL --
disable-ipv6"
$SOURCE_DIR/configure --prefix=$PRODUCT_INSTALL --disable-ipv6
if [ $? -ne 0 ]
then
$SOURCE_DIR/configure --prefix=$PRODUCT_INSTALL --disable-ipv6
if [ $? -ne 0 ]
then
@@
-34,17
+34,17
@@
then
echo "ERROR on make install"
exit 3
fi
echo "ERROR on make install"
exit 3
fi
+function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
-if [[ $VERSION == "4.1.6" ]]
-then
+if version_ge $VERSION "4.1" ; then
# fix headers
echo
echo "*** fix headers"
cd $PRODUCT_INSTALL/bin
# fix headers
echo
echo "*** fix headers"
cd $PRODUCT_INSTALL/bin
- sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidl > _omniidl
+ sed -e "s%#\!.*python%#\!/usr/bin/env python
3
%" omniidl > _omniidl
mv -f _omniidl omniidl
chmod a+x omniidl
mv -f _omniidl omniidl
chmod a+x omniidl
- sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py
+ sed -e "s%#\!.*python%#\!/usr/bin/env python
3
%" omniidlrun.py > _omniidlrun.py
mv -f _omniidlrun.py omniidlrun.py
chmod a+x omniidlrun.py
fi
mv -f _omniidlrun.py omniidlrun.py
chmod a+x omniidlrun.py
fi