diff --git a/ChangeLog b/ChangeLog
index c1360aee8d84c26accf8dbcd0f19101286aa6f5a..52a15f071b37fb44121f874d04534d21fd579fa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-12 Jesper Öqvist <jesper.oqvist@cs.lth.se>
+
+ * New release: 20130212
+
2013-02-10 Jesper Öqvist <jesper.oqvist@cs.lth.se>
* Removed obsolete file Makefile.deprecated
@@ -57,7 +61,7 @@
2012-11-22 Jesper Öqvist <jesper.oqvist@cs.lth.se>
- * Generate improved error messages for method/equation refinement errors
+ * Improved error messages for method/equation refinement errors
2012-11-14 Jesper Öqvist <jesper.oqvist@cs.lth.se>
@@ -65,16 +69,18 @@
introductions. This allows interface methods to be refined again.
Trac ticket: http://svn.cs.lth.se/trac/jastadd-trac/ticket/69
- * Increased the minimum list size limit (above zero) to 4 (was 1)
+ * Increased minimum (non-empty) child array size from 1 to 4
* Added init$Children method to initialize the child array with the
correct initial size. This also avoids some redundant initialization of
-
nta children.
+
* Refactored constructor code generation
2012-11-12 Jesper Öqvist <jesper.oqvist@cs.lth.se>
+ * New release: 20121112
+
* Generate fewer compute methods. Regular non-lazy synthesized
attributes do not need a separate compute method.
Fewer compute methods will in general reduce the stack depth
@@ -89,7 +95,7 @@
* Added SVN revision number to version string
-2012-10-26 Jesper Öqvist
+2012-10-26 Jesper Öqvist <jesper.oqvist@cs.lth.se>
* New release: 20121026
diff --git a/doc/index.html b/doc/index.html
index 046eeede114a6d67ad1a5e3b0d501568e63dd117..fec23af020eaec0eeabf34ccfbba6ea2e00286b7 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,4 +1,4 @@
-<h1>JastAdd2 Release R20121112
+<h1>JastAdd2 Release R20130212
</h1>
<h2> Binary distribution </h2>
diff --git a/doc/index.php b/doc/index.php
index 080853cf52cc114404ef9590b87fce23ef607edb..02c2e23f491f17802b6d94b8f58fb7005a18fc16 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -1,4 +1,4 @@
<?php
include("../../../web/include/functions.php");
-printHtmlContentFile("index.html");
+printHtmlFile("index.html");
?>
diff --git a/doc/reference-manual.html b/doc/reference-manual.html
index e2ed8c8d88a2d75f514839dc3a2c60edb1406250..3b33975bb9e01237971f186f68b2f5e4fb836a5b 100644
--- a/doc/reference-manual.html
+++ b/doc/reference-manual.html
@@ -6,7 +6,7 @@
</head>
<body>
-<h1>Reference manual for JastAdd2 R20121112
+<h1>Reference manual for JastAdd2 R20130212
</h1>
<h3>Index</h3>
<ul>
diff --git a/doc/reference-manual.php b/doc/reference-manual.php
index 2a208e3fdc0e4b3d0cf737a84b27d3627843c18d..bf358e9a5736d75301457336bcd130b569bf1380 100644
--- a/doc/reference-manual.php
+++ b/doc/reference-manual.php
@@ -1,4 +1,4 @@
<?php
include("../../../web/include/functions.php");
-printHtmlContentFile("reference-manual.html");
+printHtmlFile("reference-manual.html");
?>
diff --git a/doc/release-notes.php b/doc/release-notes.php
index 21d7c4668183d16abe72ab780a3bd5634032b1c0..eccc6a76820a63b1568bd2040765f2f5197cec70 100644
--- a/doc/release-notes.php
+++ b/doc/release-notes.php
@@ -1,4 +1,4 @@
<?php
include("../../../web/include/functions.php");
-printHtmlContentFile("release-notes.html");
+printHtmlFile("release-notes.html");
?>
diff --git a/jastadd/JastAdd.java b/jastadd/JastAdd.java
index f701c498c373963bfb66c885f1b7c51544bcbe0e..ed7ebde6551dc62c12b39861a7c741188c108915 100644
--- a/jastadd/JastAdd.java
+++ b/jastadd/JastAdd.java
@@ -507,15 +507,18 @@ public class JastAdd {
outputDir = new File(outputDirName);
if(!outputDir.exists()) {
- System.err.println("Output directory does not exist");
+ System.err.println("Output directory " + outputDir.getAbsolutePath() +
+ " does not exist");
System.exit(1);
}
if(!outputDir.isDirectory()) {
- System.err.println("Output directory is not a directory");
+ System.err.println("Output directory " + outputDir.getAbsolutePath() +
+ " is not a directory");
System.exit(1);
}
if(!outputDir.canWrite()) {
- System.err.println("Output directory is write protected");
+ System.err.println("Output directory " + outputDir.getAbsolutePath() +
+ " is write protected");
System.exit(1);
}
diff --git a/release.sh b/release.sh
index e7c0502e5214b2aa6516a72e10de65e3c34b51af..6ad04271623207729f0bb554f8debd7535088e64 100755
--- a/release.sh
+++ b/release.sh
@@ -4,47 +4,35 @@
VERSION=R`date +%Y%m%d`
echo "# Follow these steps to release a new jastadd2 version ${VERSION}:"
-
echo
echo "# 1. Patch the html files to use the correct version number"
-
-echo "sed -e 's/\\(JastAdd2 Release \\)R[0123456789]*/"'\\1'"${VERSION}/' \\"
+echo "sed -e 's/\\(JastAdd2 Release \\)R[0-9]*/"'\\1'"${VERSION}/' \\"
echo " doc/index.html > doc/index.html.new"
echo "mv doc/index.html.new doc/index.html"
-
-echo "sed -e 's/\\(manual for JastAdd2 \\)R[0123456789]*/"'\\1'"${VERSION}/' \\"
+echo "sed -e 's/\\(manual for JastAdd2 \\)R[0-9]*/"'\\1'"${VERSION}/' \\"
echo " doc/reference-manual.html >doc/reference-manual.html.new"
echo "mv doc/reference-manual.html.new doc/reference-manual.html"
-
echo
echo "# 2. Create the release zip files jastadd2-src.zip and jastadd2-bin.zip"
echo "ant release"
-
-echo
-echo "# 3.1 Create a new dir at jastadd.org"
-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}"
-
echo
-echo "# 3.2 Make sure the new files have the correct permissions (664 will do)"
-
+echo "# 3. Create a new dir at jastadd.org"
+echo "ssh login.cs.lth.se \"mkdir /cs/jastadd/releases/jastadd2/${VERSION}\""
echo
-echo "# 4. Upload the zip files and appropriate documentation to jastadd.org"
+echo "# 4.1 Upload the zip files and appropriate documentation to jastadd.org"
echo "scp jastadd2.jar jastadd2-src.zip jastadd2-bin.zip doc/*.html doc/*.php\\"
echo " 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}
-
+echo
+echo "# 4.2 Make sure the new files have group write permission"
+echo "ssh login.cs.lth.se \"chmod -R g+w /cs/jastadd/releases/jastadd2/${VERSION}\""
echo
echo "# 5. Cleaning up"
echo "rm -f jastadd2-bin.zip jastadd2-src.zip"
-
echo # Check that it works
echo ------------------------------------------------------
echo Browse to the website and check that everything works.
echo Then ant clean and commit.
echo ------------------------------------------------------
-
echo
echo "# 6. Tag in SVN"
echo "svn copy http://svn.cs.lth.se/svn/jastadd/trunk/JastAdd2 \\"