Changeset 554 for CMT/HEAD

Timestamp:

Aug 25, 2010, 3:16:18 PM (14 years ago)

Author:

rybkin

Message:

See C.L. 439

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_parser.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2010-08-25    <rybkin@lal.in2p3.fr> 439
+
+        * source/cmt_parser.cxx: In class Cmt, in function
+        configure_current_package for standalone case, do not (re)set
+        m_current_structuring_style yet, rather do it in reach_current_package
+        
 2010-08-25    <rybkin@lal.in2p3.fr> 438
 

CMT/HEAD/source/cmt_parser.cxx

@@ -1059 +1059 @@
       Me.m_current_version = "v0";
       Me.m_current_path = Me.m_current_dir;
-      Me.m_current_structuring_style = without_version_directory;
-      //      Me.m_current_style = none_style;
+      // Do NOT (re)set m_current_structuring_style yet
+      // (as requirements may NOT exist, so this is not a package)
+      // rather do it in reach_current_package (if/when requirements is read)
+      //Me.m_current_structuring_style = without_version_directory;
       build_prefix (Me.m_current_package, Me.m_current_prefix);
       build_config (Me.m_current_prefix, Me.m_current_config);
@@ -7599 +7601 @@
           return (0);
         }
+
+      Me.m_current_structuring_style = without_version_directory;
     }
   else if (Me.m_current_package != "")