diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index e8715dbb5..9c661973e 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -62,11 +62,11 @@ import static processing.app.I18n._; * files and images, etc) that comes from that. */ public class Base { - public static final int REVISION = 158; + public static final int REVISION = BaseNoGui.REVISION; /** This might be replaced by main() if there's a lib/version.txt file. */ - static String VERSION_NAME = "0158"; + static String VERSION_NAME = BaseNoGui.VERSION_NAME; /** Set true if this a proper release rather than a numbered revision. */ - static public boolean RELEASE = false; + static public boolean RELEASE = BaseNoGui.RELEASE; static Platform platform; diff --git a/app/src/processing/app/BaseNoGui.java b/app/src/processing/app/BaseNoGui.java new file mode 100644 index 000000000..0574f6bfe --- /dev/null +++ b/app/src/processing/app/BaseNoGui.java @@ -0,0 +1,11 @@ +package processing.app; + +public class BaseNoGui { + + public static final int REVISION = 158; + /** This might be replaced by main() if there's a lib/version.txt file. */ + static String VERSION_NAME = "0158"; + /** Set true if this a proper release rather than a numbered revision. */ + static public boolean RELEASE = false; + +} diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java index 1f7540e9c..79e4958b4 100644 --- a/app/src/processing/app/debug/Compiler.java +++ b/app/src/processing/app/debug/Compiler.java @@ -37,6 +37,7 @@ import java.util.List; import java.util.Map; import processing.app.Base; +import processing.app.BaseNoGui; import processing.app.I18n; import processing.app.PreferencesData; import processing.app.SketchCode; @@ -578,7 +579,7 @@ public class Compiler implements MessageConsumer { throws RunnerException { String includes = prepareIncludes(includeFolders); PreferencesMap dict = new PreferencesMap(prefs); - dict.put("ide_version", "" + Base.REVISION); + dict.put("ide_version", "" + BaseNoGui.REVISION); dict.put("includes", includes); dict.put("source_file", sourceFile.getAbsolutePath()); dict.put("object_file", objectFile.getAbsolutePath()); @@ -597,7 +598,7 @@ public class Compiler implements MessageConsumer { String includes = prepareIncludes(includeFolders); PreferencesMap dict = new PreferencesMap(prefs); - dict.put("ide_version", "" + Base.REVISION); + dict.put("ide_version", "" + BaseNoGui.REVISION); dict.put("includes", includes); dict.put("source_file", sourceFile.getAbsolutePath()); dict.put("object_file", objectFile.getAbsolutePath()); @@ -616,7 +617,7 @@ public class Compiler implements MessageConsumer { String includes = prepareIncludes(includeFolders); PreferencesMap dict = new PreferencesMap(prefs); - dict.put("ide_version", "" + Base.REVISION); + dict.put("ide_version", "" + BaseNoGui.REVISION); dict.put("includes", includes); dict.put("source_file", sourceFile.getAbsolutePath()); dict.put("object_file", objectFile.getAbsolutePath()); @@ -778,7 +779,7 @@ public class Compiler implements MessageConsumer { for (File file : coreObjectFiles) { PreferencesMap dict = new PreferencesMap(prefs); - dict.put("ide_version", "" + Base.REVISION); + dict.put("ide_version", "" + BaseNoGui.REVISION); dict.put("archive_file", afile.getName()); dict.put("object_file", file.getAbsolutePath()); @@ -819,7 +820,7 @@ public class Compiler implements MessageConsumer { dict.put("compiler.c.elf.flags", flags); dict.put("archive_file", "core.a"); dict.put("object_files", objectFileList); - dict.put("ide_version", "" + Base.REVISION); + dict.put("ide_version", "" + BaseNoGui.REVISION); String[] cmdArray; try { @@ -834,7 +835,7 @@ public class Compiler implements MessageConsumer { // 5. extract EEPROM data (from EEMEM directive) to .eep file. void compileEep() throws RunnerException { PreferencesMap dict = new PreferencesMap(prefs); - dict.put("ide_version", "" + Base.REVISION); + dict.put("ide_version", "" + BaseNoGui.REVISION); String[] cmdArray; try { @@ -849,7 +850,7 @@ public class Compiler implements MessageConsumer { // 6. build the .hex file void compileHex() throws RunnerException { PreferencesMap dict = new PreferencesMap(prefs); - dict.put("ide_version", "" + Base.REVISION); + dict.put("ide_version", "" + BaseNoGui.REVISION); String[] cmdArray; try {