Merge pull request #548 from mgudemann/miniz_support

Miniz support

Author: Daniel Kroening

regression/cbmc-java/jar-file3/A.jar

@@ -0,0 +1,19 @@
+public class jarfile3
+{
+  public class A
+  {
+    int x=1;
+  }
+  public class B
+  {
+    int x=1;
+  }
+
+  void f(int i)
+  {
+    A a=new A();
+    B b=new B();
+    assert(a.x==1);
+    assert(b.x==1);
+  }
+}

regression/cbmc-java/jar-file3/B.jar

@@ -0,0 +1,8 @@
+CORE
+C.jar
+--function jarfile3.f -classpath A.jar:B.jar
+^EXIT=0$
+^SIGNAL=0$
+^VERIFICATION SUCCESSFUL
+--
+^warning: ignoring

regression/cbmc-java/jar-file3/C.jar

@@ -2,7 +2,7 @@ DIRS = ansi-c big-int cbmc cpp goto-cc goto-instrument goto-programs \
        goto-symex langapi pointer-analysis solvers util linking xmllang \
        assembler analyses java_bytecode path-symex musketeer \
        json cegis goto-analyzer jsil symex goto-diff clobber \
-       memory-models
+       memory-models miniz
 
 all: cbmc.dir goto-cc.dir goto-instrument.dir symex.dir goto-analyzer.dir goto-diff.dir
 
@@ -20,7 +20,7 @@ cpp.dir: ansi-c.dir linking.dir
 
 languages: util.dir langapi.dir \
            cpp.dir ansi-c.dir xmllang.dir assembler.dir java_bytecode.dir \
-           jsil.dir
+           jsil.dir miniz.dir
 
 goto-instrument.dir: languages goto-programs.dir pointer-analysis.dir \
                      goto-symex.dir linking.dir analyses.dir solvers.dir \
@@ -84,28 +84,4 @@ glucose-download:
 	@(cd ../glucose-syrup; patch -p1 < ../scripts/glucose-syrup-patch)
 	@rm glucose-syrup.tgz
 
-zlib-download:
-	@echo "Downloading zlib 1.2.11"
-	@lwp-download http://zlib.net/zlib-1.2.11.tar.gz
-	@tar xfz zlib-1.2.11.tar.gz
-	@rm -Rf ../zlib
-	@mv zlib-1.2.11 ../zlib
-	@rm zlib-1.2.11.tar.gz
-
-libzip-download:
-	@echo "Downloading libzip 1.1.2"
-	# The below wants SSL
-	#@lwp-download http://www.nih.at/libzip/libzip-1.1.2.tar.gz
-	@lwp-download http://http.debian.net/debian/pool/main/libz/libzip/libzip_1.1.2.orig.tar.gz
-	@tar xfz libzip_1.1.2.orig.tar.gz
-	@rm -Rf ../libzip
-	@mv libzip-1.1.2 ../libzip
-	@rm libzip_1.1.2.orig.tar.gz
-
-libzip-build:
-	@echo "Building zlib"
-	@(cd ../zlib; ./configure; make)
-	@echo "Building libzip"
-	@(cd ../libzip; BASE=`pwd`; ./configure --with-zlib=$(BASE)/zlib ; make)
-
-.PHONY: minisat2-download glucose-download zlib-download libzip-download libzip-build
+.PHONY: minisat2-download glucose-download

regression/cbmc-java/jar-file3/jarfile3.class

@@ -27,7 +27,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
       ../xmllang/xmllang$(LIBEXT) \
       ../assembler/assembler$(LIBEXT) \
       ../solvers/solvers$(LIBEXT) \
-      ../util/util$(LIBEXT)
+      ../util/util$(LIBEXT) \
+      ../miniz/miniz$(OBJEXT)
 
 INCLUDES= -I ..
 
@@ -48,9 +49,6 @@ endif
 ifneq ($(wildcard ../java_bytecode/Makefile),)
   OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
   CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
-  ifneq ($(wildcard $(LIBZIPINC)),)
-    LIBS += $(LIBZIPLIB)
-  endif
 endif
 
 ifneq ($(wildcard ../jsil/Makefile),)

regression/cbmc-java/jar-file3/jarfile3.java

@@ -115,7 +115,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
       ../cbmc/show_vcc$(OBJEXT) \
       ../cbmc/cbmc_dimacs$(OBJEXT) ../cbmc/all_properties$(OBJEXT) \
       ../cbmc/fault_localization$(OBJEXT) \
-      ../cbmc/symex_coverage$(OBJEXT)
+      ../cbmc/symex_coverage$(OBJEXT) \
+      ../miniz/miniz$(OBJEXT)
 
 INCLUDES= -I ..
 
@@ -137,9 +138,6 @@ all: cegis$(EXEEXT)
 ifneq ($(wildcard ../java_bytecode/Makefile),)
   OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
   CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
-  ifneq ($(wildcard $(LIBZIPINC)),)
-    LIBS += $(LIBZIPLIB)
-  endif
 endif
 
 ###############################################################################

regression/cbmc-java/jar-file3/test.desc

@@ -15,7 +15,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
        ../goto-symex/rewrite_union$(OBJEXT) \
        ../pointer-analysis/dereference$(OBJEXT) \
        ../goto-instrument/dump_c$(OBJEXT) \
-       ../goto-instrument/goto_program2code$(OBJEXT)
+       ../goto-instrument/goto_program2code$(OBJEXT) \
+       ../miniz/miniz$(OBJEXT)
 
 INCLUDES= -I ..