From 4de564c92d8d2f33f7ca1032b4de37a3150bb4ac Mon Sep 17 00:00:00 2001 From: jfa Date: Sat, 6 May 2006 09:02:02 +0000 Subject: [PATCH] Join modifications from branch OCC_debug_for_3_2_0b1 --- Makefile.in | 3 ++- adm_local/Makefile.in | 19 +++++++++++++++++++ adm_local/unix/make_commence.in | 24 ++++++++++++++++-------- build_configure | 4 ++-- resources/SalomeApp.xml | 11 +++++++++++ src/SierpinskyGUI/Makefile.in | 2 +- src/SierpinskyGUI/SIERPINSKY_icons.po | 18 ++++++++++++++++++ src/SierpinskyGUI/SIERPINSKY_msg_en.po | 18 ++++++++++++++++++ 8 files changed, 87 insertions(+), 12 deletions(-) create mode 100644 resources/SalomeApp.xml diff --git a/Makefile.in b/Makefile.in index 504e999..ca3a461 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,7 +20,8 @@ RESOURCES_FILES = \ SIERPINSKY.png \ go.png \ graph1.xml \ - graph2.xml + graph2.xml \ + SalomeApp.xml BIN_SCRIPT = VERSION 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 d74ac23..6e6bd28 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -251,7 +251,13 @@ 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 make_omniorb + +KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript + +$(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ + $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/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 :-) @@ -266,7 +272,7 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base cd $(top_srcdir) && ./build_configure -ACLOCAL_SRC = \ +ACLOCAL_KERNEL = \ 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 \ @@ -284,12 +290,14 @@ ACLOCAL_RAND = check_RANDOMIZER.m4 ACLOCAL_VISU = check_VISU.m4 ACLOCAL_CUR = check_gd.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/%) \ - $(ACLOCAL_MED:%=@MED_ROOT_DIR@/adm_local/unix/config_files/%) - $(ACLOCAL_VISU:%=@VISU_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 \ + $(ACLOCAL_MED:%=@MED_ROOT_DIR@/adm_local/unix/config_files/%) \ + $(ACLOCAL_VISU:%=@VISU_ROOT_DIR@/adm_local/unix/config_files/%) \ + $(ACLOCAL_RAND:%=@RANDOMIZER_ROOT_DIR@/adm_local/unix/config_files/%) \ + $(ACLOCAL_CUR:%=$(top_srcdir)/adm_local/unix/config_files/%) + cd $(top_srcdir) ; 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 \ -I @MED_ROOT_DIR@/adm_local/unix/config_files \ - -I @RANDOMIZER_ROOT_DIR@/adm_local/unix/config_files \ - -I @VISU_ROOT_DIR@/adm_local/unix/config_files + -I @VISU_ROOT_DIR@/adm_local/unix/config_files \ + -I @RANDOMIZER_ROOT_DIR@/adm_local/unix/config_files diff --git a/build_configure b/build_configure index 66adba8..80ce3de 100755 --- a/build_configure +++ b/build_configure @@ -160,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:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 @@ -170,7 +170,7 @@ 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 " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 \rm -f configure.in_tmp2 configure.in_tmp3 diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml new file mode 100644 index 0000000..dde8c9d --- /dev/null +++ b/resources/SalomeApp.xml @@ -0,0 +1,11 @@ + +
+ + + +
+
+ + +
+ diff --git a/src/SierpinskyGUI/Makefile.in b/src/SierpinskyGUI/Makefile.in index ac2042f..cde2f8f 100644 --- a/src/SierpinskyGUI/Makefile.in +++ b/src/SierpinskyGUI/Makefile.in @@ -33,7 +33,7 @@ LIB_MOC = \ LIB_CLIENT_IDL = SALOME_Component.idl SALOME_Exception.idl SALOMEDS.idl Sierpinsky.idl Randomizer.idl \ SALOME_GenericObj.idl SALOMEDS_Attributes.idl SALOME_Comm.idl MED.idl VISU_Gen.idl -CPPFLAGS+= $(QT_INCLUDES) $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) +CPPFLAGS+= $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) CXXFLAGS+= $(QT_INCLUDES) $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome diff --git a/src/SierpinskyGUI/SIERPINSKY_icons.po b/src/SierpinskyGUI/SIERPINSKY_icons.po index d1fc0e8..3b19f50 100644 --- a/src/SierpinskyGUI/SIERPINSKY_icons.po +++ b/src/SierpinskyGUI/SIERPINSKY_icons.po @@ -1,3 +1,21 @@ +# 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/ +# # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. "Foo::Bar" # would be translated to "Pub", not "Foo::Pub". diff --git a/src/SierpinskyGUI/SIERPINSKY_msg_en.po b/src/SierpinskyGUI/SIERPINSKY_msg_en.po index 7777329..aa604a4 100644 --- a/src/SierpinskyGUI/SIERPINSKY_msg_en.po +++ b/src/SierpinskyGUI/SIERPINSKY_msg_en.po @@ -1,3 +1,21 @@ +# 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/ +# # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. translating # from French to English, "Foo::Bar" would be translated to "Pub", -- 2.30.2