Changeset 591 for CMT

Timestamp:

Nov 29, 2011, 10:07:38 AM (12 years ago)

Author:

rybkin

Message:

See C.L. 468

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/cmt_make_shlib_common.sh (modified) (1 diff)
• mgr/cmt_uninstall_action.sh (modified) (1 diff)
• mgr/fragments/library (modified) (1 diff)
• source/cmt_constituent.cxx (modified) (2 diffs)
• source/cmt_generator.cxx (modified) (2 diffs)
• source/cmt_generators.cxx (modified) (5 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2011-11-29    <rybkin@lal.in2p3.fr> 468
+
+        * source/cmt_generators.cxx: In class DependencyGenerator, function reset,
+        set default name to "cmt_unnamed", in function prepare_header_file_filters,
+        do not create filter, if corresponding macro is defined with empty value
+        * source/cmt_generator.cxx: In class Generator, function
+        build_dependencies_infile, do not write header file filters macro, if it is
+        defined with empty value
+        * source/cmt_constituent.cxx: Minor code cleanup
+        * mgr/fragments/library: Pass necessary for script $(make_shlib) macro
+        values via environment
+        * mgr/cmt_make_shlib_common.sh: Take necessary macro values from
+        environment, if available, rather than invoke CMT multiple times to compute
+        * mgr/cmt_uninstall_action.sh: Unset CMTDEBUG if set in order to avoid
+        debug output interference with script, and enable shell trace mode
+
 2011-11-28    <rybkin@lal.in2p3.fr> 467
 

CMT/HEAD/mgr/cmt_make_shlib_common.sh

@@ -34 +34 @@
 fi
 
-ld=`${CMTROOT}/mgr/cmt show macro_value shlibbuilder -tag=${tag}` || exit
-ldflags=`${CMTROOT}/mgr/cmt show macro_value shlibflags -tag=${tag}` || exit
-suffix=`${CMTROOT}/mgr/cmt show macro_value shlibsuffix -tag=${tag}` || exit
-libprefix=`${CMTROOT}/mgr/cmt show macro_value library_prefix -tag=${tag}` || exit
-libsuffix=`${CMTROOT}/mgr/cmt show macro_value library_suffix -tag=${tag}` || exit
+[ -n "${ld:-}" ] || ld=`${CMTROOT}/mgr/cmt show macro_value shlibbuilder -tag=${tag}` || exit
+[ -n "${ldflags+CMT}" ] || ldflags=`${CMTROOT}/mgr/cmt show macro_value shlibflags -tag=${tag}` || exit
+[ -n "${suffix+CMT}" ] || suffix=`${CMTROOT}/mgr/cmt show macro_value shlibsuffix -tag=${tag}` || exit
+[ -n "${libprefix+CMT}" ] || libprefix=`${CMTROOT}/mgr/cmt show macro_value library_prefix -tag=${tag}` || exit
+[ -n "${libsuffix+CMT}" ] || libsuffix=`${CMTROOT}/mgr/cmt show macro_value library_suffix -tag=${tag}` || exit
 
 libname=${libprefix}${lib}${libsuffix}

CMT/HEAD/mgr/cmt_uninstall_action.sh

@@ -97 +97 @@
 
   if test "${cmtpath}" = ""; then
-    package=`cmt show macro_value package`
-    cmtpath=`cmt show macro_value ${package}_cmtpath`
+    if [ -n "${CMTDEBUG:-}" ]; then
+      unset CMTDEBUG
+      set -x
+    fi
+    package=`cmt show macro_value package` || exit
+    cmtpath=`cmt show macro_value ${package}_cmtpath` || exit
   fi
 

CMT/HEAD/mgr/fragments/library

@@ -29 +29 @@
 $(${CONSTITUENT}libname).$(shlibsuffix) :: $(${CONSTITUENT}lib) requirements $(use_requirements) $(${CONSTITUENT}stamps)
         $(lib_echo) "shared library $@"
-        $(lib_silent) if test "$(makecmd)"; then QUIET=; else QUIET=1; fi; QUIET=$${QUIET} bin=$(bin) $(make_shlib) "$(tags)" ${CONSTITUENT} $(${CONSTITUENT}_shlibflags)
+        $(lib_silent) if test "$(makecmd)"; then QUIET=; else QUIET=1; fi; QUIET=$${QUIET} bin="$(bin)" ld="$(shlibbuilder)" ldflags="$(shlibflags)" suffix=$(shlibsuffix) libprefix=$(library_prefix) libsuffix=$(library_suffix) $(make_shlib) "$(tags)" ${CONSTITUENT} $(${CONSTITUENT}_shlibflags)
 
 $(${CONSTITUENT}shstamp) :: $(${CONSTITUENT}libname).$(shlibsuffix)

CMT/HEAD/source/cmt_constituent.cxx

@@ -389 +389 @@
     }
 
+  parameters.clear ();
+
   if (has_target_tag && (Document != type || "cmt_actions" != group->name ()))
     {
@@ -404 +406 @@
         }
     }
-
-  parameters.clear ();
 }
 

CMT/HEAD/source/cmt_generator.cxx

@@ -1079 +1079 @@
           const Symbol* filter_macro = Symbol::find (package_name + "_header_file_filter");
           if (filter_macro == 0) continue;
+          const cmt_string filter_expr (filter_macro->resolve_macro_value ());
+          if (filter_expr.size () == 0) continue;
           
           const Symbol* stamp_macro = Symbol::find (package_name + "_header_file_stamp");
@@ -1106 +1108 @@
 
           os << "macro " + package_name + "_header_file_filter ";
-          os << CmtSystem::quote (filter_macro->resolve_macro_value (), " \t");
+          os << CmtSystem::quote (filter_expr, " \t");
+          //os << CmtSystem::quote (filter_macro->resolve_macro_value (), " \t");
           os << "\n";
           os << "macro " + package_name + "_header_file_stamp ";

CMT/HEAD/source/cmt_generators.cxx

@@ -3073 +3073 @@
   m_deps_builder.clear ();
   m_stamps = true;
-  m_name = "unnamed";
+  m_name = "cmt_unnamed";
 }
 
@@ -3177 +3177 @@
       const Symbol* filter_macro = Symbol::find (package_name + "_header_file_filter");
       if (filter_macro == 0) continue;
+      const cmt_string filter_expr (filter_macro->resolve_macro_value ());
+      if (filter_expr.size () == 0) continue;
 
       const Symbol* stamp_macro = Symbol::find (package_name + "_header_file_stamp");
@@ -3206 +3208 @@
 
       //cerr << "0: adding filter: " << use->get_package_name () << "[" << use->get_index () << "]\n";
-      cmt_regexp* filter = new cmt_regexp (filter_macro->resolve_macro_value ());
+      cmt_regexp* filter = new cmt_regexp (filter_expr);
+      //cmt_regexp* filter = new cmt_regexp (filter_macro->resolve_macro_value ());
       assert (filter != 0);
 
@@ -3222 +3225 @@
               (r + 19) != symbol.name.size () ||
               r == 0) continue;
+          const cmt_string filter_expr (symbol.resolve_macro_value ());
+          if (filter_expr.size () == 0) continue;
 
           cmt_string package_name = symbol.name.substr(0, r);
@@ -3259 +3264 @@
           
           //cerr << "1: adding filter: " << package_name << "\n";
-          cmt_regexp* filter = new cmt_regexp (symbol.resolve_macro_value ());
+          cmt_regexp* filter = new cmt_regexp (filter_expr);
+          //cmt_regexp* filter = new cmt_regexp (symbol.resolve_macro_value ());
           assert (filter != 0);