New Java build

Makefile

@@ -118,10 +118,8 @@ library_example_gcov: vw_gcov
 python: vw
 	cd python; $(MAKE) things
 
-ifneq ($(JAVA_HOME),)
 java: vw
 	cd java; $(MAKE) things
-endif
 
 .FORCE:
 
@@ -137,7 +135,7 @@ bigtests:	.FORCE vw
 	(cd big_tests && $(MAKE) $(MAKEFLAGS))
 
 install: $(BINARIES)
-	cd vowpalwabbit; cp $(BINARIES) /usr/local/bin; cd ../cluster; $(MAKE) install
+	cd vowpalwabbit; cp $(BINARIES) /usr/local/bin; cd ../cluster; $(MAKE) install; cd ../java; $(MAKE) install;
 
 doc:
 	(cd doc && doxygen Doxyfile)
@@ -147,8 +145,6 @@ clean:
 	cd cluster && $(MAKE) clean
 	cd library && $(MAKE) clean
 	cd python  && $(MAKE) clean
-ifneq ($(JAVA_HOME),)
 	cd java    && $(MAKE) clean
-endif
 
 .PHONY: all clean install doc

java/Makefile

@@ -1,25 +1,30 @@
-ifeq ($(JAVA_HOME),)
-  $(warning No JAVA_HOME found, JNI building will fail.  Please set JAVA_HOME when using JNI)
-  exit 1
-endif
-
 VWLIBS := -L../vowpalwabbit -l vw
 STDLIBS = $(BOOST_LIBRARY) $(LIBS)
 JAVA_INCLUDE = -I $(JAVA_HOME)/include
+LIBRARY_NAME = vw_jni
 
 ifeq ($(UNAME), Linux)
   JAVA_INCLUDE += -I $(JAVA_HOME)/include/linux
+  SHARED_LIBRARY = lib$(LIBRARY_NAME).so
+  INSTALL_PATH = /usr/lib
 endif
 ifeq ($(UNAME), FreeBSD)
   JAVA_INCLUDE += -I $(JAVA_HOME)/include/linux
+  SHARED_LIBRARY = lib$(LIBRARY_NAME).so
+  INSTALL_PATH = /usr/lib
 endif
 ifeq "CYGWIN" "$(findstring CYGWIN,$(UNAME))"
   JAVA_INCLUDE += -I $(JAVA_HOME)/include/linux
+  SHARED_LIBRARY = lib$(LIBRARY_NAME).so
+  INSTALL_PATH = /usr/lib
 endif
 ifeq ($(UNAME), Darwin)
   JAVA_INCLUDE += -I $(JAVA_HOME)/include/darwin
+  SHARED_LIBRARY = lib$(LIBRARY_NAME).dylib
+  INSTALL_PATH = /Library/Java/Extensions
 endif
 
+LOCAL_LIBRARY = target/$(SHARED_LIBRARY)
 jni_SRCS = $(shell find src/main/c++ -name "*.cc")
 jni_OBJS = $(jni_SRCS:.cc=.o)
 
@@ -29,14 +34,14 @@ all:
 test:
 	cd ..; $(MAKE) test
 
-things: pom_version target/vw_jni.lib
+things: pom_version $(LOCAL_LIBRARY)
 
 pom_version: pom.xml
 	ver=$$(grep AC_INIT ../configure.ac | cut -d '[' -f 3 | cut -d ']' -f 1) && \
 	newVer=$$(perl -e "@a=split('\.', '$$ver'); \$$a[2]++; print(join('.', @a))") && \
 	perl -pi -e "s/(\s*)<version>.*-SNAPSHOT/\1<version>$$newVer-SNAPSHOT/" pom.xml
 
-target/vw_jni.lib: $(jni_OBJS) ../vowpalwabbit/main.o ../vowpalwabbit/libvw.a ../vowpalwabbit/liballreduce.a
+$(LOCAL_LIBRARY): $(jni_OBJS) ../vowpalwabbit/main.o ../vowpalwabbit/libvw.a ../vowpalwabbit/liballreduce.a
 	mkdir -p target;
 	$(CXX) -shared $(FLAGS) -o $@ $^ $(VWLIBS) $(STDLIBS) $(JAVA_INCLUDE)
 
@@ -48,7 +53,10 @@ target/vw_jni.lib: $(jni_OBJS) ../vowpalwabbit/main.o ../vowpalwabbit/libvw.a ..
 
 	-include $(jni_SRCS:.cc=.o)
 
+install: $(LOCAL_LIBRARY)
+	cp $(LOCAL_LIBRARY) $(INSTALL_PATH);
+
 .PHONY: clean
 clean:
-	rm -f target/vw_jni.lib
+	rm -f $(LOCAL_LIBRARY)
 	rm -f $(jni_SRCS:.cc=.o)

java/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.github.johnlangford</groupId>
     <artifactId>vw-jni</artifactId>
-    <version>8.3.3-SNAPSHOT</version>
+    <version>8.3.4-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Vowpal Wabbit JNI Layer</name>
     <description>
@@ -155,6 +155,8 @@
                 </executions>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <forkMode>once</forkMode>
+                    <argLine>-Djava.library.path=${project.build.directory}</argLine>
                 </configuration>
             </plugin>
             <plugin>
@@ -205,6 +207,19 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -219,22 +234,10 @@
             </activation>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>2.1.2</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

java/src/main/java/vowpalWabbit/VW.java

@@ -3,6 +3,10 @@
 import vowpalWabbit.learner.VWLearners;
 
 public final class VW {
+    static {
+        System.loadLibrary("vw_jni");
+    }
+
     /**
      * Should not be directly instantiated.
      */