Changeset 547 for CMT

Timestamp:

Aug 3, 2010, 5:11:00 PM (14 years ago)

Author:

rybkin

Message:

See C.L. 432

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/fragments/constituent (modified) (1 diff)
• mgr/fragments/constituent_lock (modified) (1 diff)
• mgr/fragments/dependencies (modified) (1 diff)
• mgr/fragments/nmake/constituent (modified) (3 diffs)
• mgr/fragments/nmake/constituent_lock (modified) (3 diffs)
• mgr/fragments/nmake/constituents_header (modified) (1 diff)
• mgr/fragments/nmake/dependencies (modified) (2 diffs)
• source/cmt.h (modified) (5 diffs)
• source/cmt_commands.cxx (modified) (3 diffs)
• source/cmt_generators.cxx (modified) (3 diffs)
• source/cmt_parser.cxx (modified) (17 diffs)
• source/cmt_parser.h (modified) (1 diff)
• source/cmt_project.cxx (modified) (3 diffs)
• source/cmt_project.h (modified) (1 diff)
• source/cmt_std.h (modified) (3 diffs)
• source/cmt_symbol.cxx (modified) (9 diffs)
• source/cmt_symbol.h (modified) (1 diff)
• source/cmt_tag.cxx (modified) (5 diffs)
• source/cmt_tag.h (modified) (1 diff)
• source/cmt_use.cxx (modified) (12 diffs)
• source/cmt_use.h (modified) (2 diffs)
• src/Makefile.header (modified) (5 diffs)
• src/NMakefile.header (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2010-08-03    <rybkin@lal.in2p3.fr> 432
+
+        * source/cmt_parser.h: Add to ActionType action_build_constituents_config,
+        action_build_constituent_config
+        * source/cmt_commands.cxx: Introduce commands "cmt build
+        constituents_config", and "cmt build constituent_config" and their help
+        messages
+        * source/cmt_tag.h: In class Tag functions show_definition, show, add
+        optional argument of type ostream
+        * source/cmt_tag.cxx: Implement optional argument
+        * source/cmt_std.h: Add header and shortcut for ostringstream
+        * source/cmt_symbol.h: In class Symbol function show_macro, add optional
+        argument of type ostream
+        * source/cmt_symbol.cxx: Implement optional argument, add actions
+        action_build_constituents_config, action_build_constituent_config in same
+        context as action_build_tag_makefile
+        * source/cmt.h: In class Cmt, introduce functions
+        do_build_constituents_config, do_build_constituent_config, for functions
+        do_show_setup, do_show_path, do_show_tags, do_show_uses, print_macros add
+        optional argument of type ostream
+        * source/cmt_parser.cxx: Implement Cmt class functions and optional
+        argument, add actions
+        action_build_constituents_config, action_build_constituent_config in same
+        context as action_build_constituents_makefile and
+        action_build_constituent_makefile, make use of functions
+        do_build_constituents_config and do_build_constituent_config, and in same
+        context as action_build_tag_makefile
+        * source/cmt_project.h: In class Project function show_paths, add optional
+        argument of type ostream
+        * source/cmt_project.cxx: Implement optional argument
+        * source/cmt_use.h: In class Use functions show_all, show_sub_uses, add
+        optional argument of type ostream
+        * source/cmt_use.cxx: Implement optional argument
+        * source/cmt_generators.cxx: In class ConstituentsMakefileGenerator
+        function build, parse option -outdir=
+        * src/Makefile.header: Make use of "cmt build constituents_config" command,
+        use .DEFAULT for (almost) all possible targets (rather than common_target)
+        * src/NMakefile.header: Make use of "cmt build constituents_config" command
+        * mgr/fragments/nmake/constituents_header: No longer use commands
+        "cmt build tag_makefile" or "cmt show setup"
+        * mgr/fragments/constituent: Make use of "cmt build constituent_config"
+        command, ensure QUICK mode can be used for from scratch build
+        * mgr/fragments/constituent_lock: idem
+        * mgr/fragments/nmake/constituent: idem
+        * mgr/fragments/nmake/constituent_lock: idem
+        * mgr/fragments/dependencies: Do not use QUICK switch (dependencies should
+        be rebuilt as needed by Make)
+        * mgr/fragments/nmake/dependencies: idem
+        
 2010-07-02    <rybkin@lal.in2p3.fr> 431
 

CMT/HEAD/mgr/fragments/constituent

@@ -69 +69 @@
 
 ifndef QUICK
-$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) build_library_links
+#$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links
+        $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
+          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_config -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
 else
-$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
+#$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
+        if [ ! -f $@ ]; then \
+          test -z "$(cmtmsg)" || \
+          echo "$(CMTMSGPREFIX)" "(constituents.make) Building ${CONSTITUENT}.make"; \
+          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_config -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}; \
+          fi
 endif
-        $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
-          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
+
+#         $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
 
 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs ${CONSTITUENT}dirs

CMT/HEAD/mgr/fragments/constituent_lock

@@ -69 +69 @@
 
 ifndef QUICK
-$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) build_library_links
+#$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links
+        $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
+          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_config -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
 else
-$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
+#$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
+        if [ ! -f $@ ]; then \
+          test -z "$(cmtmsg)" || \
+          echo "$(CMTMSGPREFIX)" "(constituents.make) Building ${CONSTITUENT}.make"; \
+          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_config -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}; \
+          fi
 endif
-        $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
-          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
+
+#         $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
 
 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs ${CONSTITUENT}dirs

CMT/HEAD/mgr/fragments/dependencies

@@ -5 +5 @@
 #$(bin)${CONSTITUENT}_dependencies.make :: dirs
 
-ifndef QUICK
+#ifndef QUICK
 $(bin)${CONSTITUENT}_dependencies.make : ${LINE} $(use_requirements) $(cmt_final_setup_${CONSTITUENT})
         $(echo) "(${CONSTITUENT}.make) Rebuilding $@"; \
           $(build_dependencies) ${CONSTITUENT} -all_sources -out=$@ ${LINE}
-endif
+#endif
 
 #$(${CONSTITUENT}_dependencies)

CMT/HEAD/mgr/fragments/nmake/constituent

@@ -19 +19 @@
 !endif
 
-!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile_${CONSTITUENT}))
+#!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile_${CONSTITUENT}))
 
-!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile_${CONSTITUENT})] == 0
-!endif
-!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
-!endif
+#!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile_${CONSTITUENT})] == 0
+#!endif
+#!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
+#!endif
 
-!if [$(echo) (constituents.nmake) Rebuilding $(cmt_final_setup_${CONSTITUENT})] == 0
-!endif
-!if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT})] == 0
-!endif
+#!if [$(echo) (constituents.nmake) Rebuilding $(cmt_final_setup_${CONSTITUENT})] == 0
+#!endif
+#!if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT})] == 0
+#!endif
 
-!if exist ($(cmt_final_setup_${CONSTITUENT})) && [ echo n|comp $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}) >nul 2>&1 ] == 0
-!if [ del $(cmt_local_setup_${CONSTITUENT}) ] == 0
-!endif
-!else
-!if [ move /y $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}) >nul ] == 0
-!endif
-!endif
+#!if exist ($(cmt_final_setup_${CONSTITUENT})) && [ echo n|comp $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}) >nul 2>&1 ] == 0
+#!if [ del $(cmt_local_setup_${CONSTITUENT}) ] == 0
+#!endif
+#!else
+#!if [ move /y $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}) >nul ] == 0
+#!endif
+#!endif
 
-!endif
+#!endif
 
 !else
@@ -52 +52 @@
 !endif
 
-!if "$(QUICK)" == ""
-$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT})
-!else
-$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
-!endif
+#!if "$(QUICK)" == ""
+#$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT})
+#!else
+#$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
+#!endif
+
+!if "$(QUICK)" == "" || !exist ($(cmt_local_${CONSTITUENT}_makefile)) || !exist ($(cmt_local_tagfile_${CONSTITUENT})) || !exist ($(cmt_final_setup_${CONSTITUENT}))
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
         $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
         @set include=$(include)
         @set lib=$(lib)
-        @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$@ ${CONSTITUENT}
+        @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_config -out=$@ ${CONSTITUENT}
+#       @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$@ ${CONSTITUENT}
 #       $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
+!else
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) ;
+!endif
 
 cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1
@@ -104 +111 @@
 
 #${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
-${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT})
+#${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT})
+${CONSTITUENT}uninstall ::
         $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}
         @set include=$(include)
         @set lib=$(lib)
-        @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
+        @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_config -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
+#       @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag)
         $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done

CMT/HEAD/mgr/fragments/nmake/constituent_lock

@@ -19 +19 @@
 !endif
 
-!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile_${CONSTITUENT}))
+#!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile_${CONSTITUENT}))
 
-!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile_${CONSTITUENT})] == 0
-!endif
-!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
-!endif
+#!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile_${CONSTITUENT})] == 0
+#!endif
+#!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
+#!endif
 
-!if [$(echo) (constituents.nmake) Rebuilding $(cmt_final_setup_${CONSTITUENT})] == 0
-!endif
-!if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT})] == 0
-!endif
+#!if [$(echo) (constituents.nmake) Rebuilding $(cmt_final_setup_${CONSTITUENT})] == 0
+#!endif
+#!if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT})] == 0
+#!endif
 
-!if exist ($(cmt_final_setup_${CONSTITUENT})) && [ echo n|comp $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}) >nul 2>&1 ] == 0
-!if [ del $(cmt_local_setup_${CONSTITUENT}) ] == 0
-!endif
-!else
-!if [ move /y $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}) >nul ] == 0
-!endif
-!endif
+#!if exist ($(cmt_final_setup_${CONSTITUENT})) && [ echo n|comp $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}) >nul 2>&1 ] == 0
+#!if [ del $(cmt_local_setup_${CONSTITUENT}) ] == 0
+#!endif
+#!else
+#!if [ move /y $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}) >nul ] == 0
+#!endif
+#!endif
 
-!endif
+#!endif
 
 !else
@@ -52 +52 @@
 !endif
 
-!if "$(QUICK)" == ""
-$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT})
-!else
-$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
-!endif
+#!if "$(QUICK)" == ""
+#$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT})
+#!else
+#$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
+#!endif
+
+!if "$(QUICK)" == "" || !exist ($(cmt_local_${CONSTITUENT}_makefile)) || !exist ($(cmt_local_tagfile_${CONSTITUENT})) || !exist ($(cmt_final_setup_${CONSTITUENT}))
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
         $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
         @set include=$(include)
         @set lib=$(lib)
-        @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$@ ${CONSTITUENT}
+        @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_config -out=$@ ${CONSTITUENT}
+#       @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$@ ${CONSTITUENT}
 #       $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
+!else
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) ;
+!endif
 
 cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1
@@ -108 +115 @@
 
 #${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
-${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT})
+#${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT})
+${CONSTITUENT}uninstall ::
         $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}
         @set include=$(include)
         @set lib=$(lib)
-        @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
+        @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_config -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
+#       @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag)
         $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done

CMT/HEAD/mgr/fragments/nmake/constituents_header

@@ -18 +18 @@
 cmt_final_setup = $(bin)setup.nmake
 
-!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile))
+#!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile))
 
-#!if [$(echo) (constituents.nmake) Rebuilding $(${PACKAGE}_tag).nmake] == 0
-!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile)] == 0
-!endif
-#!if [cmt build tag_makefile -tag_add=$(tags) >$(${PACKAGE}_tag).nmake] == 0
-!if [cmt build tag_makefile -tag_add=$(tags) >$(cmt_local_tagfile)] == 0
-!endif
+#!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile)] == 0
+#!endif
+#!if [cmt build tag_makefile -tag_add=$(tags) >$(cmt_local_tagfile)] == 0
+#!endif
 
-!if [$(echo) (constituents.nmake) Rebuilding $(cmt_final_setup)] == 0
-!endif
-!if [cmt -tag=$(tags) show setup >$(cmt_local_setup)] == 0
-!endif
+#!if [$(echo) (constituents.nmake) Rebuilding $(cmt_final_setup)] == 0
+#!endif
+#!if [cmt -tag=$(tags) show setup >$(cmt_local_setup)] == 0
+#!endif
 
-!if exist ($(cmt_final_setup)) && [ echo n|comp $(cmt_final_setup) $(cmt_local_setup) >nul 2>&1 ] == 0
-!if [ del $(cmt_local_setup) ] == 0
-!endif
-!else
-!if [ move /y $(cmt_local_setup) $(cmt_final_setup) >nul ] == 0
-!endif
-!endif
+#!if exist ($(cmt_final_setup)) && [ echo n|comp $(cmt_final_setup) $(cmt_local_setup) >nul 2>&1 ] == 0
+#!if [ del $(cmt_local_setup) ] == 0
+#!endif
+#!else
+#!if [ move /y $(cmt_local_setup) $(cmt_final_setup) >nul ] == 0
+#!endif
+#!endif
 
-!endif
+#!endif
 
 #!include $(${PACKAGE}_tag).nmake

CMT/HEAD/mgr/fragments/nmake/dependencies

@@ -1 +1 @@
 #-- start of dependency ------------------
 
-!if "$(QUICK)" == ""
+#!if "$(QUICK)" == ""
 
 #!if exist ("$(CMTROOT)/$(CMTBIN)/cmt.exe")
@@ -17 +17 @@
         $(build_dependencies) ${CONSTITUENT} -all_sources -out:$@ ${LINE}
 
-!endif
+#!endif
 
 !if exist ($(bin)${CONSTITUENT}_dependencies.nmake)

CMT/HEAD/source/cmt.h

@@ -107 +107 @@
   static void do_broadcast (const ArgParser& ap);
   static void do_build_constituent_makefile (const ArgParser& ap);
+  static void do_build_constituent_config (const ArgParser& ap);
   static void do_build_constituents_makefile (const ArgParser& ap);
+  static void do_build_constituents_config (const ArgParser& ap);
   static void do_build_dependencies (const ArgParser& ap,
                                      int argc,
@@ -179 +181 @@
   static void do_show_manager (const ArgParser& ap);
   static void do_show_packages (const ArgParser& ap);
-  static void do_show_path (const ArgParser& ap);
+  static void do_show_path (const ArgParser& ap, ostream& out = cout);
   static void do_show_pattern (const ArgParser& ap);
   static void do_show_pattern_names (const ArgParser& ap);
@@ -186 +188 @@
   static void do_show_project_author (const ArgParser& ap);  
   static void do_show_pwd (const ArgParser& ap);
-  static void do_show_setup (const ArgParser& ap);
+  static void do_show_setup (const ArgParser& ap, ostream& out = cout);
   static void do_show_set (const ArgParser& ap);
   static void do_show_set_names (const ArgParser& ap);
@@ -192 +194 @@
   static void do_show_sets (const ArgParser& ap);
   static void do_show_strategies (const ArgParser& ap);
-  static void do_show_tags (const ArgParser& ap);
+  static void do_show_tags (const ArgParser& ap, ostream& out = cout);
   static void do_show_use_paths (const ArgParser& ap);
-  static void do_show_uses (const ArgParser& ap);
+  static void do_show_uses (const ArgParser& ap, ostream& out = cout);
   static void do_show_version (const ArgParser& ap);
   static void do_show_versions (const ArgParser& ap);
@@ -254 +256 @@
   static void print_clean (PrintMode mode);
   static void print_context (Use& use, PrintMode mode, const cmt_string& tag);
-  static void print_macros (PrintMode mode, const cmt_string& pattern = "");
+  static void print_macros (PrintMode mode, const cmt_string& pattern = "",
+                            ostream& out = cout);
+  //  static void print_macros (PrintMode mode, const cmt_string& pattern = "");
   static void print_symbol_names (PrintMode mode, const cmt_string& pattern = "");
   static void print_tabs (int tabs);

CMT/HEAD/source/cmt_commands.cxx

@@ -584 +584 @@
             }
         }
+      else if (arg == "constituent_config")
+        {
+          //      if (argc > 0)
+          if (argc == 1 ||
+              argc == 2 &&
+              (cmt_string (argv[0]).substr (0, 5) == "-out=" ||
+               cmt_string (argv[1]).substr (0, 5) == "-out=")
+              )
+            {
+              //fill_one_argument ();
+              fill_arguments ();
+              cmt.m_action = action_build_constituent_config;
+            }
+          else if (argc > 0)
+            {
+              CmtMessage::error ("syntax: wrong arguments");
+//            if (!cmt.m_quiet) cerr << "#CMT> syntax error : wrong arguments" << endl;
+              cmt.m_action = action_build_constituent_config;
+              help_action = action_help;
+            }
+          else
+            {
+              CmtMessage::error ("syntax: constituent name missing");
+              //              if (!cmt.m_quiet) cerr << "#CMT> syntax error : constituent name missing" << endl;
+              cmt.m_action = action_build_constituent_config;
+              help_action = action_help;
+            }
+        }
       else if (arg == "constituents_makefile")
         {
           fill_arguments ();
           cmt.m_action = action_build_constituents_makefile;
+        }
+      else if (arg == "constituents_config")
+        {
+          fill_arguments ();
+          cmt.m_action = action_build_constituents_config;
         }
       else if (arg == "dependencies")
@@ -2235 +2268 @@
   help_texts.add () =  "build <option>          : build actions. (Try cmt help build)";
   help_texts.add () =  "build constituent_makefile <constituent>  : generate constituent Makefile fragment";
+  help_texts.add () =  "build constituent_config <constituent>  : generate constituent Makefile fragment, also tag specific Makefile, and setup definitions file, if constituent has associated tag (via -target_tag option, or is action)";
   help_texts.add () =  "build constituents_makefile : generate constituents.make";
+  help_texts.add () =  "build constituents_config : generate constituents.make, tag specific Makefile, and setup definitions file";
   help_texts.add () =  "build dependencies      : generate dependencies";
   help_texts.add () =  "build library_links     : build symbolic links towards all imported libraries";
@@ -2335 +2370 @@
   help.add (action_build, help_texts[action_build]);
   help.add (action_build_constituent_makefile, help_texts[action_build_constituent_makefile]);
+  help.add (action_build_constituent_config, help_texts[action_build_constituent_config]);
   help.add (action_build_constituents_makefile, help_texts[action_build_constituents_makefile]);
+  help.add (action_build_constituents_config, help_texts[action_build_constituents_config]);
   help.add (action_build_dependencies, help_texts[action_build_dependencies]);
   help.add (action_build_library_links, help_texts[action_build_library_links]);

CMT/HEAD/source/cmt_generators.cxx

@@ -2524 +2524 @@
   reset ();
 
-  cmt_string file_name;
+  cmt_string file_name, dir_name;
 
   if (arguments.size () > 0)
@@ -2533 +2533 @@
           arg.erase (0, 5);
           file_name = arg;
+        }
+      else if (arg.substr (0, 8) == "-outdir=")
+        {
+          arg.erase (0, 8);
+          dir_name = arg;
         }
     }
@@ -2550 +2555 @@
           file_name += "make";
         }
+    }
+
+  if (dir_name != "")
+    {
+      if (dir_name [dir_name.size () - 1] != CmtSystem::file_separator ())
+        dir_name += CmtSystem::file_separator ();
+      file_name = dir_name + file_name;
     }
 

CMT/HEAD/source/cmt_parser.cxx

@@ -2106 +2106 @@
 
 //----------------------------------------------------------
+void Cmt::do_build_constituent_config (const ArgParser& ap)
+{
+  if (CmtLock::check () == CmtLock::locked_by_another_user)
+    {
+      CmtError::set (CmtError::conflicting_lock, "build_constituent_config>");
+      return;
+    }
+  if (ap.arguments.size () == 0) return;
+  set_standard_macros ();
+
+  CmtSystem::cmt_string_vector files (2);
+  cmt_string  outdir, name;
+  for (int i = 0; i < ap.arguments.size (); i++)
+    {
+      cmt_string arg = ap.arguments[i];
+      if (arg.substr (0, 5) == "-out=")
+        {
+          arg.erase (0, 5);
+          CmtSystem::dirname (arg, outdir);
+        }
+      else
+        {
+          name = arg;
+        }
+    }
+
+  Generator::build_constituent_makefile (ap.arguments);
+
+  const Constituent* constituent = Constituent::find (name);
+  if (constituent == 0)
+    {
+      // generate error
+      return;
+    }
+  if (!constituent->has_target_tag) return;
+  //  cerr << "constituent: " << name << endl;
+
+  cmt_string tag;
+  {
+    Symbol* macro = Symbol::find ("tag");
+    if (macro != 0)
+      {
+        tag = macro->build_macro_value ();
+        Symbol::expand (tag);
+      }
+  }
+
+  //cmt_local_tagfile = $(bin)$(tag).make
+  //cmt_final_setup = $(bin)setup.make
+  //cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make
+  //cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.make
+  files[0] = tag + "_" + name;
+  files[1] = "setup_" + name;
+  for (int i = 0; i < files.size (); i++)
+    {
+      if (Cmt::build_nmake ())
+        files[i] += ".nmake";
+      else
+        files[i] += ".make";
+
+      if (outdir != "")
+        {
+          if (outdir [outdir.size () - 1] != CmtSystem::file_separator ())
+            outdir += CmtSystem::file_separator ();
+          files[i] = outdir + files[i];
+        }
+      //      cerr << "files[" << i << "]: " << files[i] << endl;
+    }
+
+  ofstream t (files[0]);
+  if (!t)
+    {
+      CmtError::set (CmtError::file_access_error, files[0]);
+      return;
+    }
+  t.exceptions (ios::failbit | ios::badbit);
+  try
+    {
+      print_macros (Make, "", t);
+      t.close (); // ios_base::failbit
+    }
+  catch (const ios::failure& e)
+    {
+      CmtSystem::close_ostream (NULL, files[0] + ": " + cmt_string (e.what ()));
+    }
+
+  bool gen_setup (true);
+  ostringstream os;
+  ofstream s;
+  s.open (files[1], ios::in);
+  if (s) // file already exists
+    {
+      //      cerr << files[1] << " already exists" << endl;
+      do_show_setup (ap, os);
+      ostringstream osn;
+      osn << s.rdbuf ();
+      if (os.str () == osn.str ())
+        {
+          //      cerr << files[1] << " up-to-date" << endl;
+          gen_setup = false;
+        }
+    }
+  s.clear ();
+  s.close ();
+  if (gen_setup)
+    {
+      s.open (files[1]);
+      if (!s)
+        {
+          CmtError::set (CmtError::file_access_error, files[1]);
+          return;
+        }
+      s.exceptions (ios::failbit | ios::badbit);
+      try
+        {
+          if (os.str ().size () != 0)
+            {
+              //              cerr << files[1] << " contents already generated" << endl;
+              s << os.str ();
+            }
+          else
+            {
+              do_show_setup (ap, s);
+            }
+          s.close (); // ios_base::failbit
+        }
+      catch (const ios::failure& e)
+        {
+          CmtSystem::close_ostream (NULL, files[1] + ": " + cmt_string (e.what ()));
+        }
+    }
+}
+
+//----------------------------------------------------------
 void Cmt::do_build_constituents_makefile (const ArgParser& ap)
 {
@@ -2114 +2248 @@
     }
   set_standard_macros ();
+
+  Generator::build_constituents_makefile (Me.m_current_package, ap.arguments);
+}
+
+//----------------------------------------------------------
+void Cmt::do_build_constituents_config (const ArgParser& ap)
+{
+  if (CmtLock::check () == CmtLock::locked_by_another_user)
+    {
+      CmtError::set (CmtError::conflicting_lock, "build_constituents_config>");
+      return;
+    }
+  set_standard_macros ();
+
+  CmtSystem::cmt_string_vector files (2);
+  cmt_string outdir;
+  if (ap.arguments.size () > 0)
+    {
+      cmt_string arg = ap.arguments[0];
+      if (arg.substr (0, 5) == "-out=")
+        {
+          arg.erase (0, 5);
+          CmtSystem::dirname (arg, outdir);
+        }
+      else if (arg.substr (0, 8) == "-outdir=")
+        {
+          arg.erase (0, 8);
+          outdir = arg;
+        }
+    }
+  //  cerr << "outdir: " << outdir << endl;
+
+  cmt_string tag;
+  {
+    Symbol* macro = Symbol::find ("tag");
+    if (macro != 0)
+      {
+        tag = macro->build_macro_value ();
+        Symbol::expand (tag);
+      }
+  }
+
+  //cmt_local_tagfile = $(bin)$(tag).make
+  //cmt_final_setup = $(bin)setup.make
+  files[0] = tag;
+  files[1] = "setup";
+  for (int i = 0; i < files.size (); i++)
+    {
+      if (Cmt::build_nmake ())
+        files[i] += ".nmake";
+      else
+        files[i] += ".make";
+
+      if (outdir != "")
+        {
+          if (outdir [outdir.size () - 1] != CmtSystem::file_separator ())
+            outdir += CmtSystem::file_separator ();
+          files[i] = outdir + files[i];
+        }
+      //      cerr << "files[" << i << "]: " << files[i] << endl;
+    }
+
+  //  files[0] = "/dev/full";
+  ofstream t (files[0]);
+  if (!t)
+    {
+      CmtError::set (CmtError::file_access_error, files[0]);
+      return;
+    }
+  t.exceptions (ios::failbit | ios::badbit);
+  try
+    {
+      print_macros (Make, "", t);
+      t.close (); // ios_base::failbit
+    }
+  catch (const ios::failure& e)
+    {
+      CmtSystem::close_ostream (NULL, files[0] + ": " + cmt_string (e.what ()));
+    }
+
+  bool gen_setup (true);
+  ostringstream os;
+  ofstream s;
+  s.open (files[1], ios::in);
+  if (s) // file already exists
+    {
+      //      cerr << files[1] << " already exists" << endl;
+      do_show_setup (ap, os);
+      ostringstream osn;
+      osn << s.rdbuf ();
+      if (os.str () == osn.str ())
+        {
+          //      cerr << files[1] << " up-to-date" << endl;
+          gen_setup = false;
+        }
+    }
+  s.clear ();
+  s.close ();
+  if (gen_setup)
+    {
+      s.open (files[1]);
+      if (!s)
+        {
+          CmtError::set (CmtError::file_access_error, files[1]);
+          return;
+        }
+      s.exceptions (ios::failbit | ios::badbit);
+      try
+        {
+          if (os.str ().size () != 0)
+            {
+              //              cerr << files[1] << " contents already generated" << endl;
+              s << os.str ();
+            }
+          else
+            {
+              do_show_setup (ap, s);
+            }
+          s.close (); // ios_base::failbit
+        }
+      catch (const ios::failure& e)
+        {
+          CmtSystem::close_ostream (NULL, files[1] + ": " + cmt_string (e.what ()));
+        }
+    }
 
   Generator::build_constituents_makefile (Me.m_current_package, ap.arguments);
@@ -4268 +4527 @@
 
 //----------------------------------------------------------
-void Cmt::do_show_path (const ArgParser& ap)
-{
-  Project::show_paths (ap.arguments);
+void Cmt::do_show_path (const ArgParser& ap, ostream& out)
+{
+  Project::show_paths (ap.arguments, out);
 }
 
@@ -4306 +4565 @@
 
 //----------------------------------------------------------
-void Cmt::do_show_setup (const ArgParser& ap)
-{
-  cout << "----------> uses" << endl;
-  do_show_uses (ap);
+void Cmt::do_show_setup (const ArgParser& ap, ostream& out)
+//void Cmt::do_show_setup (const ArgParser& ap)
+{
+  out << "----------> uses" << endl;
+  do_show_uses (ap, out);
   // This is temporary to ensure that Make - which runs "cmt show setup" -
   // does not fail for packages with unresolved uses
@@ -4315 +4575 @@
     CmtError::clear ();
 
-  cout << "----------> tags" << endl;
-  do_show_tags (ap);
-
-  cout << "----------> CMTPATH" << endl;
-  do_show_path (ap);
+  out << "----------> tags" << endl;
+  do_show_tags (ap, out);
+
+  out << "----------> CMTPATH" << endl;
+  do_show_path (ap, out);
 }
 
@@ -4470 +4730 @@
 
 //----------------------------------------------------------
-void Cmt::do_show_tags (const ArgParser& /*ap*/)
+void Cmt::do_show_tags (const ArgParser& /*ap*/, ostream& out)
 {
   Tag::TagPtrVector tags = Tag::tags ();
@@ -4482 +4742 @@
       if (tag != 0)
         {
-          tag->show (Me.m_quiet);
+          tag->show (Me.m_quiet, out);
         }
     }
@@ -4499 +4759 @@
 
 //----------------------------------------------------------
-void Cmt::do_show_uses (const ArgParser& /*ap*/)
-{
-  Use::show_all ();
+void Cmt::do_show_uses (const ArgParser& /*ap*/, ostream& out)
+{
+  Use::show_all (false, out);
 }
 
@@ -5982 +6242 @@
     case action_broadcast :
     case action_build_constituent_makefile :
+    case action_build_constituent_config :
     case action_build_constituents_makefile :
+    case action_build_constituents_config :
     case action_build_dependencies :
     case action_build_library_links :
@@ -6095 +6357 @@
     case action_broadcast :
     case action_build_constituent_makefile :
+    case action_build_constituent_config :
     case action_build_constituents_makefile :
+    case action_build_constituents_config :
     case action_build_dependencies :
     case action_build_library_links :
@@ -6200 +6464 @@
     case action_broadcast :
     case action_build_constituent_makefile :
+    case action_build_constituent_config :
     case action_build_constituents_makefile :
+    case action_build_constituents_config :
     case action_build_dependencies :
     case action_build_library_links :
@@ -6317 +6583 @@
           // case action_broadcast :
         case action_build_constituent_makefile :
+        case action_build_constituent_config :
         case action_build_constituents_makefile :
+        case action_build_constituents_config :
         case action_build_dependencies :
         case action_build_library_links :
@@ -6432 +6700 @@
           do_build_constituent_makefile (ap);
           break;
+        case action_build_constituent_config :
+          do_build_constituent_config (ap);
+          break;
         case action_build_constituents_makefile :
           do_build_constituents_makefile (ap);
+          break;
+        case action_build_constituents_config :
+          do_build_constituents_config (ap);
           break;
         case action_build_dependencies :
@@ -7051 +7325 @@
  * in recursively read requirements files.
  */
-void Cmt::print_macros (PrintMode mode, const cmt_string& pattern)
+void Cmt::print_macros (PrintMode mode, const cmt_string& pattern, ostream& out)
+//void Cmt::print_macros (PrintMode mode, const cmt_string& pattern)
 {
   int number;
@@ -7084 +7359 @@
               (symbol.type == Symbol::SymbolAction)) continue;
         }
-      else if (Me.m_action == action_build_tag_makefile)
+      else if ((Me.m_action == action_build_tag_makefile) ||
+               (Me.m_action == action_build_constituents_config) ||
+               (Me.m_action == action_build_constituent_config))
         {
           // Exclude scripts and actions
@@ -7098 +7375 @@
       if (symbol.value_lists.size () < 1) continue;
 
-      symbol.show_macro (mode);
+      symbol.show_macro (mode, out);
+      //      symbol.show_macro (mode);
     }
 }
@@ -8247 +8525 @@
             else
               {
-                if (Me.m_action == action_build_constituents_makefile)
+                if (Me.m_action == action_build_constituents_makefile ||
+                    Me.m_action == action_build_constituents_config)
                   CmtMessage::warning ("package " + import +
                                        " cannot be imported (requested for " +

CMT/HEAD/source/cmt_parser.h

@@ -223 +223 @@
 
   action_build_constituent_makefile,
+  action_build_constituent_config,
   action_build_constituents_makefile,
+  action_build_constituents_config,
   action_build_dependencies,
   action_build_library_links,

CMT/HEAD/source/cmt_project.cxx

@@ -1423 +1423 @@
 
 /*----------------------------------------------------------*/
-void Project::show_paths (const CmtSystem::cmt_string_vector& arguments)
+void Project::show_paths (const CmtSystem::cmt_string_vector& arguments,
+                          ostream& out)
 //void Project::show_paths ()
 {
-  if (arguments.size () == 0)
+  if (arguments.size () == 0 ||
+      Cmt::get_action () != action_show_path)
     {
       const ProjectPtrVector& Ordered = Project::ordered_projects ();
@@ -1439 +1441 @@
           if (CmtSystem::test_directory (w))
             {
-              cout << "# Add path " << w << " from " << s << endl;
+              out << "# Add path " << w << " from " << s << endl;
             }
         }
@@ -1456 +1458 @@
           if (CmtSystem::test_directory (w))
             {
-              cout << "# Create path " << w << " from " << s << endl;
+              out << "# Create path " << w << " from " << s << endl;
             }
         }

CMT/HEAD/source/cmt_project.h

@@ -115 +115 @@
   static void show_container (const cmt_string& path = "");
   static void show_specified_strategies_for_all ();
-  static void show_paths (const CmtSystem::cmt_string_vector& arguments);
+  static void show_paths (const CmtSystem::cmt_string_vector& arguments, ostream& out = cout);
   //  static void show_paths ();
   static const cmt_string& get_project_file_name ();

CMT/HEAD/source/cmt_std.h

@@ -27 +27 @@
 #include <iostream.h>
 #include <fstream.h>
+#include <sstream.h>
 
 #define ios_base ios
@@ -37 +38 @@
 #include <iostream>
 #include <fstream>
+#include <sstream>
 
 #define cout std::cout
@@ -43 +45 @@
 #define ofstream std::ofstream
 #define ifstream std::ifstream
+#define ostringstream std::ostringstream
 #define istream std::istream
 #define ostream std::ostream

CMT/HEAD/source/cmt_symbol.cxx

@@ -719 +719 @@
 
             if ((!Cmt::get_quiet ()) &&
-                (action != action_build_tag_makefile))
+                (action != action_build_constituents_config) &&
+                (action != action_build_constituent_config))
               {
                 cmt_string s1;
@@ -1841 +1842 @@
 
 //-------------------------------------------------------------
-void Symbol::show_macro (PrintMode mode)
+void Symbol::show_macro (PrintMode mode, ostream& out)
+//void Symbol::show_macro (PrintMode mode)
 {
   if (Cmt::get_debug ())
@@ -1854 +1856 @@
   if ((!Cmt::get_quiet ()) &&
       (action != action_build_tag_makefile) &&
+      (action != action_build_constituents_config) &&
+      (action != action_build_constituent_config) &&
       (action != action_show_macros) &&
       (action != action_show_actions) &&
       (action != action_show_sets))
     {
-      cout << "#" << endl;
-      cout << "# Selection : " << endl;
+      out << "#" << endl;
+      out << "# Selection : " << endl;
     }
 
@@ -1871 +1875 @@
           (action == action_show_action) ||
           (action == action_build_tag_makefile) ||
+          (action == action_build_constituents_config) ||
+          (action == action_build_constituent_config) ||
           (action == action_load) ||
           (!Cmt::get_quiet ()))
@@ -1876 +1882 @@
           if (mode == Make)
             {
-              cout << name << "=";
+              out << name << "=";
             }
           else
             {
-              cout << name << "='";
+              out << name << "='";
             }
         }
@@ -1890 +1896 @@
           expand (value);
         }
-      else if (action == action_build_tag_makefile)
+      else if (action == action_build_tag_makefile ||
+               action == action_build_constituents_config ||
+               action == action_build_constituent_config)
         {
             /* 
@@ -1903 +1911 @@
         }
 
-      cout << value;
+      out << value;
 
       if ((action == action_show_macro) ||
@@ -1912 +1920 @@
           (action == action_show_action) ||
           (action == action_build_tag_makefile) ||
+          (action == action_build_constituents_config) ||
+          (action == action_build_constituent_config) ||
           (action == action_load) ||
           (!Cmt::get_quiet ()))
@@ -1917 +1927 @@
           if (mode != Make)
             {
-              cout << "'";
+              out << "'";
             }
 #ifdef WIN32
           else
             {
-              cout << " ";
+              out << " ";
             }
 #endif
         }
 
-      cout << endl;
+      out << endl;
     }
 }

CMT/HEAD/source/cmt_symbol.h

@@ -120 +120 @@
   cmt_string clean_macro_value () const;
   cmt_string resolve_macro_value (const cmt_string& tag_name = "");
-  void show_macro (PrintMode mode);
+  void show_macro (PrintMode mode, ostream& out = cout);
+  //  void show_macro (PrintMode mode);
 
   ValueBuilder* builder;

CMT/HEAD/source/cmt_tag.cxx

@@ -716 +716 @@
 
 /*----------------------------------------------------------*/
-void Tag::show_definition (bool quiet) const
+void Tag::show_definition (bool quiet, ostream& out) const
 {
   static const cmt_string priority_text[] = {
@@ -730 +730 @@
   if (m_name == "Default") return;
 
-  cout << m_name;
+  out << m_name;
 
   if (!quiet)
@@ -740 +740 @@
           if (m_def_use != 0)
             {
-              cout << " (from ";
-              if (m_context != "use") cout << m_context;
-              cout << "package " << m_def_use->get_package_name () << ")";
+              out << " (from ";
+              if (m_context != "use") out << m_context;
+              out << "package " << m_def_use->get_package_name () << ")";
             }
         }
       else
         {
-          cout << " (from " << m_context << ")";
+          out << " (from " << m_context << ")";
         }
-      //cout << " (" << priority_text[m_priority] << ")";
+      //out << " (" << priority_text[m_priority] << ")";
       
       if (m_tag_refs.size () > 0)
@@ -757 +757 @@
           if (m_ref_uses.size () != 0)
             {
-              cout << " package [";
+              out << " package [";
               for (number = 0; number < m_ref_uses.size (); number++)
                 {
                   Use* use = m_ref_uses[number];
-                  if (number > 0) cout << " ";
-                  cout << use->get_package_name ();
+                  if (number > 0) out << " ";
+                  out << use->get_package_name ();
                 }
-              cout << "]";
+              out << "]";
             }
           /*
           if (m_set_use != 0)
             {
-              cout << " package " << m_set_use->get_package_name ();
+              out << " package " << m_set_use->get_package_name ();
             }
           */
           
-          cout << " implies [";
+          out << " implies [";
           
           for (number = 0; number < m_tag_refs.size (); number++)
             {
               Tag* ref = m_tag_refs[number];
-              if (number > 0) cout << " ";
-              cout << ref->m_name;
+              if (number > 0) out << " ";
+              out << ref->m_name;
             }
           
-          cout << "]";
+          out << "]";
         }
       
@@ -791 +791 @@
           if (m_set_use != 0)
             {
-              cout << " package " << m_set_use->get_package_name ();
+              out << " package " << m_set_use->get_package_name ();
             }
           
-          cout << " excludes [";
+          out << " excludes [";
           
           for (number = 0; number < m_tag_excludes.size (); number++)
             {
               Tag* ref = m_tag_excludes[number];
-              if (number > 0) cout << " ";
-              cout << ref->m_name;
+              if (number > 0) out << " ";
+              out << ref->m_name;
             }
           
-          cout << "]";
+          out << "]";
         }
     }
-  cout << endl;
-}
-
-/*----------------------------------------------------------*/
-void Tag::show (bool quiet) const
-{
-  if (is_primary () && is_selected ()) show_definition (quiet);
+  out << endl;
+}
+
+/*----------------------------------------------------------*/
+void Tag::show (bool quiet, ostream& out) const
+{
+  if (is_primary () && is_selected ()) show_definition (quiet, out);
 }
 

CMT/HEAD/source/cmt_tag.h

@@ -52 +52 @@
   void unmark ();
   void mark ();
-  void show_definition (bool quiet) const;
-  void show (bool quiet) const;
+  void show_definition (bool quiet, ostream& out = cout) const;
+  //  void show_definition (bool quiet) const;
+  void show (bool quiet, ostream& out = cout) const;
+  //  void show (bool quiet) const;
   bool is_selected () const;
   bool is_primary () const;

CMT/HEAD/source/cmt_use.cxx

@@ -364 +364 @@
 
 //----------------------------------------------------------
-void Use::show_all (bool skip_discarded)
-{
-  show_all ("use ", skip_discarded);
+void Use::show_all (bool skip_discarded, ostream& out)
+//void Use::show_all (bool skip_discarded)
+{
+  show_all ("use ", skip_discarded, out);
 }
 
@@ -470 +471 @@
 
 //----------------------------------------------------------
-void Use::show_all (const cmt_string& prefix, bool skip_discarded)
+void Use::show_all (const cmt_string& prefix, bool skip_discarded, ostream& out)
+//void Use::show_all (const cmt_string& prefix, bool skip_discarded)
 {
   static UsePtrVector& uses = get_ordered_uses ();
@@ -496 +498 @@
   use = &(current ());
   use->unselect ();
-  if (!Cmt::get_quiet ()) use->show_sub_uses ("", skip_discarded);
+  if (!Cmt::get_quiet ()) use->show_sub_uses ("", skip_discarded, out);
 
   if (uses.size () > 0)
@@ -502 +504 @@
       if (!Cmt::get_quiet ())
         {
-          cout << "#\n";
-          cout << "# Selection :\n";
+          out << "#\n";
+          out << "# Selection :\n";
         }
 
@@ -528 +530 @@
               if (!Cmt::get_quiet ())
                 {
-                  cout << "# package " << use->get_package_name () <<
+                  out << "# package " << use->get_package_name () <<
                     " " << use->version << " " << use->path << 
                     " not found" <<
@@ -549 +551 @@
                 }
               
-              cout << prefix << use->get_package_name ()
+              out << prefix << use->get_package_name ()
                    << " " << use->version;
 
@@ -556 +558 @@
                   if (!Cmt::get_quiet ()) 
                     {
-                      cout << " (" << use->path << ")";
+                      out << " (" << use->path << ")";
                     }
                 }
               else
                 {
-                  cout << " " << use->path;
+                  out << " " << use->path;
                 }
 
               if (!Cmt::get_quiet ()) 
                 {
-                  if (p != "") cout << " (" << p << ")";
-                  if (use->auto_imports == Off) cout << " (no_auto_imports)";
+                  if (p != "") out << " (" << p << ")";
+                  if (use->auto_imports == Off) out << " (no_auto_imports)";
                 }
 
-              cout << endl;
+              out << endl;
             }
         }
@@ -577 +579 @@
       if (suse != 0 && !suse->discarded && !suse->m_hidden && suse->located ())
         {
-          cout << prefix << suse->get_package_name ()
+          out << prefix << suse->get_package_name ()
                << " " << suse->version;
           if (!Cmt::get_quiet ()) 
             {
-              cout << " (" << suse->path << ")";
-            }
-          cout << endl;
+              out << " (" << suse->path << ")";
+            }
+          out << endl;
         }
       suse = Use::find (CmtSystem::get_user_context_package ());
       if (suse != 0 && !suse->discarded && !suse->m_hidden && suse->located ())
         {
-          cout << prefix << suse->get_package_name ()
+          out << prefix << suse->get_package_name ()
                << " " << suse->version;
           if (!Cmt::get_quiet ()) 
             {
-              cout << " (" << suse->path << ")";
-            }
-          cout << endl;
+              out << " (" << suse->path << ")";
+            }
+          out << endl;
         }
       /*
       if (Cmt::get_cmt_home () != "")
         {
-          cout << prefix << CmtSystem::get_home_package () << " v0";
+          out << prefix << CmtSystem::get_home_package () << " v0";
           if (!Cmt::get_quiet ()) 
             {
-              cout << " (" << Cmt::get_cmt_home () << ")";
-            }
-          cout << endl;
+              out << " (" << Cmt::get_cmt_home () << ")";
+            }
+          out << endl;
         }
 
       if (Cmt::get_cmt_user_context () != "")
         {
-          cout << prefix << CmtSystem::get_user_context_package () << " v0";
+          out << prefix << CmtSystem::get_user_context_package () << " v0";
           if (!Cmt::get_quiet ()) 
             {
-              cout << " (" << Cmt::get_cmt_user_context () << ")";
-            }
-          cout << endl;
+              out << " (" << Cmt::get_cmt_user_context () << ")";
+            }
+          out << endl;
         }
       */
@@ -3951 +3953 @@
 
 //----------------------------------------------------------
-void Use::show_sub_uses (const cmt_string& request, bool skip_discarded)
+void Use::show_sub_uses (const cmt_string& request, bool skip_discarded, ostream& out)
+//void Use::show_sub_uses (const cmt_string& request, bool skip_discarded)
 {
   Use* current = &(Use::current ());
@@ -3963 +3966 @@
   if (level > 0)
     {
-      cout << "# ";
-      for (n = 0; n < (level-1); n++) cout << "  ";
+      out << "# ";
+      for (n = 0; n < (level-1); n++) out << "  ";
 
       if (request == "")
         {
-          cout << "use " << get_package_name () << " " << specified_version;
+          out << "use " << get_package_name () << " " << specified_version;
 
           if (this == current) 
             {
-              cout << " (current)";
+              out << " (current)";
             }
           else
             {
-              if (specified_path != "") cout << " " << specified_path;
+              if (specified_path != "") out << " " << specified_path;
             }
         }
       else
         {
-          cout << "use " << request;
+          out << "use " << request;
         }
 
       if (version_alias != "")
         {
-          cout << " | " << version_alias << " " << path_alias;
-        }
-
-      if (initial_scope == ScopeUnspecified) cout << " (unspecified)";
-      else if (initial_scope != ScopePublic) cout << " (private)";
-
-      if (auto_imports == Off) cout << " (no_auto_imports)";
-
-      if (structuring_style == without_version_directory) cout << " (no_version_directory)";
-      //      if (style == no_version_style) cout << " (no_version_directory)";
+          out << " | " << version_alias << " " << path_alias;
+        }
+
+      if (initial_scope == ScopeUnspecified) out << " (unspecified)";
+      else if (initial_scope != ScopePublic) out << " (private)";
+
+      if (auto_imports == Off) out << " (no_auto_imports)";
+
+      if (structuring_style == without_version_directory) out << " (no_version_directory)";
+      //      if (style == no_version_style) out << " (no_version_directory)";
 
       if (m_has_native_version)
@@ -4006 +4009 @@
             {
               cmt_string value = s->resolve_macro_value ();
-              cout << " (native_version=" << value << ")";
+              out << " (native_version=" << value << ")";
             }
         }
 
-      cout << endl;
+      out << endl;
     }
 
@@ -4030 +4033 @@
       use->auto_imports = sub_use_auto_imports[n];
 
-      use->show_sub_uses (request, skip_discarded);
+      use->show_sub_uses (request, skip_discarded, out);
 
       use->initial_scope = saved_scope;

CMT/HEAD/source/cmt_use.h

@@ -46 +46 @@
   static void select_clients (const cmt_string& package,
                               const cmt_string& version);
-  static void show_all (bool skip_discarded = false);
-  static void show_all (const cmt_string& prefix, bool skip_discarded = false);
+  static void show_all (bool skip_discarded = false, ostream& out = cout );
+  //  static void show_all (bool skip_discarded = false);
+  static void show_all (const cmt_string& prefix, bool skip_discarded = false,
+                        ostream& out = cout);
+  //  static void show_all (const cmt_string& prefix, bool skip_discarded = false);
 
   static Use& current ();
@@ -185 +188 @@
   bool is_client (const cmt_string& package,
                   const cmt_string& version);
-  void show_sub_uses (const cmt_string& request, bool skip_discarded = false);
+  void show_sub_uses (const cmt_string& request, bool skip_discarded = false,
+                      ostream& out = cout);
+  //  void show_sub_uses (const cmt_string& request, bool skip_discarded = false);
   bool select_alternate ();
   Use* get_selected_version ();

CMT/HEAD/src/Makefile.header

@@ -31 +31 @@
 #  Generic entry points for all targets
 #
-ifndef QUICK
-all :: check_config ;
-else
-all :: no_check_config ;
-endif
+#ifndef QUICK
+#all :: check_config ;
+#else
+#all :: no_check_config ;
+#endif
+#all :: $(cmt_constituents_makefile)
+#       @$(MAKE) --no-print-directory -f $(cmt_constituents_makefile) $@
+default :: all ;
 
 check_config ::
         @$(cmtexe) check configuration; retval=$$?; \
-        if test $${retval} = 0; then \
-          $(MAKE) --no-print-directory target="all" common_target; \
-        else \
+        if test $${retval} -ne 0; then \
           test -z "$(cmtmsg)" || \
           echo "$(CMTMSGPREFIX)" "(Makefile.header) Configuration error(s). Please correct" >&2; \
-        fi
+        fi; exit $${retval}
 
-no_check_config ::
-        @$(MAKE) --no-print-directory target="all" common_target
+#       @$(cmtexe) check configuration; retval=$$?; \
+#       if test $${retval} = 0; then \
+#         $(MAKE) --no-print-directory target="all" common_target; \
+#       else \
+#         test -z "$(cmtmsg)" || \
+#         echo "$(CMTMSGPREFIX)" "(Makefile.header) Configuration error(s). Please correct" >&2; \
+#       fi
+
+#no_check_config ::
+#       @$(MAKE) --no-print-directory target="all" common_target
 
 binclean ::
@@ -58 +67 @@
         fi
 
-clean ::
-        @$(cmtexe) check configuration
-        @$(MAKE) --no-print-directory target="$@" common_target
+#clean uninstall :: check_config
+#       @$(MAKE) --no-print-directory -f $(cmt_constituents_makefile) $@
+#       @$(cmtexe) check configuration
+#       @$(MAKE) --no-print-directory target="$@" common_target
 
 .DEFAULT ::
-        @$(cmtexe) check configuration
-        @$(MAKE) --no-print-directory target="$@" common_target
+        @$(MAKE) $(cmt_constituents_makefile)
+        @$(MAKE) --no-print-directory -f $(cmt_constituents_makefile) $@
+
+#       @$(cmtexe) check configuration
+#       @$(MAKE) --no-print-directory target="$@" common_target
 #       @$(MAKE) --no-print-directory target="config $@" common_target
 
@@ -70 +83 @@
 #  Capture all possible targets
 #
-common_target : $(cmt_constituents_makefile)
-        @$(MAKE) --no-print-directory -f $(cmt_constituents_makefile) $(target)
-#       @$(MAKE) --no-print-directory -f $< cmt_lock_pid=$(cmt_lock_pid) $(target)
+#common_target : $(cmt_constituents_makefile)
+#       @$(MAKE) --no-print-directory -f $(cmt_constituents_makefile) $(target)
 
-$(cmt_constituents_makefile) : $(cmt_local_tagfile)
+#$(cmt_constituents_makefile) : $(cmt_local_tagfile)
+
+ifndef QUICK
+$(cmt_constituents_makefile) : check_config
+else
+$(cmt_constituents_makefile) :
+endif
         $(echo) "(Makefile.header) Rebuilding $@"; \
           if test ! -d $(@D) ; then $(mkdir) -p $(@D); fi; \
-          $(cmtexe) -tag=$(tags) build constituents_makefile -out=$@; \
+          $(cmtexe) -tag=$(tags) build constituents_config -out=$@; \
           retval=$$?; \
-          if test $${retval} != 0; then \
+          if test $${retval} -ne 0; then \
             test -z "$(cmtmsg)" || \
             echo "$(CMTMSGPREFIX)" "(Makefile.header) Cannot generate $@" >&2; \
@@ -103 +121 @@
             \rm $(cmt_local_setup); else \
             \mv -f $(cmt_local_setup) $(cmt_final_setup); fi
-
-#         && /bin/echo $@ ok   
-#       $(echo) CMTCONFIG=$(CMTCONFIG) ; \
-#
 
 #
@@ -150 +164 @@
 # explicit rule not to remake
 ${CMTROOT}/src/Makefile.header : ;
+
+# for multiple command line goals,
+# avoid race conditions when (re)writing constituents.make
+.NOTPARALLEL :

CMT/HEAD/src/NMakefile.header

@@ -77 +77 @@
 !if [$(echo) (NMakefile.header) Rebuilding $(cmt_constituents_makefile)] == 0
 !endif
-!if [$(cmtexe) -tag=$(tags) build constituents_makefile -out=$(cmt_constituents_makefile)] == 0
+!if [$(cmtexe) -tag=$(tags) build constituents_config -out=$(cmt_constituents_makefile)] == 0
+#!if [$(cmtexe) -tag=$(tags) build constituents_makefile -out=$(cmt_constituents_makefile)] == 0
 !endif