From a2b4e833cfb48dfee7c4a4d3e995bc4e68b44b2d Mon Sep 17 00:00:00 2001 From: inv Date: Fri, 30 Mar 2012 13:40:46 +0000 Subject: [PATCH] SALOME 6.5.0 preparation: Sphinx 1.0.7 -> 1.1.3 --- config_CentOS_5.5_64bit.xml | 1 + config_Debian_4.0.xml | 1 + config_Debian_4.0_64bit.xml | 1 + config_Debian_5.0_64bit.xml | 1 + config_Debian_6.0_64bit.xml | 1 + config_Mandriva_2008.0.xml | 1 + config_Mandriva_2008.0_64bit.xml | 1 + config_Mandriva_2010.0.xml | 1 + config_Mandriva_2010.0_64bit.xml | 1 + config_Red_Hat_Enterprise_WS_4_64bit.xml | 1 + config_Scientific_SL_5.1_64bit.xml | 1 + config_files/Sphinx.sh | 42 +++++++----------------- 12 files changed, 22 insertions(+), 31 deletions(-) diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index 3c0ae98..d2fe274 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -1092,6 +1092,7 @@ Python + docutils Python diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml index 4fb8250..ed3bef3 100755 --- a/config_Debian_4.0.xml +++ b/config_Debian_4.0.xml @@ -1092,6 +1092,7 @@ Python + docutils Python diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml index 5eda911..e348bb9 100755 --- a/config_Debian_4.0_64bit.xml +++ b/config_Debian_4.0_64bit.xml @@ -1092,6 +1092,7 @@ Python + docutils Python diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml index 42a5bee..2ed218c 100755 --- a/config_Debian_5.0_64bit.xml +++ b/config_Debian_5.0_64bit.xml @@ -1092,6 +1092,7 @@ Python + docutils Python diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml index 1afe786..85ac6be 100755 --- a/config_Debian_6.0_64bit.xml +++ b/config_Debian_6.0_64bit.xml @@ -1092,6 +1092,7 @@ Python + docutils Python diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml index de664e2..85d86cb 100755 --- a/config_Mandriva_2008.0.xml +++ b/config_Mandriva_2008.0.xml @@ -1092,6 +1092,7 @@ Python + docutils Python diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml index c6726e8..32ebbbe 100755 --- a/config_Mandriva_2008.0_64bit.xml +++ b/config_Mandriva_2008.0_64bit.xml @@ -1092,6 +1092,7 @@ Python + docutils Python diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml index aabbb47..5a718ff 100755 --- a/config_Mandriva_2010.0.xml +++ b/config_Mandriva_2010.0.xml @@ -1078,6 +1078,7 @@ Python + docutils Python diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml index 1d17085..31d636d 100755 --- a/config_Mandriva_2010.0_64bit.xml +++ b/config_Mandriva_2010.0_64bit.xml @@ -1078,6 +1078,7 @@ Python + docutils Python diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml index 7401ce4..b08d9e0 100755 --- a/config_Red_Hat_Enterprise_WS_4_64bit.xml +++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml @@ -1092,6 +1092,7 @@ Python + docutils Python diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml index 22c7f74..dfca6e0 100755 --- a/config_Scientific_SL_5.1_64bit.xml +++ b/config_Scientific_SL_5.1_64bit.xml @@ -1092,6 +1092,7 @@ Python + docutils Python diff --git a/config_files/Sphinx.sh b/config_files/Sphinx.sh index ecb16a5..ff8cd04 100755 --- a/config_files/Sphinx.sh +++ b/config_files/Sphinx.sh @@ -1,12 +1,12 @@ #!/bin/bash -noprofile #################################################################################### -# File : sphinx-1.0.7.sh +# File : Sphinx.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2008 CEA +# Copyright : 2002-2012 CEA # # This script is the part of the SALOME installation procedure. # @@ -77,13 +77,11 @@ install_source # build sources test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -mkdir ${PRODUCT_DIR}/bin -mkdir ${PRODUCT_DIR}/lib -mkdir ${PRODUCT_DIR}/lib/python${PYTHON_VERSION} -mkdir ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages +mkdir -p ${PRODUCT_DIR}/bin +mkdir -p ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages -export PYTHONPATH=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/lib/python${PYTHON_VERSION}/site-packages:${PYTHONPATH} -export PATH=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:${PATH} +export PYTHONPATH=${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages:${PYTHONPATH} +export PATH=${PRODUCT_DIR}/bin:${PATH} export PYTHONDONTWRITEBYTECODE= @@ -99,29 +97,11 @@ cd ${PRODUCT_SRC_DIR}/Sphinx-${SPHINX_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MA cd ${PRODUCT_DIR}/bin; -sed -e "s%#\!.*python%#\!/usr/bin/env python%" easy_install > _easy_install -mv -f _easy_install easy_install -chmod a+x easy_install - -sed -e "s%#\!.*python%#\!/usr/bin/env python%" easy_install-${PYTHON_VERSION} > _easy_install-${PYTHON_VERSION} -mv -f _easy_install-${PYTHON_VERSION} easy_install-${PYTHON_VERSION} -chmod a+x easy_install-${PYTHON_VERSION} - -sed -e "s%#\!.*python%#\!/usr/bin/env python%" pygmentize > _pygmentize -mv -f _pygmentize pygmentize -chmod a+x pygmentize - -sed -e "s%#\!.*python%#\!/usr/bin/env python%" sphinx-build > _sphinx-build -mv -f _sphinx-build sphinx-build -chmod a+x sphinx-build - -sed -e "s%#\!.*python%#\!/usr/bin/env python%" sphinx-quickstart > _sphinx-quickstart -mv -f _sphinx-quickstart sphinx-quickstart -chmod a+x sphinx-quickstart - -sed -e "s%#\!.*python%#\!/usr/bin/env python%" sphinx-autogen > _sphinx-autogen -mv -f _sphinx-autogen sphinx-autogen -chmod a+x sphinx-autogen +scripts=`find . -type f` +for f in X $scripts ; do + if test "${f}" == "X" ; then continue ; fi + sed -i "s%#\!.*python%#\!/usr/bin/env python%" ${f} +done cd ${PRODUCT_DIR} -- 2.39.2