Changeset 629 for CMT

Timestamp:

Jan 28, 2013, 2:41:55 PM (11 years ago)

Author:

rybkin

Message:

See C.L. 500

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/fragments/constituent_app_lib (modified) (3 diffs)
• mgr/fragments/dependencies (modified) (2 diffs)
• source/cmt_constituent.cxx (modified) (5 diffs)
• source/cmt_constituent.h (modified) (1 diff)
• source/cmt_parser.cxx (modified) (1 diff)
• source/cmt_project.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2013-01-25    <rybkin@lal.in2p3.fr> 500
+
+        * source/cmt_constituent.cxx: In class constituents_action_iterator
+        function set, assign constituent member has_modules according to passed
+        option -modules or -no_modules, print diagnostic message about bad option
+        if Verbose level is activated only, in class Constituent function clear,
+        set has_modules to false, in function show, add printout for options
+        -modules and -no_modules
+        * source/cmt_constituent.h: In class Constituent, introduce member
+        has_modules for applications and libraries in languages with modules (like
+        Fortran 90 and later)
+        * source/cmt_project.cxx: In class Project functions set_strategy and
+        update_strategy, update strategy for project(s) without parent and children 
+        * source/cmt_parser.cxx: In class StandardMacroBuilder function
+        fill_for_constituent_macros, for applications, libraries add to macros
+        <constituent>compile_dependencies macros <dependency>compile for
+        dependencies that have modules so that dependencies modules, generated at
+        compile time, are available before constituent compilation
+        * mgr/fragments/dependencies: Do not (re)build
+        ${CONSTITUENT}_dependencies.make at prototype build stage as some header
+        files may not be available yet
+        * mgr/fragments/constituent_app_lib: In target ${CONSTITUENT}install rule
+        command, check whether makefile exists to allow for use of -n (no-op) Make
+        option, in target ${CONSTITUENT}uninstall rule command, ignore errors,
+        similar to target ${CONSTITUENT}clean rule command
+
 2013-01-11    <rybkin@lal.in2p3.fr> 499
 

CMT/HEAD/mgr/fragments/constituent_app_lib

@@ -101 +101 @@
 
 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
-        $(echo) "(constituents.make) Starting ${CONSTITUENT}clean"
+        $(echo) "(constituents.make) Starting $@"
         @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
-          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean; \
+          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $@; \
         fi
-        $(echo) "(constituents.make) ${CONSTITUENT}clean done"
+        $(echo) "(constituents.make) $@ done"
 #       @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean
 
@@ -113 +113 @@
 
 ${CONSTITUENT}install :: ${CONSTITUENT}compile $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
-        $(echo) "(constituents.make) Starting install ${CONSTITUENT}"
-        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $@
-        $(echo) "(constituents.make) install ${CONSTITUENT} done"
+        $(echo) "(constituents.make) Starting $@"
+        @if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
+          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $@; \
+          fi
+#       @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $@
+        $(echo) "(constituents.make) $@ done"
 
 uninstall : ${CONSTITUENT}uninstall
@@ -122 +125 @@
 
 ${CONSTITUENT}uninstall : $(${CONSTITUENT}uninstall_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
-        $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
-        @if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
+        $(echo) "(constituents.make) Starting $@"
+        @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
           $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall; \
           fi
 #       @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
-        $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
+        $(echo) "(constituents.make) $@ done"
 
 remove_library_links :: ${CONSTITUENT}uninstall ;

CMT/HEAD/mgr/fragments/dependencies

@@ -2 +2 @@
 ifneq ($(MAKECMDGOALS),${CONSTITUENT}clean)
 ifneq ($(MAKECMDGOALS),uninstall)
+ifneq ($(MAKECMDGOALS),${CONSTITUENT}prototype)
 
 $(bin)${CONSTITUENT}_dependencies.make : $(use_requirements) $(cmt_final_setup_${CONSTITUENT})
@@ -11 +12 @@
 endif
 endif
+endif
 
 ${CONSTITUENT}clean ::

CMT/HEAD/source/cmt_constituent.cxx

@@ -16 +16 @@
 #include "cmt_database.h"
 #include "cmt_log.h"
+#include "cmt_error.h"
 
 /*----------------------------------------------------------*/
@@ -174 +175 @@
         m_constituent.need_prototypes = false;
       }
+    else if (w == "-modules")
+      {
+        if (m_constituent.type == Application ||
+            m_constituent.type == Library)
+          {
+            m_constituent.has_modules = true;
+          }
+      }
+    else if (w == "-no_modules")
+      {
+        if (m_constituent.type == Application ||
+            m_constituent.type == Library)
+          {
+            m_constituent.has_modules = false;
+          }
+      }
     else if (w == "-check")
       {
@@ -253 +270 @@
     else if (w.substr (0, 1) == "-")
       {
-        //if (!Cmt::get_quiet ())
-        //{
-        CmtMessage::warning ("bad option " + w + " in constituent " +
-                             m_constituent.name);
-        //      cerr << "#CMT> Warning: bad option " 
-        //           << w << " in constituent " << m_constituent.name << endl;
-        //CmtError::set (CmtError::execution_error, cmd);
-        //}
+        if (CmtMessage::active (Verbose))
+          CmtMessage::warning
+            (CmtError::get_error_name (CmtError::syntax_error)
+             + ": bad option " + w + " in constituent " + m_constituent.name);
       }
     else if ((equal = w.find ("=")) != cmt_string::npos)
@@ -522 +535 @@
   no_share        = false;
   need_prototypes = false;
+  has_modules     = false;
   need_check      = false;
   build_triggers  = false;
@@ -672 +686 @@
     }
   
+  if (type == Application || type == Library)
+    {
+      if (has_modules)
+        out << " -modules";
+      else
+        out << " -no_modules";
+    }
+  
   if (has_target_tag)
     {

CMT/HEAD/source/cmt_constituent.h

@@ -58 +58 @@
   bool no_share;
   bool need_prototypes;
+  bool has_modules;
   bool need_check;
   bool build_triggers;

CMT/HEAD/source/cmt_parser.cxx

@@ -9657 +9657 @@
                         if (dep->need_prototypes)
                           temp += " " + word + "prototype";
+                        if (dep->has_modules)
+                          temp += " " + word + "compile";
                         break;
                       case Document:

CMT/HEAD/source/cmt_project.cxx

@@ -2958 +2958 @@
       project->update_strategy (definition, b_value);
     }
+
+  const ProjectPtrVector& OrderedProjects = Project::ordered_projects ();
+  for (int i = OrderedProjects.size () - 2; i >= 0; i--)
+    {
+      if (this != OrderedProjects[i + 1]) continue;
+      if (!OrderedProjects[i]->has_parents () &&
+          OrderedProjects[i]->get_children_size () == 0)
+        {
+          OrderedProjects[i]->update_strategy (definition, b_value);
+        }
+      break;
+    }
 }
 
@@ -3011 +3023 @@
 
           project->update_strategy (definition, b_value);
+        }
+
+      const ProjectPtrVector& OrderedProjects = Project::ordered_projects ();
+      for (int i = OrderedProjects.size () - 2; i >= 0; i--)
+        {
+          if (this != OrderedProjects[i + 1]) continue;
+          if (!OrderedProjects[i]->has_parents () &&
+              OrderedProjects[i]->get_children_size () == 0)
+            {
+              OrderedProjects[i]->update_strategy (definition, b_value);
+            }
+          break;
         }
     }