Merge branch 'master' into javalib-plugin

Author: davidpichardie

CHANGELOG

@@ -1,3 +1,9 @@
+From 3.2 to 3.2.2
+-----------------
+Minor changes:
+* small improvements in the test directory
+* use Stdlib instead of Pervasives
+
 From 3.2 to 3.2.1
 -----------------
 Minor changes:

javalib.opam

@@ -1,11 +1,11 @@
 opam-version: "2.0"
 name: "javalib"
-version: "3.2.1"
-maintainer: "Nicolas Barré <nicolas.barre@irisa.fr>"
+version: "3.2.2"
+maintainer: "David Pichardie <david.pichardie@ens-rennes.fr>"
 authors: "Javalib Development team"
 homepage: "https://javalib-team.github.io/javalib/"
 bug-reports: "https://github.com/javalib-team/javalib/issues"
-license: "LGPL-2.1 with OCaml linking exception"
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 dev-repo: "git+https://github.com/javalib-team/javalib.git"
 build: [
   ["./configure.sh" "-s" {ocaml:native-dynlink}]
@@ -16,7 +16,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "conf-which" {build}
   "ocamlfind" {build}
-  "camlzip" {>= "1.05"}
+  "camlzip" {>= "1.11"}
   "extlib"
   "containers"
 ]

src/META.source

@@ -1,4 +1,4 @@
-version = "3.2.1"
+version = "3.2.2"
 description = "library to parse Java .class files"
 archive(native) = "javalib.cmxa"
 archive(byte) = "javalib.cma"

src/jFile.ml

@@ -120,7 +120,7 @@ let lookup c : cp_unit -> JClassLow.jclass =
 	    | `dir d ->
 		if is_file (Filename.concat d c)
 		then
-		  let ch = open_in_bin (Filename.concat d c) in
+		  let ch = Stdlib.open_in_bin (Filename.concat d c) in
 		    JLib.IO.input_channel ch
 		else raise Not_found
 	    | `jar jar ->
@@ -156,7 +156,7 @@ let write_class_low output_dir classe =
     (mkdir
        (Filename.concat output_dir (Filename.dirname c))
        0o755);
-    let f = open_out_bin (Filename.concat output_dir c) in
+    let f = Stdlib.open_out_bin (Filename.concat output_dir c) in
     let output = JLib.IO.output_channel f in
       JUnparse.unparse_class_low_level output classe;
       JLib.IO.close_out output
@@ -171,7 +171,7 @@ let dir_sep =
     | _ -> assert false (* Inspirated from filename.ml in the stdlib *)
 
 let extract_class_name_from_file file =
-  let input = JLib.IO.input_channel (open_in_bin file) in
+  let input = JLib.IO.input_channel (Stdlib.open_in_bin file) in
   let c = JParse.parse_class_low_level input in
     JLib.IO.close_in input;
     let cname = c.j_name in
@@ -291,7 +291,7 @@ let fold_string class_path f file =
       try
 	apply_to_dir_or_class
 	  (function c ->
-	     let ch = open_in_bin c in
+	     let ch = Stdlib.open_in_bin c in
 	     let input = JLib.IO.input_channel ch in
 	     let classe = JParse.parse_class_low_level input in
 	       JLib.IO.close_in input;

src/ptrees/ptset.ml

@@ -335,7 +335,7 @@ let elements s =
   in
   (* unfortunately there is no easy way to get the elements in ascending
      order with little-endian Patricia trees *)
-  List.sort compare (elements_aux [] s)
+  List.sort Stdlib.compare (elements_aux [] s)
 
 let split x s =
   let coll k (l, b, r) =
@@ -599,7 +599,7 @@ module Big = struct
       | Branch (_,_,l,r) -> elements_aux (elements_aux acc r) l
     in
     (* we still have to sort because of possible negative elements *)
-    List.sort compare (elements_aux [] s)
+    List.sort Stdlib.compare (elements_aux [] s)
 
   let split x s =
     let coll k (l, b, r) =

tests/Makefile

@@ -50,13 +50,11 @@ all:javatests java/javac java/unparsed
 
 	if [ -s .errors ]; then cat .errors >> /dev/stderr; exit 1; fi
 
-javatests: javatests/huge javatests/jmods
+javatests: javatests/out javatests/jmods
 	mkdir -p javatests
 
-javatests/huge:
+javatests/out:
 	mkdir -p javatests/out
-	wget -r -nH --cut-dirs=4 -np --reject="*.html,*.tmp" -e robots=off \
-	https://scm.gforge.inria.fr/anonscm/svn/javalib/tests/javatests/
 
 javatests/jmods:
 	mkdir -p javatests/jmods
@@ -71,4 +69,4 @@ java/unparsed:
 
 clean cleantests:
 	make -C src clean
-	rm -rf javatests java/javac java/unparsed java/*.txt .errors
+	rm -rf javatests/out javatests/jmods java/javac java/unparsed java/*.txt .errors