From 42c4cf75d819c8eefcedcac3ba9932bc96185700 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 17 Feb 2009 08:40:37 +0000 Subject: [PATCH] Merge from BR_V5_DEV 17Feb09 --- HELLO_version.h.in | 36 +++---- Makefile.am | 25 ++--- adm_local/Makefile.am | 41 ++++---- adm_local/unix/Makefile.am | 40 ++++---- adm_local/unix/config_files/Makefile.am | 42 ++++---- adm_local/unix/config_files/README | 3 - adm_local/unix/config_files/check_HELLO.m4 | 21 ++++ adm_local/unix/make_common_starter.am | 68 +++++++++---- bin/Makefile.am | 59 +++++------ bin/myrunSalome.py | 9 +- bin/runAppli.in | 23 ++++- build_configure | 25 ++++- clean_configure | 35 +++++++ configure.ac | 39 +++++--- .../HELLO_icons.po => doc/Makefile.am | 22 ++--- idl/HELLO_Gen.idl | 29 +++--- idl/Makefile.am | 66 ++++++------- resources/HELLO.png | Bin 831 -> 3444 bytes resources/HELLOCatalog.xml.in | 23 +++++ resources/Makefile.am | 10 +- resources/SalomeApp.xml | 23 +++++ src/HELLO/HELLO.cxx | 29 +++--- src/HELLO/HELLO.hxx | 29 +++--- src/HELLO/Makefile.am | 39 ++++---- src/HELLOGUI/HELLOGUI.cxx | 51 +++++----- src/HELLOGUI/HELLOGUI.h | 30 +++--- src/HELLOGUI/HELLO_icons.ts | 33 +++++++ src/HELLOGUI/HELLO_msg_en.po | 80 --------------- src/HELLOGUI/HELLO_msg_en.ts | 92 ++++++++++++++++++ src/HELLOGUI/HELLO_msg_fr.po | 80 --------------- src/HELLOGUI/HELLO_msg_fr.ts | 92 ++++++++++++++++++ src/HELLOGUI/Makefile.am | 9 +- src/HELLOGUI/old/HELLO_msg_en.po | 34 ------- src/HELLOGUI/old/HELLO_msg_fr.po | 34 ------- src/Makefile.am | 38 ++++---- 35 files changed, 748 insertions(+), 561 deletions(-) delete mode 100644 adm_local/unix/config_files/README create mode 100755 clean_configure rename src/HELLOGUI/HELLO_icons.po => doc/Makefile.am (54%) mode change 100644 => 100755 create mode 100644 src/HELLOGUI/HELLO_icons.ts delete mode 100644 src/HELLOGUI/HELLO_msg_en.po create mode 100644 src/HELLOGUI/HELLO_msg_en.ts delete mode 100644 src/HELLOGUI/HELLO_msg_fr.po create mode 100644 src/HELLOGUI/HELLO_msg_fr.ts delete mode 100644 src/HELLOGUI/old/HELLO_msg_en.po delete mode 100644 src/HELLOGUI/old/HELLO_msg_fr.po diff --git a/HELLO_version.h.in b/HELLO_version.h.in index ccb3486..4b40fb5 100644 --- a/HELLO_version.h.in +++ b/HELLO_version.h.in @@ -1,26 +1,28 @@ -// 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. +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// See http://www.salome-platform.org/ +// 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/ or email : webmaster.salome@opencascade.com // // File : HELLO_version.h // Author : Vadim SANDLER // Module : SALOME - +// #if !defined(__HELLO_VERSION_H__) #define __HELLO_VERSION_H__ diff --git a/Makefile.am b/Makefile.am index 17cc541..89ed790 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,7 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 @@ -14,31 +17,29 @@ # 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/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -* Makefile *- -# # Author : Patrick GOLDBRONN (CEA) # Date : 28/06/2001 # Modified by : Alexander BORODIN (OCN) - autotools usage # $Header: # - include $(top_srcdir)/adm_local/unix/make_common_starter.am +ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files -SUBDIRS = idl adm_local resources src bin - -DIST_SUBDIRS = idl adm_local resources src bin +SUBDIRS = idl adm_local resources src bin doc DISTCLEANFILES = a.out aclocal.m4 configure -salomeinclude_DATA=HELLO_version.h +salomeinclude_DATA = HELLO_version.h -EXTRA_DIST+= \ - build_configure \ - clean_configure \ - LICENCE +EXTRA_DIST += \ + build_configure \ + clean_configure dist-hook: rm -rf `find $(distdir) -name CVS` diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 7ae83a6..f35273f 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,19 +1,24 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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/ or email : webmaster.salome@opencascade.com -# +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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/ or email : webmaster.salome@opencascade.com +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + SUBDIRS = unix diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index facd4e6..5f6d5f7 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,22 +1,24 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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/ or email : webmaster.salome@opencascade.com -# - +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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/ or email : webmaster.salome@opencascade.com +# include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index 9c9edea..bb3a217 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,23 +1,25 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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/ or email : webmaster.salome@opencascade.com -# +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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/ or email : webmaster.salome@opencascade.com +# include $(top_srcdir)/adm_local/unix/make_common_starter.am -dist_admlocalm4_DATA= \ - README \ +dist_admlocalm4_DATA = \ check_HELLO.m4 diff --git a/adm_local/unix/config_files/README b/adm_local/unix/config_files/README deleted file mode 100644 index feb997b..0000000 --- a/adm_local/unix/config_files/README +++ /dev/null @@ -1,3 +0,0 @@ -This file is only here for CVS: -CVS does not always create empty directory, and adm_local/unix/config_file -is needed by build_configure. diff --git a/adm_local/unix/config_files/check_HELLO.m4 b/adm_local/unix/config_files/check_HELLO.m4 index f87dc2f..3e8038b 100755 --- a/adm_local/unix/config_files/check_HELLO.m4 +++ b/adm_local/unix/config_files/check_HELLO.m4 @@ -1,3 +1,24 @@ +dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl # Check availability of HELLO module binary distribution # # Author : Marc Tajchman (CEA, 2002) diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 5339413..36ad8c3 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,49 +1,83 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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/ or email : webmaster.salome@opencascade.com # # ============================================================ # This file defines the common definitions used in several # Makefile. This file must be included, if needed, by the file # Makefile.am. # ============================================================ -# - # Standard directory for installation -salomeincludedir = $(includedir)/@PACKAGE@ -libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ -bindir = $(prefix)/bin/@PACKAGE@ +# +salomeincludedir = $(includedir)/salome +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome +bindir = $(prefix)/bin/salome salomescriptdir = $(bindir) +salomepythondir = $(pythondir)/salome +salomepyexecdir = $(pyexecdir)/salome # Directory for installing idl files -salomeidldir = $(prefix)/idl/@PACKAGE@ +salomeidldir = $(prefix)/idl/salome # Directory for installing resource files -salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ +salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ # Directories for installing admin files -admlocaldir = $(prefix)/adm_local -admlocalunixdir = $(admlocaldir)/unix -admlocalm4dir = $(admlocaldir)/unix/config_files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files # Shared modules installation directory -sharedpkgpythondir =$(pkgpythondir)/shared_modules +sharedpkgpythondir = $(salomepythondir)/shared_modules # Documentation directory -docdir = $(datadir)/doc/@PACKAGE@ +docdir = $(datadir)/doc/salome # common rules -# moc-files generation +# meta object implementation files generation (moc) %_moc.cxx: %.h $(MOC) $< -o $@ -# qm-files generation -%.qm: %.po - $(MSG2QM) $< $@ +# translation (*.qm) files generation (lrelease) +%.qm: %.ts + $(LRELEASE) $< -qm $@ + +# resource files generation (qrcc) +qrc_%.cxx: %.qrc + $(QRCC) $< -o $@ -name $(*F) + +# qt forms files generation (uic) +ui_%.h: %.ui + $(UIC) -o $@ $< -EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po) +# extra distributed files +EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ + $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) +# customize clean operation mostlyclean-local: rm -f @builddir@/*_moc.cxx rm -f @builddir@/*.qm + rm -f @builddir@/ui_*.h + rm -f @builddir@/qrc_*.cxx # tests tests: unittest diff --git a/bin/Makefile.am b/bin/Makefile.am index 9aa3859..f9eb701 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,40 +1,35 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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/ or email : webmaster.salome@opencascade.com -# -* Makefile *- +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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/ or email : webmaster.salome@opencascade.com +# +# -* Makefile *- # Author : Guillaume Boulant (CSSI) # Module : COMPONENT # - include $(top_srcdir)/adm_local/unix/make_common_starter.am -# -# =============================================================== -# Files to be installed -# =============================================================== -# - -# These files are data, module or lib files - -dist_salomescript_DATA= \ +dist_salomescript_SCRIPTS = \ myrunSalome.py -nodist_salomescript_DATA= \ - VERSION \ - runAppli -EXTRA_DIST+= VERSION.in runAppli.in +nodist_salomescript_SCRIPTS = \ + runAppli + +nodist_salomescript_DATA = \ + VERSION diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py index 083461d..e0909d2 100755 --- a/bin/myrunSalome.py +++ b/bin/myrunSalome.py @@ -1,4 +1,7 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 @@ -14,10 +17,10 @@ # 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/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # #!/usr/bin/env python - +# def test(clt): """ Test function that creates an instance of HELLO component diff --git a/bin/runAppli.in b/bin/runAppli.in index 8e448e2..d6c8e33 100755 --- a/bin/runAppli.in +++ b/bin/runAppli.in @@ -1,4 +1,25 @@ #!/bin/sh +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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/ or email : webmaster.salome@opencascade.com +# if [ -z "${KERNEL_ROOT_DIR}" ] ; then export KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ @@ -41,4 +62,4 @@ searchFreePort() { searchFreePort -${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $HELLO_ROOT_DIR/bin/salome/myrunSalome.py --modules=HELLO --containers=cpp,python --killall +${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $HELLO_ROOT_DIR/bin/salome/myrunSalome.py --modules=HELLO --killall diff --git a/build_configure b/build_configure index 3c8e79e..4f365ac 100755 --- a/build_configure +++ b/build_configure @@ -1,14 +1,31 @@ #!/bin/bash - +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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/ or email : webmaster.salome@opencascade.com # # Tool for updating list of .in file for the SALOME project # and regenerating configure script -# # Author : # Modified by : Alexander BORODIN (OCN) - autotools usage # Date : 10/10/2002 - - +# ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` diff --git a/clean_configure b/clean_configure new file mode 100755 index 0000000..f57f7b3 --- /dev/null +++ b/clean_configure @@ -0,0 +1,35 @@ +#!/bin/sh +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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/ or email : webmaster.salome@opencascade.com +# +rm -rf autom4te.cache aclocal.m4 configure make_config +find . -name "*~" -print -exec rm {} \; +find . -name "*.pyc" -print -exec rm {} \; +#exit +# ==================== ON SORT AVANT + +find bin -name Makefile.in | xargs rm -f +find doc -name Makefile.in | xargs rm -f +find idl -name Makefile.in | xargs rm -f +find resources -name Makefile.in | xargs rm -f +find salome_adm -name Makefile.in | xargs rm -f +find src -name Makefile.in | xargs rm -f +rm -f Makefile.in diff --git a/configure.ac b/configure.ac index 7ac36ce..3859142 100644 --- a/configure.ac +++ b/configure.ac @@ -1,21 +1,35 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # -# PLEASE DO NOT MODIFY configure.in FILE +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # -# ALL CHANGES WILL BE DISCARDED BY THE NEXT -# build_configure COMMAND +# 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. # -# CHANGES MUST BE MADE IN configure.in.base FILE +# 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/ or email : webmaster.salome@opencascade.com # +# PLEASE DO NOT MODIFY configure.in FILE +# ALL CHANGES WILL BE DISCARDED BY THE NEXT +# build_configure COMMAND +# CHANGES MUST BE MADE IN configure.in.base FILE # Author : Marc Tajchman (CEA) # Date : 28/06/2001 # Modified by : Patrick GOLDBRONN (CEA) # Modified by : Marc Tajchman (CEA) -# # Created from configure.in.base # - -AC_INIT([Salome2 Project HELLO module],[4.1.1], [webmaster.salome@opencascade.com], [salome]) +AC_INIT([Salome2 Project HELLO module],[5.1.0], [webmaster.salome@opencascade.com], [SalomeHELLO]) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -154,14 +168,6 @@ echo CHECK_QT -echo -echo --------------------------------------------- -echo testing msg2qm -echo --------------------------------------------- -echo - -CHECK_MSG2QM - echo echo --------------------------------------------- echo BOOST Library @@ -235,7 +241,7 @@ echo --------------------------------------------- echo echo Configure -variables="cc_ok threads_ok boost_ok python_ok omniORB_ok qt_ok msg2qm_ok Kernel_ok SalomeGUI_ok" +variables="cc_ok threads_ok boost_ok python_ok omniORB_ok qt_ok Kernel_ok SalomeGUI_ok" for var in $variables do @@ -276,6 +282,7 @@ AC_OUTPUT([ \ ./bin/VERSION \ ./bin/runAppli \ ./bin/Makefile \ + ./doc/Makefile \ ./HELLO_version.h \ ./resources/HELLOCatalog.xml \ ./src/Makefile \ diff --git a/src/HELLOGUI/HELLO_icons.po b/doc/Makefile.am old mode 100644 new mode 100755 similarity index 54% rename from src/HELLOGUI/HELLO_icons.po rename to doc/Makefile.am index f5b4919..ab3e5c7 --- a/src/HELLOGUI/HELLO_icons.po +++ b/doc/Makefile.am @@ -1,4 +1,7 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 @@ -14,19 +17,10 @@ # 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/ or email : webmaster.salome@opencascade.com +# 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" -# would be translated to "Pub", not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2002-05-28 10:57:43 AM CEST\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" +include $(top_srcdir)/adm_local/unix/make_common_starter.am -msgid "ICON_GET_BANNER" -msgstr "ExecHELLO.png" +dist_doc_DATA = dev_guide.html +EXTRA_DIST += dev_guide.txt diff --git a/idl/HELLO_Gen.idl b/idl/HELLO_Gen.idl index 9b7089e..9245978 100644 --- a/idl/HELLO_Gen.idl +++ b/idl/HELLO_Gen.idl @@ -1,20 +1,23 @@ -// Copyright (C) 2005 CEA/DEN, EDF R&D +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, 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. +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// 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. +// 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. // -// 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 +// 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. // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// 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/ or email : webmaster.salome@opencascade.com // #ifndef __HELLO_GEN__ #define __HELLO_GEN__ diff --git a/idl/Makefile.am b/idl/Makefile.am index 1d49082..5911ed4 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,37 +1,35 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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/ or email : webmaster.salome@opencascade.com -# - +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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/ or email : webmaster.salome@opencascade.com # # This Makefile is responsible of generating the client and server # implementation of IDL interfaces for both C++ and python usage. # The building process of the C++ files is in charge of each source # package and then is not manage here. # - include $(top_srcdir)/adm_local/unix/make_common_starter.am BASEIDL_FILES = HELLO_Gen.idl -EXTRA_DIST+= $(BASEIDL_FILES) - # This variable defines the files to be installed -salomeidl_DATA = $(BASEIDL_FILES) +dist_salomeidl_DATA = $(BASEIDL_FILES) # GUI idl common library lib_LTLIBRARIES = libSalomeIDLHELLO.la @@ -43,18 +41,18 @@ nodist_libSalomeIDLHELLO_la_SOURCES = \ HELLO_GenDynSK.cc: HELLO_GenSK.cc # header files must be exported: other modules have to use this library -nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh) +nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) -libSalomeIDLHELLO_la_CPPFLAGS =\ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/salome_adm/unix \ - -I$(top_builddir)/idl \ - @CORBA_CXXFLAGS@ \ +libSalomeIDLHELLO_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ \ @CORBA_INCLUDES@ libSalomeIDLHELLO_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeIDLHELLO_la_LIBADD = \ - $(KERNEL_LDFLAGS) -lSalomeIDLKernel \ +libSalomeIDLHELLO_la_LIBADD = \ + $(KERNEL_LDFLAGS) -lSalomeIDLKernel \ @CORBA_LIBS@ # These variables defines the building process of CORBA files @@ -83,14 +81,14 @@ SUFFIXES = .idl .hh SK.cc $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) - $(INSTALL) -d $(pkgpythondir) + $(INSTALL) -d $(DESTDIR)$(salomepythondir) ls $^ | while read file; do \ - $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \ + $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ done # uninstall-local removes too much, but it works in distcheck uninstall-local: - rm -rf $(pkgpythondir)/* + rm -rf $(DESTDIR)$(salomepythondir)/* mostlyclean-local: -rm -f *.hh *.cc .depidl diff --git a/resources/HELLO.png b/resources/HELLO.png index 16a20c116e8243a6b49ed862613d2cc49bdf4caa..21ebc33f771ebda37cbd5cdac69d920d4c240d57 100644 GIT binary patch literal 3444 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 F{{#NTOzQvu delta 822 zcmV-61IhgK8ovfHiBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxI{*Lx1ZP1_ zK>z@;j|==^1(6{ae*)o2L_t(|oW+$*YZGZ4z<+&aY&UGFg4G(*dXR<1k0C4~q!-!m zP`Z0AW!3JjdbCB#9`ztnWxL$Ml}ZWUZ_zXE zeYG}Js}B7#A#CHib=KF{I0;WhJU%{7tJR{>*!ft37QWx&;Gju9pQl!<@bcx_5!7|- z6bfspOoj%fw!iNZh7rbSEXyX2W8yeQYtUMuwPtvDm@o`kT3Tjx^(k7*p??JTm&6!I z5{WSeDHU2Pf09I^wMHpP5CmMmej^3_Y{b6bqTTjM5{XhVg~AJ7zy1?|>FH@MUObOd zhQq^%&CMdWZvC2q+x@_Pg_JQ$DGG%bJbwIyVzG#2o#E=$@5yGf#Bm5%IplY1BB@I((}Bdlpj1;;nAaqNZEDBWHP2)F0;K|e?lou7>0B@ZO)xLix4(9Z~lnZ za_A`Hw{Ocd8VwxBA)n8qH7KP3u&gskDFGN6$uKrHiZR_rN}14Z`#4UOD2mcG?k`2H zR>Ak*lO&RzojSEzojZ3H7#Ydnx>Y>S!*Qx8Whj-lnV+9O0`^K_pA-mTo88@AMn}KJ z7|q1QePfzG&~%qf-#0DirL!QIOhM^sp!GqyxAfM0;JR*$E!QXNfM)! zMk!6R=`lO|^T2T%xGP+@P7nmdag3BPS}T;&NSUCNAq)?B_pZgn#3h!Omr@gz0)P5V z|6*n3H?Cd#fsKtn*xTDDib6ho2q=}ddH(!&d}d~5Xf{1ATsY6|+rJEi9|OO7wQla- zT{QiRMhM%?&i-WX-(ND>Z0?wDVPV0{&CUJ$IvunIuUz@gJbU)kEH2(l=}xsaq1)Y) z&B$cFVQOj;%SxFKwEs^>2-{3fPJP*@>HnO+0hzznl0FD~L;wH)07*qoM6N<$f&vYT ASpWb4 diff --git a/resources/HELLOCatalog.xml.in b/resources/HELLOCatalog.xml.in index 980bfaa..f7ab5e9 100644 --- a/resources/HELLOCatalog.xml.in +++ b/resources/HELLOCatalog.xml.in @@ -1,4 +1,27 @@ + diff --git a/resources/Makefile.am b/resources/Makefile.am index 2ff9720..ab665ba 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 @@ -17,9 +19,8 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# # $Header$ - +# include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_salomeres_DATA = \ @@ -27,4 +28,5 @@ SalomeApp.xml \ HELLO.png \ ExecHELLO.png -nodist_salomeres_DATA = HELLOCatalog.xml +# VSR: little trick to avoid putting if HELLOCatalog.xml to the distribution archive +nodist_salomeres_SCRIPTS = HELLOCatalog.xml diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index e1b607f..e3dc963 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -1,3 +1,26 @@ +
diff --git a/src/HELLO/HELLO.cxx b/src/HELLO/HELLO.cxx index aa02263..83a9439 100755 --- a/src/HELLO/HELLO.cxx +++ b/src/HELLO/HELLO.cxx @@ -1,20 +1,23 @@ -// Copyright (C) 2005 CEA/DEN, EDF R&D +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, 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. +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// 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. +// 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. // -// 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 +// 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. // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// 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/ 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 f4dad98..e37ad37 100644 --- a/src/HELLO/HELLO.hxx +++ b/src/HELLO/HELLO.hxx @@ -1,20 +1,23 @@ -// Copyright (C) 2005 CEA/DEN, EDF R&D +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, 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. +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// 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. +// 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. // -// 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 +// 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. // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// 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/ or email : webmaster.salome@opencascade.com // #ifndef _HELLO_HXX_ #define _HELLO_HXX_ diff --git a/src/HELLO/Makefile.am b/src/HELLO/Makefile.am index 72f2c22..54fe4af 100755 --- a/src/HELLO/Makefile.am +++ b/src/HELLO/Makefile.am @@ -1,30 +1,29 @@ -# SuperVisionTest AddComponent : example of component that adds two numbers +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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. # -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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/ or email : webmaster.salome@opencascade.com # +# SuperVisionTest AddComponent : example of component that adds two numbers # File : Makefile.in # Author : , CEA # Modified by : Alexander BORODIN (OCN) - autotools usage - +# include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files diff --git a/src/HELLOGUI/HELLOGUI.cxx b/src/HELLOGUI/HELLOGUI.cxx index c52954f..cd43b10 100644 --- a/src/HELLOGUI/HELLOGUI.cxx +++ b/src/HELLOGUI/HELLOGUI.cxx @@ -1,31 +1,36 @@ -// Copyright (C) 2005 CEA/DEN, EDF R&D +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, 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. +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// 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. +// 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. // -// 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 +// 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. // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// 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/ or email : webmaster.salome@opencascade.com // #include "HELLOGUI.h" #include #include +#include #include #include // QT Includes -#include +#include +#include using namespace std; @@ -52,14 +57,14 @@ void HELLOGUI::initialize( CAM_Application* app ) InitHELLOGen( dynamic_cast( app ) ); - QWidget* aParent = app->desktop(); + QWidget* aParent = application()->desktop(); SUIT_ResourceMgr* aResourceMgr = app->resourceMgr(); // create actions - createAction( 190, tr( "TLT_MY_NEW_ITEM" ), QIconSet(), tr( "MEN_MY_NEW_ITEM" ), tr( "STS_MY_NEW_ITEM" ), 0, aParent, false, + createAction( 190, tr( "TLT_MY_NEW_ITEM" ), QIcon(), tr( "MEN_MY_NEW_ITEM" ), tr( "STS_MY_NEW_ITEM" ), 0, aParent, false, this, SLOT( OnMyNewItem() ) ); QPixmap aPixmap = aResourceMgr->loadPixmap( "HELLO",tr( "ICON_GET_BANNER" ) ); - createAction( 901, tr( "TLT_GET_BANNER" ), QIconSet( aPixmap ), tr( "MEN_GET_BANNER" ), tr( "STS_GET_BANNER" ), 0, aParent, false, + createAction( 901, tr( "TLT_GET_BANNER" ), QIcon( aPixmap ), tr( "MEN_GET_BANNER" ), tr( "STS_GET_BANNER" ), 0, aParent, false, this, SLOT( OnGetBanner() ) ); // create menus @@ -108,14 +113,14 @@ bool HELLOGUI::deactivateModule( SUIT_Study* theStudy ) void HELLOGUI::windows( QMap& theMap ) const { theMap.clear(); - theMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::DockLeft ); - theMap.insert( SalomeApp_Application::WT_PyConsole, Qt::DockBottom ); + theMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea ); + theMap.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea ); } // Action slot void HELLOGUI::OnMyNewItem() { - SUIT_MessageBox::warn1( getApp()->desktop(),tr( "INF_HELLO_BANNER" ), tr( "INF_HELLO_MENU" ), tr( "BUT_OK" ) ); + SUIT_MessageBox::warning( getApp()->desktop(),tr( "INF_HELLO_BANNER" ), tr( "INF_HELLO_MENU" ) ); } // Action slot @@ -123,14 +128,14 @@ void HELLOGUI::OnGetBanner() { // Dialog to get the Name bool ok = FALSE; - QString myName = QInputDialog::getText( tr( "QUE_HELLO_LABEL" ), tr( "QUE_HELLO_NAME" ), + QString myName = QInputDialog::getText( getApp()->desktop(), tr( "QUE_HELLO_LABEL" ), tr( "QUE_HELLO_NAME" ), QLineEdit::Normal, QString::null, &ok ); if ( ok && !myName.isEmpty()) // if we got a name, get a HELLO component and ask for makeBanner { HELLO_ORB::HELLO_Gen_ptr hellogen = HELLOGUI::InitHELLOGen( getApp() ); - QString banner = hellogen->makeBanner( myName ); - SUIT_MessageBox::info1( getApp()->desktop(), tr( "INF_HELLO_BANNER" ), banner, tr( "BUT_OK" ) ); + QString banner = hellogen->makeBanner( (const char*)myName.toLatin1() ); + SUIT_MessageBox::information( getApp()->desktop(), tr( "INF_HELLO_BANNER" ), banner, tr( "BUT_OK" ) ); } } diff --git a/src/HELLOGUI/HELLOGUI.h b/src/HELLOGUI/HELLOGUI.h index d48193a..c875ae3 100644 --- a/src/HELLOGUI/HELLOGUI.h +++ b/src/HELLOGUI/HELLOGUI.h @@ -1,24 +1,26 @@ -// Copyright (C) 2005 CEA/DEN, EDF R&D +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, 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. +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// 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. +// 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. // -// 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 +// 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. // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// 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/ or email : webmaster.salome@opencascade.com // // HELLOGUI : HELLO component GUI implemetation // - #ifndef _HELLOGUI_H_ #define _HELLOGUI_H_ diff --git a/src/HELLOGUI/HELLO_icons.ts b/src/HELLOGUI/HELLO_icons.ts new file mode 100644 index 0000000..e412af0 --- /dev/null +++ b/src/HELLOGUI/HELLO_icons.ts @@ -0,0 +1,33 @@ + + + + + @default + + ICON_GET_BANNER + ExecHELLO.png + + + diff --git a/src/HELLOGUI/HELLO_msg_en.po b/src/HELLOGUI/HELLO_msg_en.po deleted file mode 100644 index f9ba694..0000000 --- a/src/HELLOGUI/HELLO_msg_en.po +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# 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/ 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 -# from French to English, "Foo::Bar" would be translated to "Pub", -# not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2003-11-19 03:10:19 PM CET\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" - -#: HELLOGUI.cxx:76 -msgid "HELLOGUI::BUT_OK" -msgstr "OK" - -#: HELLOGUI.cxx:76 -msgid "HELLOGUI::INF_HELLO_BANNER" -msgstr "HELLO Information" - -#: HELLOGUI.cxx:76 -msgid "HELLOGUI::INF_HELLO_MENU" -msgstr "This is just a test" - -#: HELLOGUI.cxx:57 -msgid "HELLOGUI::QUE_HELLO_LABEL" -msgstr "Name Import" - -#: HELLOGUI.cxx:57 -msgid "HELLOGUI::QUE_HELLO_NAME" -msgstr "Please, Enter your name" - -msgid "TLT_MY_NEW_ITEM" -msgstr "My menu item" - -msgid "MEN_MY_NEW_ITEM" -msgstr "My menu item" - -msgid "STS_MY_NEW_ITEM" -msgstr "Call my menu item" - -msgid "TLT_GET_BANNER" -msgstr "Get HELLO banner" - -msgid "MEN_GET_BANNER" -msgstr "Get banner" - -msgid "STS_GET_BANNER" -msgstr "Get HELLO banner" - -msgid "MEN_FILE" -msgstr "&File" - -msgid "MEN_FILE_HELLO" -msgstr "Hello" - -msgid "MEN_HELLO" -msgstr "HELLO" - -msgid "TOOL_HELLO" -msgstr "HELLO" - diff --git a/src/HELLOGUI/HELLO_msg_en.ts b/src/HELLOGUI/HELLO_msg_en.ts new file mode 100644 index 0000000..6a9d9d6 --- /dev/null +++ b/src/HELLOGUI/HELLO_msg_en.ts @@ -0,0 +1,92 @@ + + + + + @default + + MEN_FILE + &File + + + MEN_FILE_HELLO + Hello + + + MEN_GET_BANNER + Get banner + + + MEN_HELLO + HELLO + + + MEN_MY_NEW_ITEM + My menu item + + + STS_GET_BANNER + Get HELLO banner + + + STS_MY_NEW_ITEM + Call my menu item + + + TLT_GET_BANNER + Get HELLO banner + + + TLT_MY_NEW_ITEM + My menu item + + + TOOL_HELLO + HELLO + + + + HELLOGUI + + BUT_OK + OK + + + INF_HELLO_BANNER + HELLO Information + + + INF_HELLO_MENU + This is just a test + + + QUE_HELLO_LABEL + Name Import + + + QUE_HELLO_NAME + Please, Enter your name + + + diff --git a/src/HELLOGUI/HELLO_msg_fr.po b/src/HELLOGUI/HELLO_msg_fr.po deleted file mode 100644 index c9c9d8b..0000000 --- a/src/HELLOGUI/HELLO_msg_fr.po +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# 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/ 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 -# from French to English, "Foo::Bar" would be translated to "Pub", -# not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2003-11-19 03:10:25 PM CET\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" - -#: HELLOGUI.cxx:76 -msgid "HELLOGUI::BUT_OK" -msgstr "OK" - -#: HELLOGUI.cxx:76 -msgid "HELLOGUI::INF_HELLO_BANNER" -msgstr "Information HELLO" - -#: HELLOGUI.cxx:76 -msgid "HELLOGUI::INF_HELLO_MENU" -msgstr "Ceci est un simple test" - -#: HELLOGUI.cxx:57 -msgid "HELLOGUI::QUE_HELLO_LABEL" -msgstr "Import Prénom" - -#: HELLOGUI.cxx:57 -msgid "HELLOGUI::QUE_HELLO_NAME" -msgstr "Entrez votre prénom, s'il vous plait" - -msgid "TLT_MY_NEW_ITEM" -msgstr "My menu item" - -msgid "MEN_MY_NEW_ITEM" -msgstr "My menu item" - -msgid "STS_MY_NEW_ITEM" -msgstr "Call my menu item" - -msgid "TLT_GET_BANNER" -msgstr "Get HELLO banner" - -msgid "MEN_GET_BANNER" -msgstr "Get banner" - -msgid "STS_GET_BANNER" -msgstr "Get HELLO banner" - -msgid "MEN_FILE" -msgstr "&File" - -msgid "MEN_FILE_HELLO" -msgstr "Hello" - -msgid "MEN_HELLO" -msgstr "HELLO" - -msgid "TOOL_HELLO" -msgstr "HELLO" - diff --git a/src/HELLOGUI/HELLO_msg_fr.ts b/src/HELLOGUI/HELLO_msg_fr.ts new file mode 100644 index 0000000..67a9965 --- /dev/null +++ b/src/HELLOGUI/HELLO_msg_fr.ts @@ -0,0 +1,92 @@ + + + + + @default + + MEN_FILE + &File + + + MEN_FILE_HELLO + Hello + + + MEN_GET_BANNER + Get banner + + + MEN_HELLO + HELLO + + + MEN_MY_NEW_ITEM + My menu item + + + STS_GET_BANNER + Get HELLO banner + + + STS_MY_NEW_ITEM + Call my menu item + + + TLT_GET_BANNER + Get HELLO banner + + + TLT_MY_NEW_ITEM + My menu item + + + TOOL_HELLO + HELLO + + + + HELLOGUI + + BUT_OK + OK + + + INF_HELLO_BANNER + Information HELLO + + + INF_HELLO_MENU + Ceci est un simple test + + + QUE_HELLO_LABEL + Import Prnom + + + QUE_HELLO_NAME + Entrez votre prnom, s'il vous plait + + + diff --git a/src/HELLOGUI/Makefile.am b/src/HELLOGUI/Makefile.am index 84e15a4..2b26728 100644 --- a/src/HELLOGUI/Makefile.am +++ b/src/HELLOGUI/Makefile.am @@ -1,4 +1,7 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 @@ -14,15 +17,13 @@ # 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/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -* Makefile *- -# # Author : # Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GHS3DPLUGIN # - include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files diff --git a/src/HELLOGUI/old/HELLO_msg_en.po b/src/HELLOGUI/old/HELLO_msg_en.po deleted file mode 100644 index 479f879..0000000 --- a/src/HELLOGUI/old/HELLO_msg_en.po +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# 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/ 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" -# would be translated to "Pub", not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2002-05-28 10:57:43 AM CEST\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" - -msgid "HELLO_INF_NAME" -msgstr "Name Import" - -msgid "HELLO_MSG_NAME" -msgstr "Please, Enter your name" diff --git a/src/HELLOGUI/old/HELLO_msg_fr.po b/src/HELLOGUI/old/HELLO_msg_fr.po deleted file mode 100644 index 66736ae..0000000 --- a/src/HELLOGUI/old/HELLO_msg_fr.po +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# 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/ 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" -# would be translated to "Pub", not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2002-05-28 10:57:43 AM CEST\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" - -msgid "HELLO_INF_NAME" -msgstr "Import Prénom" - -msgid "HELLO_MSG_NAME" -msgstr "Entrez votre prénom, s'il vous plait" diff --git a/src/Makefile.am b/src/Makefile.am index a5ac613..a28933c 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,28 +1,28 @@ -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # +# Copyright (C) 2003-2007 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/ or email : webmaster.salome@opencascade.com # # File : Makefile.in # Author : (CEA) # Modified by : Alexander BORODIN (OCN) - autotools usage - +# include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = HELLO HELLOGUI -- 2.39.2