Salome HOME
Implement 'make dist' and 'make distcheck' steps V5_1_0a1
authorvsr <vsr@opencascade.com>
Wed, 17 Sep 2008 03:25:49 +0000 (03:25 +0000)
committervsr <vsr@opencascade.com>
Wed, 17 Sep 2008 03:25:49 +0000 (03:25 +0000)
15 files changed:
Makefile.am
adm_local/Makefile.am
adm_local/unix/config_files/Makefile.am
adm_local/unix/config_files/README [deleted file]
adm_local/unix/make_common_starter.am
bin/Makefile.am
clean_configure [new file with mode: 0755]
configure.ac
doc/Makefile.am [new file with mode: 0755]
idl/Makefile.am
resources/Makefile.am
src/PYHELLO/Makefile.am
src/PYHELLOGUI/Makefile.am
src/PYHELLOGUI/PYHELLO_icons.po [deleted file]
src/PYHELLOGUI/PYHELLO_msg_en.po [deleted file]

index e4803d74f1c716215f1db288c28d59d0e6b929df..0a1c6601ae39ec27b603a2164334234e401be814 100644 (file)
 
 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
 
-EXTRA_DIST+= \
-       build_configure \
-       clean_configure \
-       LICENCE
+EXTRA_DIST +=          \
+       build_configure \
+       clean_configure
 
 dist-hook:
        rm -rf `find $(distdir) -name CVS`
index 7ae83a6fc82f9b81116b259ad29f7610ead06353..b2d96e987677f1ed3625a5761229d90256626bc2 100644 (file)
@@ -16,4 +16,7 @@
 # 
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 # 
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS = unix
index ece5b5b896183e1a06091e5371c9f3fdd83280fd..40387fa52c3e176202d8d42e5cf2b0ce2e2f393b 100644 (file)
@@ -16,8 +16,8 @@
 # 
 # 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_PYHELLO.m4
diff --git a/adm_local/unix/config_files/README b/adm_local/unix/config_files/README
deleted file mode 100644 (file)
index feb997b..0000000
+++ /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.
index c6e076e41b406d1200039f328ffdfe553e860742..c8f973454a3a3d9a780d419d30bc0a8479a4e653 100644 (file)
@@ -7,43 +7,58 @@
 #
 
 # 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
+# translation (*.qm) files generation (lrelease)
 %.qm: %.ts
        $(LRELEASE) $< -qm $@
 
-EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.ts)
+# resource files generation (qrcc)
+qrc_%.cxx: %.qrc
+       $(QRCC) $< -o $@ -name $(*F)
 
+# qt forms files generation (uic)
+ui_%.h: %.ui
+       $(UIC) -o $@ $<
+
+# 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
index 9aa385967ab04575f1a4293825fe64b19b2ca101..200af4f95fa6aa5b4f10334fecd1e9ec02af60d1 100644 (file)
 
 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= \
+
+nodist_salomescript_DATA = \
        VERSION \
        runAppli
-
-EXTRA_DIST+= VERSION.in runAppli.in
diff --git a/clean_configure b/clean_configure
new file mode 100755 (executable)
index 0000000..be0b542
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+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
index 702682c2c8af0ee24b03d9342814846b8bc73703..46610680c6430f54d86ae3e2e8dda6757dd3808b 100644 (file)
@@ -15,7 +15,7 @@
 # Created from configure.in.base
 #
 
-AC_INIT([Salome2 Project PYHELLO module], [5.0.0], [webmaster.salome@opencascade.com], [salome])
+AC_INIT([Salome2 Project PYHELLO module], [5.0.0], [webmaster.salome@opencascade.com], [SalomePYHELLO])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -209,6 +209,7 @@ AC_OUTPUT([ \
   ./bin/VERSION \
   ./bin/runAppli \
   ./bin/Makefile \
+  ./doc/Makefile \
   ./src/Makefile \
   ./src/PYHELLO/Makefile \
   ./src/PYHELLOGUI/Makefile \
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100755 (executable)
index 0000000..a736cd9
--- /dev/null
@@ -0,0 +1,10 @@
+#  Copyright (C) 2003  CEA/DEN, EDF R&D
+#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+dist_doc_DATA = dev_guide.pdf
+
+EXTRA_DIST   += dev_guide.txt
index df680bea161a2b85f5b7344543c4563e80e29197..89b9817a139b2d2caf10725cf85987ba9d4c8248 100644 (file)
@@ -28,10 +28,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 BASEIDL_FILES = PYHELLO_Gen.idl
 
-EXTRA_DIST+= $(BASEIDL_FILES)
-
 # This variable defines the files to be installed
-salomeidl_DATA = $(BASEIDL_FILES)
+dist_salomeidl_DATA = $(BASEIDL_FILES)
 
 # These variables defines the building process of CORBA files
 OMNIORB_IDL         = @OMNIORB_IDL@
@@ -41,7 +39,6 @@ OMNIORB_IDLPYFLAGS  = \
        -I$(top_builddir)/idl/salome \
        -I$(KERNEL_ROOT_DIR)/idl/salome
 
-
 IDLCXXFLAGS = \
        -bcxx \
        @IDLCXXFLAGS@ \
@@ -52,25 +49,17 @@ IDLPYFLAGS  = \
        @IDLPYFLAGS@ \
        -I$(KERNEL_ROOT_DIR)/idl/salome
 
-# install python client (generated from idl file
-install: install-pyidl install-idl
-
-# create directory $(idldir) and copy idl files into it
-install-idl: $(BASEIDL_FILES)
-       $(INSTALL) -d  $(salomeidldir)
-       cp -p -f $^ $(salomeidldir)
-
-install-pyidl: $(BASEIDL_FILES)
-       $(INSTALL) -d  $(PYTHON_SITE_INSTALL)
+install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%)
+       $(INSTALL) -d  $(DESTDIR)$(salomepythondir)
        @for file in $^ dummy; do \
           if [ $$file != "dummy" ]; then \
-             $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \
+             $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
           fi ; \
         done ;
 
 # uninstall-local removes too much, but it works in distcheck
 uninstall-local:
-       rm -rf $(pkgpythondir)/*
+       rm -rf $(DESTDIR)$(salomepythondir)/*
 
 mostlyclean-local:
        -rm -f *.py
index a68f5d20b4da8882a53e947a7f8f8ba63ace2dab..4aecabdad5414b0aa85daff33fc7640144006bf4 100644 (file)
@@ -31,4 +31,5 @@ dist_salomeres_DATA = \
        ExecPYHELLO.png \
        SalomeApp.xml
 
-nodist_salomeres_DATA = PYHELLOCatalog.xml
+# VSR: little trick to avoid putting if PYHELLOCatalog.xml to the distribution archive
+nodist_salomeres_SCRIPTS = PYHELLOCatalog.xml
index 8fed1af69268cee8fdebc7347f3ba94e9d58ffb4..3068ace412b5839b431dd7bb1fa91a5bc886a5f5 100755 (executable)
@@ -28,5 +28,5 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Scripts to be installed
-dist_salomescript_DATA = \
+dist_salomescript_SCRIPTS = \
        PYHELLO.py
index 11f1121c8a25c72a36bbfcc248d5e7e94915383c..c19c7d1af7875163ea65dbcb6894f03c5519c11f 100755 (executable)
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-# header files 
-salomeinclude_HEADERS =
-
 # Scripts to be installed
-dist_salomescript_DATA = \
+dist_salomescript_SCRIPTS = \
        PYHELLOGUI.py
 
 # resources files
diff --git a/src/PYHELLOGUI/PYHELLO_icons.po b/src/PYHELLOGUI/PYHELLO_icons.po
deleted file mode 100644 (file)
index 7268d4d..0000000
+++ /dev/null
@@ -1,29 +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 <EMAIL@ADDRESS>\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-
diff --git a/src/PYHELLOGUI/PYHELLO_msg_en.po b/src/PYHELLOGUI/PYHELLO_msg_en.po
deleted file mode 100644 (file)
index 7268d4d..0000000
+++ /dev/null
@@ -1,29 +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 <EMAIL@ADDRESS>\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-