From: jfa Date: Thu, 1 Jun 2006 11:52:13 +0000 (+0000) Subject: Join modifications from branch BR_DEBUG_3_2_0b1 X-Git-Tag: T3_2_0b2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0f6233f2102032f7f6e5f4dde2657175d7bd80f4;p=samples%2Fhello.git Join modifications from branch BR_DEBUG_3_2_0b1 --- diff --git a/HELLO_version.h.in b/HELLO_version.h.in new file mode 100644 index 0000000..ccb3486 --- /dev/null +++ b/HELLO_version.h.in @@ -0,0 +1,34 @@ +// Copyright (C) 2005 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.salome-platform.org/ +// +// File : HELLO_version.h +// Author : Vadim SANDLER +// Module : SALOME + +#if !defined(__HELLO_VERSION_H__) +#define __HELLO_VERSION_H__ + +/* + HELLO_VERSION is (major << 16) + (minor << 8) + patch. +*/ + +#define HELLO_VERSION_STR "@VERSION@" +#define HELLO_VERSION @XVERSION@ + +#endif // __HELLO_VERSION_H__ diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..fdc6546 --- /dev/null +++ b/INSTALL @@ -0,0 +1 @@ +SALOME2 : HELLO module (sample) diff --git a/Makefile.in b/Makefile.in index 3789d4b..26630e1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -* Makefile *- # @@ -27,7 +27,8 @@ top_srcdir=@top_srcdir@ top_builddir=. srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl +VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl + @COMMENCE@ @@ -38,14 +39,22 @@ RESOURCES_FILES = HELLOCatalog.xml HELLO.png ExecHELLO.png SalomeApp.xml BIN_SCRIPT= VERSION runAppli myrunSalome.py # copy header files in common directory -ifeq ($(HAVE_SSTREAM),yes) - include_list=include/salome/SALOMEconfig.h -else - include_list=include/salome/SALOMEconfig.h include/salome/sstream + +include_list = include/salome/SALOMEconfig.h \ + include/salome/HELLO_version.h + +ifneq ($(HAVE_SSTREAM),yes) + include_list += include/salome/sstream endif inc: idl $(include_list) +bin: bin/salome/VERSION + +bin/salome/VERSION : bin/VERSION + -$(RM) $@ + $(LN_S) ../../$< $@ + include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref -$(RM) $@ $(LN_S) ../../$< $@ @@ -63,6 +72,10 @@ include/salome/sstream: salome_adm/unix/sstream -$(RM) $@ $(LN_S) ../../$< $@ +include/salome/HELLO_version.h: HELLO_version.h + -$(RM) $@ + $(LN_S) ../../$< $@ + depend: depend_idl depend_idl: diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in index 40ceced..cfbe6f4 100644 --- a/adm_local/Makefile.in +++ b/adm_local/Makefile.in @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # source path top_srcdir=@top_srcdir@ diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 1b1ae26..f13ea5d 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -10,7 +10,7 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome +LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ @@ -51,8 +51,8 @@ PYTHONHOME = @PYTHONHOME@ PYTHON_INCLUDES = @PYTHON_INCLUDES@ PYTHON_LIBS = @PYTHON_LIBS@ PYTHON_VERSION = @PYTHON_VERSION@ -PYTHON_SITE = @PYTHON_SITE@ -PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ +PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages +PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome # QT @@ -191,16 +191,25 @@ INSTALL_DATA=@INSTALL_DATA@ # create a symbolic link (or a copie ?) LN_S=@LN_S@ +KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ +KERNEL_SITE_DIR=@KERNEL_SITE_DIR@ +KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ +KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ + +GUI_ROOT_DIR=@GUI_ROOT_DIR@ +GUI_LDFLAGS=@GUI_LDFLAGS@ +GUI_CXXFLAGS=@GUI_CXXFLAGS@ + ## Installation points prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@/salome -libdir=@libdir@/salome +libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome # warning : if user give this path in configure we could have salome/salome :-( includedir=@includedir@/salome datadir=@datadir@/salome idldir=$(prefix)/idl/salome -sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules +sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules docdir=$(datadir)/doc diff --git a/bin/VERSION b/bin/VERSION deleted file mode 100755 index cb9975d..0000000 --- a/bin/VERSION +++ /dev/null @@ -1,2 +0,0 @@ -SALOME 2 EXEMPLE MODULE C++ : HELLO : 3.2.0b1 -This module works with KERNEL 3.2.0b1, SALOMEGUI 3.2.0b1 diff --git a/bin/VERSION.in b/bin/VERSION.in new file mode 100755 index 0000000..6b2d2af --- /dev/null +++ b/bin/VERSION.in @@ -0,0 +1 @@ +SALOME 2 EXEMPLE MODULE C++ : HELLO : @VERSION@ diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py index 7ad3220..083461d 100755 --- a/bin/myrunSalome.py +++ b/bin/myrunSalome.py @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # #!/usr/bin/env python diff --git a/configure.in.base b/configure.in.base index 3eba28a..214efbe 100644 --- a/configure.in.base +++ b/configure.in.base @@ -22,8 +22,10 @@ AC_CANONICAL_HOST PACKAGE=salome AC_SUBST(PACKAGE) -VERSION=1.2.1 +VERSION=3.2.0 +XVERSION=0x030200 AC_SUBST(VERSION) +AC_SUBST(XVERSION) dnl dnl Initialize source and build root directories @@ -130,14 +132,6 @@ echo ENABLE_PTHREADS -echo -echo --------------------------------------------- -echo BOOST Library -echo --------------------------------------------- -echo - -CHECK_BOOST - echo echo --------------------------------------------- echo testing python @@ -162,6 +156,14 @@ echo CHECK_MSG2QM +echo +echo --------------------------------------------- +echo BOOST Library +echo --------------------------------------------- +echo + +CHECK_BOOST + echo echo --------------------------------------------- echo Testing OpenCascade @@ -264,7 +266,7 @@ else fi # make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl +for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources share/salome/doc idl do $INSTALL -d $rep done diff --git a/idl/HELLO_Gen.idl b/idl/HELLO_Gen.idl index 683b374..9b7089e 100644 --- a/idl/HELLO_Gen.idl +++ b/idl/HELLO_Gen.idl @@ -14,7 +14,7 @@ // 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/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef __HELLO_GEN__ #define __HELLO_GEN__ diff --git a/idl/Makefile.in b/idl/Makefile.in index 6b3f94b..fc27897 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # generate dependencies for idl file : diff --git a/resources/HELLOCatalog.xml b/resources/HELLOCatalog.xml deleted file mode 100644 index 7e44727..0000000 --- a/resources/HELLOCatalog.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - HELLO - HELLO GUI - Data - C. Caremoli - 3.2.0a1 - EDF - RD - 1 - HELLO.png - 'linux' ~ OS - - - - diff --git a/resources/HELLOCatalog.xml.in b/resources/HELLOCatalog.xml.in new file mode 100644 index 0000000..980bfaa --- /dev/null +++ b/resources/HELLOCatalog.xml.in @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + HELLO + HELLO GUI + Data + C. Caremoli + @VERSION@ + EDF - RD + 1 + HELLO.png + 'linux' ~ OS + + + + diff --git a/src/HELLO/HELLO.cxx b/src/HELLO/HELLO.cxx index 4898279..aa02263 100755 --- a/src/HELLO/HELLO.cxx +++ b/src/HELLO/HELLO.cxx @@ -14,7 +14,7 @@ // 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/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // using namespace std; #include "HELLO.hxx" diff --git a/src/HELLO/HELLO.hxx b/src/HELLO/HELLO.hxx index 363ea27..f4dad98 100644 --- a/src/HELLO/HELLO.hxx +++ b/src/HELLO/HELLO.hxx @@ -14,7 +14,7 @@ // 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/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _HELLO_HXX_ #define _HELLO_HXX_ diff --git a/src/HELLO/Makefile.in b/src/HELLO/Makefile.in index 749c79c..87221e4 100644 --- a/src/HELLO/Makefile.in +++ b/src/HELLO/Makefile.in @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # source path top_srcdir=@top_srcdir@ @@ -37,10 +37,9 @@ EXPORT_PYSCRIPTS = # additionnal information to compil and link file -CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -# CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(KERNEL_CXXFLAGS) -LDFLAGS+= -lSalomeContainer -lOpUtil -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lOpUtil # Executables targets diff --git a/src/HELLOGUI/HELLOGUI.cxx b/src/HELLOGUI/HELLOGUI.cxx index ebe2798..c52954f 100644 --- a/src/HELLOGUI/HELLOGUI.cxx +++ b/src/HELLOGUI/HELLOGUI.cxx @@ -14,7 +14,7 @@ // 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/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "HELLOGUI.h" diff --git a/src/HELLOGUI/HELLOGUI.h b/src/HELLOGUI/HELLOGUI.h index 2c365a2..d48193a 100644 --- a/src/HELLOGUI/HELLOGUI.h +++ b/src/HELLOGUI/HELLOGUI.h @@ -14,7 +14,7 @@ // 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/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // HELLOGUI : HELLO component GUI implemetation // diff --git a/src/HELLOGUI/HELLO_icons.po b/src/HELLOGUI/HELLO_icons.po index c9878e1..f5b4919 100644 --- a/src/HELLOGUI/HELLO_icons.po +++ b/src/HELLOGUI/HELLO_icons.po @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. "Foo::Bar" diff --git a/src/HELLOGUI/HELLO_msg_en.po b/src/HELLOGUI/HELLO_msg_en.po index cb70000..f9ba694 100644 --- a/src/HELLOGUI/HELLO_msg_en.po +++ b/src/HELLOGUI/HELLO_msg_en.po @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. translating diff --git a/src/HELLOGUI/HELLO_msg_fr.po b/src/HELLOGUI/HELLO_msg_fr.po index 2b5bd2f..c9c9d8b 100644 --- a/src/HELLOGUI/HELLO_msg_fr.po +++ b/src/HELLOGUI/HELLO_msg_fr.po @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. translating diff --git a/src/HELLOGUI/Makefile.in b/src/HELLOGUI/Makefile.in index 9702e9c..a3e328c 100644 --- a/src/HELLOGUI/Makefile.in +++ b/src/HELLOGUI/Makefile.in @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # source path top_srcdir=@top_srcdir@ @@ -42,9 +42,9 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -LDFLAGS += -lSalomeApp -lHELLOEngine -L${KERNEL_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome +CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +LDFLAGS += -lSalomeApp -lHELLOEngine $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) diff --git a/src/HELLOGUI/old/HELLO_msg_en.po b/src/HELLOGUI/old/HELLO_msg_en.po index a9bb894..479f879 100644 --- a/src/HELLOGUI/old/HELLO_msg_en.po +++ b/src/HELLOGUI/old/HELLO_msg_en.po @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. "Foo::Bar" diff --git a/src/HELLOGUI/old/HELLO_msg_fr.po b/src/HELLOGUI/old/HELLO_msg_fr.po index 7f22da7..66736ae 100644 --- a/src/HELLOGUI/old/HELLO_msg_fr.po +++ b/src/HELLOGUI/old/HELLO_msg_fr.po @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. "Foo::Bar" diff --git a/src/Makefile.in b/src/Makefile.in index 654ffb2..78ce2e7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # #============================================================================== # File : Makefile.in