Enhanced linalg kernels factory.

Added -libFile switch and enhanced non-lib files extraction in LibraryExtractor
Added very simple VectorAdd demo program

Author: ochafik

jnaerator-runtime/src/main/java/com/ochafik/lang/jnaerator/runtime/LibraryExtractor.java

@@ -36,6 +36,8 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @see http://landonf.bikemonkey.org/static/soylatte/
@@ -84,16 +86,28 @@ public static String getLibraryPath(String libraryName, boolean extractAllLibrar
 			//ClassLoader cl = LibraryExtractor.class.getClassLoader();
 			String prefix = "(?i)" + (Platform.isWindows() || Platform.isWindowsCE() ? "" : "lib") + libraryName + "[^A-Za-z_].*";
 			String libsuffix = "(?i).*\\.(so|dll|dylib|jnilib)";
-			String othersuffix = "(?i).*\\.(pdb)";
+			//String othersuffix = "(?i).*\\.(pdb)";
 
 			URL sourceURL = null;
 			List<URL> otherURLs = new ArrayList<URL>();
 
 
 			String arch = getCurrentOSAndArchString();
 			//System.out.println("libURL = " + libURL);
-			List<URL> list = URLUtils.listFiles(URLUtils.getResource(cl, "libraries/" + arch), null);
-			if (list.isEmpty()) {
+			List<URL> list = URLUtils.listFiles(URLUtils.getResource(cl, "libraries/" + arch), null),
+                    noArchList = URLUtils.listFiles(URLUtils.getResource(cl, "libraries/noarch"), null);
+
+            Set<String> names = new HashSet<String>();
+            for (URL url : list) {
+                String name = getFileName(url);
+                names.add(name);
+            }
+            for (URL url : noArchList) {
+                String name = getFileName(url);
+                if (names.add(name))
+                    list.add(url);
+            }
+			/*if (list.isEmpty()) {
 				for (URL u : URLUtils.listFiles(URLUtils.getResource(cl, "libraries"), null)) {
 					String f = u.getFile();
 					int i = f.lastIndexOf('/');
@@ -105,17 +119,17 @@ public static String getLibraryPath(String libraryName, boolean extractAllLibrar
 					}
 				}
 				
-			}
+			}*/
 			for (File f : new File(".").listFiles())
 				if (f.isFile())
 					list.add(f.toURI().toURL());
 
 			for (URL url : list) {
-				String fileName = new File(url.toString()).getName();
-				boolean pref = fileName.matches(prefix), suff = fileName.matches(libsuffix); 
+				String name = getFileName(url);
+				boolean pref = name.matches(prefix), suff = name.matches(libsuffix);
 				if (pref && suff)
 					sourceURL = url;
-				else if (suff || fileName.matches(othersuffix))
+				else //if (suff || fileName.matches(othersuffix))
 					otherURLs.add(url);
 			}
 			List<File> files = new ArrayList<File>();
@@ -250,4 +264,8 @@ public static final Object getLibrary(String name, String path, final Class libr
         return shouldTraceCalls(name) ?
             LibraryExtractor.getTracingLibrary(original, libraryClass) : original;
     }
+
+    private static String getFileName(URL url) {
+        return new File(url.getFile()).getName();
+    }
 }

jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAerator.java

@@ -352,6 +352,9 @@ List<String> parsed(ParsedArg a) throws Exception {
 						break;
                     case Runtime:
                         config.runtime = a.getEnumParam(0, JNAeratorConfig.Runtime.class);
+                        break;
+                    case LibFile:
+                        config.addLibraryFile(a.getFileParam(0), arch);
                         break;
 					case File:
 						return parsedFile(a);
@@ -462,7 +465,9 @@ List<String> parsed(ParsedArg a) throws Exception {
 					case IncludeArgs:
 						return parsedArgsInclude(a);
 					case Arch:
-						arch = a.getStringParam(0);
+						arch = a.getStringParam(0).trim();
+                        if (arch.length() == 0)
+                            arch = null;
 						break;
 
 					}

jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNAeratorCommandLineArgs.java

@@ -160,7 +160,8 @@ public enum OptionDef {
 		NoJAR(				"(?i)-noJar",			"Do not create an output JAR"),
 //		EnableCPlusPlus(	"-cppInstanceMethods",	"Enable experimental C++ instance methods wrapping"),
 		NoLibBundle(		"(?i)-noLibBundle",		"Do not bundle libraries in output JAR"),
-		MaxConstructedFields(		
+		LibFile(            "-libFile",             "Bundle the provided file with the JNAerated JAR so that it is extracted with the library when it is first used.", new ArgDef(Type.ExistingFile, "resourceFile")),
+        MaxConstructedFields(
 							"-maxConstrFields",		"Maximum number of fields allowed for structure fields constructors. If a struct has more fields, it will only get a default constructor.", new ArgDef(Type.Int, "fieldCount")),
 		CPlusPlusGen(		"-genCPlusPlus",		"[Experimental, Not working at all] Generate C++ classes.");