diff --git a/.classpath b/.classpath index b8b692edb..f65105e13 100644 --- a/.classpath +++ b/.classpath @@ -8,7 +8,7 @@ - + diff --git a/app/.classpath b/app/.classpath index 4589f3f47..3d6d26edf 100644 --- a/app/.classpath +++ b/app/.classpath @@ -7,6 +7,6 @@ - + diff --git a/app/run-linux.launch b/app/run-linux.launch index ba150a694..9ad239a8b 100644 --- a/app/run-linux.launch +++ b/app/run-linux.launch @@ -10,7 +10,7 @@ - + diff --git a/build/build.xml b/build/build.xml index 077cf833a..4a8992229 100644 --- a/build/build.xml +++ b/build/build.xml @@ -46,7 +46,7 @@ - + @@ -500,7 +500,6 @@ - diff --git a/build/javadoc/make.sh b/build/javadoc/make.sh index d0532e1c3..1dbc46ce6 100755 --- a/build/javadoc/make.sh +++ b/build/javadoc/make.sh @@ -9,7 +9,7 @@ javadoc -public -notimestamp -d core \ # setting this up right, so if anyone knows how to do it without specifying # all the directories like this, please let us know. javadoc -public -notimestamp -d everything \ - -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 \ + -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 \ ../../core/src/processing/core/*.java \ ../../core/src/processing/xml/*.java \ ../../app/src/antlr/*.java \ diff --git a/build/linux/dist/lib/librxtxSerial.so b/build/linux/dist/lib/librxtxSerial.so deleted file mode 100644 index d340dcb67..000000000 Binary files a/build/linux/dist/lib/librxtxSerial.so and /dev/null differ diff --git a/build/linux/dist/lib/librxtxSerial64.so b/build/linux/dist/lib/librxtxSerial64.so deleted file mode 100644 index 3db339da9..000000000 Binary files a/build/linux/dist/lib/librxtxSerial64.so and /dev/null differ diff --git a/build/macosx/template.app/Contents/Info.plist b/build/macosx/template.app/Contents/Info.plist index 37d10f1d9..e2ca7d9e2 100755 --- a/build/macosx/template.app/Contents/Info.plist +++ b/build/macosx/template.app/Contents/Info.plist @@ -76,7 +76,7 @@ - $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 + $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 JVMArchs diff --git a/build/macosx/template.app/Contents/Resources/Java/librxtxSerial.jnilib b/build/macosx/template.app/Contents/Resources/Java/librxtxSerial.jnilib deleted file mode 100644 index b15dfa5e8..000000000 Binary files a/build/macosx/template.app/Contents/Resources/Java/librxtxSerial.jnilib and /dev/null differ diff --git a/build/windows/dist/rxtxSerial.dll b/build/windows/dist/rxtxSerial.dll deleted file mode 100644 index a7b2ae8e2..000000000 Binary files a/build/windows/dist/rxtxSerial.dll and /dev/null differ diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml index cad551e2d..358fbcf06 100644 --- a/build/windows/launcher/config.xml +++ b/build/windows/launcher/config.xml @@ -19,7 +19,7 @@ lib/core.jar lib/jna.jar lib/ecj.jar - lib/RXTXcomm.jar + lib/jssc-2.6.0.jar lib/commons-codec-1.7.jar lib/commons-exec-1.1.jar lib/commons-httpclient-3.1.jar