Merge pull request energia#62 from energia/issue_62

Add -DENERGIA=101 Pre-Processor Option for gcc and g++

Author: Rei Vilo

app/src/processing/app/Base.java

@@ -42,7 +42,7 @@
  * files and images, etc) that comes from that.
  */
 public class Base {
-  public static final int REVISION = 101;
+  public static final int REVISION = 6;
   /** This might be replaced by main() if there's a lib/version.txt file. */
   static String VERSION_NAME = "0101E0006";
   /** Set true if this a proper release rather than a numbered revision. */

app/src/processing/app/debug/Compiler.java

@@ -578,7 +578,7 @@ static private List getCommandCompilerS(String basePath, List includePaths,
           "-g", // include debugging info (so errors include line numbers)
           "-mmcu=" + boardPreferences.get("build.mcu"),
           "-DF_CPU=" + boardPreferences.get("build.f_cpu"),
-          "-DARDUINO=" + Base.REVISION,
+          "-DENERGIA=" + Base.REVISION,
         }));
     } else {
         baseCommandCompiler = new ArrayList(Arrays.asList(new String[] {
@@ -619,7 +619,7 @@ static private List getCommandCompilerC(String basePath, List includePaths,
         "-fdata-sections",
         "-mmcu=" + boardPreferences.get("build.mcu"),
         "-DF_CPU=" + boardPreferences.get("build.f_cpu"),
-        "-DARDUINO=" + Base.REVISION,
+        "-DENERGIA=" + Base.REVISION,
       }));
       } else { // default to avr
         baseCommandCompiler = new ArrayList(Arrays.asList(new String[] {
@@ -666,7 +666,7 @@ static private List getCommandCompilerCPP(String basePath,
         "-fdata-sections",
         "-mmcu=" + boardPreferences.get("build.mcu"),
         "-DF_CPU=" + boardPreferences.get("build.f_cpu"),
-        "-DARDUINO=" + Base.REVISION,
+        "-DENERGIA=" + Base.REVISION,
       }));
     } else { // default to avr
       baseCommandCompilerCPP = new ArrayList(Arrays.asList(new String[] {