8

- replaced RXTX with JSSC - updated start bat and command files
MarginallyClever · Jul 1, 2014 · 7d908e9 · 7d908e9
1 parent dbd484d
commit 7d908e9
Show file tree

Hide file tree

Showing 45 changed files with 5 additions and 19 deletions.
diff --git a/.classpath b/.classpath
@@ -2,9 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="lib" path="java/libs/jSSC-2.6.0-Release/jssc.jar" sourcepath="java/libs/jSSC-2.6.0-Release/src">
+	<classpathentry kind="lib" path="/Users/danroyer/Documents/workspace/GcodeSender/libs/jSSC-2.6.0-Release/jssc.jar" sourcepath="libs/jSSC-2.6.0-Release/src/jssc-2.6.0-src.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/GcodeSender/java/libs/jSSC-2.6.0-Release/javadoc/jssc-2.6.0-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/GcodeSender/libs/jSSC-2.6.0-Release/javadoc/jssc-2.6.0-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="bin"/>

diff --git a/bin/rxtxnative/Linux/i686-unknown-linux-gnu/librxtxParallel.so b/bin/rxtxnative/Linux/i686-unknown-linux-gnu/librxtxParallel.so
diff --git a/bin/rxtxnative/Linux/i686-unknown-linux-gnu/librxtxSerial.so b/bin/rxtxnative/Linux/i686-unknown-linux-gnu/librxtxSerial.so
diff --git a/bin/rxtxnative/Linux/ia64-unkown-linux-gnu/librxtxSerial.so b/bin/rxtxnative/Linux/ia64-unkown-linux-gnu/librxtxSerial.so
diff --git a/bin/rxtxnative/Linux/x86_64-unknown-linux-gnu/librxtxSerial.so b/bin/rxtxnative/Linux/x86_64-unknown-linux-gnu/librxtxSerial.so
diff --git a/bin/rxtxnative/Mac_OS_X/README b/bin/rxtxnative/Mac_OS_X/README
diff --git a/bin/rxtxnative/Mac_OS_X/librxtxSerial.jnilib b/bin/rxtxnative/Mac_OS_X/librxtxSerial.jnilib
diff --git a/bin/rxtxnative/Solaris/sparc-solaris/sparc32-sun-solaris2.8/librxtxSerial-2.1-7.so b/bin/rxtxnative/Solaris/sparc-solaris/sparc32-sun-solaris2.8/librxtxSerial-2.1-7.so
diff --git a/bin/rxtxnative/Solaris/sparc-solaris/sparc32-sun-solaris2.8/librxtxSerial.so b/bin/rxtxnative/Solaris/sparc-solaris/sparc32-sun-solaris2.8/librxtxSerial.so
diff --git a/bin/rxtxnative/Solaris/sparc-solaris/sparc64-sun-solaris2.8/librxtxSerial-2.1-7.so b/bin/rxtxnative/Solaris/sparc-solaris/sparc64-sun-solaris2.8/librxtxSerial-2.1-7.so
diff --git a/bin/rxtxnative/Solaris/sparc-solaris/sparc64-sun-solaris2.8/librxtxSerial.so b/bin/rxtxnative/Solaris/sparc-solaris/sparc64-sun-solaris2.8/librxtxSerial.so
diff --git a/bin/rxtxnative/Windows/i368-mingw32/README b/bin/rxtxnative/Windows/i368-mingw32/README
diff --git a/bin/rxtxnative/Windows/i368-mingw32/rxtxParallel.dll b/bin/rxtxnative/Windows/i368-mingw32/rxtxParallel.dll
diff --git a/bin/rxtxnative/Windows/i368-mingw32/rxtxSerial.dll b/bin/rxtxnative/Windows/i368-mingw32/rxtxSerial.dll
diff --git a/bin/rxtxnative/Windows/x64/RXTXcomm.jar b/bin/rxtxnative/Windows/x64/RXTXcomm.jar
diff --git a/bin/rxtxnative/Windows/x64/rxtxParallel.dll b/bin/rxtxnative/Windows/x64/rxtxParallel.dll
diff --git a/bin/rxtxnative/Windows/x64/rxtxSerial.dll b/bin/rxtxnative/Windows/x64/rxtxSerial.dll
diff --git a/java/start.command b/java/start.command
@@ -9,4 +9,4 @@ SOURCE="$(readlink "$SOURCE")"
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-java -classpath "$DIR/RXTXcomm.jar" -Djava.library.path="$DIR" -jar "$DIR/GcodeSender.jar"
+java -jar "$DIR/GcodeSender.jar"
diff --git a/java/start32.bat b/java/start32.bat
@@ -17,7 +17,7 @@ if defined JAVA_HOME (
   goto end
 )
 
-"%JAVA_HOME%\bin\java.exe" -classpath RXTXcomm.jar -Djava.library.path=32 -jar Makelangelo.jar
+"%JAVA_HOME%\bin\java.exe"  -jar Makelangelo.jar
 
 :end
 @pause
diff --git a/java/start64.bat b/java/start64.bat
@@ -17,7 +17,7 @@ if defined JAVA_HOME (
   goto end
 )
 
-"%JAVA_HOME%\bin\java.exe" -classpath RXTXcomm.jar -Djava.library.path=64 -jar Makelangelo.jar
+"%JAVA_HOME%\bin\java.exe" -jar Makelangelo.jar
 
 :end
 @pause
diff --git a/java/libs/jSSC-2.6.0-Release/COPYING → libs/jSSC-2.6.0-Release/COPYING b/java/libs/jSSC-2.6.0-Release/COPYING → libs/jSSC-2.6.0-Release/COPYING
diff --git a/java/libs/jSSC-2.6.0-Release/COPYING.LESSER → libs/jSSC-2.6.0-Release/COPYING.LESSER b/java/libs/jSSC-2.6.0-Release/COPYING.LESSER → libs/jSSC-2.6.0-Release/COPYING.LESSER
diff --git a/java/libs/jSSC-2.6.0-Release/README.txt → libs/jSSC-2.6.0-Release/README.txt b/java/libs/jSSC-2.6.0-Release/README.txt → libs/jSSC-2.6.0-Release/README.txt
diff --git a/....0-Release/javadoc/jssc-2.6.0-javadoc.jar → ....0-Release/javadoc/jssc-2.6.0-javadoc.jar b/....0-Release/javadoc/jssc-2.6.0-javadoc.jar → ....0-Release/javadoc/jssc-2.6.0-javadoc.jar
diff --git a/java/libs/jSSC-2.6.0-Release/jssc.jar → libs/jSSC-2.6.0-Release/jssc.jar b/java/libs/jSSC-2.6.0-Release/jssc.jar → libs/jSSC-2.6.0-Release/jssc.jar
diff --git a/...2.6.0-Release/src/cpp/_nix_based/jssc.cpp → ...2.6.0-Release/src/cpp/_nix_based/jssc.cpp b/...2.6.0-Release/src/cpp/_nix_based/jssc.cpp → ...2.6.0-Release/src/cpp/_nix_based/jssc.cpp
diff --git a/...ease/src/cpp/jssc_SerialNativeInterface.h → ...ease/src/cpp/jssc_SerialNativeInterface.h b/...ease/src/cpp/jssc_SerialNativeInterface.h → ...ease/src/cpp/jssc_SerialNativeInterface.h
diff --git a/...SC-2.6.0-Release/src/cpp/windows/jssc.c++ → ...SC-2.6.0-Release/src/cpp/windows/jssc.c++ b/...SC-2.6.0-Release/src/cpp/windows/jssc.c++ → ...SC-2.6.0-Release/src/cpp/windows/jssc.c++
diff --git a/...jSSC-2.6.0-Release/src/jssc-2.6.0-src.jar → ...jSSC-2.6.0-Release/src/jssc-2.6.0-src.jar b/...jSSC-2.6.0-Release/src/jssc-2.6.0-src.jar → ...jSSC-2.6.0-Release/src/jssc-2.6.0-src.jar
diff --git a/src/rxtxnative/Linux/i686-unknown-linux-gnu/librxtxParallel.so b/src/rxtxnative/Linux/i686-unknown-linux-gnu/librxtxParallel.so
diff --git a/src/rxtxnative/Linux/i686-unknown-linux-gnu/librxtxSerial.so b/src/rxtxnative/Linux/i686-unknown-linux-gnu/librxtxSerial.so
diff --git a/src/rxtxnative/Linux/ia64-unkown-linux-gnu/librxtxSerial.so b/src/rxtxnative/Linux/ia64-unkown-linux-gnu/librxtxSerial.so
diff --git a/src/rxtxnative/Linux/x86_64-unknown-linux-gnu/librxtxSerial.so b/src/rxtxnative/Linux/x86_64-unknown-linux-gnu/librxtxSerial.so
diff --git a/src/rxtxnative/Mac_OS_X/README b/src/rxtxnative/Mac_OS_X/README
diff --git a/src/rxtxnative/Mac_OS_X/librxtxSerial.jnilib b/src/rxtxnative/Mac_OS_X/librxtxSerial.jnilib
diff --git a/src/rxtxnative/Solaris/sparc-solaris/sparc32-sun-solaris2.8/librxtxSerial-2.1-7.so b/src/rxtxnative/Solaris/sparc-solaris/sparc32-sun-solaris2.8/librxtxSerial-2.1-7.so
diff --git a/src/rxtxnative/Solaris/sparc-solaris/sparc32-sun-solaris2.8/librxtxSerial.so b/src/rxtxnative/Solaris/sparc-solaris/sparc32-sun-solaris2.8/librxtxSerial.so
diff --git a/src/rxtxnative/Solaris/sparc-solaris/sparc64-sun-solaris2.8/librxtxSerial-2.1-7.so b/src/rxtxnative/Solaris/sparc-solaris/sparc64-sun-solaris2.8/librxtxSerial-2.1-7.so
diff --git a/src/rxtxnative/Solaris/sparc-solaris/sparc64-sun-solaris2.8/librxtxSerial.so b/src/rxtxnative/Solaris/sparc-solaris/sparc64-sun-solaris2.8/librxtxSerial.so
diff --git a/src/rxtxnative/Windows/i368-mingw32/README b/src/rxtxnative/Windows/i368-mingw32/README
diff --git a/src/rxtxnative/Windows/i368-mingw32/rxtxParallel.dll b/src/rxtxnative/Windows/i368-mingw32/rxtxParallel.dll
diff --git a/src/rxtxnative/Windows/i368-mingw32/rxtxSerial.dll b/src/rxtxnative/Windows/i368-mingw32/rxtxSerial.dll
diff --git a/src/rxtxnative/Windows/x64/RXTXcomm.jar b/src/rxtxnative/Windows/x64/RXTXcomm.jar
diff --git a/src/rxtxnative/Windows/x64/rxtxParallel.dll b/src/rxtxnative/Windows/x64/rxtxParallel.dll
diff --git a/src/rxtxnative/Windows/x64/rxtxSerial.dll b/src/rxtxnative/Windows/x64/rxtxSerial.dll