From 3e756e6a93d8d76491f24d2f93ca856594d9f764 Mon Sep 17 00:00:00 2001 From: boulant Date: Fri, 9 Dec 2005 15:01:34 +0000 Subject: [PATCH] Modification for building unit tests (src/UnitTest and src/*/Test) with automake from Makefile.am. --- Makefile.am | 4 +- bin/Makefile.am | 18 ++- configure.ac | 1 - salome_adm/unix/config_files/check_cppunit.m4 | 3 +- src/LifeCycleCORBA/Test/Makefile.am | 105 ++++++++++++++++++ src/LifeCycleCORBA/Test/Makefile.in | 70 ------------ src/Logger/Test/{Makefile.in => Makefile.am} | 44 ++------ src/Makefile.am | 27 ++--- src/SALOMELocalTrace/Makefile.am | 2 - src/SALOMETraceCollector/Makefile.am | 2 +- src/SALOMETraceCollector/Test/Makefile.am | 90 +++++++++++++++ src/SALOMETraceCollector/Test/Makefile.in | 64 ----------- src/UnitTests/Makefile.am | 83 ++++++++++++++ src/UnitTests/Makefile.in | 68 ------------ src/Utils/Makefile.am | 2 +- src/Utils/Test/Makefile.am | 88 +++++++++++++++ src/Utils/Test/Makefile.in | 64 ----------- 17 files changed, 407 insertions(+), 328 deletions(-) create mode 100644 src/LifeCycleCORBA/Test/Makefile.am delete mode 100644 src/LifeCycleCORBA/Test/Makefile.in rename src/Logger/Test/{Makefile.in => Makefile.am} (67%) create mode 100644 src/SALOMETraceCollector/Test/Makefile.am delete mode 100644 src/SALOMETraceCollector/Test/Makefile.in create mode 100644 src/UnitTests/Makefile.am delete mode 100644 src/UnitTests/Makefile.in create mode 100644 src/Utils/Test/Makefile.am delete mode 100644 src/Utils/Test/Makefile.in diff --git a/Makefile.am b/Makefile.am index e8e12ba23..fe33b60ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,6 @@ # $Header$ # -#SUBDIRS = idl src doc salome_adm bin resources -SUBDIRS = idl src +SUBDIRS = idl src doc salome_adm bin resources +#SUBDIRS = idl src diff --git a/bin/Makefile.am b/bin/Makefile.am index 35ff329b0..667a3c116 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -16,14 +16,14 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # These files are data, module or lib files salomescript_DATA= \ -VERSION \ -orbmodule.py \ -salome.launch \ -envSalome.py \ -salomeConsole.py + VERSION \ + orbmodule.py \ + salome.launch \ + salomeConsole.py # These files are executable scripts salomescript_SCRIPTS=\ + envSalome.py \ runIDLparser \ runSalome.py \ killSalome.py \ @@ -36,3 +36,11 @@ salomescript_SCRIPTS=\ showNS.py \ addToKillList.py + +install: install-am install-appliskel + +install-appliskel: + $(INSTALL) -d $(salomescriptdir) + cp -r $(srcdir)/appliskel $(salomescriptdir) + find $(salomescriptdir) -name CVS | xargs rm -rf + diff --git a/configure.ac b/configure.ac index 5939ed13e..dcad852ea 100644 --- a/configure.ac +++ b/configure.ac @@ -258,7 +258,6 @@ echo ---------------------------------------------- echo testing CPPUNIT only required for unit testing echo ---------------------------------------------- echo -AM_CONDITIONAL(CPPUNIT_IS_OK, [test x"$cppunit_ok" = xyes]) CHECK_CPPUNIT echo diff --git a/salome_adm/unix/config_files/check_cppunit.m4 b/salome_adm/unix/config_files/check_cppunit.m4 index 10c91812d..0d4837c69 100644 --- a/salome_adm/unix/config_files/check_cppunit.m4 +++ b/salome_adm/unix/config_files/check_cppunit.m4 @@ -96,6 +96,7 @@ else AC_SUBST(CPPUNIT_INCLUDES) AC_SUBST(CPPUNIT_LIBS) AC_SUBST(cppunit_ok) + AM_CONDITIONAL(CPPUNIT_IS_OK, [test x"$cppunit_ok" = xyes]) AC_MSG_RESULT(yes) fi @@ -105,4 +106,4 @@ fi AC_LANG_RESTORE ])dnl -dnl \ No newline at end of file +dnl diff --git a/src/LifeCycleCORBA/Test/Makefile.am b/src/LifeCycleCORBA/Test/Makefile.am new file mode 100644 index 000000000..cd434a108 --- /dev/null +++ b/src/LifeCycleCORBA/Test/Makefile.am @@ -0,0 +1,105 @@ +####################################### library +# SALOMELocalTrace : log on local machine +# +# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# +# +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS= LifeCycleCORBATest.hxx + +# Scripts to be installed +salomescript_SCRIPTS = TestLifeCycleCORBA.py + +# +# =============================================================== +# Local definitions +# =============================================================== +# + +# This directory defines the subdirectory src in the top source directory. +RPATH=../.. + +BUILT_SOURCES =\ + $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ + $(top_builddir)/idl/SALOME_TestComponent.hh $(top_builddir)/idl/SALOME_TestComponentSK.cc \ + $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc + + +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS=\ + @CPPUNIT_INCLUDES@ \ + -I$(srcdir)/$(RPATH)/Basics -I$(srcdir)/$(RPATH)/Basics/Test \ + -I$(srcdir)/$(RPATH)/SALOMELocalTrace -I$(srcdir)/$(RPATH)/SALOMELocalTrace/Test \ + -I$(srcdir)/$(RPATH)/SALOMETraceCollector -I$(srcdir)/$(RPATH)/SALOMETraceCollector/Test \ + -I$(srcdir)/$(RPATH)/NamingService \ + -I$(srcdir)/$(RPATH)/Utils -I$(srcdir)/$(RPATH)/Utils/Test \ + -I$(srcdir)/$(RPATH)/ResourcesManager \ + -I$(srcdir)/$(RPATH)/LifeCycleCORBA \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS =\ + @CPPUNIT_LIBS@ \ + $(RPATH)/Basics/libSALOMEBasics.la \ + $(RPATH)/ResourcesManager/libSalomeResourcesManager.la \ + $(RPATH)/Container/libSalomeContainer.la \ + $(RPATH)/NamingService/libSalomeNS.la \ + $(RPATH)/Registry/libRegistry.la \ + $(RPATH)/Notification/libSalomeNotification.la \ + $(RPATH)/Utils/Test/libUtilsTest.la $(RPATH)/Utils/libOpUtil.la \ + $(RPATH)/SALOMELocalTrace/Test/libSALOMELocalTraceTest.la $(RPATH)/SALOMELocalTrace/libSALOMELocalTrace.la \ + $(RPATH)/SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libLifeCycleCORBATest.la +libLifeCycleCORBATest_la_SOURCES = LifeCycleCORBATest.cxx $(BUILT_SOURCES) +libLifeCycleCORBATest_la_CPPFLAGS = $(COMMON_CPPFLAGS) +libLifeCycleCORBATest_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libLifeCycleCORBATest_la_LIBADD = $(COMMON_LIBS) + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = TestLifeCycleCORBA +TestLifeCycleCORBA_SOURCES = TestLifeCycleCORBA.cxx +TestLifeCycleCORBA_CPPFLAGS = $(COMMON_CPPFLAGS) +TestLifeCycleCORBA_LDADD = libLifeCycleCORBATest.la ../libSalomeLifeCycleCORBA.la $(COMMON_LIBS) + diff --git a/src/LifeCycleCORBA/Test/Makefile.in b/src/LifeCycleCORBA/Test/Makefile.in deleted file mode 100644 index dff2dac82..000000000 --- a/src/LifeCycleCORBA/Test/Makefile.in +++ /dev/null @@ -1,70 +0,0 @@ -# SALOMELocalTrace : log on local machine -# -# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -# -# -# -# File : Makefile.in -# Author : Paul RASCLE (EDF) -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= LifeCycleCORBATest.hxx - -EXPORT_PYSCRIPTS = TestLifeCycleCORBA.py - -# Libraries targets - -LIB = libLifeCycleCORBATest.la -LIB_SRC = LifeCycleCORBATest.cxx -LIB_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl \ - SALOME_Exception.idl - -# Executables targets - -BIN = TestLifeCycleCORBA -BIN_SRC = - -CXXFLAGS += @CPPUNIT_INCLUDES@ -CPPFLAGS += @CPPUNIT_INCLUDES@ - -LIBS= @LIBS@ @CPPUNIT_LIBS@ - -LDFLAGS+= - -LDFLAGSFORBIN+= \ - -lSALOMELocalTraceTest -lSALOMELocalTrace -lSALOMEBasics \ - -lSALOMETraceCollectorTest \ - -lUtilsTest -lOpUtil \ - -lSalomeNS -lSalomeContainer -lSalomeResourcesManager \ - -lRegistry -lSalomeNotification \ - -lLifeCycleCORBATest -lSalomeLifeCycleCORBA - - -@CONCLUDE@ diff --git a/src/Logger/Test/Makefile.in b/src/Logger/Test/Makefile.am similarity index 67% rename from src/Logger/Test/Makefile.in rename to src/Logger/Test/Makefile.am index 2ff5e398b..357b3b757 100644 --- a/src/Logger/Test/Makefile.in +++ b/src/Logger/Test/Makefile.am @@ -21,41 +21,19 @@ # # # -# File : Makefile.in -# Author : Paul RASCLE (EDF) -# Module : SALOME +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/salome_adm/unix/make_common_starter.am -@COMMENCE@ - -# header files -EXPORT_HEADERS= - -EXPORT_PYSCRIPTS = TestKiller.py - -# Libraries targets - -LIB = -LIB_SRC = - -# Executables targets - -BIN = -BIN_SRC = - -CXXFLAGS += @CPPUNIT_INCLUDES@ -CPPFLAGS += @CPPUNIT_INCLUDES@ - -LIBS= @LIBS@ @CPPUNIT_LIBS@ - -LDFLAGS+= - -LDFLAGSFORBIN+= +# +# =============================================================== +# Files to be installed +# =============================================================== +# -@CONCLUDE@ +# Executable scripts to be installed +salomescript_SCRIPTS = TestKiller.py diff --git a/src/Makefile.am b/src/Makefile.am index 2da3f17bf..f11403da4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,22 +25,6 @@ # $Header$ SUBDIRS = \ - Basics \ - SALOMELocalTrace - -if CPPUNIT_IS_OK - SUBDIRS+= \ - Basics/Test \ - SALOMELocalTrace/Test \ - Logger/Test \ - SALOMETraceCollector/Test \ - Utils/Test \ - LifeCycleCORBA/Test \ - UnitTests -endif - - -TMPSUBDIRS = \ Basics \ SALOMELocalTrace \ CASCatch \ @@ -69,3 +53,14 @@ TMPSUBDIRS = \ ModuleGenerator \ Communication + +if CPPUNIT_IS_OK + SUBDIRS+= \ + Basics/Test \ + SALOMELocalTrace/Test \ + Logger/Test \ + SALOMETraceCollector/Test \ + Utils/Test \ + LifeCycleCORBA/Test \ + UnitTests +endif diff --git a/src/SALOMELocalTrace/Makefile.am b/src/SALOMELocalTrace/Makefile.am index ea97cad92..b6c9a7e02 100644 --- a/src/SALOMELocalTrace/Makefile.am +++ b/src/SALOMELocalTrace/Makefile.am @@ -28,8 +28,6 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am -SUBDIRS = Test - salomeinclude_HEADERS = utilities.h \ LocalTraceBufferPool.hxx \ BaseTraceCollector.hxx diff --git a/src/SALOMETraceCollector/Makefile.am b/src/SALOMETraceCollector/Makefile.am index df31674a9..74ab9ac63 100644 --- a/src/SALOMETraceCollector/Makefile.am +++ b/src/SALOMETraceCollector/Makefile.am @@ -34,4 +34,4 @@ libwith_loggerTraceCollector_la_CPPFLAGS =\ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ libwith_loggerTraceCollector_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libwith_loggerTraceCollector_la_LIBADD = ../SALOMELocalTrace/libSALOMELocalTrace.la +libwith_loggerTraceCollector_la_LIBADD = ../SALOMELocalTrace/libSALOMELocalTrace.la @CORBA_LIBS@ diff --git a/src/SALOMETraceCollector/Test/Makefile.am b/src/SALOMETraceCollector/Test/Makefile.am new file mode 100644 index 000000000..8e90bb7b4 --- /dev/null +++ b/src/SALOMETraceCollector/Test/Makefile.am @@ -0,0 +1,90 @@ +####################################### library +# SALOMELocalTrace : log on local machine +# +# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# +# +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL +# $Header$ + + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# + +# header files +salomeinclude_HEADERS= SALOMETraceCollectorTest.hxx + +# Scripts to be installed +salomescript_SCRIPTS = TestSALOMETraceCollector.py + + +# +# =============================================================== +# Local definitions +# =============================================================== +# + +# This directory defines the subdirectory src in the top source directory. +RPATH=../.. + + +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS=\ + @CPPUNIT_INCLUDES@ \ + -I$(srcdir)/$(RPATH)/Basics -I$(srcdir)/$(RPATH)/Basics/Test \ + -I$(srcdir)/$(RPATH)/SALOMELocalTrace -I$(srcdir)/$(RPATH)/SALOMELocalTrace/Test\ + -I$(srcdir)/$(RPATH)/SALOMETraceCollector \ + -I$(top_builddir)/salome_adm/unix + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS =\ + @CPPUNIT_LIBS@ \ + $(RPATH)/SALOMELocalTrace/Test/libSALOMELocalTraceTest.la $(RPATH)/SALOMELocalTrace/libSALOMELocalTrace.la \ + $(RPATH)/Basics/libSALOMEBasics.la + + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libSALOMETraceCollectorTest.la +libSALOMETraceCollectorTest_la_SOURCES = SALOMETraceCollectorTest.cxx +libSALOMETraceCollectorTest_la_CPPFLAGS = $(COMMON_CPPFLAGS) +libSALOMETraceCollectorTest_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSALOMETraceCollectorTest_la_LIBADD = $(COMMON_LIBS) + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = TestSALOMETraceCollector +TestSALOMETraceCollector_SOURCES = TestSALOMETraceCollector.cxx +TestSALOMETraceCollector_CPPFLAGS = $(COMMON_CPPFLAGS) +TestSALOMETraceCollector_LDADD = libSALOMETraceCollectorTest.la $(COMMON_LIBS) diff --git a/src/SALOMETraceCollector/Test/Makefile.in b/src/SALOMETraceCollector/Test/Makefile.in deleted file mode 100644 index ddc7c53ca..000000000 --- a/src/SALOMETraceCollector/Test/Makefile.in +++ /dev/null @@ -1,64 +0,0 @@ -# SALOMELocalTrace : log on local machine -# -# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -# -# -# -# File : Makefile.in -# Author : Paul RASCLE (EDF) -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= SALOMETraceCollectorTest.hxx - -EXPORT_PYSCRIPTS = TestSALOMETraceCollector.py - -# Libraries targets - -LIB = libSALOMETraceCollectorTest.la -LIB_SRC = SALOMETraceCollectorTest.cxx - -# Executables targets - -BIN = TestSALOMETraceCollector -BIN_SRC = - - -CXXFLAGS += @CPPUNIT_INCLUDES@ -CPPFLAGS += @CPPUNIT_INCLUDES@ - -LIBS= @LIBS@ @CPPUNIT_LIBS@ - -LDFLAGS+= - -LDFLAGSFORBIN+= \ - -lSALOMELocalTraceTest -lSALOMELocalTrace -lSALOMEBasics \ - -lSALOMETraceCollectorTest - -@CONCLUDE@ diff --git a/src/UnitTests/Makefile.am b/src/UnitTests/Makefile.am new file mode 100644 index 000000000..0466be708 --- /dev/null +++ b/src/UnitTests/Makefile.am @@ -0,0 +1,83 @@ +# +# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# +# +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL +# $Header$ + + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# + +# Executable scripts to be installed +salomescript_SCRIPTS = UnitTests.py + +# +# =============================================================== +# Executables targets +# =============================================================== +# + +BUILT_SOURCES = \ + $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ + $(top_builddir)/idl/SALOME_TestComponent.hh $(top_builddir)/idl/SALOME_TestComponentSK.cc \ + $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc + +bin_PROGRAMS = UnitTests +UnitTests_SOURCES = UnitTests.cxx $(BUILT_SOURCES) +UnitTests_CPPFLAGS =\ + @CPPUNIT_INCLUDES@ \ + -I$(srcdir)/../Basics -I$(srcdir)/../Basics/Test \ + -I$(srcdir)/../SALOMELocalTrace -I$(srcdir)/../SALOMELocalTrace/Test \ + -I$(srcdir)/../SALOMETraceCollector -I$(srcdir)/../SALOMETraceCollector/Test \ + -I$(srcdir)/../NamingService \ + -I$(srcdir)/../Utils -I$(srcdir)/../Utils/Test \ + -I$(srcdir)/../Registry \ + -I$(srcdir)/../Notification \ + -I$(srcdir)/../ResourcesManager \ + -I$(srcdir)/../LifeCycleCORBA -I$(srcdir)/../LifeCycleCORBA/Test \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + + +UnitTests_LDADD =\ + @CPPUNIT_LIBS@ \ + ../Basics/libSALOMEBasics.la \ + ../SALOMELocalTrace/libSALOMELocalTrace.la ../SALOMELocalTrace/Test/libSALOMELocalTraceTest.la \ + ../Registry/libRegistry.la \ + ../Notification/libSalomeNotification.la \ + ../ResourcesManager/libSalomeResourcesManager.la \ + ../NamingService/libSalomeNS.la \ + ../Container/libSalomeContainer.la \ + ../SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \ + ../Utils/libOpUtil.la ../Utils/Test/libUtilsTest.la \ + ../LifeCycleCORBA/libSalomeLifeCycleCORBA.la ../LifeCycleCORBA/Test/libLifeCycleCORBATest.la \ + @CORBA_LIBS@ + + diff --git a/src/UnitTests/Makefile.in b/src/UnitTests/Makefile.in deleted file mode 100644 index a0c154083..000000000 --- a/src/UnitTests/Makefile.in +++ /dev/null @@ -1,68 +0,0 @@ -# -# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -# -# -# -# File : Makefile.in -# Author : Paul RASCLE (EDF) -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= - -EXPORT_PYSCRIPTS = UnitTests.py - -# Libraries targets - -LIB = -LIB_SRC = - -# Executables targets - -BIN = UnitTests -BIN_SRC = -BIN_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl \ - SALOME_Exception.idl - -CXXFLAGS += @CPPUNIT_INCLUDES@ -CPPFLAGS += @CPPUNIT_INCLUDES@ - -LIBS= @LIBS@ @CPPUNIT_LIBS@ - -LDFLAGSFORBIN+= \ - -lSALOMELocalTraceTest -lSALOMELocalTrace -lSALOMEBasics \ - -lSALOMETraceCollectorTest \ - -lUtilsTest -lOpUtil \ - -lSalomeNS -lSalomeContainer -lSalomeResourcesManager \ - -lRegistry -lSalomeNotification \ - -lLifeCycleCORBATest -lSalomeLifeCycleCORBA \ - - - -@CONCLUDE@ diff --git a/src/Utils/Makefile.am b/src/Utils/Makefile.am index 7c8e719ad..077b2bcf2 100644 --- a/src/Utils/Makefile.am +++ b/src/Utils/Makefile.am @@ -75,7 +75,7 @@ libOpUtil_la_CPPFLAGS = \ -I$(top_builddir)/idl \ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -libOpUtil_la_LIBADD = ../SALOMELocalTrace/libSALOMELocalTrace.la +libOpUtil_la_LIBADD = ../SALOMELocalTrace/libSALOMELocalTrace.la @CORBA_LIBS@ diff --git a/src/Utils/Test/Makefile.am b/src/Utils/Test/Makefile.am new file mode 100644 index 000000000..f942322cb --- /dev/null +++ b/src/Utils/Test/Makefile.am @@ -0,0 +1,88 @@ +####################################### library +# SALOMELocalTrace : log on local machine +# +# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# +# +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS= UtilsTest.hxx + +# Scripts to be installed +salomescript_SCRIPTS = TestUtils.py + + +# +# =============================================================== +# Local definitions +# =============================================================== +# +# This directory defines the subdirectory src in the top source directory. +RPATH=../.. + +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS=\ + @CPPUNIT_INCLUDES@ \ + -I$(srcdir)/$(RPATH)/Basics -I$(srcdir)/$(RPATH)/Basics/Test \ + -I$(srcdir)/$(RPATH)/SALOMELocalTrace -I$(srcdir)/$(RPATH)/SALOMELocalTrace/Test \ + -I$(srcdir)/$(RPATH)/SALOMETraceCollector -I$(srcdir)/$(RPATH)/SALOMETraceCollector/Test \ + -I$(srcdir)/$(RPATH)/Utils -I$(srcdir)/$(RPATH)/Utils/Test \ + -I$(top_builddir)/salome_adm/unix + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS =\ + @CPPUNIT_LIBS@ \ + $(RPATH)/Utils/libOpUtil.la \ + $(RPATH)/SALOMELocalTrace/Test/libSALOMELocalTraceTest.la $(RPATH)/SALOMELocalTrace/libSALOMELocalTrace.la \ + $(RPATH)/SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \ + $(RPATH)/Basics/libSALOMEBasics.la +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libUtilsTest.la +libUtilsTest_la_SOURCES = UtilsTest.cxx +libUtilsTest_la_CPPFLAGS = $(COMMON_CPPFLAGS) +libUtilsTest_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libUtilsTest_la_LIBADD = $(COMMON_LIBS) + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = TestUtils +TestUtils_SOURCES = TestUtils.cxx +TestUtils_CPPFLAGS = $(COMMON_CPPFLAGS) +TestUtils_LDADD = libUtilsTest.la $(COMMON_LIBS) + diff --git a/src/Utils/Test/Makefile.in b/src/Utils/Test/Makefile.in deleted file mode 100644 index c01a6a22e..000000000 --- a/src/Utils/Test/Makefile.in +++ /dev/null @@ -1,64 +0,0 @@ -# SALOMELocalTrace : log on local machine -# -# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -# -# -# -# File : Makefile.in -# Author : Paul RASCLE (EDF) -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= UtilsTest.hxx - -EXPORT_PYSCRIPTS = TestUtils.py - -# Libraries targets - -LIB = libUtilsTest.la -LIB_SRC = UtilsTest.cxx - -# Executables targets - -BIN = TestUtils -BIN_SRC = - -CXXFLAGS += @CPPUNIT_INCLUDES@ -CPPFLAGS += @CPPUNIT_INCLUDES@ - -LIBS= @LIBS@ @CPPUNIT_LIBS@ - -LDFLAGS+= - -LDFLAGSFORBIN+= \ - -lSALOMELocalTraceTest -lSALOMELocalTrace -lSALOMEBasics \ - -lSALOMETraceCollectorTest \ - -lUtilsTest -lOpUtil - -@CONCLUDE@ -- 2.39.2