diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-04-30 16:07:54 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-04-30 16:07:54 +0200 |
commit | 530c9d4d9f42fb5b7bf1713cd9308f4896cb1db6 (patch) | |
tree | 258ffd5f0d3021b1c33435b1ac0b2a6645e31398 | |
parent | 111e39c2ae7030b7b6a98ef83d829f87483a3c5f (diff) | |
parent | dcbc79712334675be313aff4eb765a0258ad1d89 (diff) | |
download | ATCD-530c9d4d9f42fb5b7bf1713cd9308f4896cb1db6.tar.gz |
Merge pull request #246 from jwillemsen/master
Updates in preparation of release
-rwxr-xr-x | ACE/bin/make_release.py | 2 | ||||
-rw-r--r-- | ACE/docs/bczar/bczar.html | 18 |
2 files changed, 6 insertions, 14 deletions
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index e1f89b494e9..a660120608a 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -444,7 +444,7 @@ def create_changelog (component): global old_comp_versions, comp_versions, opts - old_tag = "ACE+TAO-%d_%d_%d" % (old_comp_versions["ACE_major"], + old_tag = "ACE+TAO+CIAO-%d_%d_%d" % (old_comp_versions["ACE_major"], old_comp_versions["ACE_minor"], old_comp_versions["ACE_beta"]) diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index d497e86569d..f1b7d68423d 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -186,14 +186,6 @@ <li> TAO/VERSION</li> <li> - CIAO/ChangeLog</li> - <li> - CIAO/PROBLEM-REPORT-FORM</li> - <li> - CIAO/VERSION</li> - <li> - CIAO/ciao/Version.h</li> - <li> TAO/tao/Version.h</li> ace/Version.h</li> </code> </ul> @@ -201,7 +193,7 @@ <code>svn revert -R *</code><br> from DOC_ROOT will suffice.<br /> The tag will also need to be removed (both in Middleware and MPC): - ACE+TAO+CIAO-X_Y_Z (where X is the ACE Major version number, and Y & Z are the + 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> E.g.:<br> <code>cd ACE_TAO && git tag -d ACE+TAO-X_Y_Z<br /> @@ -290,8 +282,8 @@ Set the needed environment variables using<br> <code>export ACE_ROOT=$PWD/ACE</code><br> <code>export TAO_ROOT=$PWD/TAO</code><br> - <code>export CIAO_ROOT=$PWD/CIAO</code><br> - <code>export DANCE_ROOT=$PWD/DAnCE</code><br> + <code>export CIAO_ROOT=</code><br> + <code>export DANCE_ROOT=</code><br> <code>export DDS_ROOT=</code><br></li> <li> Check the doxygen version at the shell by executing the command:<br> @@ -364,7 +356,7 @@ "Edit". Click on the "Product" link.</li> <li> you are then at "Select product" page. You should see a list components, i.e., - ACE CIAO TAO. Click on the product you want to edit.</li> + ACE TAO. Click on the product you want to edit.</li> <li> you are then at "Edit product" page. Scroll down a bit, you should see a list of all versions coming with this product. At the very beginning of the list, @@ -435,7 +427,7 @@ etc/index.hml to show the new doxygen package you installed</li> <li>bin/diff-builds-and-group-fixed-tests-only.sh to give the correct default old_date for this release.</li></ul> <li> - Update the NEWS, TAO/NEWS, TAO/DAnCE/NEWS, and TAO/CIAO/NEWS files to have a new section for the next release.</li> + Update the ACE/NEWS and TAO/NEWS files to have a new section for the next release.</li> <li> Update OpenSuSE Build service using <code> |