Better windows compatibility

CubeControl/HelperUtility.java

@@ -40,6 +40,7 @@ public class HelperUtility {
 	static {
 		// System.out.println("Loading Serial Library...");
 		loadFromJar();
+		// System.out.println("Loaded!");
 	}
 
 	/**
@@ -53,6 +54,8 @@ public class HelperUtility {
 			loadLib(path, "Serial.dll");
 		} else if (os.indexOf("mac") > -1) {
 			loadLib(path, "libSerial.jnilib");
+		} else {
+			loadLib(path, "libSerial.so");
 		}
 	}
 
@@ -73,9 +76,11 @@ public class HelperUtility {
 			inChannel.close();
 			outChannel.close();
 			System.load(fileOut.toString());
+			System.out.println("Loaded Serial Library from " + fileOut.toString());
 		} catch (Exception e) {
 			System.out.println("Failed to load Serial Library:");
 			e.printStackTrace();
+			System.exit(1);
 		}
 	}
 
@@ -107,16 +112,21 @@ public class HelperUtility {
 	 */
 	public static String getPorts() {
 		String os = System.getProperty("os.name").toLowerCase();
-		if (os.indexOf("windows") > -1) {
-			return getThePorts("COM");
-		} else if (os.indexOf("linux") > -1) {
-			return getThePorts("tty");
-		} else if (os.indexOf("mac") > -1) {
-			return getThePorts("tty.");
+		try {
+			if (os.indexOf("windows") > -1) {
+				return getThePorts("COM");
+			} else if (os.indexOf("max") > -1) {
+				return getThePorts("tty.");
+			} else {
+				return getThePorts("tty");
+			}
+		} catch (Exception e) {
+			// Unsatisfied linker error:
+			// Serial.dll was probably not found
+			System.out.println("Exception: " + e.toString());
+		} finally {
+			return null;
 		}
-
-		// Not linux, windows or mac?
-		return getThePorts("wtf?");
 	}
 
 	private static native String getThePorts(String search);

CubeControl/libSerial/makefile

@@ -4,6 +4,12 @@ ifdef SystemRoot
 HEADERPATH = C:/Program\ Files/Java/jdk1.6.0_29/include
 RM = del
 else
+ifdef SYSTEMROOT
+# Looks like Cygwin or Mingw shell
+HEADERPATH = C:\Programme\Java\jdk1.6.0_31\include
+HEADERPATH += -IC:\Programme\Java\jdk1.6.0_31\include\win32
+RM = rm -rf
+else
 RM = rm -f
 UNAME := $(shell uname -s)
 ifeq ($(UNAME),Darwin)
@@ -12,6 +18,7 @@ else
 HEADERPATH = /usr/lib/jvm/java-6-openjdk/include
 endif
 endif
+endif
 
 # --------------------------------------
 
@@ -30,12 +37,16 @@ HelperUtility.class: ../HelperUtility.java
 ifdef SystemRoot
 libSerial: Serial.dll
 else
+ifdef SYSTEMROOT
+libSerial: Serial.dll
+else
 ifeq ($(UNAME),Darwin)
 libSerial: libSerial.jnilib
 else
 libSerial: libSerial.so
 endif
 endif
+endif
 
 libSerial.jnilib: serialHelper.c unixSerial.c serialInterface.h
 	$(CC) -x c -I$(HEADERPATH) -c serialHelper.c -o serialHelper.o
@@ -57,9 +68,13 @@ clean:
 ifdef SystemRoot
 	$(RM) *.dll
 else
+ifdef SYSTEMROOT
+	$(RM) *.dll
+else
 ifeq ($(UNAME),Darwin)
 	$(RM) *.jnilib
 else
 	$(RM) *.so
 endif
 endif
+endif

CubeControl/libSerial/winSerial.c

@@ -125,7 +125,7 @@ char** getSerialPorts(const char *search) {
 		j++; // \0
 		files[i] = (char *)malloc(j * sizeof(char));
 		for (k = 0; k < j; k++) {
-			files[i] = ports[start + k];
+			files[i][k] = ports[start + k];
 		}
 	}
 

CubeControl/makefile

@@ -8,6 +8,14 @@ RM = del
 INJAR += Serial.dll
 PLATFORM = Win
 else
+ifdef SYSTEMROOT
+# Looks like cygwin or mingw shell
+HEADERPATH = C:\Programme\Java\jdk1.6.0_31\include
+HEADERPATH += -IC:\Programme\Java\jdk1.6.0_31\include\win32
+RM = rm -rf
+INJAR += Serial.dll
+PLATFORM = Win
+else
 RM = rm -f
 UNAME := $(shell uname -s)
 ifeq ($(UNAME),Darwin)
@@ -20,6 +28,7 @@ PLATFORM = Linux
 HEADERPATH = /usr/lib/jvm/java-6-openjdk/include
 endif
 endif
+endif
 
 # All java files to be compiled
 # List so it works as target
@@ -46,12 +55,16 @@ doc/index.html: $(JAVAFILES)
 ifdef SystemRoot
 libSerial: Serial.dll
 else
+ifdef SYSTEMROOT
+libSerial: Serial.dll
+else
 ifeq ($(UNAME),Darwin)
 libSerial: libSerial.jnilib
 else
 libSerial: libSerial.so
 endif
 endif
+endif
 
 Serial.dll: libSerial/serialHelper.c libSerial/winSerial.c
 	make -C libSerial
@@ -74,5 +87,9 @@ clean:
 ifdef SystemRoot
 	$(RM) *.dll
 else
+ifdef SYSTEMROOT
+	$(RM) *.dll
+else
 	$(RM) *.jnilib
 endif
+endif