From a34eb9b3fc607c1198421687e8e7224cecaa5d1b Mon Sep 17 00:00:00 2001 From: jfa Date: Sat, 6 May 2006 09:00:40 +0000 Subject: [PATCH] Join modifications from branch OCC_debug_for_3_2_0b1 --- INSTALL | 6 +++--- Makefile.in | 1 + adm_local/Makefile.in | 19 +++++++++++++++++++ adm_local/unix/make_commence.in | 15 ++++++++++++--- bin/VERSION | 2 +- build_configure | 8 ++++++-- configure.in.base | 5 ++--- resources/SalomeApp.xml | 11 +++++++++++ src/LIGHTGUI/Makefile.in | 2 +- 9 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 resources/SalomeApp.xml diff --git a/INSTALL b/INSTALL index 4633077..c79562f 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -This is the version 3.2.0a2 of LIGHT (sample no-corba-engine) SALOME module +This is the version 3.2.0b1 of LIGHT (sample no-corba-engine) SALOME module Compatible with : - - KERNEL 3.2.0a2 - - SALOMEGUI 3.2.0a2 + - KERNEL 3.2.0b1 + - SALOMEGUI 3.2.0b1 diff --git a/Makefile.in b/Makefile.in index 4e09f83..e7b9568 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,6 +38,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin SUBDIRS = src adm_local RESOURCES_FILES = \ + SalomeApp.xml \ LIGHT.png \ line_icon.png \ paragraph_icon.png \ diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in index 9b5e810..06e2ec9 100644 --- a/adm_local/Makefile.in +++ b/adm_local/Makefile.in @@ -1,3 +1,22 @@ +# Copyright (C) 2005 OPEN CASCADE +# +# 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.salome-platform.org/ +# + # source path top_srcdir=@top_srcdir@ top_builddir=.. diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index a2e0a8c..32014eb 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -239,7 +239,16 @@ all: Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in cd $(top_builddir) ; ./config.status -$(top_builddir)/config.status: $(top_srcdir)/configure +LOCAL_MAKE = make_commence + +KERNEL_MAKE = make_module depend SALOMEconfig.h F77config.h sstream envScript + +GUI_MAKE = make_conclude + +$(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ + $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) \ + $(GUI_MAKE:%=$(GUI_ROOT_DIR)/adm_local/unix/%.in) cd $(top_builddir) ; ./config.status --recheck # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) @@ -254,7 +263,7 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base cd $(top_srcdir) && ./build_configure -ACLOCAL_SRC = \ +ACLOCAL_KERNEL = \ ac_cxx_bool.m4 \ ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ @@ -267,7 +276,7 @@ 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/%) \ +$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@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/bin/VERSION b/bin/VERSION index 4f7cac1..f61d093 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SAMPLE LIGHT (NO-CORBA-ENGINE) MODULE : VERSION: 3.2.0a2 +THIS IS SAMPLE LIGHT (NO-CORBA-ENGINE) MODULE : VERSION: 3.2.0b1 diff --git a/build_configure b/build_configure index 3571d17..dcbd686 100755 --- a/build_configure +++ b/build_configure @@ -144,6 +144,10 @@ fi echo "" >> configure.in_tmp1 echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 +# make a link allowing AC_OUTPUT to find the GUI make_conlude.in files +echo "" >> configure.in_tmp1 +echo 'ln -fs ${GUI_ROOT_DIR}/adm_local ${ROOT_SRCDIR}/gui_adm' >> configure.in_tmp1 + echo "" >> configure.in_tmp1 echo "AC_OUTPUT([ \\" >> configure.in_tmp1 @@ -160,7 +164,6 @@ 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 " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 @@ -170,7 +173,8 @@ echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 # salome_adm, par le make_conclude (resp. make_commence) du module, # c'est à dire le make_conclude (resp. make_commence) du répertoire # adm_local -echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1 +echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +echo " ./gui_adm/unix/make_conclude \\" >> configure.in_tmp1 \rm -f configure.in_tmp2 configure.in_tmp3 touch configure.in_tmp2 diff --git a/configure.in.base b/configure.in.base index e1c2367..8a357c6 100644 --- a/configure.in.base +++ b/configure.in.base @@ -348,8 +348,7 @@ done 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=${GUI_ROOT_DIR}/adm_local/unix/make_conclude -#AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +AC_SUBST_FILE(CONCLUDE) CONCLUDE=gui_adm/unix/make_conclude AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module dnl les dependences @@ -364,7 +363,7 @@ else fi # make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl +for rep in salome_adm gui_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl do # if test ! -d $rep ; then # eval mkdir $rep diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml new file mode 100644 index 0000000..91e66f2 --- /dev/null +++ b/resources/SalomeApp.xml @@ -0,0 +1,11 @@ + +
+ + + +
+
+ + +
+ diff --git a/src/LIGHTGUI/Makefile.in b/src/LIGHTGUI/Makefile.in index bc84ee5..fcf33f5 100644 --- a/src/LIGHTGUI/Makefile.in +++ b/src/LIGHTGUI/Makefile.in @@ -56,7 +56,7 @@ LIB_MOC = \ # additionnal compilation flags CPPFLAGS += \ - $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${BOOSTDIR} \ + $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \ -I${GUI_ROOT_DIR}/include/salome # additionnal linkage flags -- 2.39.2