From: inv <inv@opencascade.com>
Date: Fri, 30 Mar 2012 14:26:10 +0000 (+0000)
Subject: SALOME 6.5.0 preparation: docutils 0.7.0 -> 0.8.1
X-Git-Tag: V6_5_0b1~71
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=97c864d4cc202ed9d770c9f29158dfcd39007f1d;p=tools%2Finstall.git

SALOME 6.5.0 preparation: docutils 0.7.0 -> 0.8.1
---

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index d2fe274..68ff431 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -621,10 +621,10 @@
 	     type="prerequisite"
              description="Utilites for processing plaintext documentation">
       <installation os="CentOS 5.5 64bit"
-                    version="0.7.0" 
+                    version="0.8.1" 
 		    disable="false"
 		    installdiskspace="3528,6112,11560"
-		    script="docutils-0.7.0.sh"/>
+		    script="docutils.sh"/>
     </product>
     <product name="Sphinx"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index ed3bef3..81764e3 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -621,10 +621,10 @@
 	     type="prerequisite"
              description="Utilites for processing plaintext documentation">
       <installation os="Debian 4.0"
-                    version="0.7.0" 
+                    version="0.8.1" 
 		    disable="false"
 		    installdiskspace="3528,6112,11560"
-		    script="docutils-0.7.0.sh"/>
+		    script="docutils.sh"/>
     </product>
     <product name="Sphinx"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index e348bb9..cb7ae03 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -621,10 +621,10 @@
 	     type="prerequisite"
              description="Utilites for processing plaintext documentation">
       <installation os="Debian 4.0 64bit"
-                    version="0.7.0" 
+                    version="0.8.1" 
 		    disable="false"
 		    installdiskspace="3528,6112,11560"
-		    script="docutils-0.7.0.sh"/>
+		    script="docutils.sh"/>
     </product>
     <product name="Sphinx"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 2ed218c..e891149 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -621,10 +621,10 @@
 	     type="prerequisite"
              description="Utilites for processing plaintext documentation">
       <installation os="Debian 5.0 64bit"
-                    version="0.7.0" 
+                    version="0.8.1" 
 		    disable="false"
 		    installdiskspace="3528,6112,11560"
-		    script="docutils-0.7.0.sh"/>
+		    script="docutils.sh"/>
     </product>
     <product name="Sphinx"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 85ac6be..eac4461 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -621,10 +621,10 @@
 	     type="prerequisite"
              description="Utilites for processing plaintext documentation">
       <installation os="Debian 6.0 64bit"
-                    version="0.7.0" 
+                    version="0.8.1" 
 		    disable="false"
 		    installdiskspace="3528,6112,11560"
-		    script="docutils-0.7.0.sh"/>
+		    script="docutils.sh"/>
     </product>
     <product name="Sphinx"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 85d86cb..cff5942 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -621,10 +621,10 @@
 	     type="prerequisite"
              description="Utilites for processing plaintext documentation">
       <installation os="Mandriva 2008.0"
-                    version="0.7.0" 
+                    version="0.8.1" 
 		    disable="false"
 		    installdiskspace="3528,6112,11560"
-		    script="docutils-0.7.0.sh"/>
+		    script="docutils.sh"/>
     </product>
     <product name="Sphinx"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 32ebbbe..46e4741 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -621,10 +621,10 @@
 	     type="prerequisite"
              description="Utilites for processing plaintext documentation">
       <installation os="Mandriva 2008.0 64bit"
-                    version="0.7.0" 
+                    version="0.8.1" 
 		    disable="false"
 		    installdiskspace="3528,6112,11560"
-		    script="docutils-0.7.0.sh"/>
+		    script="docutils.sh"/>
     </product>
     <product name="Sphinx"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 5a718ff..e80392a 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -621,10 +621,10 @@
 	     type="prerequisite"
              description="Utilites for processing plaintext documentation">
       <installation os="Mandriva 2010.0"
-                    version="0.7.0" 
+                    version="0.8.1" 
 		    disable="false"
 		    installdiskspace="3528,6112,11560"
-		    script="docutils-0.7.0.sh"/>
+		    script="docutils.sh"/>
     </product>
     <product name="Sphinx"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 31d636d..389c260 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -621,10 +621,10 @@
 	     type="prerequisite"
              description="Utilites for processing plaintext documentation">
       <installation os="Mandriva 2010.0 64bit"
-                    version="0.7.0" 
+                    version="0.8.1" 
 		    disable="false"
 		    installdiskspace="3528,6112,11560"
-		    script="docutils-0.7.0.sh"/>
+		    script="docutils.sh"/>
     </product>
     <product name="Sphinx"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index b08d9e0..0db4b4c 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -621,10 +621,10 @@
 	     type="prerequisite"
              description="Utilites for processing plaintext documentation">
       <installation os="Red Hat Enterprise WS 4 64bit"
-                    version="0.7.0" 
+                    version="0.8.1" 
 		    disable="false"
 		    installdiskspace="3528,6112,11560"
-		    script="docutils-0.7.0.sh"/>
+		    script="docutils.sh"/>
     </product>
     <product name="Sphinx"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index dfca6e0..84b0c2e 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -621,10 +621,10 @@
 	     type="prerequisite"
              description="Utilites for processing plaintext documentation">
       <installation os="Scientific SL 5.1 64bit"
-                    version="0.7.0" 
+                    version="0.8.1" 
 		    disable="false"
 		    installdiskspace="3528,6112,11560"
-		    script="docutils-0.7.0.sh"/>
+		    script="docutils.sh"/>
     </product>
     <product name="Sphinx"
 	     type="prerequisite"
diff --git a/config_files/docutils-0.7.0.sh b/config_files/docutils-0.7.0.sh
deleted file mode 100755
index 28d4049..0000000
--- a/config_files/docutils-0.7.0.sh
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : docutils-0.7.0.sh
-#  Created   : Mon Oct 12 11:20:00 2009
-#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-#  Project   : SALOME
-#  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-#
-# docutils version
-#
-DOCUTILS_VERSION=0.7.0
-
-check_version(){
-# It is not necessary to check version!
-return 0
-}
-
-print_env_bin(){
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export PYTHONPATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-export PATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:\${PATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-# unpack
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR} ; check_job ${PRODUCT_DIR}/BUILD.LOG python setup.py install --prefix=${PRODUCT_DIR}
-
-cd ${PRODUCT_DIR}/bin; 
-
-scripts=`find . -name "*.py" -exec basename {} ";" | awk -F. '{print $1}'`
-for f in X $scripts ; do
-    if test "${f}" == "X" ; then continue ; fi
-    sed -e "s%#\!.*python%#\!/usr/bin/env python%" ${f}.py > _${f}.py
-    mv -f _${f}.py ${f}.py
-    chmod a+x ${f}.py
-    ln -sf ${f}.py ${f}
-done
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-cd ${PRODUCT_DIR}/bin; 
-
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" rst2latex.py > _rst2latex.py
-mv -f _rst2latex.py rst2latex.py
-chmod a+x rst2latex.py
-ln -sf rst2latex.py rst2latex
-
-sed -e "s%#\!.*python%#\!/usr/bin/env python%" rst2html.py > _rst2html.py
-mv -f _rst2html.py rst2html.py
-chmod a+x rst2html.py
-ln -sf rst2html.py rst2html
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="docutils-${DOCUTILS_VERSION}"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/docutils.sh b/config_files/docutils.sh
new file mode 100755
index 0000000..821cc0f
--- /dev/null
+++ b/config_files/docutils.sh
@@ -0,0 +1,121 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : docutils.sh
+#  Created   : Mon Oct 12 11:20:00 2009
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2012 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+#
+# docutils version
+#
+DOCUTILS_VERSION=0.8.1
+
+check_version(){
+# It is not necessary to check version!
+return 0
+}
+
+print_env_bin(){
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYTHONPATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+export PATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:\${PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+# unpack
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR} ; check_job ${PRODUCT_DIR}/BUILD.LOG python setup.py install --prefix=${PRODUCT_DIR}
+
+cd ${PRODUCT_DIR}/bin; 
+
+scripts=`find . -name "*.py" -exec basename {} ";" | awk -F. '{print $1}'`
+for f in X $scripts ; do
+    if test "${f}" == "X" ; then continue ; fi
+    sed -i "s%#\!.*python%#\!/usr/bin/env python%" ${f}.py
+    ln -sf ${f}.py ${f}
+done
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+# to generate environment script for sources
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="docutils-${DOCUTILS_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE