Changeset 523 for CMT/HEAD/source

Timestamp:

Oct 15, 2009, 12:46:33 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 410

Location:

CMT/HEAD/source

Files:

• cmt_parser.cxx (modified) (5 diffs)
• cmt_project.cxx (modified) (3 diffs)
• cmt_syntax.cxx (modified) (1 diff)

CMT/HEAD/source/cmt_parser.cxx

@@ -4302 +4302 @@
     }
 
+  if (current_use.get_strategy ("SetupScripts"))
+    {
+      cout << " scripts";
+    }
+  else
+    {
+      cout << " no_scripts";
+    }
+
   cout << endl;
   
@@ -4748 +4757 @@
   static const PrintMode  mode[2]     = {Csh, Sh};
 #endif
+
+  Use& current_use = Use::current ();
+
+  if (!current_use.get_strategy ("SetupScripts"))
+    {
+      for (int i = 0; i < modes; i++)
+        {
+          cmt_string old_file_name = "cleanup";
+          old_file_name += ".";
+          old_file_name += suffix[i];
+          if (CmtSystem::test_file (old_file_name))
+            {
+              if (CmtMessage::active (Error))
+                cerr << "Removing cleanup script " + old_file_name << endl;
+              CmtSystem::remove_file (old_file_name);
+            }
+        }
+      return;
+    }
 
   if (CmtMessage::active (Error))
@@ -4836 +4864 @@
 #endif
 
+  Use& current_use = Use::current ();
+
+  if (!current_use.get_strategy ("SetupScripts"))
+    {
+      for (int i = 0; i < modes; i++)
+        {
+          cmt_string old_file_name = "setup";
+          old_file_name += ".";
+          old_file_name += suffix[i];
+          if (CmtSystem::test_file (old_file_name))
+            {
+              if (CmtMessage::active (Error))
+                cerr << "Removing setup script " + old_file_name << endl;
+              CmtSystem::remove_file (old_file_name);
+            }
+        }
+      return;
+    }
+
   if (CmtMessage::active (Error))
     cerr << "Creating setup scripts." << endl;
-
-  Use& current_use = Use::current ();
   
   cmt_string no_cleanup_opt;
@@ -4950 +4995 @@
   static const PrintMode  mode[2]     = {Csh, Sh};
 #endif
+
+  Use& current_use = Use::current ();
+
+  if (!current_use.get_strategy ("SetupScripts"))
+    {
+      for (int i = 0; i < modes; i++)
+        {
+          cmt_string old_file_name = "cleanup";
+          old_file_name += ".";
+          old_file_name += suffix[i];
+          if (CmtSystem::test_file (old_file_name))
+            {
+              if (CmtMessage::active (Error))
+                cerr << "Removing cleanup script " + old_file_name << endl;
+              CmtSystem::remove_file (old_file_name);
+            }
+        }
+      return;
+    }
 
   if (CmtMessage::active (Error))
@@ -5060 +5124 @@
 #endif
 
+  Use& current_use = Use::current ();
+
+  if (!current_use.get_strategy ("SetupScripts"))
+    {
+      for (int i = 0; i < modes; i++)
+        {
+          cmt_string old_file_name = "setup";
+          old_file_name += ".";
+          old_file_name += suffix[i];
+          if (CmtSystem::test_file (old_file_name))
+            {
+              if (CmtMessage::active (Error))
+                cerr << "Removing setup script " + old_file_name << endl;
+              CmtSystem::remove_file (old_file_name);
+            }
+        }
+      return;
+    }
+
   if (CmtMessage::active (Error))
     cerr << "Creating setup scripts." << endl;
-
-  Use& current_use = Use::current ();
 
   cmt_string no_cleanup_opt;

CMT/HEAD/source/cmt_project.cxx

@@ -1945 +1945 @@
   set_default_strategy ("SetupRoot");
   set_default_strategy ("SetupCleanup");
+  set_default_strategy ("SetupScripts");
   set_default_strategy ("BuildPrototypes");
   set_default_strategy ("InstallArea");
@@ -2723 +2724 @@
 
   s = new StrategyDef;
+  s->m_keyword = "setup";
+  s->m_name = "SetupScripts";
+  s->m_on_value = "scripts";
+  s->m_off_value = "no_scripts";
+  s->m_default_value = true;
+  s->m_priority_value = false;
+
+  m_defs.push_back (s);
+
+  s = new StrategyDef;
   s->m_keyword = "structure";
   s->m_name = "VersionDirectory";
@@ -2857 +2868 @@
   m_off_tag = Tag::find (to_untag_name);
 
-  if (m_on_tag == 0) 
+  if (m_on_tag == 0 || m_off_tag == 0)
     {
       m_on_tag = Tag::add (to_tag_name, PriorityConfig, "PROJECT", 0);

CMT/HEAD/source/cmt_syntax.cxx

@@ -1037 +1037 @@
       {
         strategy = "SetupCleanup";
+      }
+    else if (value == "scripts")
+      {
+        strategy = "SetupScripts";
+      }
+    else if (value == "no_scripts")
+      {
+        strategy = "SetupScripts";
       }
     else