Changeset 330

Timestamp:

Nov 20, 2006, 4:25:18 PM (18 years ago)

Author:

garonne

Message:

add extra line from project.cmt to every packages belonging to the project

Location:

CMT/v1r20b1/source

Files:

• cmt_project.cxx (modified) (1 diff)
• cmt_project.h (modified) (1 diff)
• cmt_syntax.cxx (modified) (6 diffs)

CMT/v1r20b1/source/cmt_project.cxx

@@ -581 +581 @@
                                       project->get_name()+"_project_policy", 
                                       project->get_release (), "", "");                                                         
-      project_use->done      = false;//true;
+      project_use->done      = true; //false;
       project_use->discarded = false;
       project_use->selected  = true;

CMT/v1r20b1/source/cmt_project.h

@@ -192 +192 @@
   void  set_use (Use* use);  
   
+  cmt_vector <cmt_string> m_extra_lines;
+  
 private:
 

CMT/v1r20b1/source/cmt_syntax.cxx

@@ -247 +247 @@
                int line_number)
   {
+      
       // action (words, project->get_use(), file_name, line_number);
-      //cout<<project->get_use()->get_strategy("InstallArea")<<endl;   
-      
+      // cout<<project->get_use()->get_strategy("InstallArea")<<endl;   
+  
+            
       for (int i = 1; i < words.size (); i++)
       {
-        const cmt_string& w = words[i];
-
-        cmt_string strategy;
-        cmt_string value;
+               const cmt_string& w = words[i];
+
+               cmt_string strategy;
+               cmt_string value;
 
         bool in_error = false;
@@ -265 +267 @@
                // project->set_strategy (strategy, value, project->get_use()->get_package_name ());
                project->set_strategy (strategy, value, "");
+               cmt_string s  = "build_strategy ";
+           s             += words[i];
+           s             += "\n";            
+               bool no_found = true;                     
+           int size =  project->m_extra_lines.size ();
+           for (int n = 0; n < size; n++)
+           {
+            if (s==project->m_extra_lines[n])
+                no_found = false;
+           }
+           if (no_found)         
+           {  
+              cmt_string & buffer = project->m_extra_lines.add();           
+              buffer = s;
+           }
             }  
           }
@@ -1080 +1097 @@
           {
             if (project != 0) project->set_strategy (strategy, value, "");
+        cmt_string s  = "setup_strategy ";
+        s             += words[i];
+        s             += "\n";            
+        bool no_found = true;                    
+        int size =  project->m_extra_lines.size ();
+        for (int n = 0; n < size; n++)
+        {
+        if (s==project->m_extra_lines[n])
+            no_found = false;
+        }
+        if (no_found)         
+        {  
+              cmt_string & buffer = project->m_extra_lines.add();           
+              buffer = s;
+        }           
           }
         else
@@ -1168 +1200 @@
           {
             if (project != 0) project->set_strategy (strategy, value, "");
+            cmt_string s  = "structure_strategy ";
+        s             += words[i];
+        s             += "\n";            
+        bool no_found = true;                    
+        int size =  project->m_extra_lines.size ();
+        for (int n = 0; n < size; n++)
+        {
+        if (s==project->m_extra_lines[n])
+            no_found = false;
+        }
+        if (no_found)         
+        {  
+              cmt_string & buffer = project->m_extra_lines.add();           
+              buffer = s;
+        }           
+
           }
         else
@@ -1331 +1379 @@
   me.do_parse_requirements (file_name, use);
 
+
   if (use != 0)
   {
         //
+         
         Project* p = use->get_project ();
         if (p != 0)
@@ -1350 +1400 @@
               //}
               
-              use->add_sub_use (p_use);   
+              // add the dependency
+              use->add_sub_use (p_use);
               
+              // add the right extra statements
+              {
+                int size =  p->m_extra_lines.size ();
+                for (int n = 0; n < size; n++)
+                {
+                    cmt_string& s = p->m_extra_lines[n];
+                    SyntaxParser::parse_requirements_line (s, use);
+                }  
+              } 
+              
+              // Fill other values                
               use->sub_use_scopes.push_back (use->get_current_scope ());
               use->sub_use_auto_imports.push_back (p_use->auto_imports);