Skip to content

Commit 4d3a9a4

Browse files
committed
Revert "removing old rxtx references"
This reverts commit 719f79c.
1 parent e605623 commit 4d3a9a4

File tree

7 files changed

+8
-3
lines changed

7 files changed

+8
-3
lines changed

build/build.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<include name="app/pde.jar" />
2727
<include name="app/lib/ecj.jar" />
2828
<include name="app/lib/jna.jar" />
29-
<include name="app/lib/jssc.jar" />
29+
<include name="app/lib/RXTXcomm.jar" />
3030
<include name="app/lib/ant.jar" />
3131
<include name="app/lib/ant-launcher.jar" />
3232
</fileset>
@@ -448,6 +448,10 @@
448448
<fileset file="shared/revisions.txt" />
449449
</copy>
450450

451+
<copy todir="linux/work">
452+
<fileset dir="linux/dist" includes="lib/**" />
453+
</copy>
454+
451455
<copy todir="linux/work/lib" flatten="true">
452456
<fileset refid="runtime.jars" />
453457
</copy>
@@ -485,6 +489,7 @@
485489

486490
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
487491
<copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
492+
<copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
488493

489494
<chmod perm="755" file="linux/work/hardware/tools/avrdude" />
490495

build/linux/dist/lib/librxtxSerial.so

146 KB
Binary file not shown.
199 KB
Binary file not shown.

build/macosx/template.app/Contents/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<!-- In 0149, removed /System/Library/Java from the CLASSPATH because
7777
it can cause problems if users have installed weird files there.
7878
http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
79-
<string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/jssc.jar</string>
79+
<string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/RXTXcomm.jar</string>
8080

8181
<key>JVMArchs</key>
8282
<array>
Binary file not shown.

build/windows/dist/rxtxSerial.dll

34.5 KB
Binary file not shown.

build/windows/launcher/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<cp>lib/core.jar</cp>
2020
<cp>lib/jna.jar</cp>
2121
<cp>lib/ecj.jar</cp>
22-
<cp>lib/jssc.jar</cp>
22+
<cp>lib/RXTXcomm.jar</cp>
2323
<cp>lib/commons-exec-1.1.jar</cp>
2424
</classPath>
2525
<jre>

0 commit comments

Comments
 (0)