Changeset 22 for CMT

Timestamp:

Mar 30, 2005, 5:00:20 PM (20 years ago)

Author:

arnault

Message:

create project improvements - see CL261

Location:

CMT/v1r19

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_commands.cxx (modified) (2 diffs)
• source/cmt_parser.cxx (modified) (2 diffs)
• source/cmt_project.cxx (modified) (5 diffs)
• source/cmt_project.h (modified) (1 diff)

CMT/v1r19/ChangeLog

@@ -1 @@
-2005-03-30    <arnault@lal.in2p3.fr>
+2005-03-30  Christian Arnault  <arnault@lal.in2p3.fr> 261
 
         * doc/table.html: Install link to the Trac bug reporting system.  
 
 2005-03-30  Christian Arnault  <arnault@lal.in2p3.fr> 261
+
+        * source/cmt_project.cxx (create): The create function now creates
+        the complete directory hierarchy for the project including the
+        release level(s). Can accept a path.
+        (create_project): Don't assume a release level.
+
+        * source/cmt_project.h (class Project): The create function now accepts a release and a path argument 
+
+        * source/cmt_commands.cxx (show): Suppress debug printouts
+        * source/cmt_parser.cxx (do_help): Suppress debug printouts
 
         * source/cmt_system.cxx (is_version_directory): Accept HEAD/head as a valid version directory.

CMT/v1r19/source/cmt_commands.cxx

@@ -1973 +1973 @@
 void CommandHelp::show (ActionType action)
 {
-  cerr << "CommandHelp::show> action = " << action << endl;
+  //cerr << "CommandHelp::show> action = " << action << endl;
 
   static HelpTexts& help_texts = get_help_texts ();
@@ -2055 +2055 @@
   help_texts.add () =  "config                  : generate setup and cleanup scripts";
   help_texts.add () =  "create <package> <version> [<path>] : create and configure a new package";
-  help_texts.add () =  "create_project <project>  : create and configure a new project";
+  help_texts.add () =  "create_project <project> <name> [<path>] : create and configure a new project";
   help_texts.add () =  "cvsbranches <module>      : display the subdirectories for a module";
   help_texts.add () =  "cvssubpackagess <module>  : display the subpackages for a module";

CMT/v1r19/source/cmt_parser.cxx

@@ -2444 +2444 @@
 
   const cmt_string& project = ap.arguments[0];
-
-  Project::create (project);
+  const cmt_string& release = ap.arguments[1];
+  cmt_string path;
+
+  if (ap.arguments.size () >= 3)
+    {
+      path = ap.arguments[2];
+    }
+
+  Project::create (project, release, path);
 }
 
@@ -2587 +2594 @@
 void Cmt::do_help (const ArgParser& ap)
 {
-  cerr << "ap.help_action=" << ap.help_action << " Me.m_action=" << Me.m_action << endl;
+  //cerr << "ap.help_action=" << ap.help_action << " Me.m_action=" << Me.m_action << endl;
   if (Me.m_action == action_none)
     {

CMT/v1r19/source/cmt_project.cxx

@@ -200 +200 @@
   cmt_string name;
   cmt_string release;
-  CmtSystem::basename (compressed_path, release);
 
   //
@@ -448 +447 @@
 
 //----------------------------------------------------------
-void Project::create (const cmt_string& name)
+void Project::create (const cmt_string& name, 
+                      const cmt_string& release, 
+                      const cmt_string& path)
 {
   cout << "------------------------------------------" << endl;
-  cout << "Configuring environment for project " << name << endl;
+  cout << "Configuring environment for project " << name << " " << release;
+
+  if (path != "")
+    {
+      cout << " in " << path;
+    }
+
+  cout << endl;
   cout << "CMT version " << Cmt::get_cmt_version () << "." << endl;
   cout << "------------------------------------------" << endl;
+
+  if (path != "")
+    {
+      if (!CmtSystem::mkdir (path))
+        {
+          cout << "Cannot create the " << path << " directory" << endl;
+          return;
+        }
+
+      if (!CmtSystem::cd (path))
+        {
+          cout << "Cannot access the " << path << " directory" << endl;
+          return;
+        }
+    }
+
+  if (!CmtSystem::mkdir (name))
+    {
+      cout << "Cannot create the " << name << " directory" << endl;
+      return;
+    }
+
+  if (!CmtSystem::cd (name))
+    {
+      cout << "Cannot access the " << name << " directory" << endl;
+      return;
+    }
+
+  if (release != "")
+    {
+      if (!CmtSystem::mkdir (release))
+        {
+          cout << "Cannot create the " << release << " directory" << endl;
+          return;
+        }
+      
+      if (!CmtSystem::cd (release))
+        {
+          cout << "Cannot access the " << release << " directory" << endl;
+          return;
+        }
+    }
 
   if (!CmtSystem::test_directory ("cmt"))
@@ -629 +679 @@
 void Project::show_all ()
 {
-  /*
-  static ProjectVector& Projects = projects ();
-
-  for (int i = 0; i < Projects.size (); i++)
-    {
-      const Project& project = Projects[i];
-      project.show ();
-    }
-  */
-
   static Project::ProjectVector& Projects = Project::projects ();
   
@@ -1259 +1299 @@
   int i;
 
+  /*
   for (i = 0; i < m_parents.size (); i++)
     {
@@ -1272 +1313 @@
       cout << " C=" << p->get_name ();
     }
+  */
 
   cout << endl;

CMT/v1r19/source/cmt_project.h

@@ -95 +95 @@
   typedef cmt_vector<Project*> ProjectPtrVector;
 
-  static void create (const cmt_string& name);
+  static void create (const cmt_string& name, 
+                      const cmt_string& release, 
+                      const cmt_string& path);
 
   static Project* find_by_name (const cmt_string& name);