arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

Removed duplicate version fields in Base class

Browse Source
This commit is contained in:
Cristian Maglie
2014-11-18 14:04:14 +01:00
parent 13fd27704f
commit b0bd52b387
6 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -41,11 +41,10 @@ import processing.app.packages.LibraryList;
public class BaseNoGui {
/** Version string to be used for build */
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;
/** Extended version string displayed on GUI */
static String VERSION_NAME = "1.5.8";
static File buildFolder;
@ -608,19 +607,6 @@ public class BaseNoGui {
}
static public void initVersion() {
try {
File versionFile = getContentFile("lib/version.txt");
if (versionFile.exists()) {
String version = PApplet.loadStrings(versionFile)[0];
if (!version.equals(VERSION_NAME) && !version.equals("${version}")) {
VERSION_NAME = version;
RELEASE = true;
}
}
} catch (Exception e) {
e.printStackTrace();
}
// help 3rd party installers find the correct hardware path
PreferencesData.set("last.ide." + VERSION_NAME + ".hardwarepath", getHardwarePath());
PreferencesData.set("last.ide." + VERSION_NAME + ".daterun", "" + (new Date()).getTime() / 1000);