From 612503026ef21233320e39fe440495c1636154eb Mon Sep 17 00:00:00 2001 From: jfa Date: Mon, 13 Mar 2006 16:16:27 +0000 Subject: [PATCH] Join modifications from branch OCC_development_for_3_2_0a2 --- Makefile.in | 9 +-- adm_local/Makefile.in | 41 +++++++++++ adm_local/unix/config_files/check_GUI.m4 | 65 ----------------- adm_local/unix/config_files/check_LIGHT.m4 | 53 ++++++++++++++ adm_local/unix/make_commence.in | 85 ++++++++++++---------- build_configure | 16 +++- configure.in.base | 67 +++++++++-------- 7 files changed, 193 insertions(+), 143 deletions(-) create mode 100644 adm_local/Makefile.in delete mode 100755 adm_local/unix/config_files/check_GUI.m4 create mode 100755 adm_local/unix/config_files/check_LIGHT.m4 diff --git a/Makefile.in b/Makefile.in index e0aca87..4e09f83 100644 --- a/Makefile.in +++ b/Makefile.in @@ -30,17 +30,12 @@ top_srcdir=@top_srcdir@ top_builddir=. srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl:${KERNEL_ROOT_DIR}/idl/salome +VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin @COMMENCE@ -ifeq (@WITHIHM@,no) - SUBDIRS = src -endif -ifeq (@WITHIHM@,yes) - SUBDIRS = src -endif +SUBDIRS = src adm_local RESOURCES_FILES = \ LIGHT.png \ diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in new file mode 100644 index 0000000..9b5e810 --- /dev/null +++ b/adm_local/Makefile.in @@ -0,0 +1,41 @@ +# source path +top_srcdir=@top_srcdir@ +top_builddir=.. +srcdir=@srcdir@ +VPATH=.:$(srcdir)/adm_local + + +all: resources + +install: + cp -rf @top_srcdir@/adm_local @prefix@ + +bin: + +resources : + cp -rf @top_srcdir@/adm_local $(top_builddir) + +inc: + +lib: + +depend: + +depend_idl: + +install-end: + +install-include: + +install-bin: + +uninstall: + +uninstall-idl: + +distclean: + +clean: + +distclean-other: + diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4 deleted file mode 100755 index 73a026e..0000000 --- a/adm_local/unix/config_files/check_GUI.m4 +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -# -#------------------------------------------------------------ -# Check availability of Salome binary distribution -# -# Author : Marc Tajchman (CEA, 2002) -#------------------------------------------------------------ - -AC_DEFUN([CHECK_SALOME_GUI],[ - -AC_CHECKING(for Salome GUI) - -SalomeGUI_ok=no - -AC_ARG_WITH(gui, - --with-salome_gui=DIR root directory path of SALOME GUI installation, - SALOME_GUI_DIR="$withval",SALOME_GUI_DIR="") - -if test "x$SALOME_GUI_DIR" = "x" ; then - if test "x$GUI_ROOT_DIR" != "x" ; then - SALOME_GUI_DIR=$GUI_ROOT_DIR - else - # search Salome binaries in PATH variable - AC_PATH_PROG(TEMP, SUITApp) - if test "x$TEMP" != "x" ; then - SALOME_GUI_BIN_DIR=`dirname $TEMP` - SALOME_GUI_DIR=`dirname $SALOME_GUI_BIN_DIR` - fi - fi -fi - -if test "x$SALOME_GUI_DIR" != "x" ; then - if test -f ${SALOME_GUI_DIR}/bin/salome/SUITApp ; then - SalomeGUI_ok=yes - AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR}) - GUI_ROOT_DIR=${SALOME_GUI_DIR} - fi -fi -if test "x$SalomeGUI_ok" == "xno" ; then - AC_MSG_WARN("Cannot find compiled SALOME GUI distribution") -fi - -AC_SUBST(GUI_ROOT_DIR) - -AC_MSG_RESULT(for SALOME GUI: $SalomeGUI_ok) - -])dnl - diff --git a/adm_local/unix/config_files/check_LIGHT.m4 b/adm_local/unix/config_files/check_LIGHT.m4 new file mode 100755 index 0000000..69e16f2 --- /dev/null +++ b/adm_local/unix/config_files/check_LIGHT.m4 @@ -0,0 +1,53 @@ +# Check availability of LIGHT module binary distribution +# +# Author : Marc Tajchman (CEA, 2002) +#------------------------------------------------------------ + +AC_DEFUN([CHECK_LIGHT],[ + +AC_CHECKING(for Light) + +Light_ok=no + +AC_ARG_WITH(gui, + --with-light=DIR root directory path of LIGHT installation, + LIGHT_DIR="$withval",LIGHT_DIR="") + +if test "x$LIGHT_DIR" = "x" ; then + +# no --with-light option used + + if test "x$LIGHT_ROOT_DIR" != "x" ; then + + # LIGHT_ROOT_DIR environment variable defined + LIGHT_DIR=$LIGHT_ROOT_DIR + + else + + # search LIGHT binaries in PATH variable + AC_PATH_PROG(TEMP, libLIGHT.so) + if test "x$TEMP" != "x" ; then + LIGHT_BIN_DIR=`dirname $TEMP` + LIGHT_DIR=`dirname $LIGHT_BIN_DIR` + fi + + fi +# +fi + +if test -f ${LIGHT_DIR}/lib/salome/libLIGHT.so ; then + Light_ok=yes + AC_MSG_RESULT(Using LIGHT distribution in ${LIGHT_DIR}) + + if test "x$LIGHT_ROOT_DIR" == "x" ; then + LIGHT_ROOT_DIR=${LIGHT_DIR} + fi + AC_SUBST(LIGHT_ROOT_DIR) +else + AC_MSG_WARN("Cannot find compiled LIGHT distribution") +fi + +AC_MSG_RESULT(for LIGHT: $Light_ok) + +])dnl + diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 4ece646..a2e0a8c 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -1,6 +1,8 @@ # common directories to put headerfiles inc_builddir=$(top_builddir)/include/salome +GUI_DISABLE_CORBA=@GUI_DISABLE_CORBA@ + @SET_MAKE@ SHELL=@SHELL@ @@ -131,52 +133,52 @@ SWIG = @SWIG@ SWIG_FLAGS = @SWIG_FLAGS@ -I$(inc_builddir) -I$(srcdir) -I. # OMNIORB +# +#OMNIORB_ROOT = @OMNIORB_ROOT@ +#OMNIORB_INCLUDES = @OMNIORB_INCLUDES@ +#OMNIORB_LIBS = @OMNIORB_LIBS@ +#OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ -OMNIORB_ROOT = @OMNIORB_ROOT@ -OMNIORB_INCLUDES = @OMNIORB_INCLUDES@ -OMNIORB_LIBS = @OMNIORB_LIBS@ -OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ - -OMNIORB_IDL = @OMNIORB_IDL@ -OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/salome/idl \ - -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome +#OMNIORB_IDL = @OMNIORB_IDL@ +#OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +#OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/salome/idl \ +# -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome -OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ -OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ -OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@ +#OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ +#OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +#OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@ -OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@ -OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@ -OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@ +#OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@ +#OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@ +#OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@ # Default ORB -CORBA_ROOT = @CORBA_ROOT@ -CORBA_INCLUDES = @CORBA_INCLUDES@ -CORBA_LIBS = @CORBA_LIBS@ -CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ +#CORBA_ROOT = @CORBA_ROOT@ +#CORBA_INCLUDES = @CORBA_INCLUDES@ +#CORBA_LIBS = @CORBA_LIBS@ +#CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ -IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome -IDLPYFLAGS = @IDLPYFLAGS@ +#IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome \ +# -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome +#IDLPYFLAGS = @IDLPYFLAGS@ -IDL = @IDL@ +#IDL = @IDL@ -IDL_CLN_H = @IDL_CLN_H@ -IDL_CLN_CXX = @IDL_CLN_CXX@ -IDL_CLN_OBJ = @IDL_CLN_OBJ@ +#IDL_CLN_H = @IDL_CLN_H@ +#IDL_CLN_CXX = @IDL_CLN_CXX@ +#IDL_CLN_OBJ = @IDL_CLN_OBJ@ -IDL_SRV_H = @IDL_SRV_H@ -IDL_SRV_CXX = @IDL_SRV_CXX@ -IDL_SRV_OBJ = @IDL_SRV_OBJ@ +#IDL_SRV_H = @IDL_SRV_H@ +#IDL_SRV_CXX = @IDL_SRV_CXX@ +#IDL_SRV_OBJ = @IDL_SRV_OBJ@ -CPPFLAGS+= $(CORBA_INCLUDES) -CXXFLAGS+= $(CORBA_CXXFLAGS) +#CPPFLAGS+= $(CORBA_INCLUDES) +#CXXFLAGS+= $(CORBA_CXXFLAGS) # add corba libs when link salome application ! #LDFLAGS+= $(CORBA_LIBS) -LIBS+=$(CORBA_LIBS) +#LIBS+=$(CORBA_LIBS) DOXYGEN = @DOXYGEN@ @@ -253,13 +255,20 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base ACLOCAL_SRC = \ -ac_cxx_bool.m4 check_corba.m4 check_vtk.m4 \ +ac_cxx_bool.m4 \ ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ -ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ -ac_cxx_partial_specialization.m4 check_opengl.m4 python.m4 \ +ac_cxx_namespaces.m4 pyembed.m4 \ +ac_cxx_partial_specialization.m4 python.m4 \ ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ -ac_cc_warnings.m4 check_qt.m4 check_swig.m4 +ac_cc_warnings.m4 + +ACLOCAL_GUI = \ +check_vtk.m4 check_opengl.m4 check_qt.m4 \ +check_GUI.m4 + +$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ + $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) + cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ + -I @GUI_ROOT_DIR@/adm_local/unix/config_files -$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) - cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files diff --git a/build_configure b/build_configure index ab0f71c..3571d17 100755 --- a/build_configure +++ b/build_configure @@ -48,6 +48,14 @@ fi # echo "failed : KERNEL_SRC variable is not correct !" # exit #fi +######################################################################## +# Test if the GUI_ROOT_DIR is set correctly + +if test ! -d "${GUI_ROOT_DIR}"; then + echo "failed : GUI_ROOT_DIR variable is not correct !" + exit +fi + ######################################################################## # find_in - utility function # @@ -77,6 +85,7 @@ find_in() case $1 in */CVS) return ;; + */adm_local/*) return ;; *) ;; esac @@ -151,7 +160,7 @@ echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1 +#echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1 echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 @@ -162,7 +171,6 @@ echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 # c'est à dire le make_conclude (resp. make_commence) du répertoire # adm_local echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 \rm -f configure.in_tmp2 configure.in_tmp3 touch configure.in_tmp2 @@ -173,7 +181,6 @@ find_in . configure.in_tmp2 # restrictions imposées par les versions récente de autoconf. sed -e '/^ \.\/salome_adm/d' \ -e '/configure.in/d' \ - -e '/^ \.\/adm_local/d' \ -e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1 echo "])" >> configure.in_tmp1 @@ -238,7 +245,8 @@ else echo -n "Creating 'configure' script ... " fi -aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files +aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files if autoconf then echo "done" diff --git a/configure.in.base b/configure.in.base index f5e5582..e1c2367 100644 --- a/configure.in.base +++ b/configure.in.base @@ -45,6 +45,13 @@ AC_SUBST(PACKAGE) VERSION=0.0.1 AC_SUBST(VERSION) +dnl +dnl Initialize disable corba variable +dnl + +GUI_DISABLE_CORBA=yes +CHECK_DISABLE_CORBA + dnl dnl Initialize source and build root directories dnl @@ -201,13 +208,13 @@ dnl echo dnl CHECK_JAVA -echo -echo --------------------------------------------- -echo testing swig -echo --------------------------------------------- -echo - -CHECK_SWIG +#echo +#echo --------------------------------------------- +#echo testing swig +#echo --------------------------------------------- +#echo +# +#CHECK_SWIG echo echo --------------------------------------------- @@ -217,13 +224,13 @@ echo ENABLE_PTHREADS -echo -echo --------------------------------------------- -echo testing omniORB -echo --------------------------------------------- -echo - -CHECK_OMNIORB +#echo +#echo --------------------------------------------- +#echo testing omniORB +#echo --------------------------------------------- +#echo +# +#CHECK_OMNIORB dnl echo dnl echo --------------------------------------------- @@ -233,18 +240,18 @@ dnl echo dnl CHECK_MICO -echo -echo --------------------------------------------- -echo default ORB : omniORB -echo --------------------------------------------- -echo +#echo +#echo --------------------------------------------- +#echo default ORB : omniORB +#echo --------------------------------------------- +#echo -DEFAULT_ORB=omniORB -CHECK_CORBA +#DEFAULT_ORB=omniORB +#CHECK_CORBA -AC_SUBST_FILE(CORBA) -corba=make_$ORB -CORBA=adm_local/unix/$corba +#AC_SUBST_FILE(CORBA) +#corba=make_$ORB +#CORBA=adm_local/unix/$corba echo echo --------------------------------------------- @@ -325,7 +332,8 @@ echo --------------------------------------------- echo echo Configure -variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok SalomeGUI_ok" +#variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok SalomeGUI_ok" +variables="cc_ok lex_yacc_ok python_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok occ_ok doxygen_ok graphviz_ok Kernel_ok SalomeGUI_ok" for var in $variables do @@ -333,14 +341,15 @@ do eval echo \$$var done -echo -echo "Default ORB : $DEFAULT_ORB" -echo +#echo +#echo "Default ORB : $DEFAULT_ORB" +#echo dnl generals files which could be included in every makefile AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence -AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +AC_SUBST_FILE(CONCLUDE) CONCLUDE=${GUI_ROOT_DIR}/adm_local/unix/make_conclude +#AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module dnl les dependences -- 2.39.2