Changeset 280

Timestamp:

Oct 12, 2006, 7:40:03 PM (18 years ago)

Author:

garonne

Message:

enable and propagate -native_version syntax. STILL NOT FINISHED -- Backup commit

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_parser.cxx (modified) (2 diffs)
• source/cmt_syntax.cxx (modified) (1 diff)
• source/cmt_use.cxx (modified) (9 diffs)
• source/cmt_use.h (modified) (3 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2006-12-17 Vincent Garonne <garonne@lal.in2p3.fr> 315
+
+    * source/cmt_std.h: add __APPLE__ for removing compilation warnings    
 
 2006-11-17 Vincent Garonne <garonne@lal.in2p3.fr> 314

CMT/HEAD/source/cmt_parser.cxx

@@ -7673 +7673 @@
   Me.m_recursive = true;
   //Me.m_debug = false;
-  use = Use::add (Me.m_default_path, "CMT", Me.m_cmt_version, "", "", 0);
+  use = Use::add (Me.m_default_path, "CMT", Me.m_cmt_version, "", "", "", 0);
   Me.m_recursive = recursive_copy;
   Me.m_debug = debug_copy;
@@ -7712 +7712 @@
   Me.m_recursive = true;
 
-  use = Use::add (path, name, "v0", "", "", 0);
+  use = Use::add (path, name, "v0", "", "", "", 0);
 
   cmt_string f = Me.m_cmt_user_context;

CMT/HEAD/source/cmt_syntax.cxx

@@ -64 +64 @@
   {
     if (use == &(Use::current ()))
-      {
-        Constituent::action (Application, words);
-      }
-  }
+    {
+            Constituent::action (Application, words);
+     }
+  }
+  
   void action (const CmtSystem::cmt_string_vector& words,
                   Project* project,

CMT/HEAD/source/cmt_use.cxx

@@ -583 +583 @@
   void set (const cmt_string& w)
       {
-        if (w == "-auto_imports")
+        if (w.find (0, "-native_version=") != -1)
+          {
+               native_version = w.substr (16);
+          }
+          else if (w == "-auto_imports")
           {
             auto_imports = On;
@@ -747 +751 @@
         /// Now do create or retreive the Use object.
         Use* new_use = Use::add (path, package, version, 
-                                 version_alias, path_alias, parent,
-                                 auto_imports);
+                                 version_alias, path_alias, native_version,
+                                 parent, auto_imports);
 
         if (new_use != 0)
@@ -836 +840 @@
   
   State auto_imports;
-
+  cmt_string native_version;
   cmt_string package;
   cmt_string version;
@@ -850 +854 @@
 
   //
-  // complete syntax : "use <package> <version> <path>"
+  // complete syntax : "use <package> <version> <path> <-native_version=<version>>"  
   // minimal syntax  : "use <package>"
   //
@@ -883 +887 @@
       else
         {
-          it.set (ew);
+             it.set (ew);
         }
     }
@@ -1284 +1288 @@
   m_package = 0;
   m_index = -1;
+  native_version = "";
 
   clear ();
@@ -2306 +2311 @@
                const cmt_string& version_alias,
                const cmt_string& path_alias,
+               const cmt_string& native_version,
                Use* context_use,
                State specified_auto_imports)
@@ -2315 +2321 @@
 
   do_need_new = need_new (path, package_name, version, &old_use, context_use);
+  // cout <<"native_version: "<<native_version<<" "<<version<<endl;
+    
 
   if (Cmt::get_debug ())
@@ -2404 +2412 @@
    *         we have created a new Use (which has to be validated)
    */
-
   bool found = use->move_to ();
 

CMT/HEAD/source/cmt_use.h

@@ -39 +39 @@
                    const cmt_string& version_alias,
                    const cmt_string& path_alias,
+                   const cmt_string& native_version,
                    Use* context_use,
                    State specified_auto_imports = Unspecified);
@@ -138 +139 @@
   cmt_string version;            /* idem                            */
   cmt_string real_path;
+  cmt_string native_version;     /* idem                            */
   CmtDirStyle style;             /* May be cmt or mgr               */
 
@@ -172 +174 @@
                         const cmt_string& version,
                         Use** old_use,
-                        Use* context_use);
+                                    Use* context_use);
 
   bool get_all_clients (Use* to,