Changeset 652 for CMT/HEAD/source/cmt_generators.cxx

Timestamp:

Nov 5, 2013, 3:40:52 PM (11 years ago)

Author:

rybkin

Message:

See C.L. 511

File:

• CMT/HEAD/source/cmt_generators.cxx (modified) (9 diffs)

CMT/HEAD/source/cmt_generators.cxx

@@ -2841 +2841 @@
   m_PACKAGEFULLNAME.set ("PACKAGEFULLNAME");
   m_ISLOCAL.set ("ISLOCAL");
+  m_ISINCLUDED.set ("ISINCLUDED");
 
   packages_header_fragment.set ("packages_header");
@@ -2854 +2855 @@
   m_PACKAGEFULLNAME = "";
   m_ISLOCAL = "";
+  m_ISINCLUDED = "";
 
   packages_header_fragment.reset ();
@@ -2899 +2901 @@
       if (!packages_header_fragment.copy (m_output_file, 1, &m_PACKAGE)) return;
 
-      Project* cur = Project::get_current ();
+      const Project* p_cur (Project::get_current ());
       Use::UsePtrVector uses (Use::get_ordered_uses ());
       uses.push_back (&Use::current ());
+
+      Project::ConstProjectPtrVector path_exclusions;
+      Project::fill_exclusion (path_exclusions);
+
       cmt_string temp;
       for (int i = uses.size () - 1; i >= 0; i--)
         {
           Use* use = uses[i];
+
           if (use->discarded) continue;
           if (use->m_hidden) continue;
@@ -2911 +2918 @@
           if (use->get_package ()->is_cmt ()) continue;
 
-          if (use->get_project () == cur)
-            m_ISLOCAL = "is_local";
-          else
-            m_ISLOCAL = "is_not_local";
+          const Project* up = use->get_project ();
+
+          m_ISLOCAL = "is_not_local";
+          if (p_cur)
+            {
+              if (up)
+                {
+                  if (up == p_cur)
+                    {
+                      m_ISLOCAL = "is_local";
+                    }
+                }
+              else
+                {
+                  if (use->get_realpath ().find (p_cur->get_cmtpath_real ()) == 0)
+                    {
+                      m_ISLOCAL = "is_local";
+                    }
+                }
+            }
+          else if (use == &Use::current ())
+            {
+              m_ISLOCAL = "is_local";
+            }
+
+          m_ISINCLUDED = "is_included";
+          for (int j = 0; j < path_exclusions.size (); j++)
+            {
+              const Project* sp = path_exclusions[j];
+              if (up)
+                {
+                  if (up == sp)
+                    {
+                      m_ISINCLUDED = "is_not_included";
+                    }
+                }
+              else
+                {
+                  if (use->get_realpath ().find (sp->get_cmtpath_real ()) == 0)
+                    {
+                      m_ISINCLUDED = "is_not_included";
+                    }
+                }
+            }
 
           temp = use->get_full_path ();
@@ -2927 +2974 @@
               temp += "mgr";
               break;
+            default:
+              break;
             }
 #ifdef WIN32
@@ -2932 +2981 @@
 #endif
           m_PACKAGEMGRPATH = temp;
-          //      fprintf (m_output_file, "%s\n", temp.c_str());
 
           temp = "";
@@ -2956 +3004 @@
 #endif
           m_PACKAGEFULLNAME = temp;
-          //      fprintf (m_output_file, "%s\n", temp.c_str());
 
           m_PACKAGE = use->get_package_name ();
@@ -2991 +3038 @@
             }
 
-          if (!package_fragment.copy (m_output_file, 6,
+          if (!package_fragment.copy (m_output_file, 7,
                                       &m_PACKAGE, &m_PACKAGEPREFIX,
                                       &m_DEPENDENCIES,
                                       &m_PACKAGEMGRPATH, &m_PACKAGEFULLNAME,
-                                      &m_ISLOCAL)) return;
+                                      &m_ISLOCAL, &m_ISINCLUDED)) return;
         }
 
@@ -3016 +3063 @@
 
       CmtSystem::close_ostream (m_output_file, new_file_name);
-      //  fclose (m_output_file);
 
       commit (new_file_name);