From 56538ac8ef4b124e2d999a667bd8594313ab71f5 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 13 May 2011 09:49:39 +0000 Subject: [PATCH] Fix problems of 'make distcheck' --- Makefile.am | 4 +- adm_local/Makefile.am | 25 +++++++++++++ adm_local/unix/config_files/Makefile.am | 28 ++++++++++++++ configure.ac | 9 ++++- doc/Makefile.am | 37 ++++++++++++++++--- doc/{conf.py => conf.py.in} | 4 +- ...HOMARDCatalog.xml => HOMARDCatalog.xml.in} | 2 +- resources/Makefile.am | 15 +++++++- src/HOMARDGUI/Makefile.am | 14 +++++++ tests/Makefile.am | 10 ++++- 10 files changed, 134 insertions(+), 14 deletions(-) create mode 100644 adm_local/Makefile.am create mode 100644 adm_local/unix/config_files/Makefile.am rename doc/{conf.py => conf.py.in} (99%) rename resources/{HOMARDCatalog.xml => HOMARDCatalog.xml.in} (92%) diff --git a/Makefile.am b/Makefile.am index 49498a47..3154472f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,9 +31,9 @@ ACLOCAL_AMFLAGS = -I $(top_srcdir)/adm_local/unix/config_files \ -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ -I ${HOMARD_SRC}/adm_local/unix/config_files -SUBDIRS = idl resources src doc tests +SUBDIRS = idl adm_local resources src doc tests -DIST_SUBDIRS = idl resources src doc tests +DIST_SUBDIRS = idl adm_local resources src doc tests DISTCLEANFILES = a.out aclocal.m4 configure diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am new file mode 100644 index 00000000..a32da97b --- /dev/null +++ b/adm_local/Makefile.am @@ -0,0 +1,25 @@ +# 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/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am new file mode 100644 index 00000000..f315f243 --- /dev/null +++ b/adm_local/unix/config_files/Makefile.am @@ -0,0 +1,28 @@ +# 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 = \ +check_GUI.m4 \ +check_Med2.m4 \ +check_sphinx.m4 diff --git a/configure.ac b/configure.ac index 3e9a1b80..94e79dce 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,8 @@ AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([-Wno-portability]) +SHORT_VERSION=`echo $VERSION | awk -F. '{printf("%d.%d",$1,$2)}'` +AC_SUBST(SHORT_VERSION) XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` AC_SUBST(XVERSION) @@ -388,12 +390,17 @@ AC_OUTPUT([ \ salome_adm/unix/SALOMEconfig.h \ Makefile \ idl/Makefile \ + adm_local/Makefile \ + adm_local/unix/Makefile \ + adm_local/unix/config_files/Makefile \ doc/Makefile \ - src/Makefile \ + doc/conf.py \ + src/Makefile \ src/HOMARD_I/Makefile \ src/HOMARD/Makefile \ src/HOMARDGUI/Makefile \ src/HOMARD_SWIG/Makefile \ resources/Makefile \ + resources/HOMARDCatalog.xml \ tests/Makefile \ ]) diff --git a/doc/Makefile.am b/doc/Makefile.am index f6d358df..59c0a822 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -30,6 +30,7 @@ if SPHINX_IS_OK homarddoc_DATA=html/index.html html/index.html:$(RSTFILES) make htm + endif homarddocdir=$(docdir)/gui/HOMARD @@ -40,18 +41,33 @@ SPHINXBUILD = sphinx-build PAPEROPT_a4 = -D latex_paper_size=a4 ALLSPHINXOPTS = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR) -EXTRA_DIST+= images files html $(docdir) $(docdir)/gui $(homarddoc_DATA) htm: mkdir -p html doctrees - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) html + $(SPHINXBUILD) -c $(top_builddir)/doc -b html $(ALLSPHINXOPTS) html @echo @echo "Build finished. The HTML pages are in html." -RSTFILES= \ -index.rst \ -intro.rst \ +RSTFILES= \ +glossaire.rst \ +gui_create_boundary.rst \ +gui_create_case.rst \ +gui_create_hypothese.rst \ +gui_create_iteration.rst \ +gui_create_zone.rst \ +gui_usage.rst \ +index.rst \ +intro.rst \ +tui_create_boundary.rst \ +tui_create_case.rst \ +tui_create_hypothese.rst \ +tui_create_iteration.rst \ +tui_create_zone.rst \ +tui_homard.rst \ +tui_usage.rst \ tutorials.rst +EXTRA_DIST+= $(RSTFILES) images files + usr_docs: make install-data-local @@ -59,7 +75,16 @@ docs: usr_docs install-data-local: $(INSTALL) -d $(DESTDIR)$(homarddocdir) - if test -d "html"; then cp -rf html/* $(DESTDIR)$(homarddocdir); fi; + if test -d "html"; then b=; else b="$(srcdir)/"; fi; \ + if test -d $$b"html"; then cp -rf $$b"html"/* $(DESTDIR)$(homarddocdir); fi; uninstall-local: rm -rf $(DESTDIR)$(homarddocdir)/* + +clean-local: + -rm -rf doctrees + if test -d "html"; then rm -rf html ; fi + +dist-hook: + if test -d "html"; then b=; else b="$(srcdir)/"; fi; \ + if test -d $$b"html"; then cp -rf $$b"html" $(distdir) ; fi diff --git a/doc/conf.py b/doc/conf.py.in similarity index 99% rename from doc/conf.py rename to doc/conf.py.in index ad1c1f46..a42d3eac 100644 --- a/doc/conf.py +++ b/doc/conf.py.in @@ -45,9 +45,9 @@ copyright = u'1996, 2011, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret' # built documents. # # The short X.Y version. -version = '10.1' +version = '@SHORT_VERSION@' # The full version, including alpha/beta/rc tags. -release = '10.1' +release = '@VERSION@' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/resources/HOMARDCatalog.xml b/resources/HOMARDCatalog.xml.in similarity index 92% rename from resources/HOMARDCatalog.xml rename to resources/HOMARDCatalog.xml.in index 659b9ac3..ac61aa4f 100644 --- a/resources/HOMARDCatalog.xml +++ b/resources/HOMARDCatalog.xml.in @@ -16,7 +16,7 @@ HOMARD GUI Data C. Caremoli - 1.0 + @VERSION@ EDF - RD 1 HOMARD.png diff --git a/resources/Makefile.am b/resources/Makefile.am index b5b55686..cf6d70cd 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -29,25 +29,38 @@ dist_salomeres_DATA = \ boxdxyz.png \ boxdxyz_2.png \ cas_calcule.png \ + cas_non_calcule.png \ cylinderpointvector.png \ cylinderpointvector_2.png \ + delete.png \ HOMARD.png \ HOMARD_2.png \ hypotheses.png \ iter0.png \ iter_calculee.png \ + iter_calulee.png \ iter_next.png \ iter_non_calculee.png \ + iter_non_calulee.png \ med.png \ mesh_compute.png \ + mesh_hypo_edit.png \ mesh_tree_mesh.png \ + mesh_tree_importedmesh.png \ + mesh_whatis.png \ spherepoint.png \ spherepoint_2.png \ texte.png \ texte_2.png \ + triangle.png \ whatis.png \ + zone_boxdxyz.png \ + zone_boxdxyz_2.png \ zone_icone.png \ - zone_icone_2.png + zone_icone_2.png \ + zone_spherepoint.png \ + zone_spherepoint_2.png \ + zones.png # VSR: little trick to avoid putting if HOMARDCatalog.xml to the distribution archive nodist_salomeres_SCRIPTS = HOMARDCatalog.xml diff --git a/src/HOMARDGUI/Makefile.am b/src/HOMARDGUI/Makefile.am index cab06942..f4bcafaa 100644 --- a/src/HOMARDGUI/Makefile.am +++ b/src/HOMARDGUI/Makefile.am @@ -28,6 +28,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am salomeinclude_HEADERS = \ + HomardConfigFile.hxx \ MonCreateBoundaryAn.h \ CreateBoundaryAn.h \ MonEditBoundaryAn.h \ @@ -44,6 +45,7 @@ salomeinclude_HEADERS = \ CreateHypothesis.h \ MonEditHypothesis.h \ MonCreateListGroup.h \ + CreateListGroup.h \ MonEditListGroup.h \ MonCreateIteration.h \ CreateIteration.h \ @@ -133,3 +135,15 @@ libHOMARD_la_LDFLAGS = \ nodist_salomeres_DATA = \ HOMARD_msg_en.qm \ HOMARD_msg_fr.qm + +UI_FILES = \ +CreateBoundaryAn.ui \ +CreateBoundaryDi.ui \ +CreateCase.ui \ +CreateHypothesis.ui \ +CreateIteration.ui \ +CreateListGroup.ui \ +CreateZone.ui \ +EditFile.ui + +EXTRA_DIST += $(UI_FILES) diff --git a/tests/Makefile.am b/tests/Makefile.am index 6fb83c0a..d54c3632 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -39,4 +39,12 @@ dist_salomeres_DATA = \ test_3.py \ test_3.00.med \ test_3.fr.med \ - test_3.apad.02.bilan + test_3.apad.02.bilan + +EXTRA_DIST += \ + test_1.odt \ + test_1.png \ + test_2.odt \ + test_2.png \ + test_3.odt \ + test_3.png -- 2.39.2