dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

--- arduino-1.0.1/build/build.xml	2012-04-09 00:16:12.000000000 +0100
+++ arduino-1.0.1/build/build.xml	2012-06-25 06:12:09.000000000 +0100
@@ -24,9 +24,9 @@
   <fileset dir=".." id="runtime.jars">
     <include name="core/core.jar" />
     <include name="app/pde.jar" />
-    <include name="app/lib/ecj.jar" />
+<!--    <include name="app/lib/ecj.jar" /> -->
     <include name="app/lib/jna.jar" />
-    <include name="app/lib/RXTXcomm.jar" />
+<!--    <include name="app/lib/RXTXcomm.jar" /> -->
     <include name="app/lib/ant.jar" />
     <include name="app/lib/ant-launcher.jar" />
   </fileset>
@@ -361,16 +361,18 @@
   </target>
 
   <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
-    <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
-    <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
+<!--    <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />      -->
+<!--    <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" /> -->
 
-    <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
+<!--    <chmod perm="755" file="linux/work/hardware/tools/avrdude" /> -->
 
     <!-- Unzip AVR tools -->
-    <exec executable="tar" dir="linux/work/hardware">
+<!-- Removed by Paulj - use system installed instead -->
+<!--    <exec executable="tar" dir="linux/work/hardware">
       <arg value="-xjf"/>
       <arg value="../../avr_tools_linux64.tar.bz2"/>
-    </exec>
+    </exec> 
+-->
   </target>
   
   <target name="linux32-run" depends="linux32-build"