Changeset 299

Timestamp:

Nov 2, 2006, 1:18:43 PM (19 years ago)

Author:

garonne

Message:

build strategy macro extension

Location:

CMT/v1rc19/source

Files:

• cmt_syntax.cxx (modified) (4 diffs)
• cmt_version.h (modified) (1 diff)

CMT/v1rc19/source/cmt_syntax.cxx

@@ -169 +169 @@
     value =  w; 
     Symbol::expand(value);
-    cout <<"# strategy: "<<value<<endl;           
 
     if (value == "prototypes")
@@ -248 +247 @@
           {
             if (project != 0) project->set_strategy (strategy, value, "");
-            //(project->get_use())->get_package_name ());
           }
         else
@@ -976 +974 @@
     bool result = true;
 
-    value = w;
-
-    if (w == "config")
+    value =  w; 
+    Symbol::expand(value);
+
+
+    if (value == "config")
       {
         strategy = "SetupConfig";
       }
-    else if (w == "no_config")
+    else if (value == "no_config")
       {
         strategy = "SetupConfig";
       }
-    else if (w == "root")
+    else if (value == "root")
       {
         strategy = "SetupRoot";
       }
-    else if (w == "no_root")
+    else if (value == "no_root")
       {
         strategy = "SetupRoot";
       }
-    else if (w == "cleanup")
+    else if (value == "cleanup")
       {
         strategy = "SetupCleanup";
       }
-    else if (w == "no_cleanup")
+    else if (value == "no_cleanup")
       {
         strategy = "SetupCleanup";
@@ -1080 +1080 @@
 
     value = w;
-
-    if (w == "with_version_directory")
+    Symbol::expand(value);
+
+    if (value == "with_version_directory")
       {
         strategy = "VersionDirectory";
       }
-    else if (w == "without_version_directory")
+    else if (value == "without_version_directory")
       {
         strategy = "VersionDirectory";

CMT/v1rc19/source/cmt_version.h

@@ -9 +9 @@
 
 //#define CMTVERSION "v1r18p20050901"
-#define CMTVERSION "v1rbeta20p20061025"
+#define CMTVERSION "v1rc19"
 
 #endif