Skip to content
Snippets Groups Projects
Commit c82c8d8c authored by Jesper's avatar Jesper
Browse files

Merged changes from trunk

parent 1596541d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
ChangeLog
+ 10
− 4
View file @ c82c8d8c
2013-02-12 Jesper Öqvist <jesper.oqvist@cs.lth.se>
* New release: 20130212
2013-02-10 Jesper Öqvist <jesper.oqvist@cs.lth.se> 2013-02-10 Jesper Öqvist <jesper.oqvist@cs.lth.se>
* Removed obsolete file Makefile.deprecated * Removed obsolete file Makefile.deprecated
...@@ -57,7 +61,7 @@ ...@@ -57,7 +61,7 @@
2012-11-22 Jesper Öqvist <jesper.oqvist@cs.lth.se> 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> 2012-11-14 Jesper Öqvist <jesper.oqvist@cs.lth.se>
...@@ -65,16 +69,18 @@ ...@@ -65,16 +69,18 @@
introductions. This allows interface methods to be refined again. introductions. This allows interface methods to be refined again.
Trac ticket: http://svn.cs.lth.se/trac/jastadd-trac/ticket/69 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 * Added init$Children method to initialize the child array with the
correct initial size. This also avoids some redundant initialization of correct initial size. This also avoids some redundant initialization of
nta children. nta children.
* Refactored constructor code generation * Refactored constructor code generation
2012-11-12 Jesper Öqvist <jesper.oqvist@cs.lth.se> 2012-11-12 Jesper Öqvist <jesper.oqvist@cs.lth.se>
* New release: 20121112
* Generate fewer compute methods. Regular non-lazy synthesized * Generate fewer compute methods. Regular non-lazy synthesized
attributes do not need a separate compute method. attributes do not need a separate compute method.
Fewer compute methods will in general reduce the stack depth Fewer compute methods will in general reduce the stack depth
...@@ -89,7 +95,7 @@ ...@@ -89,7 +95,7 @@
* Added SVN revision number to version string * 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 * New release: 20121026
......
doc/index.html
+ 1
− 1
View file @ c82c8d8c
<h1>JastAdd2 Release R20121112 <h1>JastAdd2 Release R20130212
</h1> </h1>
<h2> Binary distribution </h2> <h2> Binary distribution </h2>
......
doc/index.php
+ 1
− 1
View file @ c82c8d8c
<?php <?php
include("../../../web/include/functions.php"); include("../../../web/include/functions.php");
printHtmlContentFile("index.html"); printHtmlFile("index.html");
?> ?>
doc/reference-manual.html
+ 1
− 1
View file @ c82c8d8c
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</head> </head>
<body> <body>
<h1>Reference manual for JastAdd2 R20121112 <h1>Reference manual for JastAdd2 R20130212
</h1> </h1>
<h3>Index</h3> <h3>Index</h3>
<ul> <ul>
......
doc/reference-manual.php
+ 1
− 1
View file @ c82c8d8c
<?php <?php
include("../../../web/include/functions.php"); include("../../../web/include/functions.php");
printHtmlContentFile("reference-manual.html"); printHtmlFile("reference-manual.html");
?> ?>
doc/release-notes.php
+ 1
− 1
View file @ c82c8d8c
<?php <?php
include("../../../web/include/functions.php"); include("../../../web/include/functions.php");
printHtmlContentFile("release-notes.html"); printHtmlFile("release-notes.html");
?> ?>
jastadd/JastAdd.java
+ 6
− 3
View file @ c82c8d8c
...@@ -507,15 +507,18 @@ public class JastAdd { ...@@ -507,15 +507,18 @@ public class JastAdd {
outputDir = new File(outputDirName); outputDir = new File(outputDirName);
if(!outputDir.exists()) { if(!outputDir.exists()) {
System.err.println("Output directory does not exist"); System.err.println("Output directory " + outputDir.getAbsolutePath() +
" does not exist");
System.exit(1); System.exit(1);
} }
if(!outputDir.isDirectory()) { 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); System.exit(1);
} }
if(!outputDir.canWrite()) { if(!outputDir.canWrite()) {
System.err.println("Output directory is write protected"); System.err.println("Output directory " + outputDir.getAbsolutePath() +
" is write protected");
System.exit(1); System.exit(1);
} }
......
release.sh
+ 8
− 20
View file @ c82c8d8c
...@@ -4,47 +4,35 @@ ...@@ -4,47 +4,35 @@
VERSION=R`date +%Y%m%d` VERSION=R`date +%Y%m%d`
echo "# Follow these steps to release a new jastadd2 version ${VERSION}:" echo "# Follow these steps to release a new jastadd2 version ${VERSION}:"
echo echo
echo "# 1. Patch the html files to use the correct version number" echo "# 1. Patch the html files to use the correct version number"
echo "sed -e 's/\\(JastAdd2 Release \\)R[0-9]*/"'\\1'"${VERSION}/' \\"
echo "sed -e 's/\\(JastAdd2 Release \\)R[0123456789]*/"'\\1'"${VERSION}/' \\"
echo " doc/index.html > doc/index.html.new" echo " doc/index.html > doc/index.html.new"
echo "mv doc/index.html.new doc/index.html" echo "mv doc/index.html.new doc/index.html"
echo "sed -e 's/\\(manual for JastAdd2 \\)R[0-9]*/"'\\1'"${VERSION}/' \\"
echo "sed -e 's/\\(manual for JastAdd2 \\)R[0123456789]*/"'\\1'"${VERSION}/' \\"
echo " doc/reference-manual.html >doc/reference-manual.html.new" echo " doc/reference-manual.html >doc/reference-manual.html.new"
echo "mv doc/reference-manual.html.new doc/reference-manual.html" echo "mv doc/reference-manual.html.new doc/reference-manual.html"
echo echo
echo "# 2. Create the release zip files jastadd2-src.zip and jastadd2-bin.zip" echo "# 2. Create the release zip files jastadd2-src.zip and jastadd2-bin.zip"
echo "ant release" 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
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
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 "scp jastadd2.jar jastadd2-src.zip jastadd2-bin.zip doc/*.html doc/*.php\\"
echo " login.cs.lth.se:/cs/jastadd/releases/jastadd2/${VERSION}" 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
echo "# 5. Cleaning up" echo "# 5. Cleaning up"
echo "rm -f jastadd2-bin.zip jastadd2-src.zip" echo "rm -f jastadd2-bin.zip jastadd2-src.zip"
echo # Check that it works echo # Check that it works
echo ------------------------------------------------------ echo ------------------------------------------------------
echo Browse to the website and check that everything works. echo Browse to the website and check that everything works.
echo Then ant clean and commit. echo Then ant clean and commit.
echo ------------------------------------------------------ echo ------------------------------------------------------
echo echo
echo "# 6. Tag in SVN" echo "# 6. Tag in SVN"
echo "svn copy http://svn.cs.lth.se/svn/jastadd/trunk/JastAdd2 \\" echo "svn copy http://svn.cs.lth.se/svn/jastadd/trunk/JastAdd2 \\"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment