rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00
Code Issues Releases Activity

Moved version info to BaseNoGui new class (work in progress).

Browse Source
This commit is contained in:
Claudio Indellicati 2014-08-21 12:23:42 +02:00 committed by Cristian Maglie
parent be96ae3a6a
commit 057106f1b9
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/processing/app/Base.java
View File

@ -62,11 +62,11 @@ import static processing.app.I18n._;
* files and images, etc) that comes from that. * files and images, etc) that comes from that.
*/ */
public class Base { 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. */ /** 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. */ /** 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; static Platform platform;

11
app/src/processing/app/BaseNoGui.java Normal file
View File

@ -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;
}

15
app/src/processing/app/debug/Compiler.java
View File

@ -37,6 +37,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import processing.app.Base; import processing.app.Base;
import processing.app.BaseNoGui;
import processing.app.I18n; import processing.app.I18n;
import processing.app.PreferencesData; import processing.app.PreferencesData;
import processing.app.SketchCode; import processing.app.SketchCode;
@ -578,7 +579,7 @@ public class Compiler implements MessageConsumer {
throws RunnerException { throws RunnerException {
String includes = prepareIncludes(includeFolders); String includes = prepareIncludes(includeFolders);
PreferencesMap dict = new PreferencesMap(prefs); PreferencesMap dict = new PreferencesMap(prefs);
dict.put("ide_version", "" + Base.REVISION); dict.put("ide_version", "" + BaseNoGui.REVISION);
dict.put("includes", includes); dict.put("includes", includes);
dict.put("source_file", sourceFile.getAbsolutePath()); dict.put("source_file", sourceFile.getAbsolutePath());
dict.put("object_file", objectFile.getAbsolutePath()); dict.put("object_file", objectFile.getAbsolutePath());
@ -597,7 +598,7 @@ public class Compiler implements MessageConsumer {
String includes = prepareIncludes(includeFolders); String includes = prepareIncludes(includeFolders);
PreferencesMap dict = new PreferencesMap(prefs); PreferencesMap dict = new PreferencesMap(prefs);
dict.put("ide_version", "" + Base.REVISION); dict.put("ide_version", "" + BaseNoGui.REVISION);
dict.put("includes", includes); dict.put("includes", includes);
dict.put("source_file", sourceFile.getAbsolutePath()); dict.put("source_file", sourceFile.getAbsolutePath());
dict.put("object_file", objectFile.getAbsolutePath()); dict.put("object_file", objectFile.getAbsolutePath());
@ -616,7 +617,7 @@ public class Compiler implements MessageConsumer {
String includes = prepareIncludes(includeFolders); String includes = prepareIncludes(includeFolders);
PreferencesMap dict = new PreferencesMap(prefs); PreferencesMap dict = new PreferencesMap(prefs);
dict.put("ide_version", "" + Base.REVISION); dict.put("ide_version", "" + BaseNoGui.REVISION);
dict.put("includes", includes); dict.put("includes", includes);
dict.put("source_file", sourceFile.getAbsolutePath()); dict.put("source_file", sourceFile.getAbsolutePath());
dict.put("object_file", objectFile.getAbsolutePath()); dict.put("object_file", objectFile.getAbsolutePath());
@ -778,7 +779,7 @@ public class Compiler implements MessageConsumer {
for (File file : coreObjectFiles) { for (File file : coreObjectFiles) {
PreferencesMap dict = new PreferencesMap(prefs); 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("archive_file", afile.getName());
dict.put("object_file", file.getAbsolutePath()); dict.put("object_file", file.getAbsolutePath());
@ -819,7 +820,7 @@ public class Compiler implements MessageConsumer {
dict.put("compiler.c.elf.flags", flags); dict.put("compiler.c.elf.flags", flags);
dict.put("archive_file", "core.a"); dict.put("archive_file", "core.a");
dict.put("object_files", objectFileList); dict.put("object_files", objectFileList);
dict.put("ide_version", "" + Base.REVISION); dict.put("ide_version", "" + BaseNoGui.REVISION);
String[] cmdArray; String[] cmdArray;
try { try {
@ -834,7 +835,7 @@ public class Compiler implements MessageConsumer {
// 5. extract EEPROM data (from EEMEM directive) to .eep file. // 5. extract EEPROM data (from EEMEM directive) to .eep file.
void compileEep() throws RunnerException { void compileEep() throws RunnerException {
PreferencesMap dict = new PreferencesMap(prefs); PreferencesMap dict = new PreferencesMap(prefs);
dict.put("ide_version", "" + Base.REVISION); dict.put("ide_version", "" + BaseNoGui.REVISION);
String[] cmdArray; String[] cmdArray;
try { try {
@ -849,7 +850,7 @@ public class Compiler implements MessageConsumer {
// 6. build the .hex file // 6. build the .hex file
void compileHex() throws RunnerException { void compileHex() throws RunnerException {
PreferencesMap dict = new PreferencesMap(prefs); PreferencesMap dict = new PreferencesMap(prefs);
dict.put("ide_version", "" + Base.REVISION); dict.put("ide_version", "" + BaseNoGui.REVISION);
String[] cmdArray; String[] cmdArray;
try { try {