Skip to content

Commit 4b3717b

Browse files
author
Federico Fissore
committed
jssc: updated config files (eclipse, ant build.xml, windows launcher, mac template.app), removed rxtx binaries
1 parent f334e67 commit 4b3717b

File tree

11 files changed

+7
-8
lines changed

11 files changed

+7
-8
lines changed

.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<classpathentry kind="lib" path="app/lib/apple.jar"/>
99
<classpathentry kind="lib" path="app/lib/ecj.jar"/>
1010
<classpathentry kind="lib" path="app/lib/jna.jar"/>
11-
<classpathentry kind="lib" path="app/lib/RXTXcomm.jar"/>
11+
<classpathentry kind="lib" path="app/lib/jssc-2.6.0.jar"/>
1212
<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
1313
<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
1414
<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>

app/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<classpathentry kind="lib" path="lib/ecj.jar"/>
88
<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
99
<classpathentry kind="lib" path="lib/apple.jar"/>
10-
<classpathentry kind="lib" path="lib/RXTXcomm.jar"/>
10+
<classpathentry kind="lib" path="lib/jssc-2.6.0.jar"/>
1111
<classpathentry kind="output" path="bin"/>
1212
</classpath>

app/run-linux.launch

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-openjdk-amd64&quot; javaProject=&quot;processing&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
1111
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/processing/lib/ecj.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
1212
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/processing/lib/jna.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
13-
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/processing/lib/RXTXcomm.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
13+
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/processing/lib/jssc-2.6.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
1414
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;processing-core&quot; type=&quot;1&quot;/&gt;&#10;"/>
1515
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;processing&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
1616
</listAttribute>

build/build.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<include name="app/lib/jmdns-3.4.1.jar" />
4747
<include name="app/lib/jna.jar" />
4848
<include name="app/lib/jsch-0.1.50.jar" />
49-
<include name="app/lib/RXTXcomm.jar" />
49+
<include name="app/lib/jssc-2.6.0.jar" />
5050
<include name="app/lib/ant.jar" />
5151
<include name="app/lib/ant-launcher.jar" />
5252
</fileset>
@@ -500,7 +500,6 @@
500500

501501
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
502502
<copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
503-
<copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
504503

505504
<chmod perm="755" file="linux/work/hardware/tools/avrdude" />
506505

build/javadoc/make.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ javadoc -public -notimestamp -d core \
99
# setting this up right, so if anyone knows how to do it without specifying
1010
# all the directories like this, please let us know.
1111
javadoc -public -notimestamp -d everything \
12-
-classpath ../../app/lib/antlr.jar:../../app/lib/jna.jar:../../serial/library/RXTXcomm.jar:../../opengl/library/jogl.jar:../../pdf/library/itext.jar:../../app/lib/ecj.jar \
12+
-classpath ../../app/lib/antlr.jar:../../app/lib/jna.jar:../../serial/library/jssc-2.6.0.jar:../../opengl/library/jogl.jar:../../pdf/library/itext.jar:../../app/lib/ecj.jar \
1313
../../core/src/processing/core/*.java \
1414
../../core/src/processing/xml/*.java \
1515
../../app/src/antlr/*.java \

build/linux/dist/lib/librxtxSerial.so

-47.2 KB
Binary file not shown.
-213 KB
Binary file not shown.

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

+1-1
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/RXTXcomm.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jsch-0.1.50.jar</string>
79+
<string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/jssc-2.6.0.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jsch-0.1.50.jar</string>
8080

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

build/windows/dist/rxtxSerial.dll

-107 KB
Binary file not shown.

build/windows/launcher/config.xml

+1-1
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/RXTXcomm.jar</cp>
22+
<cp>lib/jssc-2.6.0.jar</cp>
2323
<cp>lib/commons-codec-1.7.jar</cp>
2424
<cp>lib/commons-exec-1.1.jar</cp>
2525
<cp>lib/commons-httpclient-3.1.jar</cp>

0 commit comments

Comments
 (0)