Changeset 521 for CMT

Timestamp:

Sep 17, 2009, 5:31:10 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 408

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/VisualC.nmake (modified) (1 diff)
• mgr/requirements (modified) (1 diff)
• source/cmt.h (modified) (1 diff)
• source/cmt_parser.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2009-09-17    <rybkin@lal.in2p3.fr> 408
+
+        * source/cmt.h: Declare function Cmt::configure_devenv_tag
+        * source/cmt_parser.cxx: Implement Cmt::configure_devenv_tag making
+        use of command specified by macro "devenv_command" to retrieve version
+        of Microsoft (R) Visual Studio and define a corresponding tag
+        * mgr/requirements: For Windows, set macro devenv_command to "devenv /?"
+        (can be overridden via CMTHOME requirements file)
+        * mgr/VisualC.nmake: Update
+        
 2009-09-10    <rybkin@lal.in2p3.fr> 407
 

CMT/HEAD/mgr/VisualC.nmake

@@ -14 +14 @@
 msdevdll=/dll 
 msdevdllflags=/MT /D "_USRDLL" /D "WDLL_EXPORTS" 
-ppcmd=/I  
+devenv_command=devenv /? 
 preproc=cl.exe 
 cpp=cl.exe 

CMT/HEAD/mgr/requirements

@@ -207 +207 @@
       VC7debug        "0"
 
+macro devenv_command      "" \
+      WIN32               "devenv /?" \
 
 #

CMT/HEAD/source/cmt.h

@@ -99 +99 @@
   static void configure_tags (Use* use);
   static void configure_uname_tag ();
+  static void configure_devenv_tag ();
   static void configure_version_tag ();
   //  static void configure_cmt_message ();

CMT/HEAD/source/cmt_parser.cxx

@@ -1314 +1314 @@
 
       tag = Tag::add (uname, PriorityUname, "uname", 0);
+      tag->mark ();
+    }
+}
+
+//----------------------------------------------------------
+void Cmt::configure_devenv_tag ()
+{
+  cmt_string devenv_command;
+  Symbol* devenv_command_macro = Symbol::find ("devenv_command");
+  if (0 == devenv_command_macro) return;
+
+  devenv_command = devenv_command_macro->resolve_macro_value ();
+  if (devenv_command == "") return;
+  devenv_command += " 2>&1";
+
+  cmt_string output;
+  if (0 != CmtSystem::execute (devenv_command, output)) return;
+  cmt_string devenv;
+  int pos;
+  pos = output.find ("Microsoft");
+  if (pos != cmt_string::npos) devenv = "vs";
+  else return;
+
+  //
+  // Make the output as one single big line.
+  //
+
+  output.replace_all ("\n", " ");
+  output.replace_all ("\r", " ");
+
+  CmtSystem::cmt_string_vector words;
+  CmtSystem::split (output, " \t", words);
+
+  cmt_string version;
+  bool need_version (false);
+  for (int i = 0; i < words.size (); i++)
+    {
+      if (need_version && words[i] != "")
+        {
+          version = words[i];
+          break;
+        }
+      if (words[i] == "Version")
+        need_version = true;
+    }
+
+  if (version == "")
+    {
+      devenv += "00";
+    }
+  else
+    {
+      CmtSystem::cmt_string_vector nbrs;
+      CmtSystem::split (version, ".", nbrs);
+      if (1 == nbrs.size ())
+        devenv += nbrs[0];
+      else
+        devenv += nbrs[0] + nbrs[1];
+    }
+
+  if (devenv != "")
+    {
+      Tag* tag;
+
+      tag = Tag::add (devenv, PriorityUname, "devenv", 0);
       tag->mark ();
     }
@@ -5604 +5669 @@
       
       use_home_requirements ();
+
+      configure_devenv_tag ();
 
       break;