Library in jar now

CubeControl/HelperUtility.java

@@ -22,17 +22,81 @@
  */
 
 /**
- * Helper class which runs our native library.
+ * Helper class which runs our native library, which is loaded from inside the Jar.
  * @author Thomas Buck
  * @author Max Nuding
  * @author Felix Bäder
  * @version 1.0
  */
 
+import java.io.*;
+import java.nio.channels.*;
+import java.nio.*;
+
 public class HelperUtility {
 
+	// Load libraries, copy from Jar if needed
+	// Mostly from:
+	// http://stackoverflow.com/questions/1611357/how-to-make-a-jar-file-that-include-dll-files
 	static {
-		System.loadLibrary("Serial");
+		// System.out.println("Loading Serial Library...");
+		loadFromJar();
+	}
+
+	/**
+	 * When packaged into JAR extracts DLLs, places these into
+	 */
+	private static void loadFromJar() {
+		// we need to put DLL to temp dir
+		String os = System.getProperty("os.name").toLowerCase();
+		String path = "CC_";
+		if (os.indexOf("windows") > -1) {
+			loadLib(path, "Serial.dll");
+		} else if (os.indexOf("mac") > -1) {
+			loadLib(path, "libSerial.jnilib");
+		}
+	}
+
+	/**
+	 * Puts library to temp dir and loads to memory
+	 */
+	private static void loadLib(String path, String name) {
+		try {
+			// have to use a stream
+			InputStream in = HelperUtility.class.getResourceAsStream(name);
+			// System.out.println("Input Stream: " + in);
+			File fileOut = new File(System.getProperty("java.io.tmpdir") + "/" + path + name);
+			OutputStream out = new FileOutputStream(fileOut);
+			ReadableByteChannel inChannel = Channels.newChannel(in);
+			WritableByteChannel outChannel = Channels.newChannel(out);
+			fastChannelCopy(inChannel, outChannel);
+			inChannel.close();
+			outChannel.close();
+			System.load(fileOut.toString());
+		} catch (Exception e) {
+			System.out.println("Failed to load Serial Library:");
+			e.printStackTrace();
+		}
+	}
+
+	// http://thomaswabner.wordpress.com/2007/10/09/fast-stream-copy-using-javanio-channels/
+	public static void fastChannelCopy(ReadableByteChannel src, WritableByteChannel dest) throws IOException {
+		ByteBuffer buffer = ByteBuffer.allocateDirect(16 * 1024);
+		while (src.read(buffer) != -1) {
+			// prepare the buffer to be drained
+			buffer.flip();
+			// write to the channel, may block
+			dest.write(buffer);
+			// If partial transfer, shift remainder down
+			// If buffer is empty, same as doing clear()
+			buffer.compact();
+		}
+		// EOF will leave buffer in fill state
+		buffer.flip();
+		// make sure the buffer is fully drained.
+		while (buffer.hasRemaining()) {
+			dest.write(buffer);
+		}
 	}
 
 	/**

CubeControl/makefile

@@ -3,27 +3,28 @@ CC = gcc
 # Path to jni.h
 ifdef SystemRoot
 HEADERPATH = C:/Program\ Files/Java/jdk1.6.0_29/include
-$(RM) = del
+RM = del
+INJAR = *.class *.png Serial.dll
+PLATFORM = Win
 else
 HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
-$(RM) = rm -f
+RM = rm -f
+INJAR = *.class *.png libSerial.jnilib
+PLATFORM = Mac
 endif
 
 # All java files to be compiled
 # List so it works as target
 JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java cubeWorker.java layerEditFrame.java Led3D.java Frame.java
 
-# Files that go in the jar
-INJAR = *.class *.png
-
 # --------------------------------------
 
-all: libSerial CubeControl.jar
+all: libSerial CubeControl.jar clean
 
 doc: doc/index.html
 
-CubeControl.jar: HelperUtility.class manifest.txt
-	jar -cmf manifest.txt "CubeControl.jar" $(INJAR)
+CubeControl.jar: HelperUtility.class manifest.txt libSerial
+	jar -cmf manifest.txt "CubeControl$(PLATFORM).jar" $(INJAR)
 
 serialInterface.h: HelperUtility.class
 	javah -o serialInterface.h HelperUtility
@@ -54,7 +55,6 @@ clean:
 	$(RM) *.class
 	$(RM) *.h
 	$(RM) *.o
-	$(RM) *.jar
 ifdef SystemRoot
 	$(RM) *.dll
 else

README.md

@@ -13,10 +13,10 @@ It will use [Peter Fleury's UART and TWI Library](http://homepage.hispeed.ch/pet
 
 ## Cube Control
 
-We also build a software to create and load animations into the cube. This software is written in Java and C and is Compatible between Windows and Unix.
-It's source is in the "Cube Control" directory. It has it's own makefile, in which you can specify the Target OS. "unix" means any Unix like OS (Linux, OS X...), "win" means Windows.
-You obviously need a working JDK and a C Compiler Environment (we use gcc).
+We also build a software to create and load animations into the cube. This software is written in Java and C and should work on Windows and Unix.
+It's source is in the "Cube Control" directory.
 
 ## Build instructions
 
-Theres a global makefile in the top folder. If you run it, it will (probably) create CubeControl.jar, CubeFirmware.hex and a OS-dependent serial library (Serial.dll or libSerial.jnilib...). If not, you should take a look at the makefile in CubeControl. Hard-Coded include directorys are probably different than on your system...
+Theres a global makefile in the top folder. If you run it, it will (probably) create CubeControl.jar, CubeFirmware.hex and a OS-dependent serial library (Serial.dll or libSerial.jnilib...). If not, you should take a look at the makefile in CubeControl. Hard-Coded include directorys are probably different than on your system... You obviously need a working JDK and a C Compiler Environment (we use gcc).
+CubeControls makefile will autodetect a Windows Host and compile a Windows Version accordingly. If it is not on Windows, it will compile a Mac Version. Unix is currently not supported by the makefile, but should work if compiled manually.