Changeset 333

Timestamp:

Nov 21, 2006, 11:15:02 AM (19 years ago)

Author:

garonne

Message:

do not create native_version if macro is empty

Location:

CMT/v1r20b1/source

Files:

• cmt_parser.cxx (modified) (1 diff)
• cmt_project.cxx (modified) (1 diff)
• cmt_use.cxx (modified) (2 diffs)

CMT/v1r20b1/source/cmt_parser.cxx

@@ -4531 +4531 @@
   if (macro != 0)
   {
-      cout << "Creating native_version file." << endl;    
       cmt_string value = macro->resolve_macro_value ();
-      FILE* f          = fopen ("new.native_version.cmt", "wb");
-      if (f != NULL)
+      if (value != "")
       {
+        cout << "Creating native_version file." << endl;    
+        FILE* f          = fopen ("new.native_version.cmt", "wb");
+        if (f != NULL)
+        {
             fprintf (f, "%s\n", value.c_str ());
-      }      
-      //cout<<value <<endl;
-      fclose (f);
-
-      CmtSystem::compare_and_update_files ("new.native_version.cmt", "native_version.cmt");
+        }      
+        //cout<<value <<endl;
+        fclose (f);
+
+        CmtSystem::compare_and_update_files ("new.native_version.cmt", "native_version.cmt");
+      } 
   }    
 }

CMT/v1r20b1/source/cmt_project.cxx

@@ -579 +579 @@
           // 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", 
+                                      "package_policy_for_project_"+project->get_name(),                                       
                                       project->get_release (), "", "");                                                         
       project_use->done      = true; //false;

CMT/v1r20b1/source/cmt_use.cxx

@@ -493 +493 @@
 
           if (use->discarded) continue;
+          if (use->m_hidden) continue;
 
           if (!use->located ())
@@ -3780 +3781 @@
 
   if (skip_discarded && discarded) return;
+  if (m_hidden) return;
 
   if (level > 0)