From a6aed94fe881671b946fce88951124c7e95cb11f Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Tue, 17 Jun 2008 12:52:46 -0700 Subject: [PATCH] plug more holes in release steps --- doc/release_steps.txt | 26 ++++++++++++++------------ wscript | 4 ++-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/doc/release_steps.txt b/doc/release_steps.txt index dc959aaad..cbc92bd81 100644 --- a/doc/release_steps.txt +++ b/doc/release_steps.txt @@ -8,34 +8,36 @@ Steps in doing an ns-3 release - confirm that Doxygen builds cleanly and without warnings (./waf check; ./waf --doxygen), and check in any necessary changes - ensure no regressions (./waf --regression) + - update the wscript in ns-3-dev to point REGRESSION_TRACES_TAR_NAME and + REGRESSION_TRACES_DIR_NAME to the correct places. 2. ./waf configure; ./waf dist - - this will create a ns-3.0.x.tar.bz2 tarball - - this will also create a ns-3.0.x-ref-traces.tar.bz2 tarball + - this will create a ns-3.1x.tar.bz2 tarball + - this will also create a ns-3.1x-ref-traces.tar.bz2 tarball 3. test tarball on release platforms (waf check and maybe some other scripts) 4. once you are happy with the tarball, tag ns-3-dev with "release ns-3.0.X" - - hg tag "release ns-3.0.x" + - hg tag "release ns-3.1x" - hg push 5. clone the tagged ns-3-dev and place it on the repository - ssh code.nsnam.org; sudo tcsh; su code; - - cp -r /home/code/repos/ns-3-dev /home/code/repos/ns-3.0.x - - cd /home/code/repos/ns-3.0.x/.hg and edit the hgrc appropriately: - "description = ns-3.0.x release - name = ns-3.0.x" + - cp -r /home/code/repos/ns-3-dev /home/code/repos/ns-3.1x + - cd /home/code/repos/ns-3.1x/.hg and edit the hgrc appropriately: + "description = ns-3.1x release + name = ns-3.1x" 6. Run the regression tests on the new release and update the reference traces - ./waf --regression - ./waf --valgrind --regression (for valgrind version) - There should be no regression errors at this time - - tag ns-3-dev-ref-traces with "release ns-3.0.X" - hg tag "release ns-3.0.x" + - tag ns-3-dev-ref-traces with "release ns-3.1X" + hg tag "release ns-3.1x" hg push - clone the ns-3-dev-ref-traces and place it on the repository as in step - 5 but use the name ns-3.0.x-ref-traces + 5 but use the name ns-3.1x-ref-traces 7. Create a reference traces tarball - again, run "./waf dist" -8. upload "ns-3.0.x.tar.bz2" to the /var/www/html/releases/ directory on +8. upload "ns-3.1x.tar.bz2" to the /var/www/html/releases/ directory on the www.nsnam.org server - give it 644 file permissions, and user/group = apache -9. upload "ns-3.0.x-ref-traces.tar.bz2" to the /var/www/html/releases/ +9. upload "ns-3.1x-ref-traces.tar.bz2" to the /var/www/html/releases/ directory on the www.nsnam.org server - give it 644 file permissions, and user/group = apache 10. update web pages on www.nsnam.org (source is in the www/ module) diff --git a/wscript b/wscript index 150868743..1c5699a91 100644 --- a/wscript +++ b/wscript @@ -34,7 +34,7 @@ REGRESSION_TRACES_URL = "http://www.nsnam.org/releases/" # mercurial on the system. It is expected to be created using tar -cjf and # will be extracted using tar -xjf # -REGRESSION_TRACES_TAR_NAME = "ns-3.0.12-ref-traces.tar.bz2" +REGRESSION_TRACES_TAR_NAME = "ns-3.1-RC1-ref-traces.tar.bz2" # # The path to the Mercurial repository used to find the reference traces if @@ -47,7 +47,7 @@ REGRESSION_TRACES_REPO = "http://code.nsnam.org/" # The local directory name (relative to the 'regression' dir) into # which the reference traces will go in either case (net or hg). # -REGRESSION_TRACES_DIR_NAME = "ns-3-dev-ref-traces" +REGRESSION_TRACES_DIR_NAME = "ns-3.1-RC1-ref-traces" def dist_hook():