From: vsr Date: Fri, 13 May 2011 09:49:39 +0000 (+0000) Subject: Fix problems of 'make distcheck' X-Git-Tag: V6_3_0~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=56538ac8ef4b124e2d999a667bd8594313ab71f5;p=modules%2Fhomard.git Fix problems of 'make distcheck' --- 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 deleted file mode 100644 index ad1c1f46..00000000 --- a/doc/conf.py +++ /dev/null @@ -1,198 +0,0 @@ -# -*- coding: iso-8859-1 -*- -# -# HOMARD documentation build configuration file, created by -# sphinx-quickstart on Tue Jan 5 08:51:14 2010. -# -# This file is execfile()d with the current directory set to its containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import sys, os - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.append(os.path.abspath('.')) - -# -- General configuration ----------------------------------------------------- - -# Add any Sphinx extension module names here, as strings. They can be extensions -# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.coverage', 'sphinx.ext.ifconfig'] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -source_encoding = 'iso-8859-1' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'HOMARD' -copyright = u'1996, 2011, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '10.1' -# The full version, including alpha/beta/rc tags. -release = '10.1' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of documents that shouldn't be included in the build. -#unused_docs = [] - -# List of directories, relative to source directory, that shouldn't be searched -# for source files. -exclude_trees = ['_build'] - -# The reST default role (used for this markup: `text`) to use for all documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - - -# -- Options for HTML output --------------------------------------------------- - -# The theme to use for HTML and HTML Help pages. Major themes that come with -# Sphinx are currently 'default' and 'sphinxdoc'. -html_theme = 'default' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_use_modindex = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = '' - -# Output file base name for HTML help builder. -htmlhelp_basename = 'HOMARDdoc' - - -# -- Options for LaTeX output -------------------------------------------------- - -# The paper size ('letter' or 'a4'). -#latex_paper_size = 'letter' - -# The font size ('10pt', '11pt' or '12pt'). -#latex_font_size = '10pt' - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass [howto/manual]). -latex_documents = [ - ('index', 'HOMARD.tex', u'HOMARD Documentation', - u'G. NICOLAS et T. FOUQUET', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# Additional stuff for the LaTeX preamble. -#latex_preamble = '' - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_use_modindex = True - - -# Example configuration for intersphinx: refer to the Python standard library. -intersphinx_mapping = {'http://docs.python.org/': None} diff --git a/doc/conf.py.in b/doc/conf.py.in new file mode 100644 index 00000000..a42d3eac --- /dev/null +++ b/doc/conf.py.in @@ -0,0 +1,198 @@ +# -*- coding: iso-8859-1 -*- +# +# HOMARD documentation build configuration file, created by +# sphinx-quickstart on Tue Jan 5 08:51:14 2010. +# +# This file is execfile()d with the current directory set to its containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import sys, os + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +#sys.path.append(os.path.abspath('.')) + +# -- General configuration ----------------------------------------------------- + +# Add any Sphinx extension module names here, as strings. They can be extensions +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.coverage', 'sphinx.ext.ifconfig'] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +source_encoding = 'iso-8859-1' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'HOMARD' +copyright = u'1996, 2011, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = '@SHORT_VERSION@' +# The full version, including alpha/beta/rc tags. +release = '@VERSION@' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of documents that shouldn't be included in the build. +#unused_docs = [] + +# List of directories, relative to source directory, that shouldn't be searched +# for source files. +exclude_trees = ['_build'] + +# The reST default role (used for this markup: `text`) to use for all documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +#modindex_common_prefix = [] + + +# -- Options for HTML output --------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. Major themes that come with +# Sphinx are currently 'default' and 'sphinxdoc'. +html_theme = 'default' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +#html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +#html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +#html_use_modindex = True + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = '' + +# Output file base name for HTML help builder. +htmlhelp_basename = 'HOMARDdoc' + + +# -- Options for LaTeX output -------------------------------------------------- + +# The paper size ('letter' or 'a4'). +#latex_paper_size = 'letter' + +# The font size ('10pt', '11pt' or '12pt'). +#latex_font_size = '10pt' + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, documentclass [howto/manual]). +latex_documents = [ + ('index', 'HOMARD.tex', u'HOMARD Documentation', + u'G. NICOLAS et T. FOUQUET', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# Additional stuff for the LaTeX preamble. +#latex_preamble = '' + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_use_modindex = True + + +# Example configuration for intersphinx: refer to the Python standard library. +intersphinx_mapping = {'http://docs.python.org/': None} diff --git a/resources/HOMARDCatalog.xml b/resources/HOMARDCatalog.xml deleted file mode 100644 index 659b9ac3..00000000 --- a/resources/HOMARDCatalog.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - HOMARD - HOMARD GUI - Data - C. Caremoli - 1.0 - EDF - RD - 1 - HOMARD.png - 'linux' ~ OS - - - - diff --git a/resources/HOMARDCatalog.xml.in b/resources/HOMARDCatalog.xml.in new file mode 100644 index 00000000..ac61aa4f --- /dev/null +++ b/resources/HOMARDCatalog.xml.in @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + HOMARD + HOMARD GUI + Data + C. Caremoli + @VERSION@ + EDF - RD + 1 + HOMARD.png + 'linux' ~ OS + + + + 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