[med-svn] [vista] 04/04: ENH: In rules separating install, config, build.

[Luis Ibanez]

This is an automated email from the git hooks/post-receive script.

luisibanez-guest pushed a commit to branch master
in repository vista.

commit 6a9680c681d7acdc368018a9d22c093829aa0678
Author: Luis Ibanez <luis.ibanez at kitware.com>
Date:   Mon Jan 13 17:17:45 2014 -0500

    ENH: In rules separating install, config, build.
    
    Separated in the rules file, the sections for installation of the
    initial database, the configuration with CMake, and the build process
    calling ExperimentalStart, ExperimentalConfigure, ExperimentalBuild.
---
 debian/changelog |  1 +
 debian/rules     | 31 ++++++++++++++-----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dbbae2e..e051355 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,5 +17,6 @@ vista-foia (0.20140106-1) UNRELEASED; urgency=low
   * Fixed lintian warning on Apache 2.0 license in copyright file.
   * Fixed package name in debian/control Provides: field. Lintian warning.
   * Configured CMake to build the binary testing directory.
+  * In rules separating install, configure and build.
 
  -- Luis Ibanez <luis.ibanez at kitware.com>  Wed, 4 Jul 2012 17:16:45 -0500
diff --git a/debian/rules b/debian/rules
index 8a7080b..623b623 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,23 +20,6 @@ VISTA_TESTING_SOURCE_DIR=$(PWD)
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
--DCMAKE_INSTALL_PREFIX:PATH=/usr \
--DGTM_INSTALL_DIR=$(GTM_INSTALL_DIR) \
--DVISTA_GLOBALS_DIR:PATH=$(VISTA_GLOBALS_DIR) \
--DVISTA_ROUTINE_DIR:PATH=$(VISTA_ROUTINES_DIR)
-
-override_dh_auto_install:
-	mkdir -p $(VISTAINSTANCEDIR)
-	mkdir -p $(VISTA_TESTING_BINARY_DIR)
-	mkdir -p $(VISTA_ROUTINES_DIR)
-	mkdir -p $(VISTA_OBJECTS_DIR)
-	mkdir -p $(VISTA_GLOBALS_DIR)
-	mkdir -p $(VISTAINSTANCEDIR)/inet
-	mkdir -p $(VISTAINSTANCEDIR)/inet/Logs
-	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); echo "change -s DEFAULT -f=$(VISTAINSTANCEDIR)/g/database" | $(GTM_INSTALL_DIR)/mumps -r GDE)
-	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); $(GTM_INSTALL_DIR)/mupip create)
-	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); $(GTM_INSTALL_DIR)/dse change -f -key_max=1023 -rec=4096)
 	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); \
 cd $(VISTA_TESTING_BINARY_DIR); \
 cmake $(VISTA_TESTING_SOURCE_DIR)   \
@@ -55,6 +38,20 @@ cmake $(VISTA_TESTING_SOURCE_DIR)   \
 -DTEST_VISTA_FRESH_GTM_ROUTINE_DIR:PATH=$(VISTA_ROUTINES_DIR) \
 -DTEST_VISTA_FRESH_GTM_GLOBALS_DAT:FILEPATH=$(VISTA_GTM_DATABASE).dat \
 )
+
+override_dh_auto_install:
+	mkdir -p $(VISTAINSTANCEDIR)
+	mkdir -p $(VISTA_TESTING_BINARY_DIR)
+	mkdir -p $(VISTA_ROUTINES_DIR)
+	mkdir -p $(VISTA_OBJECTS_DIR)
+	mkdir -p $(VISTA_GLOBALS_DIR)
+	mkdir -p $(VISTAINSTANCEDIR)/inet
+	mkdir -p $(VISTAINSTANCEDIR)/inet/Logs
+	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); echo "change -s DEFAULT -f=$(VISTAINSTANCEDIR)/g/database" | $(GTM_INSTALL_DIR)/mumps -r GDE)
+	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); $(GTM_INSTALL_DIR)/mupip create)
+	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); $(GTM_INSTALL_DIR)/dse change -f -key_max=1023 -rec=4096)
+
+override_dh_auto_build:
 	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); \
 cd $(VISTA_TESTING_BINARY_DIR); \
 make ExperimentalStart; \

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/vista.git