Small updates to release process.

f6b6e378 · Görel Hedin · 65579120 · f6b6e378 · f6b6e378 · f6b6e378
Commit f6b6e378 authored May 06, 2011 by Görel Hedin
--- a/README
+++ b/README
@@ -87,20 +87,24 @@ Possibly, the test suites for JastAdd2 and JastAdd3 could be merged at some poin
 For the time being, we keep them as separate suites, but with the same numbers for the same tests.
 --------------------------------------------------------
 MAKE A NEW RELEASE at JastAdd.org
-  1. Make sure the ChangeLog, reference manual, and the release-notes.html contains appropriate content.
+  1  Make sure the following files have appropriate content:
+     - ChangeLog
+     - doc/reference-manual.html
+     - doc/release-notes.html
  2. Create a new jar file:
      > make jar
  3. Run all test cases.
-  4. Make clean and commit.
-  5. Run the release script which will show you commands for doing the release.
-     > ./release
+  4. Run the release script which will show you commands for doing the release.
+     > ./release.sh
     This will involve:
     - Creating a new tagged version R20110506 (or other appropriate date)
+     - Patching html files with version R20110506
     - Creating a zip file jastadd2-src.zip for the source distribution
     - Creating a zip file jastadd2-bin.zip for the binary distribution.
     - Upload the zip files and appropriate documentation to jastadd.org
     - Cleaning up
-  6. Browse to jastadd.org/releases/jastadd2/R20110506 and check the content.
+  5. Browse to jastadd.org/releases/jastadd2/R20110506 and check the content.
+  6. Make clean and commit
  7. Update the web pages to reflect the new release on the download and news pages. 
 --------------------------------------------------------
 DIRECTORIES, FILES, TOOLS
@@ -200,6 +204,7 @@ Directories and files:
  manifest     Manifest file for building the jastadd2.jar file
  newrelease   A script for patching two files with a new version
               number: jastadd/JastAdd.java and manifest
+  release.sh   A script printing the commands for doing a release.
  ChangeLog    A textfile recording changes done to JastAdd, intended for
               users of JastAdd (focusing on external behavior).
  ChangeLogUntil2010.txt

--- a/doc/index.html
+++ b/doc/index.html
@@ -13,6 +13,36 @@

 <h2> Source distribution </h2>
 <ul>
-  <li> The source: <a href="jastadd2-src.zip">jastadd2-src.zip</a>
-  <br> Unpack by the command "unzip jastadd2-src.zip" </li>
+  <li> The source: <a href="jastadd2-src.zip">jastadd2-src.zip</a></li>
+  <ul>
+    <li> Unpack by the command "unzip jastadd2-src.zip" </li>
+    <li> Get <a href="http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.5.3.jar">AspectJ 1.5.3</a>,
+         and install it as follows: </li>
+       <ul>
+         <li>Create a new empty dir where you unpack aspectj-1.5.3.jar by the command
+         <pre>jar -xf aspectj-1.5.3.jar
+         </pre>
+         </li>
+         <li> Move its "lib" directory to "jastadd-src/tools" and rename it to "aspectj-1.5.3".
+              You should end up with the following directory structure:
+         <pre>
+         jastadd-src/
+           ...
+           tools/
+             ...
+             aspectj-1.5.3/
+               aspectjlib.jar
+               aspectjrt.jar
+               aspectjtools.jar
+               aspectjweaver.jar
+         </pre>
+         </li>
+       </ul>
+    <li> Go to jastadd-src and build jastadd2.jar:
+         <pre>
+         > cd jastadd-src
+         > make jar
+         </pre>
+    </li>
+  </ul>
 </ul>
--- a/doc/reference-manual.html
+++ b/doc/reference-manual.html
@@ -6,7 +6,7 @@
 </head>

 <body>
-<h1>Reference manual for JastAdd
+<h1>Reference manual for JastAdd2 R20110506
 </h1>
 <h3>Index</h3>
 <ul>

--- a/release.sh
+++ b/release.sh
@@ -2,6 +2,15 @@
 VERSION=R`date +%Y%m%d`
 echo Do the following commands to create and upload jastadd2 version ${VERSION}

+# Patch the html files to use the correct version number
+echo "sed -e '/JastAdd2 Release R/ s/Release R......../Release '${VERSION}'/' doc/index.html >doc/index.html.new"
+echo rm doc/index.html
+echo mv doc/index.html.new doc/index.html
+
+echo "sed -e '/Reference manual for JastAdd2 R/ s/JastAdd2 R......../JastAdd2 '${VERSION}'/' doc/reference-manual.html >doc/reference-manual.html.new"
+echo rm doc/reference-manual.html
+echo mv doc/reference-manual.html.new doc/reference-manual.html
+
 # Create a zip file jastadd2-src.zip for the source distribution
 echo make source-zip
 #make source-zip
@@ -15,7 +24,7 @@ echo ssh login.cs.lth.se \"cd /cs/jastadd/releases/jastadd2 \&\& mkdir ${VERSION
 #ssh login.cs.lth.se "cd /cs/jastadd/releases/jastadd2 && mkdir ${VERSION}"

 # Upload the zip files and appropriate documentation to jastadd.org
-echo scp jastadd2-src.jar jastadd2-bin.zip doc/*.html doc/*.php login.cs.lth.se:/cs/jastadd/releases/jastadd2/${VERSION}
+echo scp jastadd2.jar jastadd2-src.zip jastadd2-bin.zip doc/*.html doc/*.php login.cs.lth.se:/cs/jastadd/releases/jastadd2/${VERSION}
 #scp jastadd2-src.jar jastadd2-bin.zip doc/*.html doc/*.php login.cs.lth.se:/cs/jastadd/releases/jastadd2/${VERSION}

 # Cleaning up