Skip to content

Commit 122db27

Browse files
author
Matthias Güdemann
committed
update Makefiles / remove all references to libzip/zlib
1 parent f8226f2 commit 122db27

File tree

14 files changed

+21
-79
lines changed

14 files changed

+21
-79
lines changed

‎src/Makefile

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ DIRS = ansi-c big-int cbmc cpp goto-cc goto-instrument goto-programs \
22
goto-symex langapi pointer-analysis solvers util linking xmllang \
33
assembler analyses java_bytecode path-symex musketeer \
44
json cegis goto-analyzer jsil symex goto-diff clobber \
5-
memory-models
5+
memory-models miniz
66

77
all: cbmc.dir goto-cc.dir goto-instrument.dir symex.dir goto-analyzer.dir goto-diff.dir
88

@@ -20,7 +20,7 @@ cpp.dir: ansi-c.dir linking.dir
2020

2121
languages: util.dir langapi.dir \
2222
cpp.dir ansi-c.dir xmllang.dir assembler.dir java_bytecode.dir \
23-
jsil.dir
23+
jsil.dir miniz.dir
2424

2525
goto-instrument.dir: languages goto-programs.dir pointer-analysis.dir \
2626
goto-symex.dir linking.dir analyses.dir solvers.dir \
@@ -84,28 +84,4 @@ glucose-download:
8484
@(cd ../glucose-syrup; patch -p1 < ../scripts/glucose-syrup-patch)
8585
@rm glucose-syrup.tgz
8686

87-
zlib-download:
88-
@echo "Downloading zlib 1.2.11"
89-
@lwp-download http://zlib.net/zlib-1.2.11.tar.gz
90-
@tar xfz zlib-1.2.11.tar.gz
91-
@rm -Rf ../zlib
92-
@mv zlib-1.2.11 ../zlib
93-
@rm zlib-1.2.11.tar.gz
94-
95-
libzip-download:
96-
@echo "Downloading libzip 1.1.2"
97-
# The below wants SSL
98-
#@lwp-download http://www.nih.at/libzip/libzip-1.1.2.tar.gz
99-
@lwp-download http://http.debian.net/debian/pool/main/libz/libzip/libzip_1.1.2.orig.tar.gz
100-
@tar xfz libzip_1.1.2.orig.tar.gz
101-
@rm -Rf ../libzip
102-
@mv libzip-1.1.2 ../libzip
103-
@rm libzip_1.1.2.orig.tar.gz
104-
105-
libzip-build:
106-
@echo "Building zlib"
107-
@(cd ../zlib; ./configure; make)
108-
@echo "Building libzip"
109-
@(cd ../libzip; BASE=`pwd`; ./configure --with-zlib=$(BASE)/zlib ; make)
110-
111-
.PHONY: minisat2-download glucose-download zlib-download libzip-download libzip-build
87+
.PHONY: minisat2-download glucose-download

‎src/cbmc/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
2727
../xmllang/xmllang$(LIBEXT) \
2828
../assembler/assembler$(LIBEXT) \
2929
../solvers/solvers$(LIBEXT) \
30-
../util/util$(LIBEXT)
30+
../util/util$(LIBEXT) \
31+
../miniz/miniz$(OBJEXT)
3132

3233
INCLUDES= -I ..
3334

@@ -48,9 +49,6 @@ endif
4849
ifneq ($(wildcard ../java_bytecode/Makefile),)
4950
OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
5051
CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
51-
ifneq ($(wildcard $(LIBZIPINC)),)
52-
LIBS += $(LIBZIPLIB)
53-
endif
5452
endif
5553

5654
ifneq ($(wildcard ../jsil/Makefile),)

‎src/cegis/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
115115
../cbmc/show_vcc$(OBJEXT) \
116116
../cbmc/cbmc_dimacs$(OBJEXT) ../cbmc/all_properties$(OBJEXT) \
117117
../cbmc/fault_localization$(OBJEXT) \
118-
../cbmc/symex_coverage$(OBJEXT)
118+
../cbmc/symex_coverage$(OBJEXT) \
119+
../miniz/miniz$(OBJEXT)
119120

120121
INCLUDES= -I ..
121122

@@ -137,9 +138,6 @@ all: cegis$(EXEEXT)
137138
ifneq ($(wildcard ../java_bytecode/Makefile),)
138139
OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
139140
CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
140-
ifneq ($(wildcard $(LIBZIPINC)),)
141-
LIBS += $(LIBZIPLIB)
142-
endif
143141
endif
144142

145143
###############################################################################

‎src/clobber/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
1515
../goto-symex/rewrite_union$(OBJEXT) \
1616
../pointer-analysis/dereference$(OBJEXT) \
1717
../goto-instrument/dump_c$(OBJEXT) \
18-
../goto-instrument/goto_program2code$(OBJEXT)
18+
../goto-instrument/goto_program2code$(OBJEXT) \
19+
../miniz/miniz$(OBJEXT)
1920

2021
INCLUDES= -I ..
2122

‎src/config.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ BUILD_ENV = AUTO
2424
MINISAT2 = ../../minisat-2.2.1
2525
#GLUCOSE = ../../glucose-syrup
2626
#SMVSAT =
27-
LIBZIPLIB = ../../libzip/lib/.libs/libzip.a ../../zlib/libz.a
28-
LIBZIPINC = ../../libzip/lib
2927

3028
# Signing identity for MacOS Gatekeeper
3129

‎src/goto-analyzer/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
1212
../langapi/langapi$(LIBEXT) \
1313
../json/json$(LIBEXT) \
1414
../assembler/assembler$(LIBEXT) \
15-
../util/util$(LIBEXT)
15+
../util/util$(LIBEXT) \
16+
../miniz/miniz$(OBJEXT)
1617

1718
INCLUDES= -I ..
1819

@@ -28,9 +29,6 @@ all: goto-analyzer$(EXEEXT)
2829
ifneq ($(wildcard ../java_bytecode/Makefile),)
2930
OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
3031
CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
31-
ifneq ($(wildcard $(LIBZIPINC)),)
32-
LIBS += $(LIBZIPLIB)
33-
endif
3432
endif
3533

3634
ifneq ($(wildcard ../jsil/Makefile),)

‎src/goto-cc/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ OBJ += ../big-int/big-int$(LIBEXT) \
1313
../cpp/cpp$(LIBEXT) \
1414
../xmllang/xmllang$(LIBEXT) \
1515
../assembler/assembler$(LIBEXT) \
16-
../langapi/langapi$(LIBEXT)
16+
../langapi/langapi$(LIBEXT) \
17+
../miniz/miniz$(OBJEXT)
1718

1819
INCLUDES= -I ..
1920

@@ -31,9 +32,6 @@ all: goto-cc$(EXEEXT)
3132

3233
ifneq ($(wildcard ../java_bytecode/Makefile),)
3334
OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
34-
ifneq ($(wildcard $(LIBZIPINC)),)
35-
LIBS += $(LIBZIPLIB)
36-
endif
3735
endif
3836

3937
ifneq ($(wildcard ../jsil/Makefile),)

‎src/goto-diff/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
1313
../langapi/langapi$(LIBEXT) \
1414
../xmllang/xmllang$(LIBEXT) \
1515
../util/util$(LIBEXT) \
16-
../solvers/solvers$(LIBEXT)
16+
../solvers/solvers$(LIBEXT) \
17+
../miniz/miniz$(OBJEXT)
1718

1819
INCLUDES= -I ..
1920

@@ -29,9 +30,6 @@ all: goto-diff$(EXEEXT)
2930
ifneq ($(wildcard ../java_bytecode/Makefile),)
3031
OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
3132
CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
32-
ifneq ($(wildcard $(LIBZIPINC)),)
33-
LIBS += $(LIBZIPLIB)
34-
endif
3533
endif
3634

3735
ifneq ($(wildcard ../specc/Makefile),)

‎src/goto-instrument/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
3737
../langapi/langapi$(LIBEXT) \
3838
../xmllang/xmllang$(LIBEXT) \
3939
../util/util$(LIBEXT) \
40-
../solvers/solvers$(LIBEXT)
40+
../solvers/solvers$(LIBEXT) \
41+
../miniz/miniz$(OBJEXT)
4142

4243
INCLUDES= -I ..
4344

@@ -53,9 +54,6 @@ all: goto-instrument$(EXEEXT)
5354
ifneq ($(wildcard ../java_bytecode/Makefile),)
5455
OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
5556
CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
56-
ifneq ($(wildcard $(LIBZIPINC)),)
57-
LIBS += $(LIBZIPLIB)
58-
endif
5957
endif
6058

6159
ifneq ($(LIB_GLPK),)

‎src/java_bytecode/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ include ../common
1515

1616
CLEANFILES = java_bytecode$(LIBEXT)
1717

18-
ifneq ($(wildcard $(LIBZIPINC)),)
19-
INCLUDES += -I $(LIBZIPINC)
20-
CP_CXXFLAGS += -DHAVE_LIBZIP
21-
endif
22-
2318
all: java_bytecode$(LIBEXT)
2419

2520
###############################################################################

‎src/java_bytecode/java_bytecode_language.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ bool java_bytecode_languaget::parse(
137137
}
138138
else if(has_suffix(path, ".jar"))
139139
{
140-
#ifdef HAVE_LIBZIP
141140
if(config.java.main_class.empty())
142141
{
143142
// Does it have a main class set in the manifest?
@@ -161,11 +160,6 @@ bool java_bytecode_languaget::parse(
161160
}
162161
else
163162
java_class_loader.add_jar_file(path);
164-
165-
#else
166-
error() << "No support for reading JAR files" << eom;
167-
return true;
168-
#endif
169163
}
170164
else
171165
assert(false);

‎src/java_bytecode/java_class_loader.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,6 @@ void java_class_loadert::read_jar_file(const irep_idt &file)
212212
if(jar_map.find(file)!=jar_map.end())
213213
return;
214214

215-
#ifndef HAVE_LIBZIP
216-
error() << "no support for reading JAR files configured" << eom;
217-
return;
218-
#endif
219-
220215
jar_filet &jar_file=jar_pool(id2string(file));
221216

222217
if(!jar_file)

‎src/miniz/Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ INCLUDES= -I ..
55
include ../config.inc
66
include ../common
77

8-
CLEANFILES = miniz$(LIBEXT)
8+
CLEANFILES = miniz$(OBJEXT)
99

10-
all: miniz$(LIBEXT)
10+
all: miniz$(OBJEXT)
1111

1212
###############################################################################
13-
14-
miniz$(LIBEXT): $(OBJ)
15-
$(LINKLIB)

‎src/symex/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
1616
../goto-symex/rewrite_union$(OBJEXT) \
1717
../pointer-analysis/dereference$(OBJEXT) \
1818
../goto-instrument/cover$(OBJEXT) \
19-
../path-symex/path-symex$(LIBEXT)
19+
../path-symex/path-symex$(LIBEXT) \
20+
../miniz/miniz$(OBJEXT)
2021

2122
INCLUDES= -I ..
2223

@@ -37,9 +38,6 @@ endif
3738
ifneq ($(wildcard ../java_bytecode/Makefile),)
3839
OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
3940
CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
40-
ifneq ($(wildcard $(LIBZIPINC)),)
41-
LIBS += $(LIBZIPLIB)
42-
endif
4341
endif
4442

4543
ifneq ($(wildcard ../specc/Makefile),)

0 commit comments

Comments
 (0)