Changeset 42

Timestamp:

Apr 25, 2005, 2:02:18 PM (19 years ago)

Author:

arnault

Message:

Preparing support for projects in CVS - See CL 270

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• doc/CMTDoc.html (modified) (65 diffs)
• doc/gendoc.py (modified) (1 diff)
• mgr/VisualC.nmake (modified) (1 diff)
• mgr/cmt.nmake (modified) (1 diff)
• source/cmt.h (modified) (1 diff)
• source/cmt_commands.cxx (modified) (5 diffs)
• source/cmt_commands.h (modified) (1 diff)
• source/cmt_cvs.cxx (modified) (13 diffs)
• source/cmt_cvs.h (modified) (1 diff)
• source/cmt_parser.cxx (modified) (6 diffs)
• source/cmt_parser.h (modified) (1 diff)
• source/cmt_system.cxx (modified) (2 diffs)
• source/cmt_use.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2005-04-25    <arnault@lal.in2p3.fr> 270
+
+        * source/cmt_cvs.cxx (class CvsImplementation): Accept empty
+        argument for queries on subprojects
+
+        * source/cmt_cvs.cxx (class CvsImplementation): Accept empty
+        argument for queries on subpackages
+
+        * source/cmt_cvs.cxx (class CvsImplementation): Selection for
+        getting the mudule contents is done using the structure
+        information.
+
+        * source/cmt_cvs.cxx (class CvsImplementation): Isolate specific
+        behaviour into dedicated functions for getting the specific
+        contents for packages or for projects.
+
+        * source/cmt_cvs.cxx (class CvsImplementation): Retrieve fields
+        for structure and subprojects from the CVS pluggin.
+
+        * source/cmt_cvs.cxx (class CvsImplementation): Manage the
+        protocol level related with the version of the CVS pluggin.
+
+        * source/cmt_cvs.cxx (class CvsImplementation): Suppress all dots
+        from the tmpdir due to problems on Windows
+
+        * source/cmt_cvs.cxx (class CvsImplementation): Add support for
+        struture_info and subprojects coming from the new CVS pluggin
+
+        * source/cmt_parser.cxx (do_cvssubprojects): Handle the
+        cvssubprojects command
+        (parser): Commands related with CVS should at least read the
+        requirements file of CMT
+
+        * source/cmt_parser.h (enum): Add cvssubprojects action
+
+        * source/cmt_commands.cxx (CommandHelp): Add help for
+        cvssubprojects command
+
+        * source/cmt_commands.cxx (do_cvssubprojects): Accept empty
+        argument to query for subprojects at top of the repository
+
+        * source/cmt_commands.cxx (do_cvssubpackages): Accept empty
+        argument to query for subpackages at top of the repository
+
+        * source/cmt_commands.cxx (ArgParser): Manage cvssubprojects command.
+
+        * source/cmt_commands.h (class ArgParser): Add cvssubprojects command
+
+        * source/cmt_use.cxx (fill_standard_macros): Production of a new
+        standard macro for obtaining the project releases
+
+        * source/cmt_cvs.h (class Cvs): Add the subprojects function to
+        query CVS about the existing subprojects of a given module.
+
 2005-04-23  Christian Arnault  <arnault@lal.in2p3.fr> 269
 

CMT/HEAD/doc/CMTDoc.html

@@ -7 +7 @@
    tt.cmt {color:#00AA00; font-weight: normal; %background-color: #eeeeee}
    pre {color:#FF0000; background-color: #eeeeee; border-style: solid; border-width: 1; border-color: black; padding: 4}
-   pre.cmt {color:#00AA00; background-color: #eeeeee; border-style: solid; border-width: 1; border-color: black; padding: 4}
+   pre.cmt {font-family: courier; color:#00AA00; background-color: #eeeeee; border-style: solid; border-width: 1; border-color: black; padding: 4}
    h2 {color:#0000FF}
    h3 {color:#00AA00}
@@ -23 +23 @@
 <center>Christian Arnault</center>
 <center><tt>arnault@lal.in2p3.fr</tt></center></h2>
-<center><i>Document revision date : 2005-03-31</i></center><hr><h2><a href="#index">General index</a></h2>
+<center><i>Document revision date : 2005-04-17</i></center><hr><h2><a href="#index">General index</a></h2>
 <hr><h2><a name="Presentation"></a><a href="#index"><tt>&nbsp;1</tt></a> - Presentation</h2>
 <blockquote>
@@ -389 +389 @@
       platform specific tools will be dynamically reconfigured and
       parameterized transparently.
+
+
 </blockquote>
 </blockquote>
 <hr><h2><a name="Defining and managing projects"></a><a href="#index"><tt>&nbsp;4</tt></a> - Defining and managing projects</h2>
 <blockquote>
+
   <p>In the CMT terminology, the complete software base is composed
       of CMT packages. Those packages are organized into
@@ -431 +434 @@
         packages.</li>
 </ul>
+
   <p>Projects receive detailed descriptions or specifications in a
       dedicated <i>project file</i>
@@ -438 +442 @@
   . It can receive the following
     specifications:</p>
-<pre class="cmt">
-project &lt;project-name&gt;          [1]
+
+<pre>project &lt;project-name&gt;          [1]
 <i>project-use specifications...</i>   [2]
 <i>strategy specifications...</i>      [3]
 </pre>
+
   <ol>
     <li>The project name specified here takes precedence over the
@@ -539 +544 @@
   <p>Every strategy setting defines two mutually exclusive tags
       and activates one of them.</p>
-<pre class="cmt">
+<pre>
 &lt;project&gt;_&lt;have_item&gt; 
 &lt;project&gt;_&lt;have_not_item&gt; </pre>
 <p>Examples</p>
-<pre class="cmt">
+<pre>
 &lt;project&gt;_prototypes
 &lt;project&gt;_no_prototypes
@@ -772 +777 @@
               or (in a <tt>requirements</tt>
      file) 
-<pre class="cmt">
+<pre>
 path_append CMTPATH "/home/arnault/mydev"
 path_append CMTPATH "/ProjectB"</pre>
@@ -1124 +1129 @@
   </li>
 </ul>
-<pre class="cmt">
+<pre>
 use Bar v7r5                    [1]</pre>
 <i>or</i>
-<pre class="cmt">
+<pre>
 use Bar v7r5 A                  [2]</pre>
 <i>or</i>
-<pre class="cmt">
+<pre>
 use Bar v7r5 /ProjectB/A        [3]</pre>
   <p>Given these keys, the referenced package is looked for
@@ -1164 +1169 @@
    statement (defined within a given package)
     containing : </p>
-<pre class="cmt">
+<pre>
 ... 
 use Bar v7r5
@@ -1378 +1383 @@
       location path of an external software package. Here we take the
     example of the Anaphe utility: </p>
-<pre class="cmt">
+<pre>
 macro AnapheTOP "" \
       CERN  "/afs/cern.ch/sw/lhcxx" \
@@ -1649 +1654 @@
       <tt>target_B</tt>
     will in turn be active.</p>
-<pre class="cmt">
+<pre>
 library A -target_tag A.cxx
 application P -target_tag P.cxx
@@ -1734 +1739 @@
             the <tt>set</tt>
    statement in a requirements file</li>
-<pre class="cmt">
+<pre>
 set CMTSITE "CERN"
 set CMTCONFIG "${CMTBIN}" sun "Solaris-CC-dbg"</pre>
@@ -1741 +1746 @@
             using the <tt>tag</tt>
      statement (in a requirements file):
-<pre class="cmt">
+<pre>
 tag newtag tag1 tag2 tag3</pre>
               which means that:
@@ -1757 +1762 @@
      using the <tt>tag_exclude</tt>
      syntax.
-<pre class="cmt">
+<pre>
 tag_exclude debug optimized</pre>
           This example implies that the two tags <tt>debug</tt>
@@ -1842 +1847 @@
           will force the tag <tt>foo</tt>
     :
-<pre class="cmt">
+<pre>
 tag_apply foo</pre>
 <pre>
@@ -1857 +1862 @@
     <li>
     <i>Implying a tag from another one using the tag association syntax</i>
-<pre class="cmt">
+<pre>
 tag Linux foo</pre>
 <pre>
@@ -1873 +1878 @@
       <i>Through conventionally encoded values of <tt>CMTCONFIG</tt>
     </i>
-<pre class="cmt">
+<pre>
 tag Linux-foo Linux foo</pre>
 <pre>
@@ -1928 +1933 @@
   <p>All symbol definitions providing specific values triggered by
       the active selectors will be selected, such as in:</p>
-<pre class="cmt">
+<pre>
 macro_append cppflags "" \
              debug    " -g "</pre>
@@ -2139 +2144 @@
       in the <tt>&nbsp;<a HREF='#The requirements file'>requirements</a>&nbsp;</tt>
       file :
-<pre class="cmt">
+<pre>
 ... 
 macro Foo_linkopts " -lFoo " \
@@ -2282 +2287 @@
         in <tt>${CMTROOT}/fragments/tex</tt>
 .) :</p>
-<pre class="cmt">
+<pre>
 ============ tex ===================================== 
 ${CONSTITUENT} :: ${FILEPATH}/${NAME}.ps
@@ -2300 +2305 @@
     's <a HREF="#The         requirements file">requirements</a>
      file as follows :
-<pre class="cmt">
+<pre>
 make_fragment tex -header=tex_header</pre>
               where: 
@@ -2317 +2322 @@
             to include in its &nbsp;<a HREF='#The requirements file'>requirements</a>&nbsp; file a statement similar
             to the following:
-<pre class="cmt">
+<pre>
 document tex MyDoc -s=../doc doc1.tex doc2.tex </pre>
               where: 
@@ -2344 +2349 @@
     </ol>
     <p>The result for our example is: </p>
-<pre class="cmt">
+<pre>
 =========== MyDoc.make =============================== 
 
@@ -2420 +2425 @@
      be declared in the
     &nbsp;<a HREF='#The requirements file'>requirements</a>&nbsp; file of the provider package as follows:
-<pre class="cmt">
+<pre>
 make_fragment &lt;fragment-name&gt; [ options... ] </pre>
               where options may be : 
@@ -2549 +2554 @@
     <li> rootcint 
     <p>It generates C++ hubs for the Cint interpreter in Root. </p>
-<pre class="cmt">
+<pre>
 ========= rootcint ========================================= 
 $(src)${NAME}.cc :: ${FULLNAME}   
@@ -2558 +2563 @@
       <p>It generates C++ source files (xxx.g files) from Atlas' AGE 
                 description files. </p>
-<pre class="cmt">
+<pre>
 ========= agetocxx ========================================= 
 output=$(${CONSTITUENT}_output) 
@@ -2572 +2577 @@
         cd $(bin); $(ar) $(${CONSTITUENT}lib) ${NAME}.o; /bin/rm -f ${NAME}.o 
 ============================================================ </pre>
-<pre class="cmt">
+<pre>
 ========= agetocxx_header ================================== 
 ${CONSTITUENT}lib       = $(bin)lib${CONSTITUENT}.a 
@@ -2595 +2600 @@
 ============================================================ </pre>
               It must be declared as follows : 
-<pre class="cmt">
+<pre>
 make_fragment agetocxx -suffix=cxx -dependencies -header=agetocxx_header </pre>
   </li>
@@ -2867 +2872 @@
                       and are by default expected from the <tt>../src</tt>
                     directory</p>
-<pre class="cmt">
+<pre>
 library A A.cxx B.cxx</pre>
       <p>Then it is possible to change the default search
                       location as well as to use a simplified wildcarding
                     syntax:</p>
-<pre class="cmt">
+<pre>
 library A -s=A *.cxx -s=B *.cxx</pre>
       <ul>
@@ -2899 +2904 @@
                       regular expressions from general wildcarding
                     techniques:</p>
-<pre class="cmt">
+<pre>
 library A -s=A -x=[0-9] *.cxx -s=B -k=^B *.cxx</pre>
       <ul>
@@ -2931 +2936 @@
                       between the different targets, as in the following
                     example:</p>
-<pre class="cmt">
+<pre>
 library AXt  -suffix=Xt  *.cxx
 library AXaw -suffix=Xaw *.cxx</pre>
@@ -2944 +2949 @@
       </tt>
                     character), such as in the next example:</p>
-<pre class="cmt">
+<pre>
 make_fragment doc_to_html                             (1)
 
@@ -3006 +3011 @@
               automatically when the default make command is run.</p>
 <p>One could, for instance specify within the requirements file :</p>
-<pre class="cmt">
+<pre>
 # Constituents belonging to the default <i>all</i> group
 
@@ -3060 +3065 @@
    and is
               declared by the following statement:</p>
-<pre class="cmt">
+<pre>
 language fortran90 \
   -suffix=f90 -suffix=F90 \             [1]
@@ -3100 +3105 @@
   <tt>for</tt>
  macro).</p>
-<pre class="cmt">
+<pre>
 macro for             "f77" \
 ...
@@ -3109 +3114 @@
   , defined as
             follows:</p>
-<pre class="cmt">
+<pre>
 macro f90             "f90"
 ...
@@ -3119 +3124 @@
   <tt>-extra_output_suffix</tt>
  option like in:</p>
-<pre class="cmt">
+<pre>
 language idl -suffix=idl -fragment=idl -extra_output_suffix=_skel</pre>
             where, in this case, two object files are produced for each
@@ -3475 +3480 @@
 </ul>
 <p>Examples of such definition are : </p>
-<pre class="cmt">
+<pre>
 package CMT 
 
@@ -3510 +3515 @@
               concept of a generic shell command.
 <p>An example of a symple action:</p>
-<pre class="cmt">
+<pre>
 action directory "ls $(dir_options)" WIN32 "dir $(dir_options)"</pre>
   <p>Like other symbols, actions can be visualized using
@@ -3552 +3557 @@
                             macro.
         <p>Example 1</p>
-<pre class="cmt">
+<pre>
 library A ...
 action B ...
@@ -3561 +3566 @@
          will be rebuilt first.
         <p>Example 2</p>
-<pre class="cmt">
+<pre>
 library A ...
 action B ...
@@ -3581 +3586 @@
   <p>Describe the relationships with other packages; the
             generic syntax is :</p>
-<pre class="cmt">
+<pre>
 use &lt;package&gt; [ &lt;version&gt; [ &lt;offset&gt; ] ]</pre>
   <p>Omitting the version specification means that the most
@@ -3597 +3602 @@
             CMTPATH).</p>
 <p> Examples of such relationships are :</p>
-<pre class="cmt">
+<pre>
 use OnX v5r2 
 use CSet v2r3 
@@ -3641 +3646 @@
   ). Suppose
             we have the following organization:</p>
-<pre class="cmt">
+<pre>
 ----------------
 package A
@@ -3797 +3802 @@
                         pattern which will apply the include_path statement as
                       follows:</p>
-<pre class="cmt">
+<pre>
 pattern -global include_path include_path ${&lt;package&gt;_root}/&lt;package&gt;/</pre>
       <p>For instance, a package named <tt>PackA</tt>
        will expand this
                       pattern as follows:</p>
-<pre class="cmt">
+<pre>
 include_path ${PackA_root}/PackA/</pre>
   </li>
@@ -3811 +3816 @@
                         paths must be explicited, through an environment
                       variable. The following pattern can automate this operation:</p>
-<pre class="cmt">
+<pre>
 pattern ld_library_path \
   path_remove LD_LIBRARY_PATH "/&lt;package&gt;/" ; \
@@ -3819 +3824 @@
                         would be concerned. These packages will simply have to
                       apply the pattern as follows:</p>
-<pre class="cmt">
+<pre>
 apply_pattern ld_library_path</pre>
       <p>The schema installed by this pattern provides first a
@@ -3835 +3840 @@
                         application. Then every make command would naturally
                       ensure its actual presence.</p>
-<pre class="cmt">
+<pre>
 pattern quality_test application &lt;package&gt;test &lt;package&gt;test.cxx &lt;other_sources&gt;</pre>
       <p>In this example, an additional pattern
@@ -3856 +3861 @@
       <p>Doing so, it is possible to specify custmization
                       values for user defined template parameters</p>
-<pre class="cmt">
+<pre>
 pattern TA macro &lt;base&gt;AAA "AAA"
 
@@ -3867 +3872 @@
                         and thus using the pattern name as a plain CMT
                       keyword. The previous example becomes: </p>
-<pre class="cmt">
+<pre>
 TA base=abc
 TA base=def</pre>
@@ -3902 +3907 @@
                         particular package by using the following
                       statement:</p>
-<pre class="cmt">
+<pre>
 ignore_pattern &lt;name&gt;</pre>
   </li>
@@ -3930 +3935 @@
 </p>
 <p>As an example suppose we define</p>
-<pre class="cmt">
+<pre>
 path        CMTPATH "/ProjectA"
 path_append CMTPATH "/ProjectB"
@@ -3948 +3953 @@
   <a href="#Generated macros">automatic macros</a>
             (automatically setup for all used packages)
-<pre class="cmt">
+<pre>
 &lt;package&gt;_cmtpath
 &lt;package&gt;_offset</pre>
@@ -3959 +3964 @@
   <p>Describe the specific directory branches to be added while
               configuring the package.</p>
-<pre class="cmt">
+<pre>
 branches &lt;branch-name&gt; ... </pre>
   <p> These branches will be created (if needed) at the same
@@ -4075 +4080 @@
   <p>Every strategy setting defines two mutually exclusive
             tags and activates one of them.</p>
-<pre class="cmt">
+<pre>
 &lt;project&gt;_&lt;have_item&gt; 
 &lt;project&gt;_&lt;have_not_item&gt; </pre>
             Examples 
-<pre class="cmt">
+<pre>
 &lt;project&gt;_prototypes
 &lt;project&gt;_no_prototypes
@@ -4392 +4397 @@
    file as
             follows :</p>
-<pre class="cmt">
+<pre>
 tag Foo                [1]
 tag Bar Foo FooA FooB  [2]
@@ -4775 +4780 @@
                         contain the list of constituent names corresponding to
                       libraries that must be exported.</p>
-<pre class="cmt">
+<pre>
 library Foo ...
 library Foo-utils ...
@@ -5127 +5132 @@
     <li>Run a shell command described in the macro named <tt>lock_command</tt>
      meant to install physical locks onto all files for this version of this package. A typical definition for this macro could be:
-<pre class="cmt">
+<pre>
 macro lock_command   "chmod -R a-w ../*" \
       WIN32          "attrib /S /D +R ../*"</pre>
@@ -5539 +5544 @@
       <li>Run a shell command described in the macro named <tt>unlock_command</tt>
        meant to remove physical locks from all files for this version of this package. A typical definition for this macro could be:
-<pre class="cmt">
+<pre>
 macro unlock_command "chmod -R g+w ../*" \
       WIN32          "attrib /S /D -R ../*"</pre>
@@ -5645 +5650 @@
               appropriate in all projects) is controlled by one option of the
             build strategy, which can take one of the two values:</p>
-<pre class="cmt">
+<pre>
 build_strategy prototypes
 build_strategy no_prototypes</pre>
@@ -6011 +6016 @@
  file, containing (among other statements 
         not shown for the sake of clarity) : 
-<pre class="cmt">
+<pre>
 package OPACS 
 
@@ -6028 +6033 @@
    package would have just to provide a use 
           statement like : </p>
-<pre class="cmt">
+<pre>
 use OPACS v3 </pre>
   <p>This procedure gives the complete benefit of the use 
@@ -6968 +6973 @@
           <p>
                       A typical example of how to define such a macro could be : </p>
-<pre class="cmt">
+<pre>
 macro Cm_linkopts "-L$(CMROOT)/$(Cm_tag) -lCm -lm" </pre>
       </td>
@@ -6986 +6991 @@
         .  Thus,
                     a typical definition for this macro could be :
-<pre class="cmt">
+<pre>
 macro Cm_stamps "$(Cm_root)/$(Cm_tag)/Cm.stamp" </pre>
           <p>Then, these stamp file references are accumulated
@@ -9753 +9758 @@
 <hr><h3><a name="The default strategies defined in CMT"></a><a href="#index"><tt>18.&nbsp;8</tt></a> - The default strategies defined in CMT</h3>
 <blockquote>
-<pre class="cmt">
+<pre>
   DefaultPrototypesStrategy = Prototypes, 
   DefaultInstallAreaStrategy = WithoutInstallArea</pre>

CMT/HEAD/doc/gendoc.py

@@ -174 +174 @@
     print '   tt.cmt {color:#00AA00; font-weight: normal; %background-color: #eeeeee}'
     print '   pre {color:#FF0000; background-color: #eeeeee; border-style: solid; border-width: 1; border-color: black; padding: 4}'
-    print '   pre.cmt {color:#00AA00; background-color: #eeeeee; border-style: solid; border-width: 1; border-color: black; padding: 4}'
+    print '   pre.cmt {font-family: courier; color:#00AA00; background-color: #eeeeee; border-style: solid; border-width: 1; border-color: black; padding: 4}'
     print '   h2 {color:#0000FF}'
     print '   h3 {color:#00AA00}'

CMT/HEAD/mgr/VisualC.nmake

@@ -1 +1 @@
 CMT_tag=$(tag) 
 CMTVERSION=HEAD 
+CMT_project=macro 
 cmt_hardware_query_command=uname -m 
 cmt_hardware=WIN32 

CMT/HEAD/mgr/cmt.nmake

@@ -3 +3 @@
 #  Application cmt
 #
-#   Generated Sat Apr 02 23:11:18 2005  by arnault
+#   Generated Mon Apr 25 12:01:50 2005  by ARNAULT
 #
 #====================================

CMT/HEAD/source/cmt.h

@@ -126 +126 @@
   static void do_cvsbranches (const ArgParser& ap);
   static void do_cvssubpackages (const ArgParser& ap);
+  static void do_cvssubprojects (const ArgParser& ap);
   static void do_cvstags (const ArgParser& ap);
   static void do_do (const ArgParser& ap);

CMT/HEAD/source/cmt_commands.cxx

@@ -79 +79 @@
   pv.push_back (&ArgParser::do_cvsbranches); i++;
 
-  parsers.add ("cvss", i);
-  parsers.add ("cvssu", i);
-  parsers.add ("cvssub", i);
-  parsers.add ("cvssubp", i);
   parsers.add ("cvssubpa", i);
   parsers.add ("cvssubpac", i);
@@ -91 +87 @@
   parsers.add ("cvssubpackages", i);
   pv.push_back (&ArgParser::do_cvssubpackages); i++;
+
+  parsers.add ("cvssubpr", i);
+  parsers.add ("cvssubpro", i);
+  parsers.add ("cvssubproj", i);
+  parsers.add ("cvssubproje", i);
+  parsers.add ("cvssubprojec", i);
+  parsers.add ("cvssubproject", i);
+  parsers.add ("cvssubprojects", i);
+  pv.push_back (&ArgParser::do_cvssubprojects); i++;
 
   parsers.add ("cvst", i);
@@ -832 +837 @@
     {
       fill_one_argument ();
-      cmt.m_action = action_cvssubpackages;
-    }
-  else
-    {
-      if (!cmt.m_quiet) cerr << "#CMT> syntax error : cvssubpackages arguments missing" << endl;
-      help_action = action_help;
-      cmt.m_action = action_cvssubpackages;
-    }
+    }
+
+  cmt.m_action = action_cvssubpackages;
+}
+
+void ArgParser::do_cvssubprojects ()
+{
+  if (argc > 0)
+    {
+      fill_one_argument ();
+    }
+
+  cmt.m_action = action_cvssubprojects;
 }
 
@@ -2057 +2067 @@
   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";
+  help_texts.add () =  "cvssubpackages <module>   : display the subpackages for a module";
+  help_texts.add () =  "cvssubprojects <module>   : display the subprojects for a module";
   help_texts.add () =  "cvstags <module>          : display the CVS tags for a module";
   help_texts.add () =  "do <action> [<param>=<value>] ... : Execute an action";
@@ -2153 +2164 @@
   help.add (action_cvsbranches, help_texts[action_cvsbranches]);
   help.add (action_cvssubpackages, help_texts[action_cvssubpackages]);
+  help.add (action_cvssubprojects, help_texts[action_cvssubprojects]);
   help.add (action_cvstags, help_texts[action_cvstags]);
   help.add (action_do, help_texts[action_do]);

CMT/HEAD/source/cmt_commands.h

@@ -42 +42 @@
   void do_cvsbranches ();
   void do_cvssubpackages ();
+  void do_cvssubprojects ();
   void do_cvstags ();
   void do_do ();

CMT/HEAD/source/cmt_cvs.cxx

@@ -148 +148 @@
     m_last_module = "";
     m_last_cvs_infos = "";
+    structure_info = "";
     error_info = "";
     tags_top_info = "";
@@ -155 +156 @@
     branches_info = "";
     subpackages_info = "";
+    subprojects_info = "";
   }
 
@@ -185 +187 @@
     // the script named cmt_buildcvsinfos2.sh (referenced in the loginfo script)
     //
-    //  This script performs a scan in the CVS repository for currently 4 types of
+    //  This script performs a scan in the CVS repository for the following types of
     // information :
     //
+    //   the recognized structure below this module (none, project, package)
     //   all top symbolic tags installed for the module
     //   all symbolic tags installed for the module
     //   all branches available below this module
     //   all subpackages installed below the module.
+    //   all subprojects installed below the module.
     //
     //    In principle, only modules corresponding to true CMT packages are considered.
@@ -200 +204 @@
     //
   void show_cvs_infos (const cmt_string& module)
-      {
-        if (module == "")
-          {
-            cout << "#CMT> cmt cvs needs a module name" << endl;
-            return;
-          }
-
-        if (module == m_last_module)
-          {
-            if (m_verbose)
-              {
-                cout << "#CMT> cvs infos for module " << module << " already there" << endl;
-              }
-          }
-        else
-          {
-            m_last_module = module;
+  {
+    static const cmt_string cmtcvsinfos = ".cmtcvsinfos";
+    static const cmt_string protocol_level = "/v1r1";
+
+    if (module == "")
+      {
+        cout << "#CMT> cmt cvs needs a module name" << endl;
+        return;
+      }
+
+    if (module == m_last_module)
+      {
+        if (m_verbose)
+          {
+            cout << "#CMT> cvs infos for module " << module << " already there" << endl;
+          }
+      }
+    else
+      {
+        m_last_module = module;
         
-            cmt_string home_dir = CmtSystem::pwd ();
-
-            //
-            // Activities related with .cmtcvsinfos will occur in a temporary directory
-            //
-            cmt_string tmp_dir = CmtSystem::getenv ("TMPDIR");
-            if (tmp_dir == "")
-              {
-                tmp_dir = CmtSystem::file_separator ();
-                tmp_dir += "tmp";
-              }
-            
-            if (!CmtSystem::cd (tmp_dir))
-              {
-                tmp_dir = home_dir;
-              }
-            
-            tmp_dir += CmtSystem::file_separator ();
-            tmp_dir += "cmtcvs";
-            {
-              cmt_string temp = CmtSystem::get_temporary_name ();
-              CmtSystem::basename (temp, temp);
-              tmp_dir += temp;
-            }
-        
-            if (!CmtSystem::test_directory (tmp_dir))
-              {
-                if (!CmtSystem::mkdir (tmp_dir))
-                  {
-                    cout << "#CMT> Cannot create the temporary directory [" 
-                         << tmp_dir << "]" << endl;
-                    return;
-                  }
-              }
-            
-            //trap "rm -rf ${tmp_dir}" 0 1 2 15
-            
-            if (!CmtSystem::cd (tmp_dir))
-              {
-                cout << "#CMT> Cannot move to the temporary directory " << tmp_dir << endl;
-
-                if (m_verbose)
-                  {
-                    cout << "#CMT> now removing tmp_dir " << tmp_dir << " home=" << home_dir << endl;
-                  }
-                
-                CmtSystem::remove_directory (tmp_dir);
-
+        cmt_string home_dir = CmtSystem::pwd ();
+        
+        //
+        // Activities related with .cmtcvsinfos will occur in a temporary directory
+        //
+        cmt_string tmp_dir = CmtSystem::getenv ("TMPDIR");
+        if (tmp_dir == "")
+          {
+            tmp_dir = CmtSystem::file_separator ();
+            tmp_dir += "tmp";
+          }
+        
+        if (!CmtSystem::cd (tmp_dir))
+          {
+            tmp_dir = home_dir;
+          }
+        
+        tmp_dir += CmtSystem::file_separator ();
+        tmp_dir += "cmtcvs";
+        {
+          cmt_string temp = CmtSystem::get_temporary_name ();
+          CmtSystem::basename (temp, temp);
+          temp.replace_all (".", "");
+          tmp_dir += temp;
+        }
+
+        if (!CmtSystem::test_directory (tmp_dir))
+          {
+            if (!CmtSystem::mkdir (tmp_dir))
+              {
+                cout << "#CMT> Cannot create the temporary directory [" 
+                     << tmp_dir << "]" << endl;
                 return;
               }
+          }
+        
+        //trap "rm -rf ${tmp_dir}" 0 1 2 15
+        
+        if (!CmtSystem::cd (tmp_dir))
+          {
+            cout << "#CMT> Cannot move to the temporary directory " << tmp_dir << endl;
             
             if (m_verbose)
               {
-                cout << "#CMT> cvs infos are now obtained from the temporary directory " << CmtSystem::pwd () << endl;  
-              }
-            
-            /*
-              #
-              # The script associated to such entries is supposed to :
-              #  1) extract the set of <infos> from the ${module}/cmt/requirements file
-              #  2) build an output of the form :
-              #      <infos>=info1 info2 info3 ...
-              #
-              # Currently this script can be found in
-              #
-              # ${CMTROOT}/cmt/cmt_buildcvsinfos2.sh
-              # %CMTROOT%/cmt/cmt_buildcvsinfos.py
-              #
-            */
-            
-            if (!CmtSystem::test_directory (".cmtcvsinfos"))
-              {
-                CmtSystem::mkdir (".cmtcvsinfos");
-              }
-            
-            CmtSystem::cd (".cmtcvsinfos");
-            
-            cmt_string cvsroot;
-            
-            CmtSystem::get_cvsroot (cvsroot);
-            
-            cmt_string command;
-            
-            command = "cvs";
-            if (cvsroot != "") 
-              {
-                command += " -d ";
-                command += cvsroot;
-              }
-            command += " -Q import -m cmt ";
-            if (m_cmtcvstest)
-              {
-                command += ".cmtcvsinfos/cmtcvstest";
-              }
-            else
-              {
-                command += ".cmtcvsinfos";
-              }
-            command += "/";
-            command += module;
-            command += " CMT v1";
-            
-            if (m_verbose || m_simulation)
-              {
-                cout << "#CMT> Executing [" << command << "]" << endl;
-              }
-
-            m_last_cvs_infos = "";
-            CmtSystem::execute (command, m_last_cvs_infos);
-
-            if (m_verbose)
-              {
                 cout << "#CMT> now removing tmp_dir " << tmp_dir << " home=" << home_dir << endl;
               }
             
             CmtSystem::remove_directory (tmp_dir);
-
-            CmtSystem::cd (home_dir);
-          }
-
-        /**
-           Now retrieve all info fields :
-
-             error=
-             tags_top=
-             tags=
-             branches=
-             subpackages=
-
-         */
-
-        Grep grep;
-
-        grep.run (m_last_cvs_infos, "error=");
-
-        if (grep.result () != "")
-          {
-            error_info = grep.result ();
-            error_info.replace ("error=", "");
-          }
-        else
-          {
-            error_info = "";
-          }
-
-        grep.run (m_last_cvs_infos, "tags_top=");
-
-        if (grep.result () != "")
-          {
-            tags_top_info = grep.result ();
-            tags_top_info.replace ("tags_top=", "");
-          }
-        else
-          {
-            tags_top_info = "";
-          }
-
-        grep.run (m_last_cvs_infos, "tags=");
-
-        if (grep.result () != "")
-          {
-            tags_info = grep.result ();
-            tags_info.replace ("tags=", "");
-          }
-        else
-          {
-            tags_info = "";
-          }
-
-        grep.run (m_last_cvs_infos, "cvsversions_top=");
-
-        if (grep.result () != "")
-          {
-            cvsversions_top_info = grep.result ();
-            cvsversions_top_info.replace ("cvsversions_top=", "");
-          }
-        else
-          {
-            cvsversions_top_info = "";
-          }
-
-        grep.run (m_last_cvs_infos, "cvsversions=");
-
-        if (grep.result () != "")
-          {
-            cvsversions_info = grep.result ();
-            cvsversions_info.replace ("cvsversions=", "");
-          }
-        else
-          {
-            cvsversions_info = "";
-          }
-
-        cmt_string tag_filter = CmtSystem::getenv ("CMTCVSTAGFILTER");
-
-        if (tag_filter != "")
-          {
-            cmt_string package;
-            CmtSystem::basename (module, package);
-            
-            cmt_string pattern = "<package>";
-            
-            tag_filter.replace_all (pattern, package);
-            
-            cmt_regexp exp (tag_filter);
-            
-            cmt_string text;
-            
-            filter_list (tags_top_info, exp);
-            filter_list (tags_info, exp);
-            filter_list (cvsversions_top_info, exp);
-            filter_list (cvsversions_info, exp);
-          }
-
-        if (m_cmtcvstest)
-          {
-            cout << "## tags_top_info=" << tags_top_info << endl;
-            cout << "## tags_info=" << tags_info << endl;
-            cout << "## cvsversions_top_info=" << cvsversions_top_info << endl;
-            cout << "## cvsversions_info=" << cvsversions_info << endl;
-          }
-
-        grep.run (m_last_cvs_infos, "branches=");
-
-        if (grep.result () != "")
-          {
-            branches_info = grep.result ();
-            branches_info.replace ("branches=", "");
-          }
-        else
-          {
-            branches_info = "";
-          }
-
-        grep.run (m_last_cvs_infos, "subpackages=");
-
-        if (grep.result () != "")
-          {
-            subpackages_info = grep.result ();
-            subpackages_info.replace ("subpackages=", "");
-          }
-        else
-          {
-            subpackages_info = "";
-          }
-      }
-
+            
+            return;
+          }
+        
+        if (m_verbose)
+          {
+            cout << "#CMT> cvs infos are now obtained from the temporary directory " << CmtSystem::pwd () << endl;  
+          }
+        
+        /*
+          #
+          # The script associated to such entries is supposed to :
+          #  1) extract the set of <infos> from the ${module}/cmt/requirements file
+          #  2) build an output of the form :
+          #      <infos>=info1 info2 info3 ...
+          #
+          # Currently this script can be found in
+          #
+          # ${CMTROOT}/cmt/cmt_buildcvsinfos2.sh
+          # %CMTROOT%/cmt/cmt_buildcvsinfos.py
+          #
+        */
+        
+        if (!CmtSystem::test_directory (cmtcvsinfos))
+          {
+            CmtSystem::mkdir (cmtcvsinfos);
+          }
+        
+        CmtSystem::cd (cmtcvsinfos);
+        
+        cmt_string cvsroot;
+        
+        CmtSystem::get_cvsroot (cvsroot);
+        
+        cmt_string command;
+        
+        command = "cvs";
+        if (cvsroot != "") 
+          {
+            command += " -d ";
+            command += cvsroot;
+          }
+        command += " -Q import -m cmt ";
+
+        command += cmtcvsinfos;
+
+        if (m_cmtcvstest)
+          {
+            command += "/cmtcvstest";
+          }
+
+        command += protocol_level;
+        command += "/";
+        command += module;
+        command += " CMT v1";
+        
+        if (m_verbose || m_simulation)
+          {
+            cout << "#CMT> Executing [" << command << "]" << endl;
+          }
+        
+        m_last_cvs_infos = "";
+        CmtSystem::execute (command, m_last_cvs_infos);
+        
+        if (m_verbose)
+          {
+            cout << "#CMT> now removing tmp_dir " << tmp_dir << " home=" << home_dir << endl;
+          }
+        
+        CmtSystem::cd (home_dir);
+        CmtSystem::remove_directory (tmp_dir);  
+      }
+    
+    /**
+       Now retrieve all info fields :
+       
+       structure=
+       error=
+       tags_top=
+       tags=
+       branches=
+       subpackages=
+       subprojects=
+       
+    */
+
+    Grep grep;
+
+    grep.run (m_last_cvs_infos, "structure=");
+    
+    if (grep.result () != "")
+      {
+        structure_info = grep.result ();
+        structure_info.replace ("structure=", "");
+      }
+    else
+      {
+        // This may happen for old protocol level < v1r1
+        structure_info = "package";
+      }
+    
+    grep.run (m_last_cvs_infos, "error=");
+    
+    if (grep.result () != "")
+      {
+        error_info = grep.result ();
+        error_info.replace ("error=", "");
+      }
+    else
+      {
+        error_info = "";
+      }
+    
+    grep.run (m_last_cvs_infos, "tags_top=");
+    
+    if (grep.result () != "")
+      {
+        tags_top_info = grep.result ();
+        tags_top_info.replace ("tags_top=", "");
+      }
+    else
+      {
+        tags_top_info = "";
+      }
+    
+    grep.run (m_last_cvs_infos, "tags=");
+    
+    if (grep.result () != "")
+      {
+        tags_info = grep.result ();
+        tags_info.replace ("tags=", "");
+      }
+    else
+      {
+        tags_info = "";
+      }
+    
+    grep.run (m_last_cvs_infos, "cvsversions_top=");
+    
+    if (grep.result () != "")
+      {
+        cvsversions_top_info = grep.result ();
+        cvsversions_top_info.replace ("cvsversions_top=", "");
+      }
+    else
+      {
+        cvsversions_top_info = "";
+      }
+    
+    grep.run (m_last_cvs_infos, "cvsversions=");
+    
+    if (grep.result () != "")
+      {
+        cvsversions_info = grep.result ();
+        cvsversions_info.replace ("cvsversions=", "");
+      }
+    else
+      {
+        cvsversions_info = "";
+      }
+    
+    cmt_string tag_filter = CmtSystem::getenv ("CMTCVSTAGFILTER");
+    
+    if (tag_filter != "")
+      {
+        cmt_string package;
+        CmtSystem::basename (module, package);
+        
+        cmt_string pattern = "<package>";
+        
+        tag_filter.replace_all (pattern, package);
+        
+        cmt_regexp exp (tag_filter);
+        
+        cmt_string text;
+        
+        filter_list (tags_top_info, exp);
+        filter_list (tags_info, exp);
+        filter_list (cvsversions_top_info, exp);
+        filter_list (cvsversions_info, exp);
+      }
+    
+    if (m_cmtcvstest)
+      {
+        cout << "## tags_top_info=" << tags_top_info << endl;
+        cout << "## tags_info=" << tags_info << endl;
+        cout << "## cvsversions_top_info=" << cvsversions_top_info << endl;
+        cout << "## cvsversions_info=" << cvsversions_info << endl;
+      }
+    
+    grep.run (m_last_cvs_infos, "branches=");
+    
+    if (grep.result () != "")
+      {
+        branches_info = grep.result ();
+        branches_info.replace ("branches=", "");
+      }
+    else
+      {
+        branches_info = "";
+      }
+    
+    grep.run (m_last_cvs_infos, "subpackages=");
+    
+    if (grep.result () != "")
+      {
+        subpackages_info = grep.result ();
+        subpackages_info.replace ("subpackages=", "");
+      }
+    else
+      {
+        subpackages_info = "";
+      }
+    
+    grep.run (m_last_cvs_infos, "subprojects=");
+    
+    if (grep.result () != "")
+      {
+        subprojects_info = grep.result ();
+        subprojects_info.replace ("subprojects=", "");
+      }
+    else
+      {
+        subprojects_info = "";
+      }
+  }
+  
   void show_cvs_infos (const cmt_string& offset,
                        const cmt_string& module)
@@ -700 +735 @@
                                       const cmt_string& package,
                                       const cmt_string& version)
-      {
-        cmt_string dir = m_home_dir;
-
-        if (m_checkout_dir != "")
-          {
-            dir += CmtSystem::file_separator ();
-            dir += m_checkout_dir;
-          }
-
-        dir += CmtSystem::file_separator ();
-        dir += prefix;
-        dir += CmtSystem::file_separator ();
-        dir += package;
-
-        if (Cmt::get_current_structuring_style () == with_version_directory)
-          {
-            dir += CmtSystem::file_separator ();
-            dir += version;
-          }
-
-        CmtSystem::reduce_file_separators (dir);
-
-        return (dir);
-      }
+  {
+    cmt_string dir = m_home_dir;
+    
+    if (m_checkout_dir != "")
+      {
+        dir += CmtSystem::file_separator ();
+        dir += m_checkout_dir;
+      }
+    
+    dir += CmtSystem::file_separator ();
+    dir += prefix;
+    dir += CmtSystem::file_separator ();
+    dir += package;
+    
+    if (Cmt::get_current_structuring_style () == with_version_directory)
+      {
+        dir += CmtSystem::file_separator ();
+        dir += version;
+      }
+    
+    CmtSystem::reduce_file_separators (dir);
+    
+    return (dir);
+  }
+
+  bool really_checkout_project_contents (const cmt_string& prefix,
+                                         const cmt_string& project,
+                                         const cmt_string& version,
+                                         const cmt_string& module,
+                                         const cmt_string& basedir,
+                                         bool at_head,
+                                         const cmt_string& currentdir)
+  {
+    cmt_string dir = currentdir;
+
+    cout << "  # get project files " << endl;
+
+    cmt_string command = "cvs -Q co -P ";
+    if (!at_head)
+      {
+        command += "-r ";
+        command += version;
+      }
+
+    command += "-d ";
+    command += version;
+
+    command += " ";
+    command += module;
+    command += "/cmt";
+
+    int status = 0;
+    int retry = 0;
+    
+    for (;;)
+      {
+        if (m_verbose || m_simulation)
+          {
+            cout << "#CMT> Executing [" << command << "]" << endl;
+          }
+        
+        if (!m_simulation)
+          {
+            //status = CmtSystem::execute (command, out);
+            status = CmtSystem::execute (command);
+          }
+        
+        if (status != 0)
+          {
+            retry++;
+            
+            cout << "# Error getting project CMT contents: status=" << status << endl;
+            cout << "#---------------------------------------------------------" << endl;
+            
+            if (retry > 5) exit(0);
+          }
+        else
+          {
+            break;
+          }
+      }
+
+    return (true);
+  }
+
+  bool really_checkout_package_contents (const cmt_string& prefix,
+                                         const cmt_string& package,
+                                         const cmt_string& version,
+                                         const cmt_string& module,
+                                         const cmt_string& basedir,
+                                         bool at_head,
+                                         const cmt_string& currentdir)
+  {
+    cmt_string dir = currentdir;
+
+    cout << "  # get top files " << endl;
+            
+    cmt_string command = "cvs -Q co -P -l ";
+    if (!at_head)
+      {
+        command += "-r ";
+        command += version;
+      }
+    
+    if (Cmt::get_current_structuring_style () == with_version_directory)
+      {
+        command += " -d ";
+        command += version;
+      }
+    else
+      {
+        command += " -d ";
+        command += package;
+      }
+    
+    command += " ";
+    command += module;
+    
+    if (m_cmtcvstest)
+      {
+        cmt_string cvsroot;
+        
+        CmtSystem::get_cvsroot (cvsroot);
+        
+        cout << "## cvsroot=" << cvsroot << " command[" << command << "]" << endl;
+      }
+    
+    int status = 0;
+    int retry = 0;
+    
+    for (;;)
+      {
+        if (m_verbose || m_simulation)
+          {
+            cout << "#CMT> Executing [" << command << "]" << endl;
+          }
+        
+        if (!m_simulation)
+          {
+            //status = CmtSystem::execute (command, out);
+            status = CmtSystem::execute (command);
+          }
+        
+        if (status != 0)
+          {
+            retry++;
+            
+            cout << "# Error getting package CMT contents: status=" << status << endl;
+            cout << "#---------------------------------------------------------" << endl;
+            
+            if (retry > 5) exit(0);
+            
+          }
+        else
+          {
+            break;
+          }
+      }
+
+    if (Cmt::get_current_structuring_style () == with_version_directory)
+      {
+        if (m_simulation)
+          {
+            cout << "#CMT> Would mkdir " << version << endl;
+          }
+        else
+          {
+            if (m_verbose)
+              {
+                cout << "#CMT> About to mkdir " << version << endl;
+              }
+
+            if (!CmtSystem::cd (version))
+              {
+                CmtSystem::mkdir (version);
+                if (!CmtSystem::cd (version))
+                  {
+                    cout << "# Error creating the version directory :" << version << endl;
+                    cout << "#---------------------------------------------------------" << endl;
+                    return (false);
+                  }
+              }
+            
+            /*
+              if (m_verbose)
+              {
+              cout << "#CMT> pwd.2=" << CmtSystem::pwd () << endl;
+              }
+            */
+          }
+        
+        dir += CmtSystem::file_separator ();
+        dir += version;
+      }
+    else
+      {
+        if (m_simulation)
+          {
+            cout << "#CMT> will mkdir " << package << endl;
+          }
+        else
+          {
+            if (!CmtSystem::cd (package))
+              {
+                if (m_verbose)
+                  {
+                    cout << "#CMT> About to mkdir " << package << endl;
+                  }
+                CmtSystem::mkdir (package);
+                if (!CmtSystem::cd (package))
+                  {
+                    cout << "# Error creating the package directory :" << package << endl;
+                    cout << "#---------------------------------------------------------" << endl;
+                    return (false);
+                  }
+              }
+            
+            /*
+              if (m_verbose)
+              {
+              cout << "#CMT> pwd.3=" << CmtSystem::pwd () << endl;
+              }
+            */
+          }
+        
+        dir += CmtSystem::file_separator ();
+        dir += package;
+      }
+    
+    cmt_string entries_file_name;
+    cmt_string text;
+    
+    cmt_string branches = CmtSystem::getenv ("CMTCVSBRANCHES");
+    
+    if (branches == "")
+      {
+        branches = branches_info;
+      }
+    
+    CmtSystem::cmt_string_vector branch_vector;
+    
+    CmtSystem::split (branches, " \t", branch_vector);
+    
+    int i;
+    
+    cout << "  # get branches " << branches << endl;
+    
+    //command = "(";
+    command = "";
+    
+    entries_file_name = "CVS";
+    entries_file_name += CmtSystem::file_separator ();
+    entries_file_name += "Entries";
+    
+    if (!text.read (entries_file_name))
+      {
+        // This happens when there were no top files
+      }
+    
+    for (i = 0; i < branch_vector.size (); i++)
+      {
+        cmt_string& branch = branch_vector[i];
+        
+        if (i > 0)
+          {
+            command += CmtSystem::command_separator ();
+          }
+        
+        //command += "cvs -Q co -P ";
+        command += "cvs -Q co ";
+        
+        //            if (branch != "cmt")
+        //              {
+        if (!at_head)
+          {
+            command += "-r ";
+            command += version;
+          }
+        //              }
+        
+        command += " -d ";
+        command += branch;
+        command += " ";
+        command += module;
+        command += "/";    // CVS uses the '/' notation on all platforms!!
+        command += branch;
+        //command += "\n";
+        
+        text += "D/";
+        text += branch;
+        text += "////\n";
+      }
+    
+    //command += "; echo cmtcvsstatus=$?) 2>&1 ";
+    
+    if (m_cmtcvstest)
+      {
+        cmt_string cvsroot;
+        
+        CmtSystem::get_cvsroot (cvsroot);
+        
+        cout << " cvsroot=" << cvsroot << " command[" << command << "]" << endl;
+      }
+    
+    status = 0;
+    retry = 0;
+    
+    for (;;)
+      {
+        if (m_verbose || m_simulation)
+          {
+            cout << "#CMT> Executing [" << command << "]" << endl;
+          }
+        
+        if (!m_simulation)
+          {
+            //status = CmtSystem::execute (command, out);
+            status = CmtSystem::execute (command);
+          }
+        
+        if (status != 0)
+          {
+            retry++;
+            
+            cout << "# Error getting package contents: status=" << status << endl;
+            cout << "#---------------------------------------------------------" << endl;
+            
+            if (retry > 5) exit(0);
+            
+          }
+        else
+          {
+            break;
+          }
+      }
+    
+    if (!CmtSystem::test_directory ("CVS"))
+      {
+        /**
+         * The CVS repository had not been created (this is generally
+         * due to the lack of top files)
+         */
+        
+        if (m_simulation)
+          {
+            cout << "#CMT> Would create the CVS directory" << endl;
+          }
+        else
+          {
+            if (m_verbose)
+              {
+                cout << "#CMT> About to mkdir " << "CVS" << endl;
+              }
+            CmtSystem::mkdir ("CVS");
+          }
+        
+        cmt_string s;
+        
+        // Let's create first the CVS/Root file.
+        
+        CmtSystem::get_cvsroot (s);
+        s += "\n";
+        
+        cmt_string f;
+        
+        f = "CVS";
+        f += CmtSystem::file_separator ();
+        f += "Root";
+        
+        if (m_simulation)
+          {
+            cout << "#CMT> Would fill in the CVS/Root file with " << endl;
+            cout << s << endl;
+          }
+        else
+          {
+            if (m_verbose)
+              {
+                cout << "#CMT> Fill in the CVS/Root file with " << endl;
+                cout << s << endl;
+              }
+            s.write (f);
+          }
+        
+        // Now we create the CVS/Repository file
+        
+        f = "CVS";
+        f += CmtSystem::file_separator ();
+        f += "Repository";
+        
+        CmtSystem::get_cvsroot (s);
+        if (s[0] == ':')
+          {
+            int pos = s.find (1, ":");
+            s.erase (0, pos+1);
+            pos = s.find (0, ":");
+            s.erase (0, pos+1);
+          }
+        s += "/";
+        s += module;
+        s += "\n";
+        
+        if (m_simulation)
+          {
+            cout << "#CMT> Would fill in the CVS/Repository file with " << endl;
+            cout << s << endl;
+          }
+        else
+          {
+            if (m_verbose)
+              {
+                cout << "#CMT> Fill in the CVS/Repository file with " << endl;
+                cout << s << endl;
+              }
+            s.write (f);
+          }
+      }
+    
+    if (m_simulation)
+      {
+        cout << "#CMT> Would write the top CVS/Entries file with " << endl;
+        cout << text << endl;
+      }
+    else
+      {
+        // Now the CVS/Entries is ready to be created.
+        if (m_verbose)
+          {
+            cout << "#CMT> Fill in the top CVS/Entries file with " << endl;
+            cout << text << endl;
+          }
+        text.write (entries_file_name);
+      }
+
+    return (true);
+  }
 
   bool really_checkout_package (const cmt_string& prefix,
@@ -731 +1178 @@
                                 const cmt_string& basedir,
                                 bool at_head)
-      {
-        cmt_string dir = basedir;
-        cmt_string out;
-
-        cout << "# ================= working on package " << package 
-             << " version " << version;
-
-        if (at_head) cout << " (At head) ";
-
-        {
-          cmt_string full_prefix;
-
-          full_prefix = m_offset;
-          full_prefix += prefix;
-
-          cmt_string echo_ppath;
+  {
+    cmt_string dir = basedir;
+    cmt_string out;
+    
+    cout << "# ================= working on " << structure_info << " " << package 
+         << " version " << version;
+
+    if (at_head) cout << " (At head) ";
+
+    cmt_string full_prefix;
+
+    full_prefix = m_offset;
+    full_prefix += prefix;
+
+    cmt_string echo_ppath;
         
-          if (prefix != "")
-            {
-              echo_ppath = " path ";
-              echo_ppath += prefix;
-            }
-
-          cout << echo_ppath << endl;
-        }
-
-        CmtSystem::dirname (dir, dir);
-
-        //if (Cmt::get_current_structuring_style () == with_version_directory)
-        {
-          if (m_simulation)
-            {
-              cout << "#CMT> Would mkdir " << dir << endl;
-            }
-          else
-            {
-              if (m_verbose)
-                {
-                  cout << "#CMT> About to mkdir " << dir << endl;
-                }
-              
-              if (!CmtSystem::mkdir (dir))
-                {
-                  cout << "# Error creating the base directory :" << dir << endl;
-                  cout << "#---------------------------------------------------------" << endl;
-                  return (false);
-                }
-              
-              CmtSystem::cd (dir);
-              
-              /*
-              if (m_verbose)
-                {
-                  cout << "#CMT> pwd.1=" << CmtSystem::pwd () << endl;
-                }
-              */
-            }
-        }
-        
-        cout << "  # get top files " << endl;
-            
-        cmt_string command = "cvs -Q co -P -l ";
-        if (!at_head)
-          {
-            command += "-r ";
-            command += version;
-          }
-
-        if (Cmt::get_current_structuring_style () == with_version_directory)
-          {
-            command += " -d ";
-            command += version;
-          }
-        else
-          {
-            command += " -d ";
-            command += package;
-          }
-
-        command += " ";
-        command += module;
-                
-        if (m_cmtcvstest)
-          {
-            cmt_string cvsroot;
-            
-            CmtSystem::get_cvsroot (cvsroot);
-            
-            cout << "## cvsroot=" << cvsroot << " command[" << command << "]" << endl;
-          }
-        
-        int status = 0;
-        int retry = 0;
-
-        for (;;)
-          {
-            if (m_verbose || m_simulation)
-              {
-                cout << "#CMT> Executing [" << command << "]" << endl;
-              }
-
-            if (!m_simulation)
-              {
-                //status = CmtSystem::execute (command, out);
-                status = CmtSystem::execute (command);
-              }
-        
-            if (status != 0)
-              {
-                retry++;
-
-                cout << "# Error getting package CMT contents: status=" << status << endl;
-                cout << "#---------------------------------------------------------" << endl;
-
-                if (retry > 5) exit(0);
-
-              }
-            else
-              {
-                break;
-              }
-          }
-
-
-          {
-            if (Cmt::get_current_structuring_style () == with_version_directory)
-              {
-                if (m_simulation)
-                  {
-                    cout << "#CMT> Would mkdir " << version << endl;
-                  }
-                else
-                  {
-                    if (m_verbose)
-                      {
-                        cout << "#CMT> About to mkdir " << version << endl;
-                      }
-                    if (!CmtSystem::cd (version))
-                      {
-                        CmtSystem::mkdir (version);
-                        if (!CmtSystem::cd (version))
-                          {
-                            cout << "# Error creating the version directory :" << version << endl;
-                            cout << "#---------------------------------------------------------" << endl;
-                            return (false);
-                          }
-                      }
-                    
-                    /*
-                    if (m_verbose)
-                      {
-                        cout << "#CMT> pwd.2=" << CmtSystem::pwd () << endl;
-                      }
-                    */
-                  }
-                
-                dir += CmtSystem::file_separator ();
-                dir += version;
-              }
-            else
-              {
-                if (m_simulation)
-                  {
-                    cout << "#CMT> will mkdir " << package << endl;
-                  }
-                else
-                  {
-                    if (!CmtSystem::cd (package))
-                      {
-                        if (m_verbose)
-                          {
-                            cout << "#CMT> About to mkdir " << package << endl;
-                          }
-                        CmtSystem::mkdir (package);
-                        if (!CmtSystem::cd (package))
-                          {
-                            cout << "# Error creating the package directory :" << package << endl;
-                            cout << "#---------------------------------------------------------" << endl;
-                            return (false);
-                          }
-                      }
-                    
-                    /*
-                    if (m_verbose)
-                      {
-                        cout << "#CMT> pwd.3=" << CmtSystem::pwd () << endl;
-                      }
-                    */
-                  }
-                
-                dir += CmtSystem::file_separator ();
-                dir += package;
-              }
-          }
-                
-        cmt_string entries_file_name;
-        cmt_string text;
-        
-        cmt_string branches = CmtSystem::getenv ("CMTCVSBRANCHES");
-        
-        if (branches == "")
-          {
-            branches = branches_info;
-          }
-        
-        CmtSystem::cmt_string_vector branch_vector;
-        
-        CmtSystem::split (branches, " \t", branch_vector);
-        
-        int i;
-        
-        cout << "  # get branches " << branches << endl;
-        
-        //command = "(";
-        command = "";
-
-        entries_file_name = "CVS";
-        entries_file_name += CmtSystem::file_separator ();
-        entries_file_name += "Entries";
-        
-        if (!text.read (entries_file_name))
-          {
-              // This happens when there were no top files
-          }
-        
-        for (i = 0; i < branch_vector.size (); i++)
-          {
-            cmt_string& branch = branch_vector[i];
-
-            if (i > 0)
-              {
-                command += CmtSystem::command_separator ();
-              }
-            
-              //command += "cvs -Q co -P ";
-            command += "cvs -Q co ";
-            
-//            if (branch != "cmt")
-//              {
-            if (!at_head)
-              {
-                command += "-r ";
-                command += version;
-              }
-//              }
-            
-            command += " -d ";
-            command += branch;
-            command += " ";
-            command += module;
-            command += "/";    // CVS uses the '/' notation on all platforms!!
-            command += branch;
-            //command += "\n";
-            
-            text += "D/";
-            text += branch;
-            text += "////\n";
-          }
-
-        //command += "; echo cmtcvsstatus=$?) 2>&1 ";
-
-        if (m_cmtcvstest)
-          {
-            cmt_string cvsroot;
-            
-            CmtSystem::get_cvsroot (cvsroot);
-            
-            cout << " cvsroot=" << cvsroot << " command[" << command << "]" << endl;
-          }
-        
-        status = 0;
-        retry = 0;
-
-        for (;;)
-          {
-            if (m_verbose || m_simulation)
-              {
-                cout << "#CMT> Executing [" << command << "]" << endl;
-              }
-
-            if (!m_simulation)
-              {
-                //status = CmtSystem::execute (command, out);
-                status = CmtSystem::execute (command);
-              }
-        
-            if (status != 0)
-              {
-                retry++;
-
-                cout << "# Error getting package contents: status=" << status << endl;
-                cout << "#---------------------------------------------------------" << endl;
-
-                if (retry > 5) exit(0);
-
-              }
-            else
-              {
-                break;
-              }
-          }
-
-          {
-            if (!CmtSystem::test_directory ("CVS"))
-              {
-                  /**
-                   * The CVS repository had not been created (this is generally
-                   * due to the lack of top files)
-                   */
-                
-                if (m_simulation)
-                  {
-                    cout << "#CMT> Would create the CVS directory" << endl;
-                  }
-                else
-                  {
-                    if (m_verbose)
-                      {
-                        cout << "#CMT> About to mkdir " << "CVS" << endl;
-                      }
-                    CmtSystem::mkdir ("CVS");
-                  }
-
-                cmt_string s;
-                
-                  // Let's create first the CVS/Root file.
-                
-                CmtSystem::get_cvsroot (s);
-                s += "\n";
-                
-                cmt_string f;
-                
-                f = "CVS";
-                f += CmtSystem::file_separator ();
-                f += "Root";
-                
-                if (m_simulation)
-                  {
-                    cout << "#CMT> Would fill in the CVS/Root file with " << endl;
-                    cout << s << endl;
-                  }
-                else
-                  {
-                    if (m_verbose)
-                      {
-                        cout << "#CMT> Fill in the CVS/Root file with " << endl;
-                        cout << s << endl;
-                      }
-                    s.write (f);
-                  }
-                
-                  // Now we create the CVS/Repository file
-                
-                f = "CVS";
-                f += CmtSystem::file_separator ();
-                f += "Repository";
-                
-                CmtSystem::get_cvsroot (s);
-                if (s[0] == ':')
-                  {
-                    int pos = s.find (1, ":");
-                    s.erase (0, pos+1);
-                    pos = s.find (0, ":");
-                    s.erase (0, pos+1);
-                  }
-                s += "/";
-                s += module;
-                s += "\n";
-                
-                if (m_simulation)
-                  {
-                    cout << "#CMT> Would fill in the CVS/Repository file with " << endl;
-                    cout << s << endl;
-                  }
-                else
-                  {
-                    if (m_verbose)
-                      {
-                        cout << "#CMT> Fill in the CVS/Repository file with " << endl;
-                        cout << s << endl;
-                      }
-                    s.write (f);
-                  }
-              }
-            
-            if (m_simulation)
-              {
-                cout << "#CMT> Would write the top CVS/Entries file with " << endl;
-                cout << text << endl;
-              }
-            else
-              {
-                // Now the CVS/Entries is ready to be created.
-                if (m_verbose)
-                  {
-                    cout << "#CMT> Fill in the top CVS/Entries file with " << endl;
-                    cout << text << endl;
-                  }
-                text.write (entries_file_name);
-              }
-          }
-
-        return (true);
-      }
+    if (prefix != "")
+      {
+        echo_ppath = " path ";
+        echo_ppath += prefix;
+      }
+    
+    cout << echo_ppath << endl;
+
+    CmtSystem::dirname (dir, dir);
+
+    //if (Cmt::get_current_structuring_style () == with_version_directory)
+
+    if (m_simulation)
+      {
+        cout << "#CMT> Would mkdir " << dir << endl;
+      }
+    else
+      {
+        if (m_verbose)
+          {
+            cout << "#CMT> About to mkdir " << dir << endl;
+          }
+        
+        if (!CmtSystem::mkdir (dir))
+          {
+            cout << "# Error creating the base directory :" << dir << endl;
+            cout << "#---------------------------------------------------------" << endl;
+            return (false);
+          }
+        
+        CmtSystem::cd (dir);
+        
+        /*
+          if (m_verbose)
+          {
+          cout << "#CMT> pwd.1=" << CmtSystem::pwd () << endl;
+          }
+        */
+      }
+        
+    if (structure_info == "package")
+      {
+        really_checkout_package_contents (prefix,
+                                          package,
+                                          version,
+                                          module,
+                                          basedir,
+                                          at_head,
+                                          dir);
+      }
+    else if (structure_info == "project")
+      {
+        really_checkout_project_contents (prefix,
+                                          package,
+                                          version,
+                                          module,
+                                          basedir,
+                                          at_head,
+                                          dir);
+      }
+
+    return (true);
+  }
 
   cmt_string find_matching_version (const cmt_string& expression)
@@ -1544 +1666 @@
         cmt_string out;
 
-        show_cvs_infos (CmtSystem::getenv ("CMTCVSOFFSET"), module);
+        show_cvs_infos (CmtSystem::getenv ("CMTCVSOFFSET"), (module == "") ? "." : module);
 
         if (error_info != "")
@@ -1553 +1675 @@
           {
             cout << subpackages_info << endl;
+          }
+      }
+
+  void subprojects (const cmt_string& module)
+      {
+        cmt_string out;
+
+        show_cvs_infos (CmtSystem::getenv ("CMTCVSOFFSET"), (module == "") ? "." : module);
+
+        if (error_info != "")
+          {
+            cout << error_info << endl;
+          }
+        else
+          {
+            cout << subprojects_info << endl;
           }
       }
@@ -1626 +1764 @@
         version = version_tag;
       }
-    
+
     CmtSystem::dirname (module, prefix);
     CmtSystem::basename (module, package);
@@ -1746 +1884 @@
 
   void checkout (const CmtSystem::cmt_string_vector& arguments)
-      {
-        if (arguments.size () < 1)
-          {
-            help ();
-            return;
-          }
-        
-        if (CmtSystem::getenv ("CVSROOT") == "")
-          {
-            cout << "# Please set CVSROOT first !" << endl;
-            return;
-          }
-              
-        if (CmtSystem::getenv ("CMTCVSTEST") != "")
-          {
-            m_cmtcvstest = true;
-          }
-        else
-          {
-            m_cmtcvstest = false;
-          }
-
-        m_home_dir = CmtSystem::pwd ();
-        m_checkout_dir = "";
-        m_offset = "";
-        m_branch_suffix = "";
-
-        cmt_string module;
-              
-        m_recursive = false;
-
-        bool need_version_tag = false;
-        cmt_string version_tag;
-
-        bool need_checkout_dir = false;
-        bool need_offset = false;
-        bool need_requirements_file = false;
-
-        m_simulation = false;
-        //m_verbose = true;
-        m_verbose = false;
-
-        bool need_branch_suffix = false;
-
-        m_head = true;
-
-        m_offset = CmtSystem::getenv ("CMTCVSOFFSET");
-        if (m_offset != "") 
-          {
-            m_offset += "/";
-            m_offset.replace_all ("//", "/");
-          }
-
-        for (int arg = 0; arg < arguments.size (); arg++)
-          {
-            const cmt_string& option = arguments[arg];
-
-            if (need_version_tag)
-              {
-                need_version_tag = false;
-
-                if (option == "HEAD")
-                  {
-                    m_head = true;
-                  }
-                else
-                  {
-                    version_tag = option;
-                  }
-              }
-            else if (need_checkout_dir)
-              {
-                need_checkout_dir = false;
-                m_checkout_dir = option;
-              }
-            else if (need_offset)
-              {
-                need_offset = false;
-                m_offset = option;
-                m_offset += '/';
-                m_offset.replace_all ("//", "/");
-              }
-            else if (need_branch_suffix)
-              {
-                need_branch_suffix = false;
-                m_branch_suffix = "-";
-                m_branch_suffix += option;
-              }
-            else if (need_requirements_file)
-              {
-                need_requirements_file = false;
-                m_head = false;
-                checkout_from_requirements (option);
-              }
-            else
-              {
-                if (option == "-R")
-                  {
-                    m_recursive = true;
-                  }
-                else if (option == "-l")
-                  {
-                    m_recursive = false;
-                  }
-                else if (option == "-r")
-                  {
-                    need_version_tag = true;
-                    m_head = false;
-                  }
-                else if (option == "-d")
-                  {
-                    need_checkout_dir = true;
-                  }
-                else if (option == "-o")
-                  {
-                    need_offset = true;
-                  }
-                else if (option == "-n")
-                  {
-                    m_simulation = true;
-                  }
-                else if (option == "-v")
-                  {
-                    m_verbose = true;
-                  }
-                else if (option == "-branch")
-                  {
-                    need_branch_suffix = true;
-                  }
-                else if (option == "-requirements")
-                  {
-                    need_requirements_file = true;
-                  }
-                else if (option == "--help")
-                  {
-                    help ();
-                    return;
-                  }
-                else if (option[0] == '-')
-                  {
-                    help ();
-                    return;
-                  }
-                else
-                  {
-                    do_checkout (option, version_tag);
-                  }
-              }
-          }
-
-      }
+  {
+    if (arguments.size () < 1)
+      {
+        help ();
+        return;
+      }
+    
+    if (CmtSystem::getenv ("CVSROOT") == "")
+      {
+        cout << "# Please set CVSROOT first !" << endl;
+        return;
+      }
+    
+    if (CmtSystem::getenv ("CMTCVSTEST") != "")
+      {
+        m_cmtcvstest = true;
+      }
+    else
+      {
+        m_cmtcvstest = false;
+      }
+    
+    m_home_dir = CmtSystem::pwd ();
+    m_checkout_dir = "";
+    m_offset = "";
+    m_branch_suffix = "";
+    
+    cmt_string module;
+    
+    m_recursive = false;
+    
+    bool need_version_tag = false;
+    cmt_string version_tag;
+    
+    bool need_checkout_dir = false;
+    bool need_offset = false;
+    bool need_requirements_file = false;
+    
+    m_simulation = false;
+    //m_verbose = true;
+    m_verbose = false;
+    
+    bool need_branch_suffix = false;
+    
+    m_head = true;
+    
+    m_offset = CmtSystem::getenv ("CMTCVSOFFSET");
+    if (m_offset != "") 
+      {
+        m_offset += "/";
+        m_offset.replace_all ("//", "/");
+      }
+    
+    for (int arg = 0; arg < arguments.size (); arg++)
+      {
+        const cmt_string& option = arguments[arg];
+        
+        if (need_version_tag)
+          {
+            need_version_tag = false;
+            
+            if (option == "HEAD")
+              {
+                m_head = true;
+              }
+            else
+              {
+                version_tag = option;
+              }
+          }
+        else if (need_checkout_dir)
+          {
+            need_checkout_dir = false;
+            m_checkout_dir = option;
+          }
+        else if (need_offset)
+          {
+            need_offset = false;
+            m_offset = option;
+            m_offset += '/';
+            m_offset.replace_all ("//", "/");
+          }
+        else if (need_branch_suffix)
+          {
+            need_branch_suffix = false;
+            m_branch_suffix = "-";
+            m_branch_suffix += option;
+          }
+        else if (need_requirements_file)
+          {
+            need_requirements_file = false;
+            m_head = false;
+            checkout_from_requirements (option);
+          }
+        else
+          {
+            if (option == "-R")
+              {
+                m_recursive = true;
+              }
+            else if (option == "-l")
+              {
+                m_recursive = false;
+              }
+            else if (option == "-r")
+              {
+                need_version_tag = true;
+                m_head = false;
+              }
+            else if (option == "-d")
+              {
+                need_checkout_dir = true;
+              }
+            else if (option == "-o")
+              {
+                need_offset = true;
+              }
+            else if (option == "-n")
+              {
+                m_simulation = true;
+              }
+            else if (option == "-v")
+              {
+                m_verbose = true;
+              }
+            else if (option == "-branch")
+              {
+                need_branch_suffix = true;
+              }
+            else if (option == "-requirements")
+              {
+                need_requirements_file = true;
+              }
+            else if (option == "--help")
+              {
+                help ();
+                return;
+              }
+            else if (option[0] == '-')
+              {
+                help ();
+                return;
+              }
+            else
+              {
+                do_checkout (option, version_tag);
+              }
+          }
+      }
+  }
 
 private:
@@ -1913 +2050 @@
   cmt_string m_last_module;
   cmt_string m_last_cvs_infos;
+  cmt_string structure_info;
   cmt_string error_info;
   cmt_string tags_top_info;
@@ -1920 +2058 @@
   cmt_string branches_info;
   cmt_string subpackages_info;
+  cmt_string subprojects_info;
 };
 
@@ -2204 +2343 @@
 }
 
+void Cvs::subprojects (const cmt_string& module)
+{
+  CvsImplementation cvs;
+
+  cvs.subprojects (module);
+}
+
 void Cvs::checkout (const CmtSystem::cmt_string_vector& arguments)
 {

CMT/HEAD/source/cmt_cvs.h

@@ -17 +17 @@
   static void branches (const cmt_string& module);
   static void subpackages (const cmt_string& module);
+  static void subprojects (const cmt_string& module);
   static void checkout (const CmtSystem::cmt_string_vector& arguments);
 

CMT/HEAD/source/cmt_parser.cxx

@@ -2465 +2465 @@
 {
   Cvs::subpackages (ap.arguments[0]);
+}
+
+//----------------------------------------------------------
+void Cmt::do_cvssubprojects (const ArgParser& ap)
+{
+  Cvs::subprojects (ap.arguments[0]);
 }
 
@@ -4795 +4801 @@
     case action_create :
       // case action_create_project :
-      // case action_cvsbranches :
-      // case action_cvssubpackages :
-      // case action_cvstags :
+    case action_cvsbranches :
+    case action_cvssubpackages :
+    case action_cvssubprojects :
+    case action_cvstags :
     case action_do :
     case action_expand_model :
@@ -4905 +4912 @@
       // case action_cvsbranches :
       // case action_cvssubpackages :
+      // case action_cvssubprojects :
       // case action_cvstags :
     case action_do :
@@ -5007 +5015 @@
       // case action_cvsbranches :
       // case action_cvssubpackages :
+      // case action_cvssubprojects :
       // case action_cvstags :
     case action_do :
@@ -5115 +5124 @@
           // case action_cvsbranches :
           // case action_cvssubpackages :
+          // case action_cvssubprojects :
           // case action_cvstags :
           // case action_do :
@@ -5274 +5284 @@
         case action_cvssubpackages :
           do_cvssubpackages (ap);
+          break;
+        case action_cvssubprojects :
+          do_cvssubprojects (ap);
           break;
         case action_cvstags :

CMT/HEAD/source/cmt_parser.h

@@ -235 +235 @@
   action_cvsbranches,
   action_cvssubpackages,
+  action_cvssubprojects,
   action_cvstags,
   action_do,

CMT/HEAD/source/cmt_system.cxx

@@ -604 +604 @@
 bool CmtSystem::remove_directory (const cmt_string& name)
 {
-  //cout << "Try to remove directory " << name << endl;
+  //cerr << "Try to remove directory " << name << endl;
 
   cmt_string_vector files;
@@ -616 +616 @@
       if (test_directory (file))
         {
+          //cerr << "D=" << file << endl;
           if (!remove_directory (file)) return (false);
         }
       else
         {
+          //cerr << "F=" << file << endl;
           if (!remove_file (file)) return (false);
         }
     }
- 
+
   int status = ::rmdir (name);
   if (status != 0)

CMT/HEAD/source/cmt_use.cxx

@@ -2995 +2995 @@
     }
   buffer += "\"";
+
+  buffer += "macro ";
+  buffer += package_name;
+  buffer += "_project_release";
+  buffer += " \"";
+  if (p != 0)
+    {
+      buffer += p->get_release ();
+    }
+  buffer += "\"";
 }