VERSION check fixes - removes build comparison

BobHanson · BobHanson · commit a4efd9a1cfe8 · 2019-11-22T11:20:02.000-06:00
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -20,13 +20,23 @@
 	
 if (J2S && J2S._version) return;
 
+
+/*
+ * VERSION should match what is at the end of the transpiled JavaScript .js "class" files,
+ * or a message in System.err will be generated by Clazz.setTVer(ver).
+ * 
+ */
+var VERSION = "3.2.5";
+
+
 jQuery || alert("Note -- jQuery is required, but it's not defined.");
 
 var $ = jQuery;	
 
 // settings in user-defined J2S will be added last
 	
 J2S || (J2S = {
+		_version: VERSION,
 		_debugCode: false,
 		_debugCore: false,
 		_debugPaint: false,
@@ -45,9 +55,6 @@ J2S || (J2S = {
 		_appArgs: null
    });
 
-//These should match with what is at the end of the transpiled JavaScript
-J2S._version = "3.2.5-v0";
-
 // for now, Clazz is a window global. Wouldn't be hard to encapsulate that, 
 // but it has to be also encapsulated in Clazz. 
 	
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -62,7 +62,7 @@
 J2S.LoadClazz = function(Clazz) {
 	
 Clazz.setTVer = function(ver) { // from class loading
-	if (Clazz._VERSION_T != ver)
+	if (Clazz._VERSION_T.split('-')[0] != ver.split('-')[0])
 		System.err.println("transpiler was " + Clazz._VERSION_T + " now " + ver + " for " + lastLoaded);
 	Clazz._VERSION_T = ver;
 }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@`
`62`	`62`	`J2S.LoadClazz = function(Clazz) {`
`63`	`63`
`64`	`64`	`Clazz.setTVer = function(ver) { // from class loading`
`65`		`- if (Clazz._VERSION_T != ver)`
	`65`	`+ if (Clazz._VERSION_T.split('-')[0] != ver.split('-')[0])`
`66`	`66`	`System.err.println("transpiler was " + Clazz._VERSION_T + " now " + ver + " for " + lastLoaded);`
`67`	`67`	`Clazz._VERSION_T = ver;`
`68`	`68`	`}`