Set up jar-test and some refactoring

Author: ingydotnet

.gitignore

@@ -1,3 +1,4 @@
+.vimrc
 /*.clj
 /*.md
 *.md.tmp

common/vars.mk

@@ -242,7 +242,8 @@ RAPIDYAML_JAVA := \
   $(ROOT)/rapidyaml/src/main/java/org/rapidyaml/Evt.java \
   $(ROOT)/rapidyaml/src/main/java/org/rapidyaml/YamlParseErrorException.java
 RAPIDYAML_JNI_H := $(ROOT)/rapidyaml/native/org_rapidyaml_Rapidyaml.h
-RAPIDYAML_SO := $(ROOT)/rapidyaml/native/librapidyaml.$(RAPIDYAML_VERSION).$(SO)
+RAPIDYAML_SO_NAME := librapidyaml.$(RAPIDYAML_VERSION).$(SO)
+RAPIDYAML_SO := $(ROOT)/rapidyaml/native/$(RAPIDYAML_SO_NAME)
 RAPIDYAML_LIB := $(ROOT)/rapidyaml/native/librapidyaml.$(DOTLIB)
 RAPIDYAML_JAR := $(ROOT)/rapidyaml/target/rapidyaml-$(RAPIDYAML_VERSION).jar
 RAPIDYAML_INSTALLED_DIR := \

rapidyaml/Makefile

@@ -11,21 +11,21 @@ RAPIDYAML_JAR_DEPS := \
   )
 
 RAPIDYAML_CLASS := $(RAPIDYAML_JAVA:.java=.class)
+RAPIDYAML_CLASSES := \
+  $(RAPIDYAML_CLASS:$(RAPIDYAML)/src/main/java/%=-C src/main/java %)
 
 
 #------------------------------------------------------------------------------
 default::
-	echo $(RAPIDYAML_SO)
-	echo $(RAPIDYAML_LIB)
-
-x:
-	YS -ce 'foo: var'
 
 build:: $(RAPIDYAML_JNI_H) $(RAPIDYAML_SO) $(RAPIDYAML_LIB) $(RAPIDYAML_JAR)
 	@:
 
 jar: $(RAPIDYAML_JAR)
 
+jar-test: $(RAPIDYAML_JAR)
+	java -jar $<
+
 install:: $(RAPIDYAML_INSTALLED)
 
 test:: build $(JAVA_INSTALLED)
@@ -54,17 +54,19 @@ jni: $(RAPIDYAML_JNI_H)
 #------------------------------------------------------------------------------
 $(RAPIDYAML_SO): $(RAPIDYAML_JNI_H)
 	$(MAKE) -C native $@
+
+# XXX Probably don't need this:
 $(RAPIDYAML_LIB): $(RAPIDYAML_JNI_H)
 	$(MAKE) -C native $@
 
 $(RAPIDYAML_INSTALLED): $(RAPIDYAML_JAR) $(JAVA_INSTALLED)
 	YS_RAPIDYAML_MAVEN_TEST=1 $(MVN) install
 	touch $@
 
-$(RAPIDYAML_JAR): $(RAPIDYAML_CLASS) $(JAVA_INSTALLED)
-	$(JAR) -cvf $@ $<
-	jar -uf $@ \
-	  -C $(ROOT)/rapidyaml/native/ librapidyaml.0.8.0.so
+$(RAPIDYAML_JAR): $(RAPIDYAML_CLASS) $(JAVA_INSTALLED) $(RAPIDYAML_SO)
+	$(JAR) -cf $@ $(RAPIDYAML_CLASSES)
+	$(JAR) -uf $@ -C $(RAPIDYAML)/native/ $(RAPIDYAML_SO_NAME)
+	$(JAR) -umf manifest.txt $@
 
 $(RAPIDYAML_CLASS): $(RAPIDYAML_JAVA) $(JAVA_INSTALLED)
 	@# this doesn't work:

rapidyaml/manifest.txt

@@ -0,0 +1 @@
+Main-Class: org.rapidyaml.Rapidyaml

rapidyaml/src/main/java/org/rapidyaml/Rapidyaml.java

@@ -15,6 +15,7 @@
  * https://stackoverflow.com/questions/1429172/how-to-list-the-files-inside-a-jar-file
  * https://docs.oracle.com/javase/8/docs/api/java/lang/ClassLoader.html#getSystemResources-java.lang.String-
  */
+
 package org.rapidyaml;
 
 import java.net.URL;
@@ -56,6 +57,11 @@ private native int ysparse_parse_buf(long ysparse, String filename,
 
     private final long ysparse;
 
+    public static void main(String[] args) throws Exception, IOException {
+        (new Rapidyaml()).timingEnabled(true);
+        System.out.printf("It works!\n");
+    }
+
 
     //------------------------
     // CTOR/DTOR

rapidyaml/src/test/java/org/rapidyaml/RapidyamlTest.java

@@ -1,6 +1,6 @@
 package org.rapidyaml;
 
-import org.rapidyaml.*;
+import org.rapidyaml.Rapidyaml;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;