Changeset 438 for CMT/HEAD

Timestamp:

Feb 2, 2008, 6:44:28 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 343

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt.h (modified) (3 diffs)
• source/cmt_parser.cxx (modified) (10 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-02-02    <rybkin@lal.in2p3.fr> 343
+
+        * source/cmt_parser.cxx: Correct treatment of the -with_version_directory
+        and -without_version_directory command line options
+        * source/cmt.h: idem
+        
 2008-02-02    <rybkin@lal.in2p3.fr> 342
 

CMT/HEAD/source/cmt.h

@@ -83 +83 @@
   static void clear ();
 
-  static void configure ();
+  //  static void configure ();
+  static void configure (const ArgParser& ap);
   static void configure_cmt_path (Use* use);
   static void configure_config_tag ();
@@ -89 +90 @@
   static void configure_current_dir ();
   static void configure_current_package ();
-  static void configure_current_structuring_style ();
+  //  static void configure_current_structuring_style ();
+  static void configure_current_structuring_style (const ArgParser& ap);
   static void configure_default_path ();
   static void configure_home (Use* use);
@@ -228 +230 @@
   static void install_test_cleanup_scripts ();
   static void install_test_setup_scripts ();
-  static bool load (const cmt_string& path,
+  //  static bool load (const cmt_string& path,
+  static bool load (const ArgParser& ap,
+                    const cmt_string& path,
                     const cmt_string& package,
                     const cmt_string& version,

CMT/HEAD/source/cmt_parser.cxx

@@ -505 +505 @@
 
 //----------------------------------------------------------
-void Cmt::configure ()
+//void Cmt::configure ()
+void Cmt::configure (const ArgParser& ap)
 {
   Log;
@@ -546 +547 @@
 
   log << "configure_current_structuring_style" << log_endl;
-  configure_current_structuring_style ();
+  //  configure_current_structuring_style ();
+  configure_current_structuring_style (ap);
 
   log << "configure_current_package" << log_endl;
@@ -881 +883 @@
           CmtStructuringStyle structuring_style(default_structuring_style);
           CmtStructuringStyle style(default_structuring_style);
-          // - the project the package belongs to
-          Project* p = Project::get_current ();
-          if (p)
-            {
-              style = p->get_strategy ("VersionDirectory") ? with_version_directory : without_version_directory ;
-              StrategyDef* def = StrategyMgr::find_strategy ("VersionDirectory");
-              if (def != 0)
-                {
-                  if (p->is_specified (def)) structuring_style = style;
-                }
-            }
+          // - the command line options
+          //   or
           // - the CMTSTRUCTURINGSTYLE environment variable
           if (structuring_style == default_structuring_style)
             {
               structuring_style = get_current_structuring_style ();
+            }
+          // - the project the package belongs to
+          if (structuring_style == default_structuring_style)
+            {
+              Project* p = Project::get_current ();
+              if (p)
+                {
+                  style = p->get_strategy ("VersionDirectory") ? with_version_directory : without_version_directory ;
+                  StrategyDef* def = StrategyMgr::find_strategy ("VersionDirectory");
+                  if (def != 0)
+                    {
+                      if (p->is_specified (def)) structuring_style = style;
+                    }
+                }
             }
           // - the child projects of the project the package belongs to
@@ -950 +957 @@
 
 //----------------------------------------------------------
-void Cmt::configure_current_structuring_style ()
-{
+//void Cmt::configure_current_structuring_style ()
+void Cmt::configure_current_structuring_style (const ArgParser& ap)
+{
+  for (int i = ap.argc - 1; i >= 0; i--)
+    {
+      const cmt_string& arg = ap.argv[i];
+      if (arg == "-without_version_directory")
+        {
+          Me.m_current_structuring_style = without_version_directory;
+          return;
+        }
+      else if (arg == "-with_version_directory")
+        {
+          Me.m_current_structuring_style = with_version_directory;
+          return;
+        }
+    }
+
   cmt_string s;
 
@@ -2137 +2160 @@
     }
 
-  configure_current_package ();
+  //  configure_current_package ();
 
   Generator::build_default_makefile ();
@@ -2307 +2330 @@
     }
 
-  configure_current_package ();
+  //  configure_current_package ();
 
   Generator::build_default_makefile ();
@@ -3432 +3455 @@
 
   clear     ();
-  configure ();
+  //  configure ();
+  configure (ap);
 
   cout << "# ----------- Clients of " << package <<
@@ -4650 +4674 @@
  *    This is considered to be rather unsafe, and should be replaced by query functions.
  */
-bool Cmt::load (const cmt_string& path,
+//bool Cmt::load (const cmt_string& path,
+bool Cmt::load (const ArgParser& ap,
+                const cmt_string& path,
                 const cmt_string& package,
                 const cmt_string& version,
@@ -4656 +4682 @@
 {
   clear ();
-  configure ();
+  //  configure ();
+  configure (ap);
 
   Me.m_action  = action_load;
@@ -4975 +5002 @@
   clear ();
 
-  configure ();
+  //  configure ();
+  configure (ap);
 
   CmtError::clear ();