contrib/jwrapper examples: make the java_lib example lighter and test it in check

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/contrib/jwrapper/Makefile b/contrib/jwrapper/Makefile
index 3c96127..d8d05e0 100644 (file)
--- a/contrib/jwrapper/Makefile
+++ b/contrib/jwrapper/Makefile
@@ -35,6 +35,7 @@ check: bin/jwrapper tests/wildcards.javap
        bin/jwrapper -v -u comment -o tests/wildcards.nit tests/wildcards.javap
        ../../bin/nitpick -q tests/wildcards.nit
        make -C examples/queue/ check
+       make -C examples/java_api/ check
 
 check-libs: bin/jwrapper
        # This config dependent rule must be tweaked according to each system
@@ -62,4 +63,3 @@ check-libs: bin/jwrapper
        nitpick tests/sablecc.nit
 
        make -C examples/android_api/ check
-       make -C examples/java_api/ check

diff --git a/contrib/jwrapper/examples/java_api/Makefile b/contrib/jwrapper/examples/java_api/Makefile
index ee6846b..a98f013 100644 (file)
--- a/contrib/jwrapper/examples/java_api/Makefile
+++ b/contrib/jwrapper/examples/java_api/Makefile
@@ -5,7 +5,7 @@ all: api_user
 java_api.nit:
        mkdir -p tmp
        ../../bin/jwrapper -vv -u comment -o java_api.nit $(RT_JAR) \
-               -r "^(java|org)" -i ../../../../lib/java/collections.nit
+               -r "^java.(lang|util|io)" -i ../../../../lib/java/collections.nit
        echo "+ Disabled functions: `grep '#\s*fun' $@ | wc -l` / `grep '^\s*fun' $@ | wc -l`"
 
 api_user: java_api.nit
@@ -16,7 +16,12 @@ check: api_user
        ./api_user > api_user.res
        diff api_user.sav api_user.res
 
-check-generated-java: java_api.nit
+check-more-java:
+       mkdir -p tmp
+       ../../bin/jwrapper -vv -u comment -o java_api.nit $(RT_JAR) \
+               -r "^(java|org)" -i ../../../../lib/java/collections.nit
+       echo "+ Disabled functions: `grep '#\s*fun' $@ | wc -l` / `grep '^\s*fun' $@ | wc -l`"
+
        # This may take a while...
        time -f "%E k:%S u:%U" ../../../../bin/nitc -v api_user.nit --no-cc