This is an automated email from the git hooks/post-receive script. luisibanez-guest pushed a commit to branch master in repository vista.
commit 8a1c5e8f01b179e36662b6aef7f51076607ef67c Author: Luis Ibanez <[email protected]> Date: Tue Jan 21 17:29:01 2014 -0500 Better chain rules for import and compilation. Added intermediate targets in the rules file to manage link the process of importing routines to the process of compiling routines. --- debian/changelog | 1 + debian/rules | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f25394..3488dc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,5 +26,6 @@ vista-foia (0.20140106-1) UNRELEASED; urgency=low * In control, add meta-package to point to the most recent FOIA release. The vista-foia-0.20130405 corresponds to the version of the M routines included in the FOIA release of April 5th 2013. + * In rules, better chain targets for import and then compilation. -- Luis Ibanez <[email protected]> Wed, 4 Jul 2012 17:16:45 -0500 diff --git a/debian/rules b/debian/rules index 028a6af..7093b8a 100755 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,7 @@ VISTA_GTM_ROUTINES="$(VISTA_OBJECTS_DIR)($(VISTA_ROUTINES_DIR)) $(VISTA_GTM_ROUT VISTA_M_WORKING_TREE=$(PWD)/OSEHRA-VistA-M-897bff2 VISTA_TESTING_BINARY_DIR=$(PWD)/debian/build VISTA_TESTING_SOURCE_DIR=$(PWD) +VISTA_TESTING_LOG_DIR=$(VISTA_TESTING_BINARY_DIR)/Temporary/Log %: dh $@ @@ -40,6 +41,7 @@ include debian/vista_m_routines_list # vpath %.m $(VISTA_ROUTINES_DIR) vpath %.o $(VISTA_OBJECTS_DIR) +vpath %.log $(VISTA_TESTING_LOG_DIR) # # Implicit rule to compile MUMPS files into object files @@ -60,7 +62,7 @@ vista_o_objects_files := $(patsubst %.m,%.o,$(vista_m_sources_files)) # # This list of dependencies will invoke the implicit rule for .m -> .o # -compile_vista_routines: $(vista_o_objects_files) +vista_routines_compile: $(vista_o_objects_files) echo "Compiling all M routines" @@ -85,6 +87,16 @@ cmake $(VISTA_TESTING_SOURCE_DIR) \ -DTEST_VISTA_FRESH_GTM_GLOBALS_DAT:FILEPATH=$(VISTA_GTM_DATABASE).dat \ ) +vista_import_routines_and_globals: RoutineImport.log + echo "Starting Routines Import Process" + +RoutineImport.log: + (export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); \ +cd $(VISTA_TESTING_BINARY_DIR); \ +make ExperimentalStart; \ +make ExperimentalConfigure; \ +make ExperimentalBuild) + override_dh_auto_install: mkdir -p $(VISTAINSTANCEDIR) mkdir -p $(VISTA_TESTING_BINARY_DIR) @@ -98,14 +110,8 @@ override_dh_auto_install: (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) cp -r debian/deploy $(VISTAINSTANCEDIR) -import_routines_and_globals: - (export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); \ -cd $(VISTA_TESTING_BINARY_DIR); \ -make ExperimentalStart; \ -make ExperimentalConfigure; \ -make ExperimentalBuild) -override_dh_auto_build: import_routines_and_globals compile_vista_routines +override_dh_auto_build: vista_import_routines_and_globals vista_routines_compile -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/vista.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
