Merge branch 'master' into new-extension

Conflicts:
	app/src/processing/app/Editor.java

Author: damellis

app/src/processing/app/Editor.java

@@ -2292,7 +2292,6 @@ public boolean handleSaveAs() {
 
 
   public boolean serialPrompt() {
-    populateSerialMenu();
     int count = serialMenu.getItemCount();
     Object[] names = new Object[count];
     for (int i = 0; i < count; i++) {
@@ -2357,7 +2356,9 @@ public void run() {
           // error message will already be visible
         }
       } catch (SerialNotFoundException e) {
-        if (serialPrompt()) run();
+        populateSerialMenu();
+        if (serialMenu.getItemCount() == 0) statusError(e);
+        else if (serialPrompt()) run();
         else statusNotice("Upload canceled.");
       } catch (RunnerException e) {
         //statusError("Error during upload.");
@@ -2389,7 +2390,9 @@ public void run() {
           // error message will already be visible
         }
       } catch (SerialNotFoundException e) {
-        if (serialPrompt()) run();
+        populateSerialMenu();
+        if (serialMenu.getItemCount() == 0) statusError(e);
+        else if (serialPrompt()) run();
         else statusNotice("Upload canceled.");
       } catch (RunnerException e) {
         //statusError("Error during upload.");

build/build.xml

@@ -198,6 +198,10 @@
       <arg value="macosx/dist/tools-universal.zip" />
     </exec>
 
+    <copy todir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/include/avr">    
+      <fileset file="macosx/dist/eeprom.h" />
+    </copy>
+
     <antcall target="assemble">
       <param name="target.path" value="macosx/work/Arduino.app/Contents/Resources/Java" />
     </antcall>
@@ -218,7 +222,9 @@
     </exec>
 
     <copy todir="macosx/working_dir">
-      <fileset dir="macosx/work" />
+      <fileset dir="macosx/work">
+        <exclude name="**/ArduinoTestSuite/**" />
+      </fileset>
     </copy>
 
     <!-- The ant copy command does not preserve permissions. -->
@@ -402,6 +408,10 @@
     <!-- Unzip AVR tools -->
     <unzip dest="windows/work/hardware" src="windows/avr_tools.zip" overwrite="false"/>
 
+    <copy todir="windows/work/hardware/tools/avr/avr/include/avr">
+      <fileset file="windows/eeprom.h" />
+    </copy>
+
     <antcall target="assemble">
       <param name="target.path" value="windows/work" />
     </antcall>

build/create_reference.pl

@@ -20,11 +20,12 @@
 
 my $faq = create_page('FAQ.html', "$ARDUINO/Main/FAQ");
 my $env = create_page('environment.html', "$ARDUINO/Main/Environment");
-my $css = create_page('arduino.css', "$ARDUINO/pub/skins/arduino/arduino.css");
+my $css = create_page('arduinoUno.css', "$ARDUINO/pub/skins/arduinoUno/arduinoUno.css");
 my $eeprom = create_page('EEPROM.html', "$ARDUINO/Reference/EEPROM");
 my $stepper = create_page('Stepper.html', "$ARDUINO/Reference/Stepper");
 my $softser = create_page('SoftwareSerial.html', "$ARDUINO/Reference/SoftwareSerial");
 my $wire = create_page('Wire.html', "$ARDUINO/Reference/Wire");
+my $sd = create_page('SD.html', "$ARDUINO/Reference/SD");
 my $servo = create_page('Servo.html', "$ARDUINO/Reference/Servo");
 my $spi = create_page('SPI.html', "$ARDUINO/Reference/SPI");
 my $lcd = create_page('LiquidCrystal.html', "$ARDUINO/Reference/LiquidCrystal");
@@ -38,6 +39,8 @@
 create_linked_pages($stepper, qr!$ARDUINO/Reference/(Stepper\w+)!,        '%%.html');
 create_linked_pages($wire, qr!$ARDUINO/Reference/(Wire\w+)!,        '%%.html');
 create_linked_pages($servo, qr!$ARDUINO/Reference/(Servo\w+)!,        '%%.html');
+create_linked_pages($sd, qr!$ARDUINO/Reference/(SD\w+)!,        '%%.html');
+create_linked_pages($sd, qr!$ARDUINO/Reference/(File\w+)!,        '%%.html');
 create_linked_pages($spi, qr!$ARDUINO/Reference/(SPI\w+)!,        '%%.html');
 create_linked_pages($lcd, qr!$ARDUINO/Reference/(LiquidCrystal\w+)!,        '%%.html');
 create_linked_pages($ethernet, qr!$ARDUINO/Reference/(Ethernet\w+)!,        '%%.html');
@@ -104,7 +107,7 @@ sub localize_page {
   $text =~ s!$ARDUINO/Serial/([^']*)!Serial_$1.html!xg;
 
   # direct pages to the local style file
-  $text =~ s!$ARDUINO/pub/skins/arduino/arduino.css!arduino.css!xg;
+  $text =~ s!$ARDUINO/pub/skins/arduinoUno/arduinoUno.css!arduinoUno.css!xg;
 
   # change links to Main/FAQ to go to FAQ.html 
   $text =~ s!$ARDUINO/Main/FAQ!FAQ.html!xg;

build/fetch.sh

@@ -12,6 +12,9 @@ mkdir reference  || die 'unable to create reference directory'
 cd reference
 perl ../create_reference.pl || die 'unable to create local reference pages'
 
+mkdir img
+curl http://arduino.cc/en/pub/skins/arduinoUno/img/logo.png > img/logo.png
+
 cd ..
 zip -r shared/reference.zip reference || die 'unable to create reference.zip archive'
 

build/linux/dist/arduino

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-APPDIR="$(dirname -- "${0}")"
+APPDIR="$(dirname -- $(readlink -f -- "${0}") )"
 
 cd $APPDIR