Changeset 530 for CMT

Timestamp:

Nov 28, 2009, 10:39:25 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 417

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_error.cxx (modified) (2 diffs)
• source/cmt_error.h (modified) (1 diff)
• source/cmt_parser.cxx (modified) (3 diffs)
• source/cmt_symbol.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2009-11-28    <rybkin@lal.in2p3.fr> 417
+
+        * source/cmt_error.h: Introduce error wrong_symbol_type
+        * source/cmt_error.cxx: idem, improve error messages
+        * source/cmt_parser.cxx: In functions Cmt::do_show_action,
+        Cmt::do_show_macro, replace warnings with the introduced error
+        * source/cmt_symbol.cxx: In function Symbol::action, resolve relative
+        script path without using PACKAGEROOT environment variable in case of
+        standalone package (as the variable is not set for it)
+        
 2009-11-27    <rybkin@lal.in2p3.fr> 416
 

CMT/HEAD/source/cmt_error.cxx

@@ -25 +25 @@
     error_names.add() = "language not found";
     error_names.add() = "syntax error";
-    error_names.add() = "command_not_implemented";
-    error_names.add() = "package_not_found";
-    error_names.add() = "path_not_found";
-    error_names.add() = "version_conflict";
-    error_names.add() = "file_access_error";
-    error_names.add() = "configuration_error";
-    error_names.add() = "execution_error";
-    error_names.add() = "cannot_lock";
+    error_names.add() = "command not implemented";
+    error_names.add() = "package not found";
+    error_names.add() = "path not found";
+    error_names.add() = "version conflict";
+    error_names.add() = "file access error";
+    error_names.add() = "configuration error";
+    error_names.add() = "execution error";
+    error_names.add() = "cannot lock";
     error_names.add() = "cannot_write_lock";
     error_names.add() = "cannot_run_lock_command";
@@ -39 +39 @@
     error_names.add() = "cannot_remove_lock";
     error_names.add() = "conflicting_lock";
-    error_names.add() = "unknown_command";
-    error_names.add() = "project_release_conflict";
-    error_names.add() = "execution_failed";
+    error_names.add() = "unknown command";
+    error_names.add() = "wrong symbol type";
+    error_names.add() = "project release conflict";
+    error_names.add() = "execution failed";
     m_execution_error = 0;
   }

CMT/HEAD/source/cmt_error.h

@@ -41 +41 @@
     conflicting_lock,
     unknown_command,    
+    wrong_symbol_type,    
     project_release_conflict,
     execution_failed

CMT/HEAD/source/cmt_parser.cxx

@@ -3768 +3768 @@
                 }
 
-              CmtError::set (CmtError::warning, t);
+              CmtError::set (CmtError::wrong_symbol_type, t);
             }
         }
@@ -4078 +4078 @@
                 }
 
-              CmtError::set (CmtError::warning, t);
+              CmtError::set (CmtError::wrong_symbol_type, t);
             }
         }
@@ -4091 +4091 @@
               t += "macro";
 
-              CmtError::set (CmtError::warning, t);
+              CmtError::set (CmtError::wrong_symbol_type, t);
             }
         }

CMT/HEAD/source/cmt_symbol.cxx

@@ -972 +972 @@
           else
             {
-              if (use->get_strategy ("SetupRoot"))
+              if (use->get_strategy ("SetupRoot") &&
+                  use->get_package_name () != "cmt_standalone")
                 {
 #ifdef WIN32