Changeset 466 for CMT

Timestamp:

Sep 22, 2008, 5:45:45 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 367

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/fragments/constituent_lock (modified) (1 diff)
• mgr/fragments/library_no_static (added)
• mgr/fragments/nmake/library_no_static (added)
• mgr/requirements (modified) (2 diffs)
• source/cmt_commands.cxx (modified) (2 diffs)
• source/cmt_generator.cxx (modified) (1 diff)
• source/cmt_generator.h (modified) (1 diff)
• source/cmt_generators.cxx (modified) (3 diffs)
• source/cmt_generators.h (modified) (1 diff)
• source/cmt_parser.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-09-22    <rybkin@lal.in2p3.fr> 367
+        
+        * source/cmt_generators.cxx: Implement the -no_static option for libraries
+        * source/cmt_generators.h: idem
+        * source/cmt_parser.cxx: idem
+        * source/cmt_commands.cxx: idem. Add the help text for the enhanced
+        cmt build windefs command which now accepts multiple object and/or library
+        files on the command line and/or via command file(s) and has an option
+        to specify the library name
+        * source/cmt_generator.h: In the build_windefs function, implement the
+        enhanced functionality of the cmt build windefs command
+        * source/cmt_generator.cxx: idem
+        * mgr/fragments/constituent_lock: Minor code cleanup
+        * mgr/requirements: Add the c option for the ar utility on Linux to avoid
+        the warning. Declare the library_no_static make fragment
+        * mgr/fragments/library_no_static: Introduce the make fragment to use with
+        the -no_static option
+        * mgr/fragments/nmake/library_no_static: idem for Windows
+        
 2008-07-30    <rybkin@lal.in2p3.fr> 366
         

CMT/HEAD/mgr/fragments/constituent_lock

@@ -58 +58 @@
 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
         $(echo) "(constituents.make) Creating ${CONSTITUENT}${lock_suffix} and Starting ${CONSTITUENT}"
-        @{ ${lock_command} ${CONSTITUENT}${lock_suffix} || exit $$?; } ; \
+        @${lock_command} ${CONSTITUENT}${lock_suffix} || exit $$?; \
           retval=$$?; \
           trap '${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval}' 1 2 15; \

CMT/HEAD/mgr/requirements

@@ -350 +350 @@
       LynxOS          "ar clr" \
       RIO806X         "ar clr" \
-      Linux           "ar r" \
+      Linux           "ar cr" \
       VisualC         "lib.exe /nologo "
 
@@ -493 +493 @@
 make_fragment library
 make_fragment library_no_share
+make_fragment library_no_static
 make_fragment application
 make_fragment jar

CMT/HEAD/source/cmt_commands.cxx

@@ -696 +696 @@
           if (argc > 0)
             {
-              fill_one_argument ();
+              //              fill_one_argument ();
+              fill_arguments ();
               cmt.m_action = action_build_windefs;
             }
@@ -2184 +2185 @@
   help_texts.add () =  "build temporary_name    : generate a name for a temprary file";
   help_texts.add () =  "build triggers <constituent> : generate library trigger file";
-  help_texts.add () =  "build windefs <library_name> : generate def file for Windows shared libraries";
+  help_texts.add () =  "build windefs [-name=NAME] [@commandfile] (objectfile|library)... : generate def file for Windows shared library [NAME]";
   help_texts.add () =  "check <option>          : check actions. (Try cmt help check)";
   help_texts.add () =  "check configuration     : check configuration";

CMT/HEAD/source/cmt_generator.cxx

@@ -839 +839 @@
 
 //--------------------------------------------------
-void Generator::build_windefs (const cmt_string& library_name)
-{
-  cmt_string bin;
+//void Generator::build_windefs (const cmt_string& library_name)
+void Generator::build_windefs (const CmtSystem::cmt_string_vector& arguments)
+{
   cmt_string name;
-  cmt_string suffix;
-
-  CmtSystem::dirname (library_name, bin);
-  CmtSystem::get_dot_suffix (library_name, suffix);
-  CmtSystem::basename (library_name, suffix, name);
+  CmtSystem::cmt_string_vector files;
+
+  for (int i = 0; i < arguments.size (); i++)
+    {
+      const cmt_string& w = arguments[i];
+      if (w.substr (0, 6) == "-name=" || w.substr (0, 6) == "-name:" ||
+          w.substr (0, 6) == "/name:" || w.substr (0, 6) == "/name=")
+        w.substr (6, name);
+      else if (w.substr (0, 1) == "@" && w.size () > 1)
+        {
+          cmt_string commandfile;
+          w.substr (1, commandfile);
+          if (!CmtSystem::test_file (commandfile))
+            {
+              CmtMessage::warning ("No such file `" + commandfile + "'.");
+              continue;
+            }
+          cmt_string text;
+          if (!text.read (commandfile))
+            {
+              CmtMessage::warning ("Could not read `" + commandfile + "'.");
+              continue;
+            }
+          text.replace_all ("\r", " ");
+          text.replace_all ("\n", " ");
+          CmtSystem::cmt_string_vector words;
+          CmtSystem::split (text, " \t", words);
+          for (int i = 0; i < words.size (); i++)
+            {
+              files.push_back (words[i]);
+            }
+        }
+      else
+        files.push_back (w);
+    }
+
+  if (files.size () == 0)
+    {
+      CmtMessage::error ("build_windefs: no files specified");
+      return;
+    }
+  if (name == "")
+    {
+      cmt_string suffix;
+      CmtSystem::get_dot_suffix (files[0], suffix);
+      CmtSystem::basename (files[0], suffix, name);
+    }
+  if (name == "")
+    {
+      CmtMessage::error ("build_windefs: cannot determine library name");
+      return;
+    }
+
+  //  cmt_string bin;
+
+  //  CmtSystem::dirname (library_name, bin);
+  //  CmtSystem::get_dot_suffix (library_name, suffix);
+  //  CmtSystem::basename (library_name, suffix, name);
   
-  if (!CmtSystem::cd (bin)) return;
+  //  if (!CmtSystem::cd (bin)) return;
   
-  cmt_string text;
-  cmt_string command;
+  //  cmt_string command;
   
-  command = "dumpbin /symbols ";
-  command += library_name;
+  cmt_string command ("dumpbin /symbols");
+  //  command += library_name;
+  for (int i = 0; i < files.size (); i++)
+    {
+      command += " " + files[i];
+    }
         
   WinDefAwk filter (name);

CMT/HEAD/source/cmt_generator.h

@@ -177 +177 @@
 
     // Build def files for Windows shared libraries
-  static void build_windefs (const cmt_string& library_name);
+  //  static void build_windefs (const cmt_string& library_name);
+  static void build_windefs (const CmtSystem::cmt_string_vector& arguments);
 };
 

CMT/HEAD/source/cmt_generators.cxx

@@ -47 +47 @@
   library_fragment.set ("library");
   library_no_share_fragment.set ("library_no_share");
+  library_no_static_fragment.set ("library_no_static");
   application_fragment.set ("application");
   jar_fragment.set ("jar");
@@ -71 +72 @@
   library_fragment.reset ();
   library_no_share_fragment.reset ();
+  library_no_static_fragment.reset ();
   jar_fragment.reset ();
   application_fragment.reset ();
@@ -670 +672 @@
           if (is_library)
             {
-              if (constituent.no_share)
+              if (constituent.no_share && constituent.no_static)
+                {
+                  CmtMessage::warning (constituent.name + ": No shared or static library");
+                }
+              else if (constituent.no_share)
                 {
                   library_no_share_fragment.copy (m_output_file, constituent.variables, 3, 
+                                                  &m_CONSTITUENT,
+                                                  &m_CONSTITUENTSUFFIX,
+                                                  &m_OBJS);
+                }
+              else if (constituent.no_static)
+                {
+                  library_no_static_fragment.copy (m_output_file, constituent.variables, 3, 
                                                   &m_CONSTITUENT,
                                                   &m_CONSTITUENTSUFFIX,

CMT/HEAD/source/cmt_generators.h

@@ -70 +70 @@
   FragmentHandle library_fragment;
   FragmentHandle library_no_share_fragment;
+  FragmentHandle library_no_static_fragment;
   FragmentHandle application_fragment;
   FragmentHandle jar_fragment;

CMT/HEAD/source/cmt_parser.cxx

@@ -2253 +2253 @@
     {
       set_standard_macros ();
-      Generator::build_windefs (ap.arguments[0]);
+      //      Generator::build_windefs (ap.arguments[0]);
+      Generator::build_windefs (ap.arguments);
     }
 }