improved build

h2/src/tools/org/h2/build/Build.java

@@ -209,10 +209,18 @@ public class Build extends BuildBase {
         files.addAll(getFiles("../h2/service"));
         files.addAll(getFiles("../h2/src"));
         zip("../h2web/h2.zip", files, "../", false, false);
-        exec("makensis", new String[]{"/v2", "src/installer/h2.nsi"});
+        boolean installer = false;
+        try {
+            exec("makensis", new String[]{"/v2", "src/installer/h2.nsi"});
+            installer = true;
+        } catch (Error e) {
+            print("NSIS is not available: " + e);
+        }
         String buildDate = getStaticField("org.h2.engine.Constants", "BUILD_DATE");
         writeFile(new File("../h2web/h2-" + buildDate + ".zip"), readFile(new File("../h2web/h2.zip")));
-        writeFile(new File("../h2web/h2-setup-" + buildDate + ".exe"), readFile(new File("../h2web/h2-setup.exe")));
+        if (installer) {
+            writeFile(new File("../h2web/h2-setup-" + buildDate + ".exe"), readFile(new File("../h2web/h2-setup.exe")));
+        }
     }
 
     /**

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -574,4 +574,5 @@ statisticlog activeobjects manske redeployment michael kaspersky datatext
 bleyl donald conservative offsets diabetes ansorg allocating osmond gluco
 joachim mysqladmin sudo mysqld indicator wire ring relates expedites
 approximated approximation dvan dsn dobysoft ebean syswow tmueller dbbench
-connecturl problematic transformation lazy querydsl squill empire liq
\ No newline at end of file
+connecturl problematic transformation lazy querydsl squill empire liq fle
+xive evolving

h2/src/tools/org/h2/build/doclet/Doclet.java

@@ -223,6 +223,7 @@ public class Doclet {
             }
             writer.println("<h4>" + type + " <span class=\"methodName\">" + name + "</span>" + buff.toString()
                     + "</h4>");
+            boolean hasComment = method.commentText() != null && method.commentText().trim().length() != 0;
             writer.println(formatText(method.commentText()));
             ParamTag[] paramTags = method.paramTags();
             boolean space = false;
@@ -259,7 +260,7 @@ public class Doclet {
                 }
                 writer.println("<div class=\"item\">" + returnComment + "</div>");
             } else if (!method.returnType().toString().equals("void")) {
-                if (!method.commentText().startsWith("[") && !hasThrowsTag) {
+                if (hasComment && !method.commentText().startsWith("[") && !hasThrowsTag) {
                     // [Not supported] and such are not problematic
                     // also not problematic are methods that always throw an exception
                     addError("Undocumented return value (" +