Changeset 290

Timestamp:

Oct 25, 2006, 6:37:07 PM (19 years ago)

Author:

garonne

Message:

LE commit du phew...

Location:

CMT/HEAD/source

Files:

• cmt_parser.cxx (modified) (2 diffs)
• cmt_symbol.cxx (modified) (2 diffs)
• cmt_use.cxx (modified) (33 diffs)
• cmt_use.h (modified) (3 diffs)

CMT/HEAD/source/cmt_parser.cxx

@@ -1947 +1947 @@
       if (tag == 0) continue;
 
-      if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag) && !Cmt::get_disable_warnings ()) 
+      if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag) && !Cmt::get_warnings ()) 
         {
           cerr << "#CMT> The tag " << t << " is not used in any tag expression. Please check spelling" << endl;
@@ -1967 +1967 @@
     }
 
-  if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag) && !Cmt::get_disable_warnings ()) 
+  if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag) && !Cmt::get_warnings ()) 
     {
       cerr << "#CMT> The CMTSITE value " << env << " is not used in any tag expression. Please check spelling" << endl;

CMT/HEAD/source/cmt_symbol.cxx

@@ -988 +988 @@
       if (words.size () < 2) return;
       const cmt_string& default_value = words[2];
-
+      
       Cmt::reset_all_sets_done ();
 
@@ -1033 +1033 @@
           cmt_string tag_name = words[number];
           const cmt_string& value = words[number + 1];
-
+        
           expand (tag_name);
 

CMT/HEAD/source/cmt_use.cxx

@@ -35 +35 @@
 
 static bool add_request (const cmt_string& path,
-                         const cmt_string& package_name,
-                         const cmt_string& version)
+                                     const cmt_string& package_name,
+                                     const cmt_string& version,
+                                     const cmt_string& native_version)
 {
   static cmt_map <cmt_string, bool> requests;
@@ -44 +45 @@
   request += version;
   request += " ";
+  request += native_version;
+  request += " ";  
   request += path;
   static bool b = true;
@@ -108 +111 @@
 {
 public:
-  Use* operate (Use* ref_use, Use* new_use);
+  Use* operate (Use* ref_use, Use* new_use, const cmt_string& native_version);
 };
 
@@ -134 +137 @@
 static CompareStatus compare_versions (const cmt_string& ref_version, const cmt_string& new_version)
 {
+  
   CompareStatus result = IdenticalIds;
 
@@ -147 +151 @@
 
   CmtSystem::is_version_directory (new_version, new_v, new_r, new_p);
+          cout << "#1 Required version " << new_version <<
+            " incompatible with selected version " << ref_version <<
+            endl;
+
 
   if ((new_v != -1) && (old_v != -1) && (new_v != old_v))
@@ -746 +754 @@
           {
             cout << "about to add " << package << endl;
-            show_packages ();
-          }
+                show_packages ();
+              }
 
         /// Now do create or retreive the Use object.
@@ -1424 +1432 @@
 
 //----------------------------------------------------------
-int Use::reach_package (const cmt_string& from_path)
-{
-  if (Cmt::get_debug ())
+int Use::reach_package (const cmt_string& from_path, const cmt_string& n_version)
+{
+    if (Cmt::get_debug ())
     {
       cout << "Use::reach_package> (" << get_package_name () << " " 
@@ -1583 +1591 @@
       // There are alternate possibilities when it contains wild cards
       //
-      if ((version == "") ||
-          (version.find ("*") != cmt_string::npos))
+      if ((version == "") || (version.find ("*") != cmt_string::npos))
         {
           static CmtSystem::cmt_string_vector versions;
@@ -1594 +1601 @@
           else name += version;
 
-          CmtSystem::scan_dir (name, versions);
+          CmtSystem::scan_dir (name, versions);     
+          if (n_version != "")
+          {
+              static CmtSystem::cmt_string_vector native_versions;           
+              for (int i = 0; i < versions.size (); i++)
+              {
+                  cmt_string path;
+                  if (CmtSystem::test_directory (versions[i]))
+                  {
+                      path  = versions[i];
+                      path += CmtSystem::file_separator ();
+                      path += "cmt";
+                  }
+                  else
+                  {
+                      path = "cmt";
+                  }
+                  path += CmtSystem::file_separator ();
+                  path += "native_version.cmt";        
+                                  
+                  if (CmtSystem::test_file (path))
+                      {
+                          cmt_string nv;
+                          nv.read (path);
+                          int pos;
+                          pos = nv.find ('\n');
+                          if (pos != cmt_string::npos) nv.erase (pos);
+                          pos = nv.find ('\r');
+                          if (pos != cmt_string::npos) nv.erase (pos);
+                      
+                          if (nv == n_version)
+                          {
+                               cmt_string& name_entry = native_versions.add ();
+                               name_entry += versions[i];
+                          }
+                      }                   
+              }
+              versions = native_versions;
+          }
           
           int i;
@@ -1616 +1661 @@
               if (CmtSystem::is_version_directory (name, v, r, p))
                 {
+           
                   /*
                     This check is not sufficient !! We need to check in addition
@@ -1623 +1669 @@
 
                   cmt_string req;
-
                   req = name;
                   req += CmtSystem::file_separator ();
@@ -1711 +1756 @@
 {
 public:
-  UseProjectAction (Use* use) : m_use (use), m_found (false)
+  UseProjectAction (Use* use, const cmt_string& n_version="") : m_use (use), m_found (false)
   {
+      m_n_version = n_version;
   }
 
@@ -1727 +1773 @@
     m_use->alternate_paths.clear ();
 
-    if (m_use->reach_package (path))
+    if (m_use->reach_package (path, m_n_version))
       {
         if (Cmt::get_debug ())
@@ -1760 +1806 @@
 private:
   Use* m_use;
+  cmt_string m_n_version;
   bool m_found;
 };
 
 //----------------------------------------------------------
-bool Use::move_to ()
+bool Use::move_to (const cmt_string& native_version)
 {
   if (m_located)
@@ -1778 +1825 @@
         }
 
-      reach_package (real_path);
+      reach_package (real_path, native_version);
 
       return (true);
@@ -1790 +1837 @@
   if (expanded_path == "")
     {
-      if (reach_package (""))
+      if (reach_package ("", native_version))
         {
           if (Cmt::get_debug ())
@@ -1821 +1868 @@
   if (CmtSystem::absolute_path (expanded_path))
     {
-      if (reach_package (expanded_path))
+      if (reach_package (expanded_path, native_version))
         {
           if (Cmt::get_debug ())
@@ -1849 +1896 @@
   // Second try is among the CMTPATHs
   //
-      
-  UseProjectAction pa (this);
+  UseProjectAction pa (this, native_version);
 
   Project::broadcast (pa);
@@ -1929 +1975 @@
         {
           version = alternate_versions[selected_index];
-          if (reach_package (alternate_paths[selected_index]))
+          if (reach_package (alternate_paths[selected_index], native_version))
             {
                 /*
@@ -1958 +2004 @@
                     const cmt_string& package,
                     const cmt_string& version,
+                    const cmt_string& native_version,                    
                     Use** old_use,
-                    Use* context_use)
-{
-  bool new_request = add_request (path, package, version);
+                        Use* context_use)
+{
+  bool new_request = add_request (path, package, version, native_version);
 
   Use& current_use = Use::current ();
@@ -1976 +2023 @@
     }
 
-  Package* p = Package::add (package);
-
+  Package* p         = Package::add (package);
   UsePtrVector& uses = p->get_uses ();
 
   bool do_need_new = true;
-  Use* found = 0;
-  Use* registered = 0;
+  Use* found       = 0;
+  Use* registered  = 0;
 
   int req_v = -1;
@@ -2061 +2107 @@
                        << endl;
                 }
-
               // The registered use loses against the request
             }
@@ -2100 +2145 @@
             }
         }
+
+          
 
       if (Cmt::get_debug ())
@@ -2156 +2203 @@
                   cout << "  ... requested wildcarded loses against existing explicit" << endl;
                 }
-              
-              do_need_new = false; // We don't need a new one
+                      do_need_new = false; // We don't need a new one
             }
           else
@@ -2163 +2209 @@
               // here either !has_wild_card or use_has_wild_card
           
-              if ((version == use.specified_version) &&
-                  (path == use.specified_path))
+              if ((version == use.specified_version) && (path == use.specified_path))
                 {
                   if (Cmt::get_debug ())
@@ -2320 +2365 @@
   Use* use = 0;
 
-  do_need_new = need_new (path, package_name, version, &old_use, context_use);
-  // cout <<"native_version: "<<native_version<<" "<<version<<endl;
+  do_need_new = need_new (path, package_name, version, native_version, &old_use, context_use);
+  //cout <<"native_version: "<<native_version<<" "<<version<<" "<<do_need_new<<endl;
     
 
@@ -2338 +2383 @@
     {
       use = create (path, package_name, version, version_alias, path_alias);
+      //cout <<"need_new native_version: "<<native_version<<" "<<version<<" "<<do_need_new<<endl;
     }
   else
@@ -2412 +2458 @@
    *         we have created a new Use (which has to be validated)
    */
-  bool found = use->move_to ();
+  bool found = use->move_to (native_version);
+
 
   if (Cmt::get_debug ())
@@ -2480 +2527 @@
           if (use != 0) use->discard ();
           use = old_use;
-          found = use->move_to ();
+          found = use->move_to (native_version);
         }
       else
@@ -2488 +2535 @@
             // thus we have to choose
             //
-          static BestFitSelector selector;
-          Use* selected_use = selector.operate (old_use, use);
+              static BestFitSelector selector;
+          Use* selected_use = selector.operate (old_use, use, native_version);
 
           if (Cmt::get_debug ())
@@ -2505 +2552 @@
           if (use != selected_use) 
             {
-              use = use->set_selected_version (selected_use);
+                     use = use->set_selected_version (selected_use);
             }
           
@@ -2511 +2558 @@
           /*
            *   current directory is moved to the selected one
-           */
-          found = use->move_to ();
+           */        
+          found = use->move_to (native_version);
+
         }
     }
@@ -3868 +3916 @@
 //
 //----------------------------------------------------------
-Use* BestFitSelector::operate (Use* ref_use, Use* new_use)
-{
+Use* BestFitSelector::operate (Use* ref_use, Use* new_use, const cmt_string& native_version)
+{
+    
   Use* selected = ref_use;
 

CMT/HEAD/source/cmt_use.h

@@ -82 +82 @@
   void author_action (const CmtSystem::cmt_string_vector& words);
   void manager_action (const CmtSystem::cmt_string_vector& words);
-  bool move_to ();
+  bool move_to (const cmt_string& native_version="");
   void discard ();
   void undiscard ();
@@ -159 +159 @@
 private:
   void clear ();
-  int reach_package (const cmt_string& current_path);
+  int reach_package (const cmt_string& current_path, const cmt_string& n_version="");
   void select ();
   void unselect ();
@@ -173 +173 @@
                         const cmt_string& package,
                         const cmt_string& version,
+                        const cmt_string& native_version,
                         Use** old_use,
                                     Use* context_use);