Merge pull request #4300 from gohai/arm-updates

Grab bag of smaller, mainly ARM-related updates
processing · Feb 14, 2016 · 3d96f87 · 3d96f87
2 parents 4b43d96 + 40c7628
commit 3d96f87
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -36,16 +36,7 @@
   <target name="check-linux-arm32" if="linux-arm32">
     <!-- there is currently no JRE available -->
     <property name="jre.download.jdk" value="true" />
-    <!-- temporary special case since the URL changed between 8u51 and 8u60 -->
-    <condition property="jre.downloader" value="linux-arm-vfp-hflt.tar.gz">
-      <equals arg1="${jdk.update}" arg2="51" />
-    </condition>
-    <condition property="jre.downloader" value="linux-arm32-vfp-hflt.tar.gz">
-      <not>
-        <equals arg1="${jdk.update}" arg2="51" />
-      </not>
-    </condition>
-    <!-- <property name="jre.downloader" value="linux-arm32-vfp-hflt.tar.gz" /> -->
+    <property name="jre.downloader" value="linux-arm32-vfp-hflt.tar.gz" />
     <property name="linux.dist" value="linux/processing-${version}-linux-armv6hf.tgz" />
   </target>
 
@@ -940,6 +931,8 @@
    <move file="linux/work" tofile="linux/debian/opt/processing" />
    <symlink link="linux/debian/usr/bin/processing" 
             resource="../../opt/processing/processing" />
+   <symlink link="linux/debian/usr/bin/processing-java"
+            resource="../../opt/processing/processing-java" />
 
    <!-- place .desktop and .sharedmimeinfo file -->
    <copy file="linux/processing.desktop" 
@@ -954,8 +947,15 @@
          tofile="linux/debian/usr/share/mime/packages/processing.xml" />
 
    <!-- Set properties for DEBIAN/control file -->
+   <condition property="linux.deb" value="linux/processing-${version}-linux-armv6hf.deb">
+     <equals arg1="linux-arm32" arg2="linux-arm32" />
+   </condition>
    <property name="linux.deb" value="linux/processing-${version}-linux${sun.arch.data.model}.deb" />
 
+   <!-- Raspbian seems to borrow armhf for armv6hf, so this works -->
+   <condition property="deb.arch" value="armhf">
+     <equals arg1="linux-arm32" arg2="linux-arm32" />
+   </condition>
    <condition property="deb.arch" value="i386"> 
      <equals arg1="${sun.arch.data.model}" arg2="32" />
    </condition>

diff --git a/build/linux/processing.desktop b/build/linux/processing.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=@version@ 
 Name=Processing 
-Comment=graphics and animation language 
+Comment=Software sketchbook
 Exec=processing %F
 Icon=/opt/processing/lib/icons/pde-256.png
 Terminal=false

diff --git a/java/libraries/io/examples/I2CCompass/I2CCompass.pde b/java/libraries/io/examples/I2CCompass/I2CCompass.pde
@@ -3,6 +3,7 @@ I2C i2c;
 
 // HMC6352 is a digital compass module using I2C
 // datasheet: https://www.sparkfun.com/datasheets/Components/HMC6352.pdf
+// see setup.png in the sketch folder for wiring details
 
 void setup() {
   //printArray(I2C.list());

diff --git a/java/libraries/io/examples/Interrupt/Interrupt.pde b/java/libraries/io/examples/Interrupt/Interrupt.pde
@@ -3,6 +3,7 @@ color bgcolor = 0;
 
 // GPIO numbers refer to different phyiscal pins on various boards
 // On the Raspberry Pi GPIO 4 is physical pin 7 on the header
+// see setup.png in the sketch folder for wiring details
 
 void setup() {
   GPIO.pinMode(4, GPIO.INPUT);

diff --git a/java/libraries/io/examples/SPIAnalogDigital/SPIAnalogDigital.pde b/java/libraries/io/examples/SPIAnalogDigital/SPIAnalogDigital.pde
@@ -3,6 +3,7 @@ SPI spi;
 
 // MCP3001 is a Analog-to-Digital converter using SPI
 // datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21293C.pdf
+// see setup.png in the sketch folder for wiring details
 
 void setup() {
   //printArray(SPI.list());

diff --git a/java/libraries/io/examples/SPIAnalogDigitalOOP/SPIAnalogDigitalOOP.pde b/java/libraries/io/examples/SPIAnalogDigitalOOP/SPIAnalogDigitalOOP.pde
@@ -1,6 +1,8 @@
 import processing.io.*;
 MCP3001 adc;
 
+// see setup.png in the sketch folder for wiring details
+
 void setup() {
   //printArray(SPI.list());
   adc = new MCP3001(SPI.list()[0]);

diff --git a/java/libraries/io/examples/SimpleInput/SimpleInput.pde b/java/libraries/io/examples/SimpleInput/SimpleInput.pde
@@ -2,6 +2,7 @@ import processing.io.*;
 
 // GPIO numbers refer to different phyiscal pins on various boards
 // On the Raspberry Pi GPIO 4 is physical pin 7 on the header
+// see setup.png in the sketch folder for wiring details
 
 void setup() {
   GPIO.pinMode(4, GPIO.INPUT);

diff --git a/java/libraries/io/examples/SimpleOutput/SimpleOutput.pde b/java/libraries/io/examples/SimpleOutput/SimpleOutput.pde
@@ -3,6 +3,7 @@ boolean ledOn = false;
 
 // GPIO numbers refer to different phyiscal pins on various boards
 // On the Raspberry Pi GPIO 4 is physical pin 7 on the header
+// see setup.png in the sketch folder for wiring details
 
 void setup() {
   GPIO.pinMode(4, GPIO.OUTPUT);