Merge pull request #314 from jwillemsen/master

Talk about micro instead of a beta release

2 files changed, 42 insertions, 42 deletions

diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index 963cc12cd33..d4e6084a3e2 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -31,7 +31,7 @@ doc_root=None
 """ A dict containing version information used for the release.
 This dict contains entries of the form
 COMPONENT_version
-COMPONENT_beta
+COMPONENT_micro
 COMPONENT_minor
 COMPONENT_major
 COMPONENT_code """
@@ -60,8 +60,8 @@ def parse_args ():
                        help="Create a major release.", default=None, const="major")
     parser.add_option ("--minor", dest="release_type", action="store_const",
                        help="Create a minor release.", default=None, const="minor")
-    parser.add_option ("--beta", dest="release_type", action="store_const",
-                       help="Create a beta release.", default=None, const="beta")
+    parser.add_option ("--micro", dest="release_type", action="store_const",
+                       help="Create a micro release.", default=None, const="micro")
 
     parser.add_option ("--tag", dest="tag", action="store_true",
                        help="Tag the repositorie with all needed tags", default=False)
@@ -149,7 +149,7 @@ def commit (files):
 
     version = "ACE+TAO-%d_%d_%d" % (comp_versions["ACE_major"],
                                     comp_versions["ACE_minor"],
-                                    comp_versions["ACE_beta"])
+                                    comp_versions["ACE_micro"])
     vprint ("Committing the following files for " + version + " ".join (files))
 
     if opts.take_action:
@@ -226,8 +226,8 @@ def update_version_files (component):
 #define %s_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 """ % (component, comp_versions[component + "_major"],
        component, comp_versions[component + "_minor"],
-       component, comp_versions[component + "_beta"],
-       component, comp_versions[component + "_beta"],
+       component, comp_versions[component + "_micro"],
+       component, comp_versions[component + "_micro"],
        component, comp_versions[component + "_version"],
        component, comp_versions[component + "_code"],
        component)
@@ -283,7 +283,7 @@ def update_spec_file ():
             if line.find ("define TAOVER ") is not -1:
                 line = "%define TAOVER  " + comp_versions["TAO_version"] + "\n"
             if line.find ("define is_major_ver") is not -1:
-                if opts.release_type == "beta":
+                if opts.release_type == "micro":
                     line = "%define is_major_ver 0\n"
                 else:
                     line = "%define is_major_ver 1\n"
@@ -436,7 +436,7 @@ def create_changelog (component):
 
     old_tag = "ACE+TAO-%d_%d_%d" % (old_comp_versions["ACE_major"],
                                     old_comp_versions["ACE_minor"],
-                                    old_comp_versions["ACE_beta"])
+                                    old_comp_versions["ACE_micro"])
 
     # Generate changelogs per component
     ex ("cd $DOC_ROOT/ACE_TAO && git log " + old_tag + "..HEAD " + component + " > " + component + "/ChangeLogs/" + component + "-" + comp_versions[component + "_version_"])
@@ -453,7 +453,7 @@ def get_comp_versions (component):
 
     global old_comp_versions, comp_versions, opts
 
-    beta = re.compile ("version (\d+)\.(\d+)\.(\d+)")
+    micro = re.compile ("version (\d+)\.(\d+)\.(\d+)")
     minor = re.compile ("version (\d+)\.(\d+)[^\.]")
     major = re.compile ("version (\d+)[^\.]")
 
@@ -461,14 +461,14 @@ def get_comp_versions (component):
         for line in version_file:
             match = None
 
-            match = beta.search (line)
+            match = micro.search (line)
             if match is not None:
-                vprint ("Detected beta version %s.%s.%s" %
+                vprint ("Detected micro version %s.%s.%s" %
                            (match.group (1), match.group (2), match.group (3)))
 
                 comp_versions[component + "_major"] = int (match.group (1))
                 comp_versions[component + "_minor"] = int (match.group (2))
-                comp_versions[component + "_beta"] = int (match.group (3))
+                comp_versions[component + "_micro"] = int (match.group (3))
                 break
 
             match = minor.search (line)
@@ -478,7 +478,7 @@ def get_comp_versions (component):
 
                 comp_versions[component + "_major"] = int (match.group (1))
                 comp_versions[component + "_minor"] = int (match.group (2))
-                comp_versions[component + "_beta"] = 0
+                comp_versions[component + "_micro"] = 0
                 break
 
             match = major.search (line)
@@ -487,7 +487,7 @@ def get_comp_versions (component):
 
                 comp_versions[component + "_major"] = int (match.group (1))
                 comp_versions[component + "_minor"] = 0
-                comp_versions[component + "_beta"] = 0
+                comp_versions[component + "_micro"] = 0
                 break
 
             print "FATAL ERROR: Unable to locate current version for " + component
@@ -496,42 +496,42 @@ def get_comp_versions (component):
     # Also store the current release (old from now)
     old_comp_versions[component + "_major"] = comp_versions[component + "_major"]
     old_comp_versions[component + "_minor"] = comp_versions[component + "_minor"]
-    old_comp_versions[component + "_beta"] = comp_versions[component + "_beta"]
+    old_comp_versions[component + "_micro"] = comp_versions[component + "_micro"]
 
     if opts.update:
         if opts.release_type == "major":
             comp_versions[component + "_major"] += 1
             comp_versions[component + "_minor"] = 0
-            comp_versions[component + "_beta"] = 0
+            comp_versions[component + "_micro"] = 0
         elif opts.release_type == "minor":
             comp_versions[component + "_minor"] += 1
-            comp_versions[component + "_beta"] = 0
-        elif opts.release_type == "beta":
-            comp_versions[component + "_beta"] += 1
+            comp_versions[component + "_micro"] = 0
+        elif opts.release_type == "micro":
+            comp_versions[component + "_micro"] += 1
 
-    #if opts.release_type == "beta":
+    #if opts.release_type == "micro":
     comp_versions [component + "_version"] = \
         str (comp_versions[component + "_major"])  + '.' + \
         str (comp_versions[component + "_minor"])  + '.' + \
-        str (comp_versions[component + "_beta"])
+        str (comp_versions[component + "_micro"])
     comp_versions [component + "_version_"] = \
         str (comp_versions[component + "_major"])  + '_' + \
         str (comp_versions[component + "_minor"])  + '_' + \
-        str (comp_versions[component + "_beta"])
+        str (comp_versions[component + "_micro"])
 
     comp_versions [component + "_code"] = \
         str((comp_versions[component + "_major"] << 16) + \
             (comp_versions[component + "_minor"] << 8) + \
-            comp_versions[component + "_beta"])
+            comp_versions[component + "_micro"])
 
     old_comp_versions [component + "_version"] = \
         str (old_comp_versions[component + "_major"])  + '.' + \
         str (old_comp_versions[component + "_minor"])  + '.' + \
-        str (old_comp_versions[component + "_beta"])
+        str (old_comp_versions[component + "_micro"])
     old_comp_versions [component + "_version_"] = \
         str (old_comp_versions[component + "_major"])  + '_' + \
         str (old_comp_versions[component + "_minor"])  + '_' + \
-        str (old_comp_versions[component + "_beta"])
+        str (old_comp_versions[component + "_micro"])
 
     if opts.update:
       vprint ("Updating from version %s to version %s" %
@@ -577,7 +577,7 @@ def tag ():
 
     tagname = "ACE+TAO-%d_%d_%d" % (comp_versions["ACE_major"],
                                     comp_versions["ACE_minor"],
-                                    comp_versions["ACE_beta"])
+                                    comp_versions["ACE_micro"])
 
     if opts.tag:
         if opts.take_action:
@@ -592,7 +592,7 @@ def tag ():
                 update_latest_tag ("Major", tagname)
             elif opts.release_type == "minor":
                 update_latest_tag ("Minor", tagname)
-            elif opts.release_type == "beta":
+            elif opts.release_type == "micro":
                 update_latest_tag ("Beta", tagname)
                 update_latest_tag ("Micro", tagname)
         else:
@@ -607,7 +607,7 @@ def push ():
 
     tagname = "ACE+TAO-%d_%d_%d" % (comp_versions["ACE_major"],
                                     comp_versions["ACE_minor"],
-                                    comp_versions["ACE_beta"])
+                                    comp_versions["ACE_micro"])
 
     if opts.push:
         if opts.take_action:
@@ -625,7 +625,7 @@ def push ():
                 push_latest_tag ("Major", tagname)
             elif opts.release_type == "minor":
                 push_latest_tag ("Minor", tagname)
-            elif opts.release_type == "beta":
+            elif opts.release_type == "micro":
                 push_latest_tag ("Beta", tagname)
                 push_latest_tag ("Micro", tagname)
         else:
@@ -643,7 +643,7 @@ def export_wc (stage_dir):
 
     tag = "ACE+TAO-%d_%d_%d" % (comp_versions["ACE_major"],
                                 comp_versions["ACE_minor"],
-                                comp_versions["ACE_beta"])
+                                comp_versions["ACE_micro"])
 
     # Clone the ACE repository with the needed tag
     print ("Retrieving ACE with tag " + tag)
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index c82c40e552d..7323a6abf6c 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -41,7 +41,7 @@
         Keep an eye on the <a href="http://bugzilla.dre.vanderbilt.edu/">bugzilla
         </a>
       entries that are registered by users and developers. Decide on the bugs that
-      need to be fixed for the beta and pain developers for an ETA.
+      need to be fixed for the micro and pain developers for an ETA.
     </p>
     <P>
       The document <a href="./privileges.html">here </a>talks about the powers of a
@@ -66,14 +66,14 @@
        Do note that when there are a lot of compile errors the test results are really
        unusable.</p>
     <hr>
-    <h2>Recipe for Cutting a Beta/Minor Kit</h2>
+    <h2>Recipe for Cutting a Minor Kit</h2>
     <P>
-      The build czar is also in charge for the release of the beta. Cutting a beta is
+      The build czar is also in charge for the release of the micro. Cutting a micro is
       as simple as cutting butter if things go well. Here is the procedure followed
-      while cutting a beta:
+      while cutting a micro:
       <ol>
         <li>
-          The whole process takes somewhere between 3-4 hours.</li>
+          The whole process takes somewhere between 2-3 hours.</li>
         <li>
           We suggest you take advantage of GNU Screen so that even if your SSH session is
           interrupted, the cutting process can continue. This command must be installed on
@@ -159,10 +159,10 @@
         </li>
         <li>
           Tag the release by executing<br>
-          <code>ACE/bin/make_release.py --beta --update --tag --push</code><br>
+          <code>ACE/bin/make_release.py --micro --update --tag --push</code><br>
           This will only take a couple minutes to complete and once done successfully,
           you can carry on with BOTH creating the kits and generating the doxygen
-          documentation in parallel. NOTE that <code>--beta</code> should be replaced
+          documentation in parallel. NOTE that <code>--micro</code> should be replaced
           with <code>--minor</code> or <code>--major</code> as appropriate.</li>
         <br>
         After the repository has been tagged check each file listed below to make
@@ -194,7 +194,7 @@
         from DOC_ROOT will suffice.<br />
     The tag will also need to be removed (both in Middleware and MPC):
     ACE+TAO-X_Y_Z (where X is the ACE Major version number, and Y & Z are the
-    Minor and Beta release numbers of the release that is to be restarted).<p>
+    Minor and Micro release numbers of the release that is to be restarted).<p>
       E.g.:<br>
       <code>cd ACE_TAO && git tag -d ACE+TAO-X_Y_Z<br />
         cd MPC && git tag -d ACE+TAO-X_Y_Z<br />
@@ -228,9 +228,9 @@
         git clone https://github.com/DOCGroup/ACE_TAO.git ACE_TAO<br>
         git clone https://github.com/DOCGroup/MPC.git MPC<br>
         cd ACE_TAO<br>
-        ACE/bin/make_release.py --beta --update --verbose<br>
-        ACE/bin/make_release.py --beta --tag --verbose<br>
-        ACE/bin/make_release.py --beta --push --verbose<br>
+        ACE/bin/make_release.py --micro --update --verbose<br>
+        ACE/bin/make_release.py --micro --tag --verbose<br>
+        ACE/bin/make_release.py --micro --push --verbose<br>
         ACE/bin/make_release.py --kit<br>
       </code>
     <p>
@@ -467,7 +467,7 @@
         DEVO group</a> about it.</li>
       <li>Send a note to  <a href="mailto:sysadmin@isis.vanderbilt.edu">sysadmin@isis.vanderbilt.edu</a> asking for the repo to be frozen. Provide them a list of names, including yourself and bczar to be granted write permission.
       </li>
-      <li>Compile once on Win32, Linux and Solaris before cutting a beta.</li>
+      <li>Compile once on Win32, Linux and Solaris before cutting a micro.</li>
       <li>Trust the release script when making a release. Don't make tar balls by
       hand.</li>
       <li>When all hell breaks loose, don't wait for the nightly builds to monitor