From: vsr Date: Mon, 24 Nov 2014 15:24:48 +0000 (+0300) Subject: Remove expat X-Git-Tag: V7_5_0~10 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a2772ff2cbda2600eed75fd64266953538d797cd;p=tools%2Finstall.git Remove expat --- diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index abbc3f9..0287ebd 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -612,7 +612,7 @@ description="C library for parsing XML"> @@ -1231,7 +1231,6 @@ Python tcltk Swig - expat gcc diff --git a/config_CentOS_6.3_64bit.xml b/config_CentOS_6.3_64bit.xml index 1ce6179..9419ae9 100755 --- a/config_CentOS_6.3_64bit.xml +++ b/config_CentOS_6.3_64bit.xml @@ -603,7 +603,7 @@ description="C library for parsing XML"> @@ -1153,7 +1153,6 @@ Python tcltk Swig - expat Graphviz diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml index 70b6116..5d46998 100755 --- a/config_Debian_6.0_64bit.xml +++ b/config_Debian_6.0_64bit.xml @@ -603,7 +603,7 @@ description="C library for parsing XML"> @@ -1153,7 +1153,6 @@ Python tcltk Swig - expat Graphviz diff --git a/config_Debian_7_64bit.xml b/config_Debian_7_64bit.xml index 63d4a21..3d150bf 100644 --- a/config_Debian_7_64bit.xml +++ b/config_Debian_7_64bit.xml @@ -603,7 +603,7 @@ description="C library for parsing XML"> @@ -1153,7 +1153,6 @@ Python tcltk Swig - expat Graphviz diff --git a/config_Fedora_18_64bit.xml b/config_Fedora_18_64bit.xml index 641d3af..691832b 100755 --- a/config_Fedora_18_64bit.xml +++ b/config_Fedora_18_64bit.xml @@ -603,7 +603,7 @@ description="C library for parsing XML"> @@ -1153,7 +1153,6 @@ Python tcltk Swig - expat Graphviz diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml index 6329bff..362308a 100755 --- a/config_Mandriva_2010.0_64bit.xml +++ b/config_Mandriva_2010.0_64bit.xml @@ -603,7 +603,7 @@ description="C library for parsing XML"> @@ -1148,7 +1148,6 @@ Python tcltk Swig - expat Graphviz diff --git a/config_Ubuntu_13.10_64bit.xml b/config_Ubuntu_13.10_64bit.xml index caf50ce..0962062 100644 --- a/config_Ubuntu_13.10_64bit.xml +++ b/config_Ubuntu_13.10_64bit.xml @@ -603,7 +603,7 @@ description="C library for parsing XML"> @@ -1153,7 +1153,6 @@ Python tcltk Swig - expat Graphviz diff --git a/config_files/common.sh b/config_files/common.sh index 0644fa6..c2d0042 100755 --- a/config_files/common.sh +++ b/config_files/common.sh @@ -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 index a5c7f98..0000000 --- a/config_files/expat.sh +++ /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 < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${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 < ${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} diff --git a/config_files/graphviz.sh b/config_files/graphviz.sh index cd6dd05..6218392 100755 --- a/config_files/graphviz.sh +++ b/config_files/graphviz.sh @@ -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"`