Changeset 181

Timestamp:

Apr 27, 2006, 1:20:07 PM (18 years ago)

Author:

garonne

Message:

add the cmt relocate command

Location:

CMT/HEAD/source

Files:

• cmt.h (modified) (1 diff)
• cmt_commands.cxx (modified) (4 diffs)
• cmt_commands.h (modified) (1 diff)
• cmt_parser.cxx (modified) (6 diffs)
• cmt_parser.h (modified) (2 diffs)

CMT/HEAD/source/cmt.h

@@ -131 +131 @@
   static void do_do (const ArgParser& ap);
   static void do_expand_model (const ArgParser& ap);
-  static void do_filter (const ArgParser& ap);
-  static void do_help (const ArgParser& ap);
-  static void do_lock (const ArgParser& ap);
-  static void do_remove (const ArgParser& ap);
+  static void do_filter       (const ArgParser& ap);
+  static void do_help         (const ArgParser& ap);
+  static void do_lock         (const ArgParser& ap);
+  static void do_relocate     (const ArgParser& ap);
+  static void do_remove       (const ArgParser& ap);
   static void do_remove_library_links (const ArgParser& ap);
   static void do_run (const ArgParser& ap);

CMT/HEAD/source/cmt_commands.cxx

@@ -135 +135 @@
   pv.push_back (&ArgParser::do_lock); i++;
 
-  parsers.add ("re", i);
+  parsers.add ("rel", i);
+  parsers.add ("relo", i);
+  parsers.add ("reloc", i);
+  parsers.add ("reloca", i);
+  parsers.add ("relocat", i);
+  parsers.add ("relocate", i);
+  pv.push_back (&ArgParser::do_relocate); i++;
+
   parsers.add ("rem", i);
   parsers.add ("remo", i);
@@ -992 +999 @@
     }
 }
+
+
+void ArgParser::do_relocate ()
+{
+  cmt.m_action = action_relocate;
+}
+
 
 void ArgParser::do_remove ()
@@ -2105 +2119 @@
   help_texts.add () =  "load";
   help_texts.add () =  "lock [<p> <v> [<path>]] : lock a package";
+  help_texts.add () =  "relocate                : generate only setup scripts";
   help_texts.add () =  "remove <package> <version> [<path>] : remove a package version";
   help_texts.add () =  "remove library_links    : remove symbolic links towards all imported libraries";
@@ -2201 +2216 @@
   help.add (action_load, help_texts[action_load]);
   help.add (action_lock, help_texts[action_lock]);
+  help.add (action_relocate, help_texts[action_relocate]);
   help.add (action_remove, help_texts[action_remove]);
   help.add (action_remove_library_links, help_texts[action_remove_library_links]);

CMT/HEAD/source/cmt_commands.h

@@ -43 +43 @@
   void do_cvssubpackages ();
   void do_cvssubprojects ();
-  void do_cvstags ();
-  void do_do ();
-  void do_expand ();
-  void do_filter ();
-  void do_help ();
-  void do_lock ();
-  void do_remove ();
-  void do_run ();
+  void do_cvstags  ();
+  void do_do       ();
+  void do_expand   ();
+  void do_filter   ();
+  void do_help     ();
+  void do_lock     ();
+  void do_relocate ();
+  void do_remove   ();
+  void do_run      ();
   void do_run_sequence ();
   void do_set ();

CMT/HEAD/source/cmt_parser.cxx

@@ -2175 +2175 @@
 
   //cout << "do_config> current style=" << Me.m_current_style << endl;
+
+  Me.m_quiet = true;
+
+  if (!reach_current_package ())
+    {
+      cout << "Cannot read the requirements file" << endl;
+      return;
+    }
+
+  install_setup_scripts ();
+  install_cleanup_scripts ();
+
+  CmtSystem::cd ("..");
+
+  Branch::BranchVector& branches = Branch::branches ();
+
+  int i;
+
+  for (i = 0; i < branches.size (); i++)
+    {
+      const Branch& branch = branches[i];
+      const cmt_string& branch_name = branch.name ();
+
+      if (!CmtSystem::test_directory (branch_name))
+        {
+          if (!CmtSystem::mkdir (branch_name))
+            {
+              cout << "Cannot create the " << branch_name <<" branch" << endl;
+            }
+          else
+            {
+              cout << "Installing the " << branch_name << " directory" << endl;
+            }
+        }
+      else
+        {
+          cout << branch_name << " directory already installed" << endl;
+        }
+    }
+}
+
+
+//----------------------------------------------------------
+void Cmt::do_relocate (const ArgParser& ap)
+{
+  if (CmtLock::check () == CmtLock::locked_by_another_user)
+    {
+      CmtError::set (CmtError::conflicting_lock, "relocate>");
+      return;
+    }
+
+  Use& current_use = Use::current ();
+
+  if (Me.m_debug)
+    {
+      cout << "Cmt::do_relocate> " << endl;
+      cout << "pwd "          << CmtSystem::pwd () << endl;
+      cout << "current_dir "  << Me.m_current_dir << endl;
+      cout << "default_path " << Me.m_default_path << endl;
+      cout << "cmt config "   <<
+          Me.m_current_package << " " <<
+          Me.m_current_version << " " <<
+          Me.m_current_path << endl;
+    }
+
+  if (Me.m_current_package == "CMT")     return;
+  if (Me.m_current_package == "methods") return;
+
+  cmt_string branch;
+
+  CmtSystem::basename (Me.m_current_dir, branch);
+
+  if ((branch != "mgr") && (branch != "cmt"))
+    {
+
+        //
+        // Here we are in a standalone package (ie completely unstructured)
+        //
+
+      if (CmtSystem::test_file ("requirements"))
+        {
+          cout << "------------------------------------------" << endl;
+          cout << "Configuring environment for standalone package." << endl;
+          cout << "CMT version " << Me.m_cmt_version << "." << endl;
+          cout << "System is "   << Me.m_cmt_config << endl;
+          cout << "------------------------------------------" << endl;
+
+          install_test_setup_scripts ();
+          install_test_cleanup_scripts ();
+
+          Generator::build_default_makefile ();
+        }
+      else
+        {
+          cout << "==============================================" << endl;
+          cout << "cmt relocate must be operated either upon "
+            "an existing package" << endl;
+          cout << " (ie. when a requirements file already exists)" << endl;
+          cout << "   > cd ..." << endl;
+          cout << "   > cmt relocate" << endl;
+          cout << "or to create a new package" << endl;
+          cout << "   > cmt relocate <package> <version> [<path>]" << endl;
+          cout << "==============================================" << endl;
+        }
+
+      return;
+    }
+
+  configure_current_package ();
+
+  Generator::build_default_makefile ();
+  
+  CmtSystem::cd ("..");    
+  CmtSystem::cd (branch); 
+
+  Use& use = Use::current ();
+
+  use.set (Me.m_current_package,
+           Me.m_current_version,
+           Me.m_current_path,
+           "",
+           "");
+
+  use.change_path (Me.m_current_path);
+  use.style     = Me.m_current_style;
 
   Me.m_quiet = true;
@@ -4905 +5030 @@
     case action_load :
     case action_lock :
+    case action_relocate:
     case action_remove :
     case action_remove_library_links :
@@ -5015 +5141 @@
       // case action_lock :
       // case action_remove :
+    case action_relocate:
     case action_remove_library_links :
     case action_run :
@@ -5118 +5245 @@
     case action_lock :
       // case action_remove :
+    case action_relocate :
     case action_remove_library_links :
     case action_run :
@@ -5231 +5359 @@
         case action_load :
         case action_lock :
+        case action_relocate :
         case action_remove :
         case action_remove_library_links :
@@ -5407 +5536 @@
         case action_lock :
           do_lock (ap);
+          break;
+        case action_relocate :
+          do_relocate (ap);
           break;
         case action_remove :

CMT/HEAD/source/cmt_parser.h

@@ +1 @@
+
 //-----------------------------------------------------------
 // Copyright Christian Arnault LAL-Orsay CNRS
@@ -257 +258 @@
   action_load,
   action_lock,
+  action_relocate,
   action_remove,
   action_remove_library_links,