]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Remove expat
authorvsr <vsr@opencascade.com>
Mon, 24 Nov 2014 15:24:48 +0000 (18:24 +0300)
committervsr <vsr@opencascade.com>
Mon, 24 Nov 2014 15:24:48 +0000 (18:24 +0300)
config_CentOS_5.5_64bit.xml
config_CentOS_6.3_64bit.xml
config_Debian_6.0_64bit.xml
config_Debian_7_64bit.xml
config_Fedora_18_64bit.xml
config_Mandriva_2010.0_64bit.xml
config_Ubuntu_13.10_64bit.xml
config_files/common.sh
config_files/expat.sh [deleted file]
config_files/graphviz.sh

index abbc3f99aac67b91b4d9726e21a5e92ec40080e2..0287ebdf76b348bd12ead85bfc32de403d0b38ec 100755 (executable)
              description="C library for parsing XML">
       <installation os="CentOS 5.5 64bit"
                     version="2.0.1" 
-                   disable="false"
+                   disable="true"
                    installdiskspace="1129,2391,6233"
                    script="expat.sh"/>
     </product>
       <dep>Python</dep>
       <dep>tcltk</dep>
       <dep>Swig</dep>
-      <dep>expat</dep>
     </product>
     <product name="Doxygen">
       <dep>gcc</dep>
index 1ce617962900b8680004e63131fd9534e2c8992e..9419ae9f2d0d013b6737b83776e4d9f110514322 100755 (executable)
              description="C library for parsing XML">
       <installation os="CentOS 6.3 64bit"
                     version="2.0.1" 
-                   disable="false"
+                   disable="true"
                    installdiskspace="1129,2391,6233"
                    script="expat.sh"/>
     </product>
       <dep>Python</dep>
       <dep>tcltk</dep>
       <dep>Swig</dep>
-      <dep>expat</dep>
     </product>
     <product name="Doxygen">
       <dep>Graphviz</dep>
index 70b61168949d6d99d8d7a32afbdb25c2062028c6..5d46998030522816ee868dafd7fb0c39161fe12e 100755 (executable)
              description="C library for parsing XML">
       <installation os="Debian 6.0 64bit"
                     version="2.0.1" 
-                   disable="false"
+                   disable="true"
                    installdiskspace="1129,2391,6233"
                    script="expat.sh"/>
     </product>
       <dep>Python</dep>
       <dep>tcltk</dep>
       <dep>Swig</dep>
-      <dep>expat</dep>
     </product>
     <product name="Doxygen">
       <dep>Graphviz</dep>
index 63d4a21bbf787aa20eee01d3980b8626e5c450be..3d150bf8db026f0a9803d1ff788dc0e76da767a1 100644 (file)
              description="C library for parsing XML">
       <installation os="Debian 7 64bit"
                     version="2.0.1" 
-                   disable="false"
+                   disable="true"
                    installdiskspace="1129,2391,6233"
                    script="expat.sh"/>
     </product>
       <dep>Python</dep>
       <dep>tcltk</dep>
       <dep>Swig</dep>
-      <dep>expat</dep>
     </product>
     <product name="Doxygen">
       <dep>Graphviz</dep>
index 641d3af72dbb1f825ee7088ec821dd5c16a01234..691832bd20ff053580338a67b06ec3c81ad216ec 100755 (executable)
              description="C library for parsing XML">
       <installation os="Fedora 18 64bit"
                     version="2.0.1" 
-                   disable="false"
+                   disable="true"
                    installdiskspace="1129,2391,6233"
                    script="expat.sh"/>
     </product>
       <dep>Python</dep>
       <dep>tcltk</dep>
       <dep>Swig</dep>
-      <dep>expat</dep>
     </product>
     <product name="Doxygen">
       <dep>Graphviz</dep>
index 6329bff8ceb246a0b6d76bffdecdd15e4fa0fcd3..362308a60022bef0f1f19597ade25e7f316e8137 100755 (executable)
              description="C library for parsing XML">
       <installation os="Mandriva 2010.0 64bit"
                     version="2.0.1" 
-                   disable="false"
+                   disable="true"
                    installdiskspace="1129,2391,6233"
                    script="expat.sh"/>
     </product>
       <dep>Python</dep>
       <dep>tcltk</dep>
       <dep>Swig</dep>
-      <dep>expat</dep>
     </product>
     <product name="Doxygen">
       <dep>Graphviz</dep>
index caf50ce4882fe59338d32b7307b4e838a71c5118..09620625ed3f658e5526ea546a88deeac9e604e9 100644 (file)
              description="C library for parsing XML">
       <installation os="Ubuntu 13.10 64bit"
                     version="2.0.1" 
-                   disable="false"
+                   disable="true"
                    installdiskspace="1129,2391,6233"
                    script="expat.sh"/>
     </product>
       <dep>Python</dep>
       <dep>tcltk</dep>
       <dep>Swig</dep>
-      <dep>expat</dep>
     </product>
     <product name="Doxygen">
       <dep>Graphviz</dep>
index 0644fa60985c1b24c05c031f827b6fa913443220..c2d0042056c356cca937f8b5e090a4396011db3c 100755 (executable)
@@ -781,8 +781,6 @@ fi
 graphvizdir=${GRAPHVIZ_ROOT_DIR}/lib
 # qscintilla dir
 qscintilladir=${QSCINTILLA_ROOT_DIR}/lib
-# expat dir
-expatdir=${EXPAT_ROOT_DIR}/lib
 # paraview dir
 paraviewdir=${PARAVIEW_ROOT_DIR}/lib
 # qt dir
@@ -949,11 +947,6 @@ if [ "${l}" != "X" ] ; then
        sed -i "s%[[:space:]]\(-L\)\?[^[:space:]]*QScintilla-[0-9]\.[0-9]\(\.[0-9]\)\?/lib% \1${qscintilladir}%g" ${l}
     fi
 
-    # . process expat-2.0.1 dependencies
-    if [ -n "${expatdir}" ] && [ -d "${expatdir}" ] ; then
-       sed -i "s%-L[^[:space:]]*expat[^[:space:]]*/lib%-L${expatdir}%g;s%[^[:space:]]*expat[^[:space:]]*/lib/libexpat.la%-lexpat%g" ${l}
-    fi
-
     # . process ParaView dependencies
     if [ -n "${paraviewdir}" ] && [ -d "${paraviewdir}" ] ; then
        sed -i "s%[[:space:]]\(-L\)\?[^[:space:]]*ParaView-[0-9]\.[0-9]\+\.[0-9]/lib% \1${paraviewdir}%g" ${l}
@@ -1015,9 +1008,6 @@ modif_cfg_file(){
     if [ "${LIBXML2_ROOT_DIR}" != "" ] ; then
        sed -i "s%\([^/]*\)[^; ]*/libxml2-[0-9.]\+%\1${LIBXML2_ROOT_DIR}%g" $1
     fi
-    if [ "${EXPAT_ROOT_DIR}" != "" ] ; then
-       sed -i "s%\([^/]*\)[^; ]*/expat-[0-9.]\+%\1${EXPAT_ROOT_DIR}%g" $1
-    fi
     if [ "${FREETYPE_ROOT_DIR}" != "" ] ; then
        sed -i "s%\([^/]*\)[^; ]*/freetype-[0-9.]\+%\1${FREETYPE_ROOT_DIR}%g" $1
     fi
diff --git a/config_files/expat.sh b/config_files/expat.sh
deleted file mode 100755 (executable)
index a5c7f98..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : expat.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-2014 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-#
-# expat version
-#
-VERSION_EXPAT=2.0.1
-
-check_version(){
-if [ "${EXPAT_ROOT_DIR}" != "" ] && [ -f ${EXPAT_ROOT_DIR}/include/expat.h ] ; then
-    ver_major=`grep "#define XML_MAJOR_VERSION" ${EXPAT_ROOT_DIR}/include/expat.h | awk '{print $3}'`
-    ver_minor=`grep "#define XML_MINOR_VERSION" ${EXPAT_ROOT_DIR}/include/expat.h | awk '{print $3}'`
-    ver_maint=`grep "#define XML_MICRO_VERSION" ${EXPAT_ROOT_DIR}/include/expat.h | awk '{print $3}'`
-    ver="${ver_major}.${ver_minor}.${ver_maint}"
-    if [ "${ver}" = "${VERSION_EXPAT}" ] ; then
-        return 0
-    fi
-fi
-return 1
-}
-
-print_env_bin(){
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#${DELIM} ${PRODUCT_TYPE} ${DELIM}
-export EXPAT_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${EXPAT_ROOT_DIR}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${EXPAT_ROOT_DIR}/lib:\${LD_LIBRARY_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}
-
-if [ "${SALOME_IW_COMPSIZE}" = "1" ] ; then
-    du -sk ${PRODUCT_SRC_DIR} > ${INST_ROOT}/${PRODUCT_TYPE}.src.size
-fi
-
-# 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}
-
-# install
-local CONFIGURE_OPTIONS="--prefix=${PRODUCT_DIR}"
-cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
--------------------
-Used options: ${CONFIGURE_OPTIONS}
--------------------
-EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure ${CONFIGURE_OPTIONS}
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/MAKE.LOG make install
-
-cd ${PRODUCT_DIR}
-
-if [ "${SALOME_IW_COMPSIZE}" = "1" ] ; then
-    du -sk ${PRODUCT_SRC_DIR} > ${INST_ROOT}/${PRODUCT_TYPE}.build.size
-    du -sk ${PRODUCT_DIR}     > ${INST_ROOT}/${PRODUCT_TYPE}.bin.size
-fi
-
-# 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}
-
-# modify libdir
-for l in XXX `find ${PRODUCT_DIR}/lib -name "*.la"`; do
-    if [ "${l}" = "XXX" ] ; then continue; fi
-    sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" ${l}
-done
-
-# 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="expat-${VERSION_EXPAT}"
-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} 
index cd6dd059a526a787f27a6e5bba5eacd2c01142ea..6218392f95cd5953fec735d51081a87ef522f385 100755 (executable)
@@ -95,10 +95,7 @@ if [ "${patch_build_procedure}" = "1" ] ; then
     sed -i "s%echo 'puts \[info tclversion\]' | \$TCLSH%echo 'puts \[info tclversion\]' | \$TCLSH 2>/dev/null | grep -E '^[0-9.]+$'%g" configure
 fi
 
-CONFIGURE_FLAGS="--prefix=${PRODUCT_DIR} --disable-rpath --disable-tcl --without-qt"
-if [ "${EXPAT_ROOT_DIR}" != "" ] ; then
-    CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-expat --with-expatincludedir=${EXPAT_ROOT_DIR}/include --with-expatlibdir=${EXPAT_ROOT_DIR}/lib  --enable-perl=no "
-fi
+CONFIGURE_FLAGS="--prefix=${PRODUCT_DIR} --disable-rpath --disable-tcl --without-qt --without-expat --enable-perl=no"
 if test `uname -m` = "x86_64" ; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} CFLAGS=-m64 CXXFLAGS=-m64"
 fi
@@ -146,11 +143,9 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 pydir=""
 tcldir=""
 freetypedir=""
-expatdir=""
 if [ -n "${PYTHON_ROOT_DIR}" ] ; then pydir=${PYTHON_ROOT_DIR} ; fi
 if [ -n "${TCLHOME}" ] ; then tcldir=${TCLHOME} ; fi
 if [ -n "${FREETYPE_ROOT_DIR}" ] ; then freetypedir=${FREETYPE_ROOT_DIR} ; fi
-if [ "${EXPAT_ROOT_DIR}" != "" ] ; then expatdir=${EXPAT_ROOT_DIR}/lib ; fi
 
 for l in X `find ${PRODUCT_DIR}/lib -name "*.la"`; do
     if [ "${l}" != "X" ] ; then
@@ -158,7 +153,6 @@ for l in X `find ${PRODUCT_DIR}/lib -name "*.la"`; do
         sed -i "s%[[:space:]]\(-L\)\?[^[:space:]]*Python[^[:space:]]*/lib% \1${pydir}/lib%g" ${l}
         sed -i "s%[[:space:]]\(-L\)\?[^[:space:]]*tcltk[^[:space:]]*/lib% \1${tcldir}/lib%g" ${l}
        sed -i "s%[[:space:]]\(-L\)\?[^[:space:]]*freetype[^[:space:]]*/lib\(/libfreetype\.la\)% \1${freetypedir}/lib\2%g" ${l}
-        sed -i "s%-L[^[:space:]]*expat[^[:space:]]*/lib%-L${expatdir}%g;s%[^[:space:]]*expat[^[:space:]]*/lib/libexpat.la%-lexpat%g" ${l}
 
         lpath=`dirname ${l}`
         libdir=`grep -e "^libdir=.*" ${l} | sed -e "s/^libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`