From cb056bffda8f3a573d13cc059ce5cdd321ec151f Mon Sep 17 00:00:00 2001 From: Mark Ito Date: Sun, 17 Jul 2022 19:01:29 -0400 Subject: [PATCH 1/4] Change default debug level from 1 to 0. Change debug suffixes: level 0 => no suffix, level 1 => hybrid, level 2 => dbg. --- version.pl | 2 +- version_defs.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version.pl b/version.pl index dafe3a8..6ab82b9 100755 --- a/version.pl +++ b/version.pl @@ -68,7 +68,7 @@ $year = $d{year}; $debug_level = $d{debug_level}; $profiling = $d{profiling}; - if ($debug_level eq '') {$debug_level = 1} # set a default level + if ($debug_level eq '') {$debug_level = 0} # set a default level if ($version) { print_command("${name_in_caps}_VERSION", $version); } diff --git a/version_defs.pl b/version_defs.pl index b38269b..2b3486e 100644 --- a/version_defs.pl +++ b/version_defs.pl @@ -92,4 +92,4 @@ diracxx => '', hddm => '', halld_amp => ''); -@debug_type = ('opt', '', 'dbg'); +@debug_type = ('', 'hybrid', 'dbg'); From c023f155f3e0832f2f4ea91b193f812e5fd821a8 Mon Sep 17 00:00:00 2001 From: Mark Ito Date: Sun, 17 Jul 2022 20:41:59 -0400 Subject: [PATCH 2/4] Go to new scheme for naming home directories based on debug level. Recall that the makefile ignores the value of the home directory, so the effect of the debug level must be expressed in the makefile itself. --- Makefile_halld_amp | 3 ++- Makefile_halld_recon | 3 ++- Makefile_halld_sim | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile_halld_amp b/Makefile_halld_amp index c6f22d8..d161076 100644 --- a/Makefile_halld_amp +++ b/Makefile_halld_amp @@ -19,8 +19,9 @@ ifdef HALLD_AMP_DIRTAG HALLD_AMP_DIR := $(HALLD_AMP_DIR)^$(HALLD_AMP_DIRTAG) endif ifeq ($(HALLD_AMP_DEBUG_LEVEL), 0) - HALLD_AMP_DIR := $(HALLD_AMP_DIR)+opt override HALLD_AMP_SCONS_OPTIONS += DEBUG=0 OPTIMIZATION=3 +else ifeq ($(HALLD_AMP_DEBUG_LEVEL), 1) + HALLD_AMP_DIR := $(HALLD_AMP_DIR)+hybrid else ifeq ($(HALLD_AMP_DEBUG_LEVEL), 2) HALLD_AMP_DIR := $(HALLD_AMP_DIR)+dbg override HALLD_AMP_SCONS_OPTIONS += DEBUG=1 OPTIMIZATION=0 diff --git a/Makefile_halld_recon b/Makefile_halld_recon index 9a2251d..3729da2 100644 --- a/Makefile_halld_recon +++ b/Makefile_halld_recon @@ -19,8 +19,9 @@ ifdef HALLD_RECON_DIRTAG HALLD_RECON_DIR := $(HALLD_RECON_DIR)^$(HALLD_RECON_DIRTAG) endif ifeq ($(HALLD_RECON_DEBUG_LEVEL), 0) - HALLD_RECON_DIR := $(HALLD_RECON_DIR)+opt override HALLD_RECON_SCONS_OPTIONS += DEBUG=0 OPTIMIZATION=3 +else ifeq ($(HALLD_RECON_DEBUG_LEVEL), 1) + HALLD_RECON_DIR := $(HALLD_RECON_DIR)+hybrid else ifeq ($(HALLD_RECON_DEBUG_LEVEL), 2) HALLD_RECON_DIR := $(HALLD_RECON_DIR)+dbg override HALLD_RECON_SCONS_OPTIONS += DEBUG=1 OPTIMIZATION=0 diff --git a/Makefile_halld_sim b/Makefile_halld_sim index 62c70f4..22bd530 100644 --- a/Makefile_halld_sim +++ b/Makefile_halld_sim @@ -19,8 +19,9 @@ ifdef HALLD_SIM_DIRTAG HALLD_SIM_DIR := $(HALLD_SIM_DIR)^$(HALLD_SIM_DIRTAG) endif ifeq ($(HALLD_SIM_DEBUG_LEVEL), 0) - HALLD_SIM_DIR := $(HALLD_SIM_DIR)+opt override HALLD_SIM_SCONS_OPTIONS += DEBUG=0 OPTIMIZATION=3 +else ifeq ($(HALLD_SIM_DEBUG_LEVEL), 1) + HALLD_SIM_DIR := $(HALLD_SIM_DIR)+hybrid else ifeq ($(HALLD_SIM_DEBUG_LEVEL), 2) HALLD_SIM_DIR := $(HALLD_SIM_DIR)+dbg override HALLD_SIM_SCONS_OPTIONS += DEBUG=1 OPTIMIZATION=0 From 83f09bdaa6a500b24093e76e8db1d6982614a00e Mon Sep 17 00:00:00 2001 From: Mark Ito Date: Sun, 17 Jul 2022 20:45:35 -0400 Subject: [PATCH 3/4] Fix case where there is a dirtag and a debug-level tag in the home directory name. --- version_check.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/version_check.pl b/version_check.pl index cb78d3b..5a38c92 100755 --- a/version_check.pl +++ b/version_check.pl @@ -68,14 +68,17 @@ } else { $version_field = $token0[1]; } - #print "version_field = $version_field\n"; + #print "first preliminary version_field = $version_field\n"; @token4 = split(/\^/, $version_field); if ($#token4 > 0) { $dirtag_field = $token4[$#token4]; $dirtag_string = "\\^" . $dirtag_field; + $dirtag_string =~ s/\+/\\\+/; + #print "dirtag_field = $dirtag_field, dirtag_string = $dirtag_string\n"; @token5 = split (/$dirtag_string/, $version_field); $version_field = $token5[0]; } + #print "second preliminary version_field = $version_field\n"; @token6 = split(/\+/, $version_field); if ($#token6 > 0) { $version_field = $token6[0]; @@ -99,7 +102,12 @@ @token7 = split(/\^/, $home_basename); if ($#token7 > 0) { $dirtag = $token7[1]; + @token9 = split(/\+/, $dirtag); + if ($#token9 > 0) { + $dirtag = $token9[0]; + } } + #print "dirtag = $dirtag\n" } else { } if ($dirtag) { From 4aad922b51bcf020d83ad9e58aba48b8512d6bf9 Mon Sep 17 00:00:00 2001 From: Mark Ito Date: Wed, 27 Jul 2022 21:50:09 -0400 Subject: [PATCH 4/4] Drop the debug level "hybrid" in favor of "optdbg". --- Makefile_halld_amp | 2 +- Makefile_halld_recon | 2 +- Makefile_halld_sim | 2 +- version_defs.pl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile_halld_amp b/Makefile_halld_amp index d161076..37f98c3 100644 --- a/Makefile_halld_amp +++ b/Makefile_halld_amp @@ -21,7 +21,7 @@ endif ifeq ($(HALLD_AMP_DEBUG_LEVEL), 0) override HALLD_AMP_SCONS_OPTIONS += DEBUG=0 OPTIMIZATION=3 else ifeq ($(HALLD_AMP_DEBUG_LEVEL), 1) - HALLD_AMP_DIR := $(HALLD_AMP_DIR)+hybrid + HALLD_AMP_DIR := $(HALLD_AMP_DIR)+optdbg else ifeq ($(HALLD_AMP_DEBUG_LEVEL), 2) HALLD_AMP_DIR := $(HALLD_AMP_DIR)+dbg override HALLD_AMP_SCONS_OPTIONS += DEBUG=1 OPTIMIZATION=0 diff --git a/Makefile_halld_recon b/Makefile_halld_recon index 3729da2..d806084 100644 --- a/Makefile_halld_recon +++ b/Makefile_halld_recon @@ -21,7 +21,7 @@ endif ifeq ($(HALLD_RECON_DEBUG_LEVEL), 0) override HALLD_RECON_SCONS_OPTIONS += DEBUG=0 OPTIMIZATION=3 else ifeq ($(HALLD_RECON_DEBUG_LEVEL), 1) - HALLD_RECON_DIR := $(HALLD_RECON_DIR)+hybrid + HALLD_RECON_DIR := $(HALLD_RECON_DIR)+optdbg else ifeq ($(HALLD_RECON_DEBUG_LEVEL), 2) HALLD_RECON_DIR := $(HALLD_RECON_DIR)+dbg override HALLD_RECON_SCONS_OPTIONS += DEBUG=1 OPTIMIZATION=0 diff --git a/Makefile_halld_sim b/Makefile_halld_sim index 22bd530..5013c35 100644 --- a/Makefile_halld_sim +++ b/Makefile_halld_sim @@ -21,7 +21,7 @@ endif ifeq ($(HALLD_SIM_DEBUG_LEVEL), 0) override HALLD_SIM_SCONS_OPTIONS += DEBUG=0 OPTIMIZATION=3 else ifeq ($(HALLD_SIM_DEBUG_LEVEL), 1) - HALLD_SIM_DIR := $(HALLD_SIM_DIR)+hybrid + HALLD_SIM_DIR := $(HALLD_SIM_DIR)+optdbg else ifeq ($(HALLD_SIM_DEBUG_LEVEL), 2) HALLD_SIM_DIR := $(HALLD_SIM_DIR)+dbg override HALLD_SIM_SCONS_OPTIONS += DEBUG=1 OPTIMIZATION=0 diff --git a/version_defs.pl b/version_defs.pl index 2b3486e..ccc206a 100644 --- a/version_defs.pl +++ b/version_defs.pl @@ -92,4 +92,4 @@ diracxx => '', hddm => '', halld_amp => ''); -@debug_type = ('', 'hybrid', 'dbg'); +@debug_type = ('', 'optdbg', 'dbg');