Changeset 431

Timestamp:

Jan 14, 2008, 3:02:48 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 337

Location:

CMT/HEAD

Files:

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

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-01-14    <rybkin@lal.in2p3.fr> 337
+
+        * source/cmt_parser.cxx: Make use of the structuring style, when
+        configuring a package without a version.cmt file, to allow the use
+        of digits in package names of such packages structured without
+        a version directory
+        
 2007-11-25    <rybkin@lal.in2p3.fr> 336
 

CMT/HEAD/source/cmt_parser.cxx

@@ -543 +543 @@
   configure_current_dir ();
 
+  guess_current_project ();
+
+  log << "configure_current_structuring_style" << log_endl;
+  configure_current_structuring_style ();
+
   log << "configure_current_package" << log_endl;
   configure_current_package ();
-
-  log << "configure_current_structuring_style" << log_endl;
-  configure_current_structuring_style ();
 
   Use& use = Use::current();
@@ -560 +562 @@
 
   use.change_path (Me.m_current_path);
-
-  guess_current_project ();
 
   if (CmtError::has_pending_error ()) 
@@ -875 +875 @@
           Me.m_current_style = no_version_style;
         }
-      else if (CmtSystem::is_version_directory (up_branch))
-        {
-          // The up branch IS a version directory.
-
-          Me.m_current_version = up_branch;
-          CmtSystem::dirname (up_dir, up_dir);
-          CmtSystem::basename (up_dir, Me.m_current_package);
-          CmtSystem::dirname (up_dir, Me.m_current_path);
-        }
       else
-        {
-          // No version descriptor
-          // No version directory. The version is defaulted to v*
- 
-          CmtSystem::basename (up_dir, Me.m_current_package);
-          Me.m_current_version = "v*";
-          CmtSystem::dirname (up_dir, Me.m_current_path);
-
-          Me.m_current_style = no_version_style;
-        }
-
+        {
+          // Try to determine the structuring style from:
+          //
+          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 CMTSTRUCTURINGSTYLE environment variable
+          if (structuring_style == default_structuring_style)
+            {
+              structuring_style = get_current_structuring_style ();
+            }
+          // - the child projects of the project the package belongs to
+          if (structuring_style == default_structuring_style)
+            {
+              structuring_style = style;
+            }
+          // - the default value of the Structure strategy
+          if (structuring_style == default_structuring_style)
+            {
+              structuring_style = StrategyMgr::get_default_strategy ("VersionDirectory") ? with_version_directory : without_version_directory ;
+            }
+
+          // Make use of the structuring style
+          //
+          if (structuring_style == with_version_directory && CmtSystem::is_version_directory (up_branch))
+            {
+              // The up branch IS a version directory.
+              
+              Me.m_current_version = up_branch;
+              CmtSystem::dirname (up_dir, up_dir);
+              CmtSystem::basename (up_dir, Me.m_current_package);
+              CmtSystem::dirname (up_dir, Me.m_current_path);
+            }
+          else
+            {
+              if (structuring_style == with_version_directory)
+                {
+                  cerr << "#CMT> warning: " << up_branch << " is not correct version syntax. Assuming it is package name" << endl;
+                }
+              // No version descriptor
+              // No version directory. The version is defaulted to v*
+              
+              Me.m_current_package = up_branch;
+              Me.m_current_version = "v*";
+              CmtSystem::dirname (up_dir, Me.m_current_path);
+              
+              Me.m_current_style = no_version_style;
+            }
+        }
       build_prefix (Me.m_current_package, Me.m_current_prefix);
       build_config (Me.m_current_prefix, Me.m_current_config);