From cfbcbc191485567ab9f721d662d27fd3771c6e5f Mon Sep 17 00:00:00 2001 From: gdd Date: Fri, 18 Feb 2011 15:32:35 +0000 Subject: [PATCH] Refactoring of directory structure --- clean_configure | 15 +++-- configure.ac | 1 + src/{ => GHS3DPlugin}/GHS3DPlugin_Defs.hxx | 0 src/{ => GHS3DPlugin}/GHS3DPlugin_GHS3D.cxx | 3 +- src/{ => GHS3DPlugin}/GHS3DPlugin_GHS3D.hxx | 0 src/{ => GHS3DPlugin}/GHS3DPlugin_GHS3D_i.cxx | 0 src/{ => GHS3DPlugin}/GHS3DPlugin_GHS3D_i.hxx | 0 .../GHS3DPlugin_Hypothesis.cxx | 3 +- .../GHS3DPlugin_Hypothesis.hxx | 0 .../GHS3DPlugin_Hypothesis_i.cxx | 0 .../GHS3DPlugin_Hypothesis_i.hxx | 0 src/{ => GHS3DPlugin}/GHS3DPlugin_i.cxx | 2 + src/GHS3DPlugin/Makefile.am | 63 +++++++++++++++++++ src/Makefile.am | 43 ++----------- 14 files changed, 85 insertions(+), 45 deletions(-) rename src/{ => GHS3DPlugin}/GHS3DPlugin_Defs.hxx (100%) rename src/{ => GHS3DPlugin}/GHS3DPlugin_GHS3D.cxx (99%) rename src/{ => GHS3DPlugin}/GHS3DPlugin_GHS3D.hxx (100%) rename src/{ => GHS3DPlugin}/GHS3DPlugin_GHS3D_i.cxx (100%) rename src/{ => GHS3DPlugin}/GHS3DPlugin_GHS3D_i.hxx (100%) rename src/{ => GHS3DPlugin}/GHS3DPlugin_Hypothesis.cxx (99%) rename src/{ => GHS3DPlugin}/GHS3DPlugin_Hypothesis.hxx (100%) rename src/{ => GHS3DPlugin}/GHS3DPlugin_Hypothesis_i.cxx (100%) rename src/{ => GHS3DPlugin}/GHS3DPlugin_Hypothesis_i.hxx (100%) rename src/{ => GHS3DPlugin}/GHS3DPlugin_i.cxx (96%) create mode 100644 src/GHS3DPlugin/Makefile.am diff --git a/clean_configure b/clean_configure index 294e047..ec47141 100755 --- a/clean_configure +++ b/clean_configure @@ -21,13 +21,20 @@ 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 adm_local -name Makefile.in | xargs rm -f find src -name Makefile.in | xargs rm -f +rm -f adm_local/unix/config_files/config* +rm -f adm_local/unix/config_files/depcomp +rm -f adm_local/unix/config_files/install-sh +rm -f adm_local/unix/config_files/libtool.m4 +rm -f adm_local/unix/config_files/ltmain.sh +rm -f adm_local/unix/config_files/ltoptions.m4 +rm -f adm_local/unix/config_files/ltsugar.m4 +rm -f adm_local/unix/config_files/ltversion.m4 +rm -f adm_local/unix/config_files/lt~obsolete.m4 +rm -f adm_local/unix/config_files/missing rm -f Makefile.in diff --git a/configure.ac b/configure.ac index 05ee1a7..f0999ac 100644 --- a/configure.ac +++ b/configure.ac @@ -419,6 +419,7 @@ AC_OUTPUT([ \ GHS3DPLUGIN_version.h \ src/Makefile \ src/GUI/Makefile \ + src/GHS3DPlugin/Makefile \ resources/Makefile \ idl/Makefile \ Makefile \ diff --git a/src/GHS3DPlugin_Defs.hxx b/src/GHS3DPlugin/GHS3DPlugin_Defs.hxx similarity index 100% rename from src/GHS3DPlugin_Defs.hxx rename to src/GHS3DPlugin/GHS3DPlugin_Defs.hxx diff --git a/src/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx similarity index 99% rename from src/GHS3DPlugin_GHS3D.cxx rename to src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx index 6393c23..74f3186 100644 --- a/src/GHS3DPlugin_GHS3D.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx @@ -746,11 +746,12 @@ static int findShapeID(SMESH_Mesh& mesh, { // find UV of i-th node on geomFace const SMDS_MeshNode* nNotOnSeamEdge = 0; - if ( helper.IsSeamShape( nodes[i]->getshapeId() )) + if ( helper.IsSeamShape( nodes[i]->getshapeId() )) { if ( helper.IsSeamShape( nodes[(i+1)%3]->getshapeId() )) nNotOnSeamEdge = nodes[(i+2)%3]; else nNotOnSeamEdge = nodes[(i+1)%3]; + } bool uvOK; gp_XY uv = helper.GetNodeUV( geomFace, nodes[i], nNotOnSeamEdge, &uvOK ); // check that uv is correct diff --git a/src/GHS3DPlugin_GHS3D.hxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx similarity index 100% rename from src/GHS3DPlugin_GHS3D.hxx rename to src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx diff --git a/src/GHS3DPlugin_GHS3D_i.cxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.cxx similarity index 100% rename from src/GHS3DPlugin_GHS3D_i.cxx rename to src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.cxx diff --git a/src/GHS3DPlugin_GHS3D_i.hxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.hxx similarity index 100% rename from src/GHS3DPlugin_GHS3D_i.hxx rename to src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.hxx diff --git a/src/GHS3DPlugin_Hypothesis.cxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx similarity index 99% rename from src/GHS3DPlugin_Hypothesis.cxx rename to src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx index 5079333..bdfa2b9 100644 --- a/src/GHS3DPlugin_Hypothesis.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx @@ -654,11 +654,12 @@ std::istream & GHS3DPlugin_Hypothesis::LoadFrom(std::istream & load) bool hasEnforcedVertices = false; isOK = (load >> separator); - if (isOK) + if (isOK) { if (separator == "__OPTIONS_BEGIN__") hasOptions = true; else if (separator == "__ENFORCED_VERTICES_BEGIN__") hasEnforcedVertices = true; + } if (hasOptions) { std::string txt; diff --git a/src/GHS3DPlugin_Hypothesis.hxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx similarity index 100% rename from src/GHS3DPlugin_Hypothesis.hxx rename to src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx diff --git a/src/GHS3DPlugin_Hypothesis_i.cxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx similarity index 100% rename from src/GHS3DPlugin_Hypothesis_i.cxx rename to src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx diff --git a/src/GHS3DPlugin_Hypothesis_i.hxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.hxx similarity index 100% rename from src/GHS3DPlugin_Hypothesis_i.hxx rename to src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.hxx diff --git a/src/GHS3DPlugin_i.cxx b/src/GHS3DPlugin/GHS3DPlugin_i.cxx similarity index 96% rename from src/GHS3DPlugin_i.cxx rename to src/GHS3DPlugin/GHS3DPlugin_i.cxx index 0739dea..f1dbdfb 100644 --- a/src/GHS3DPlugin_i.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_i.cxx @@ -46,6 +46,8 @@ template class GHS3DPlugin_Creator_i:public HypothesisCreator_i extern "C" { + GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName); + GHS3DPLUGIN_EXPORT GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName) { diff --git a/src/GHS3DPlugin/Makefile.am b/src/GHS3DPlugin/Makefile.am new file mode 100644 index 0000000..2875199 --- /dev/null +++ b/src/GHS3DPlugin/Makefile.am @@ -0,0 +1,63 @@ +# Copyright (C) 2004-2010 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 +# + +# -* Makefile *- +# Author : Edward AGAPOV (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GHS3DPLUGIN +# Date : 10/01/2004 +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + GHS3DPlugin_Defs.hxx \ + GHS3DPlugin_GHS3D.hxx \ + GHS3DPlugin_GHS3D_i.hxx \ + GHS3DPlugin_Hypothesis.hxx \ + GHS3DPlugin_Hypothesis_i.hxx + +# Libraries targets +lib_LTLIBRARIES = libGHS3DEngine.la + +dist_libGHS3DEngine_la_SOURCES = \ + GHS3DPlugin_GHS3D.cxx \ + GHS3DPlugin_GHS3D_i.cxx \ + GHS3DPlugin_i.cxx \ + GHS3DPlugin_Hypothesis.cxx \ + GHS3DPlugin_Hypothesis_i.cxx + +libGHS3DEngine_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + $(CAS_CPPFLAGS) \ + $(GEOM_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(SMESH_CXXFLAGS) \ + $(VTK_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(top_builddir)/idl + +libGHS3DEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLGHS3DPLUGIN.la \ + $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo \ + $(MED_LDFLAGS) -lSalomeIDLMED \ + $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lSMESHDS -lSMDS -lStdMeshers \ + $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lSALOMEBasics diff --git a/src/Makefile.am b/src/Makefile.am index 8130764..a6d0a7a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,45 +25,10 @@ # include $(top_srcdir)/adm_local/unix/make_common_starter.am +SUBDIRS = GHS3DPlugin + if GHS3DPLUGIN_ENABLE_GUI - SUBDIRS = GUI + SUBDIRS += GUI endif -DIST_SUBDIRS = GUI - -# header files -salomeinclude_HEADERS = \ - GHS3DPlugin_Defs.hxx \ - GHS3DPlugin_GHS3D.hxx \ - GHS3DPlugin_GHS3D_i.hxx \ - GHS3DPlugin_Hypothesis.hxx \ - GHS3DPlugin_Hypothesis_i.hxx - -# Libraries targets -lib_LTLIBRARIES = libGHS3DEngine.la - -dist_libGHS3DEngine_la_SOURCES = \ - GHS3DPlugin_GHS3D.cxx \ - GHS3DPlugin_GHS3D_i.cxx \ - GHS3DPlugin_i.cxx \ - GHS3DPlugin_Hypothesis.cxx \ - GHS3DPlugin_Hypothesis_i.cxx - -libGHS3DEngine_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ - $(GEOM_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(SMESH_CXXFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(top_builddir)/idl - -libGHS3DEngine_la_LDFLAGS = \ - ../idl/libSalomeIDLGHS3DPLUGIN.la \ - $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo \ - $(MED_LDFLAGS) -lSalomeIDLMED \ - $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lSMESHDS -lSMDS -lStdMeshers \ - $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lSALOMEBasics +DIST_SUBDIRS = GHS3DPlugin GUI -- 2.39.2