From 1222affa75bbc3670a08eb8fbcc8dfa51ed8881a Mon Sep 17 00:00:00 2001 From: jfa Date: Mon, 13 Mar 2006 16:30:06 +0000 Subject: [PATCH] Join modifications from branch OCC_development_for_3_2_0a2 --- Makefile.in | 2 +- adm_local/Makefile.in | 41 +++++++++++++++ adm_local/unix/config_files/check_PYHELLO.m4 | 53 ++++++++++++++++++++ adm_local/unix/make_commence.in | 15 ++++-- build_configure | 16 ++++-- configure.in.base | 20 ++++++++ 6 files changed, 139 insertions(+), 8 deletions(-) create mode 100644 adm_local/Makefile.in create mode 100755 adm_local/unix/config_files/check_PYHELLO.m4 diff --git a/Makefile.in b/Makefile.in index 30d7608..33913b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,7 +13,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl @COMMENCE@ -SUBDIRS = idl src +SUBDIRS = idl src adm_local RESOURCES_FILES = PYHELLOCatalog.xml PYHELLO.png PYHELLO_en.xml \ ExecPYHELLO.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_PYHELLO.m4 b/adm_local/unix/config_files/check_PYHELLO.m4 new file mode 100755 index 0000000..6cb9c9d --- /dev/null +++ b/adm_local/unix/config_files/check_PYHELLO.m4 @@ -0,0 +1,53 @@ +# Check availability of PYHELLO binary distribution +# +# Author : Marc Tajchman (CEA, 2002) +#------------------------------------------------------------ + +AC_DEFUN([CHECK_PYHELLO],[ + +AC_CHECKING(for PyHello) + +PyHello_ok=no + +AC_ARG_WITH(pyHello, + --with-py-hello=DIR root directory path of PYHELLO installation, + PYHELLO_DIR="$withval",PYHELLO_DIR="") + +if test "x$PYHELLO_DIR" = "x" ; then + +# no --with-py-hello option used + + if test "x$PYHELLO_ROOT_DIR" != "x" ; then + + # PYHELLO_ROOT_DIR environment variable defined + PYHELLO_DIR=$PYHELLO_ROOT_DIR + + else + + # search PyHello binaries in PATH variable + AC_PATH_PROG(TEMP, PYHELLOGUI.py) + if test "x$TEMP" != "x" ; then + PYHELLO_BIN_DIR=`dirname $TEMP` + PYHELLO_DIR=`dirname $PYHELLO_BIN_DIR` + fi + + fi +# +fi + +if test -f ${PYHELLO_DIR}/bin/salome/PYHELLOGUI.py ; then + PyHello_ok=yes + AC_MSG_RESULT(Using PYHELLO distribution in ${PYHELLO_DIR}) + + if test "x$PYHELLO_ROOT_DIR" == "x" ; then + PYHELLO_ROOT_DIR=${PYHELLO_DIR} + fi + AC_SUBST(PYHELLO_ROOT_DIR) +else + AC_MSG_WARN("Cannot find compiled PYHELLO distribution") +fi + +AC_MSG_RESULT(for PYHELLO: $PyHello_ok) + +])dnl + diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 623267d..e6c484b 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -239,13 +239,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 check_corba.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_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 check_swig.m4 -$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) +ACLOCAL_GUI = \ +check_vtk.m4 check_opengl.m4 check_qt.m4 \ +check_GUI.m4 check_corba_in_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 + diff --git a/build_configure b/build_configure index 573a23b..f2ef6da 100755 --- a/build_configure +++ b/build_configure @@ -20,6 +20,14 @@ if test ! -d "${KERNEL_ROOT_DIR}"; then 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 # @@ -49,6 +57,7 @@ find_in() case $1 in */CVS) return ;; + */adm_local/*) return ;; *) ;; esac @@ -128,9 +137,9 @@ echo "./salome_adm/unix/make_module \\" >> configure.in_tmp1 touch configure.in_tmp2 find_in . configure.in_tmp2 -sed -e '/^.\/salome_adm/d' \ +sed -e '/^...salome_adm/d' \ -e '/configure.in/d' \ - -e '/^.\/adm_local/d' \ + -e '/^...adm_local/d' \ -e 's/.in / /' \ configure.in_tmp2 >> configure.in_tmp1 @@ -194,7 +203,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 9eaef0a..ec8d23d 100644 --- a/configure.in.base +++ b/configure.in.base @@ -123,6 +123,26 @@ echo CHECK_MSG2QM +echo +echo --------------------------------------------- +echo Testing GUI +echo --------------------------------------------- +echo + +CHECK_SALOME_GUI + +echo +echo --------------------------------------------- +echo Testing full GUI +echo --------------------------------------------- +echo + +CHECK_CORBA_IN_GUI +if test "x${CORBA_IN_GUI}" != "xyes"; then + echo "failed : For configure PYHELLO1 module necessary full GUI !" + exit +fi + echo echo --------------------------------------------- echo Testing Kernel -- 2.30.2