Changeset 328

Timestamp:

Nov 16, 2006, 11:04:17 PM (18 years ago)

Author:

garonne

Message:

Sauvegarde

Location:

CMT/v1r20b1

Files:

• mgr/Makefile (modified) (2 diffs)
• source/cmt_project.cxx (modified) (1 diff)
• source/cmt_syntax.cxx (modified) (8 diffs)
• source/cmt_use.h (modified) (3 diffs)

CMT/v1r20b1/mgr/Makefile

@@ -107 +107 @@
 #---------------------------------------------------------
 
-done :
+done : cmt post_build 
         @echo "CMT has been succesfully rebuilt."
 
@@ -122 +122 @@
 CMTINSTALLAREA = 
 
+
 include cmt.make
 
-post_build :: cmt_dependencies.make $(bin)/cmt_dependencies.make
+post_build :: cmt cmt_dependencies.make $(bin)/cmt_dependencies.make 
         echo post_build done
 

CMT/v1r20b1/source/cmt_project.cxx

@@ -577 +577 @@
 
       // First create the Project.m_use for the policy
-          //cout << "About to add project policy package file [" <<  project->get_name()+"_project_policy" << "]" << endl;      
+          // cout << "About to add project policy package file [" <<  project->get_name()+"_project_policy" << "]" << endl;      
       Use* project_use = Use::create (project->get_cmtpath(), 
                                       project->get_name()+"_project_policy", 
-                                      project->get_release (), "", "");                        
-                                 
-      project_use->done      = false;
+                                      project->get_release (), "", "");                                                         
+      project_use->done      = false;//true;
       project_use->discarded = false;
-      project_use->selected  = false;
+      project_use->selected  = true;
+      project_use->m_located = true;
+      project_use->set_auto_imports(On);
+      project_use->initial_scope = ScopePublic;      
       project->set_use(project_use);
+      
+      
+     // add at the uses level ?????
+    /*static Use::UsePtrVector& uses = Use::get_ordered_uses ();
+     bool found = false;
+     int  size  = uses.size ();
+     cerr << "\n size:"<<size<< ":" << endl;     
+     for (int n = 0; n < size; n++)
+     {
+         Use* tuse = uses[n];
+         cerr << "\tpackage file [" << tuse->get_package_name() << "]" <<project_use->get_package_name()<< endl;                    
+         if (tuse->get_package_name()==project_use->get_package_name())
+                   found=true;
+
+     }
+    
+     if (not found)
+    {
+        uses.push_back (project_use);
+        project_use->m_index = uses.size () - 1;
+    }
+      */
 
       SyntaxParser::parse_project_file_text (text, 

CMT/v1r20b1/source/cmt_syntax.cxx

@@ -167 +167 @@
     bool result = true;    
      
-    value =  w; 
+    value =  w;  
+    
+    /*Symbol* symbol = Symbol::find ("use_strategy");
+    if (symbol != 0)
+    {
+      cmt_string s = symbol->build_macro_value ();
+      Symbol::expand (s);
+      cerr <<"# value s: "<<s<<endl;      
+    } */ 
+
     Symbol::expand(value);
     //cerr <<"# value: "<<value<<endl;
@@ -212 +221 @@
     for (int i = 1; i < words.size (); i++)
       {
-        const cmt_string& w = words[i];
-
-        cmt_string strategy;
-        cmt_string value;
-
-        bool in_error = false;
-
-        if (decode (w, strategy, value))
-          {
-            if (p != 0) p->set_strategy (strategy, value, use->get_package_name ());
+               const cmt_string& w = words[i];
+
+               cmt_string strategy;
+               cmt_string value;
+
+               bool in_error = false;
+
+               if (decode (w, strategy, value))
+               {
+                   
+                   if (p != 0) p->set_strategy (strategy, value, use->get_package_name ());
           }
         else
@@ -237 +247 @@
                int line_number)
   {
-    action (words, project->get_use(), file_name, line_number);
-    /*
+      // action (words, project->get_use(), file_name, line_number);
+      //cout<<project->get_use()->get_strategy("InstallArea")<<endl;   
+      
       for (int i = 1; i < words.size (); i++)
       {
@@ -250 +261 @@
         if (decode (w, strategy, value))
           {
-            if (project != 0) project->set_strategy (strategy, value, "");
+            if (project != 0) 
+            {
+               project->set_strategy (strategy, value, project->get_use()->get_package_name ());
+               // project->set_strategy (strategy, value, "");
+            }  
           }
         else
@@ -258 +273 @@
             CmtError::set (CmtError::syntax_error, "ParseRequirements> bad strategy keyword");
           }
-      }*/
+      }
   }
 };
@@ -1179 +1194 @@
                   int line_number)
   {
-              action (words, project->get_use(), file_name, line_number);    
-      }  
+    action (words, project->get_use(), file_name, line_number);    
+  }  
 };
 
@@ -1314 +1329 @@
     }
 
-    //
-    Project* p = use->get_project ();
-    if (p != 0)
-    {      
+  me.do_parse_requirements (file_name, use);
+
+  if (use != 0)
+  {
+        //
+        Project* p = use->get_project ();
+        if (p != 0)
+        {      
            Use* p_use =  p->get_use();
-           if (p_use != 0)
+           if (p_use != 0 && p_use != use)
            {
-               //cout << "About to add dependency on project policy package file [" <<  p_use->get_package_name() << "]" << endl;      
-               //use->sub_uses.push_back (p_use); // private...
-               //use->add_sub_use (p_use);
+              
+              //{
+              //  int  size  = use->sub_uses.size ();
+              //  for (int n = 0; n < size; n++)
+              //  {
+              //      Use* tuse = use->sub_uses[n];
+              //      cerr << "\tpackage file [" << tuse->get_package_name() << "]" <<p_use->get_package_name()<< endl;         
+              //  }
+              //}
+              
+              use->add_sub_use (p_use);   
+              
+              use->sub_use_scopes.push_back (use->get_current_scope ());
+              use->sub_use_auto_imports.push_back (p_use->auto_imports);
+              // cmt_string& request = use->requests.add ();                                          
+              // request = package_name;
+              // request += " ";
+              // request += version;
+              // request += " ";
+              // request += path;
+
+             // add at the uses level ?????
+            static Use::UsePtrVector& uses = Use::get_ordered_uses ();
+            //const Use& cu = Use::current ();
+
+            bool found = false;
+            int  size  = uses.size ();
+            // cerr << "\n size:"<<size<< ":" << endl;     
+            for (int n = 0; n < size; n++)
+            {
+                Use* tuse = uses[n];
+                // cerr << "\tpackage file [" << tuse->get_package_name() << "]" <<p_use->get_package_name()<< endl;                    
+                if (tuse->get_package_name()==p_use->get_package_name())
+                   found=true;
+            }    
+            if (not found)
+            {
+                  uses.push_back (p_use);
+                p_use->m_index = uses.size () - 1;
+             }
+                          
            }
-    }
-
-  me.do_parse_requirements (file_name, use);
-
-  if (use != 0)
-    {
-      use->close_scope_sections ();
-    }
+        }                 
+        use->close_scope_sections ();
+  }
 }
 
@@ -1834 +1886 @@
   keyword->action (words, project, file_name, line_number);
 }
-
-
-
-

CMT/v1r20b1/source/cmt_use.h

@@ -154 +154 @@
   bool discarded;                /* discarded by version strategy   */
   bool selected;                 /* used for recursive access       */
-
+  bool m_located;
+  ScopeType initial_scope;
+
+  UsePtrVector sub_uses;
+  cmt_vector<ScopeType> sub_use_scopes;
+  cmt_vector<State> sub_use_auto_imports;
+
+ int m_index;  // Position within the ordered list of uses
+  
   State auto_imports;
 
@@ -194 +202 @@
   //cmt_string m_package_name; /* directly read from requirements */
 
-  bool m_located;
   bool m_has_native_version;
 
-  UsePtrVector sub_uses;
-  cmt_vector<ScopeType> sub_use_scopes;
-  cmt_vector<State> sub_use_auto_imports;
-
-  ScopeType initial_scope;
+
   cmt_vector<ScopeSection> scope_sections;
 
@@ -209 +212 @@
   CmtSystem::cmt_string_vector requests;
 
-  int m_index;  // Position within the ordered list of uses
+ 
 
   friend class UseProjectAction;