From e8c4980c4eb78ae182c00af721a34fb26a4a7433 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Mon, 11 May 2015 10:48:52 +0200
Subject: [PATCH] Added BaseNoGui.VERSION_NAME_LONG: it includes "Hourly Build
 DATE" in case of a hourly build

---
 app/src/processing/app/Base.java              |  2 +-
 app/src/processing/app/Editor.java            |  4 +---
 app/src/processing/app/EditorStatus.java      |  2 +-
 .../src/processing/app/BaseNoGui.java         | 17 ++++++++++++-
 build/build.xml                               | 24 +++++++++++++------
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index d5c4f69ac..653855de2 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -1787,7 +1787,7 @@ public class Base {
 
         g.setFont(new Font("SansSerif", Font.PLAIN, 11));
         g.setColor(Color.white);
-        g.drawString(BaseNoGui.VERSION_NAME, 33, 20);
+        g.drawString(BaseNoGui.VERSION_NAME_LONG, 33, 20);
       }
     };
     window.addMouseListener(new MouseAdapter() {
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 91e72d938..0e02270fe 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -2297,9 +2297,7 @@ public class Editor extends JFrame implements RunnerListener {
       return false;
     }
     header.rebuild();
-    // Set the title of the window to "sketch_070752a - Processing 0126"
-    setTitle(I18n.format(_("{0} | Arduino {1}"), sketch.getName(),
-                         BaseNoGui.VERSION_NAME));
+    setTitle(I18n.format(_("{0} | Arduino {1}"), sketch.getName(), BaseNoGui.VERSION_NAME_LONG));
     // Disable untitled setting from previous document, if any
     untitled = false;
 
diff --git a/app/src/processing/app/EditorStatus.java b/app/src/processing/app/EditorStatus.java
index 6d715fc8c..82abf3aa2 100644
--- a/app/src/processing/app/EditorStatus.java
+++ b/app/src/processing/app/EditorStatus.java
@@ -464,7 +464,7 @@ public class EditorStatus extends JPanel /*implements ActionListener*/ {
       copyErrorButton.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           String message = "";
-          message += _("Arduino: ") + BaseNoGui.VERSION_NAME + " (" + System.getProperty("os.name") + "), ";
+          message += _("Arduino: ") + BaseNoGui.VERSION_NAME_LONG + " (" + System.getProperty("os.name") + "), ";
           message += _("Board: ") + "\"" + Base.getBoardPreferences().get("name") + "\"\n\n";
           message += editor.console.consoleTextPane.getText().trim();
           if ((PreferencesData.getBoolean("build.verbose")) == false) {
diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java
index dde4ba9f4..da2fcfdd9 100644
--- a/arduino-core/src/processing/app/BaseNoGui.java
+++ b/arduino-core/src/processing/app/BaseNoGui.java
@@ -32,7 +32,22 @@ public class BaseNoGui {
   /** Version string to be used for build */
   public static final int REVISION = 10605;
   /** Extended version string displayed on GUI */
-  static String VERSION_NAME = "1.6.5";
+  public static final String VERSION_NAME = "1.6.5";
+  public static final String VERSION_NAME_LONG;
+
+  static {
+    String versionNameLong = VERSION_NAME;
+    File hourlyBuildTxt = new File(getContentFile("lib"), "hourlyBuild.txt");
+    if (hourlyBuildTxt.exists() && hourlyBuildTxt.canRead()) {
+      versionNameLong += " Hourly Build";
+      try {
+        versionNameLong += " " + FileUtils.readFileToString(hourlyBuildTxt).trim();
+      } catch (IOException e) {
+        //noop
+      }
+    }
+    VERSION_NAME_LONG = versionNameLong;
+  }
 
   static File buildFolder;
 
diff --git a/build/build.xml b/build/build.xml
index 940a6cf60..49840c501 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -4,6 +4,10 @@
   <!--echo message="os.arch = ${os.arch}" /-->
   <!--echo message="os.version = ${os.version}" /-->
 
+  <tstamp>
+    <format property="BUILD_DATE" pattern="yyyy/MM/dd hh:mm"/>
+  </tstamp>
+
   <!-- Sets properties for macosx/windows/linux depending on current system -->
   <condition property="platform" value="macosx-old">
     <and>
@@ -59,6 +63,8 @@
 
   <target name="build" description="Build Arduino.">
     <antcall target="${platform}-build" />
+
+    <antcall target="generate-hourly-build-txt"/>
   </target>
 
   <target name="run" description="Run Arduino.">
@@ -385,7 +391,7 @@
     <antcall target="macosx-run-common"/>
   </target>
 
-  <target name="macosx-run" depends="macosx-build" description="Run Mac OS X version">
+  <target name="macosx-run" depends="build" description="Run Mac OS X version">
     <antcall target="macosx-run-common"/>
   </target>
 
@@ -393,7 +399,7 @@
     <antcall target="macosx-debug-common"/>
   </target>
 
-  <target name="macosx-debug" depends="macosx-build" description="Run Mac OS X version">
+  <target name="macosx-debug" depends="build" description="Run Mac OS X version">
     <antcall target="macosx-debug-common"/>
   </target>
 
@@ -468,7 +474,7 @@
     <antcall target="macosx-dist-common"/>
   </target>
 
-  <target name="macosx-dist" if="macosx" depends="macosx-build" description="Create a downloadable .zip for the Mac OS X version">
+  <target name="macosx-dist" if="macosx" depends="build" description="Create a downloadable .zip for the Mac OS X version">
     <antcall target="macosx-dist-common"/>
   </target>
 
@@ -637,11 +643,11 @@
     <antcall target="package-library-index-json-bundle"/>
   </target>
 
-  <target name="linux32-run" depends="linux32-build" description="Run Linux (32-bit) version">
+  <target name="linux32-run" depends="build" description="Run Linux (32-bit) version">
     <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
   </target>
 
-  <target name="linux64-run" depends="linux64-build" description="Run Linux (64-bit) version">
+  <target name="linux64-run" depends="build" description="Run Linux (64-bit) version">
     <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
   </target>
 
@@ -858,12 +864,12 @@
     <antcall target="package-library-index-json-bundle"/>
   </target>
 
-  <target name="windows-run" depends="windows-build"
+  <target name="windows-run" depends="build"
 	  description="Run windows version">
     <exec executable="windows/work/arduino.exe" dir="windows/work" spawn="true" failonerror="true"/>
   </target>
 
-  <target name="windows-dist" depends="windows-build" description="Create .zip files of windows version">
+  <target name="windows-dist" depends="build" description="Create .zip files of windows version">
 
     <loadproperties srcfile="${WINDOWS_BUNDLED_JVM}/release" prefix="windows"/>
 
@@ -989,4 +995,8 @@
     </exec>
   </target>
 
+  <target name="generate-hourly-build-txt" if="hourly">
+    <echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
+  </target>
+
 </project>