The jarSmall build target no longer includes assertions (SysProperties.CHECK,…

The jarSmall build target no longer includes assertions (SysProperties.CHECK, CHECK2, system properties h2.check and h2.check2).

h2/src/main/org/h2/constant/SysProperties.java

@@ -164,25 +164,25 @@ public class SysProperties {
      * System property <code>h2.check</code> (default: true).<br />
      * Assertions in the database engine.
      */
-    /*## CHECK begin ##
+    //## CHECK begin ##
     public static final boolean CHECK = getBooleanSetting("h2.check", true);
-    ## CHECK end ##*/
+    //## CHECK end ##
 
-    //## NO_CHECK begin ##
+    /*## NO_CHECK begin ##
     public static final boolean CHECK = false;
-    //## NO_CHECK end ##
+    ## NO_CHECK end ##*/
 
     /**
      * System property <code>h2.check2</code> (default: true).<br />
      * Additional assertions in the database engine.
      */
-    /*## CHECK begin ##
+    //## CHECK begin ##
     public static final boolean CHECK2 = getBooleanSetting("h2.check2", false);
-    ## CHECK end ##*/
+    //## CHECK end ##
 
-    //## NO_CHECK begin ##
+    /*## NO_CHECK begin ##
     public static final boolean CHECK2 = false;
-    //## NO_CHECK end ##
+    ## NO_CHECK end ##*/
 
     /**
      * System property <code>h2.clientTraceDirectory</code> (default:

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

@@ -120,12 +120,18 @@ public class Build extends BuildBase {
      * Switch the source code to the current JDK.
      */
     public void switchSource() {
+        switchSource(true);
+    }
+
+    private void switchSource(boolean enableCheck) {
         try {
             String version = System.getProperty("version");
+            String check = enableCheck ? "+CHECK" : "-CHECK";
+            String noCheck = enableCheck ? "-NO_CHECK" : "+NO_CHECK";
             if (version == null) {
-                SwitchSource.main("-dir", "src", "-auto");
+                SwitchSource.main("-dir", "src", "-auto", check, noCheck);
             } else {
-                SwitchSource.main("-dir", "src", "-version", version);
+                SwitchSource.main("-dir", "src", "-version", version, check, noCheck);
             }
             if (System.getProperty("lucene") != null) {
                 SwitchSource.main("-dir", "src", "-LUCENE2", "-LUCENE3", "+LUCENE" + getLuceneVersion());
@@ -136,7 +142,7 @@ public class Build extends BuildBase {
     }
 
     private void compile(boolean debugInfo, boolean clientOnly, boolean basicResourcesOnly) {
-        switchSource();
+        switchSource(debugInfo);
         clean();
         mkdir("temp");
         download();