Skip to content

Commit 786fdda

Browse files
kerneiskerneis
committed
Release 1.7.0
2 parents ed97424 + aba3940 commit 786fdda

126 files changed

Lines changed: 25636 additions & 2336 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@
4343
/README
4444
/index.html
4545

46-
# /bin/
47-
/bin/scaninfer.bat
48-
/bin/ccured.bat
49-
/bin/cilly.bat
50-
/bin/patcher.bat
51-
/bin/CilConfig.pm
52-
5346
# /debian/
5447
/debian/build-stamp
5548
/debian/cil
@@ -86,13 +79,10 @@
8679
# /doc/html/
8780
/doc/html/*
8881

89-
# /lib/
90-
/lib/splay
91-
/lib/*.patch2.i*
92-
/lib/topformflat
93-
/lib/topformflat.c
94-
/lib/getrusage
95-
/lib/Cilly.pm
82+
# /cilly/
83+
/cilly/CilConfig.pm
84+
/cilly/Cilly.pm
85+
/cilly/*.patch2.i*
9686

9787
# /obj/
9888
/obj/x86_*
@@ -389,8 +379,3 @@
389379
/test/small2/merge-ar
390380
/test/small2/libmerge.a
391381

392-
393-
# /ocamlutil
394-
/ocamlutil/perfcount.c
395-
/ocamlutil/profile.c
396-
/ocamlutil/Makefile

‎Makefile.in‎

Lines changed: 37 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ ifndef CAMLNATTL
4848
endif
4949
endif
5050

51-
ifndef ARCHOS
52-
ARCHOS=@ARCHOS@
53-
endif
54-
5551
ifndef MINGW
5652
MINGW=@MINGW@
5753
endif
@@ -73,7 +69,7 @@ else
7369
endif
7470

7571
# Put here all the byproducts of make
76-
OBJDIR := obj/$(ARCHOS)
72+
OBJDIR := obj
7773
DEPENDDIR := obj/.depend
7874

7975
CILLY_FEATURES :=
@@ -134,15 +130,20 @@ ocamlbuild:
134130

135131
# Now the rule to make cilly
136132

137-
cilly: $(OBJDIR)/cilly$(EXE)
133+
cilly/Makefile: cilly/Makefile.PL cilly/App/Cilly.pm
134+
cd cilly; perl Makefile.PL
135+
136+
cilly: $(OBJDIR)/cilly$(EXE) cilly/Makefile
137+
$(MAKE) -C cilly
138+
138139
$(OBJDIR)/cilly$(EXE) : $(CILLY_MODULES:%=$(OBJDIR)/%.$(CMO))
139140
@$(NARRATIVE) "Linking $(COMPILETOWHAT) $@ $(LINKMSG)"
140141
$(AT)$(CAMLLINK) -verbose -o $@ \
141142
$(CILLY_LIBS:%=%.$(CMXA)) \
142143
$^
143144

144145

145-
quickbuild: cilversion machdep cilly lib/Cilly.pm
146+
quickbuild: cilversion machdep cilly cilly/App/Cilly.pm
146147

147148
# Setup also makes the native code versions
148149

@@ -218,15 +219,17 @@ $(OBJDIR)/machdep.ml : src/machdep-ml.c configure.in Makefile.in
218219
echo "let theMachine : mach ref = ref gcc" >>$@
219220

220221

221-
lib/Cilly.pm: lib/Cilly.pm.in src/machdep-ml.c configure.in Makefile.in
222-
cp lib/Cilly.pm.in lib/Cilly.pm
222+
cilly/App/Cilly.pm: cilly/App/Cilly.pm.in src/machdep-ml.c configure.in Makefile.in
223+
cp cilly/App/Cilly.pm.in cilly/App/Cilly.pm
224+
sed -e "s|CIL_VERSION|@CIL_VERSION@|" cilly/App/Cilly.pm > cilly/App/Cilly.pm.tmp; \
225+
mv cilly/App/Cilly.pm.tmp cilly/App/Cilly.pm; \
223226
if $(MACHDEPCC) -m32 src/machdep-ml.c -o $(OBJDIR)/machdep-ml32.exe ;then \
224-
sed -e "s|nogcc32model|`$(EMUL) $(OBJDIR)/machdep-ml32.exe --env`|" lib/Cilly.pm > lib/Cilly.pm.tmp; \
225-
mv lib/Cilly.pm.tmp lib/Cilly.pm; \
227+
sed -e "s|nogcc32model|`$(EMUL) $(OBJDIR)/machdep-ml32.exe --env`|" cilly/App/Cilly.pm > cilly/App/Cilly.pm.tmp; \
228+
mv cilly/App/Cilly.pm.tmp cilly/App/Cilly.pm; \
226229
fi
227230
if $(MACHDEPCC) -m64 src/machdep-ml.c -o $(OBJDIR)/machdep-ml64.exe ;then \
228-
sed -e "s|nogcc64model|`$(EMUL) $(OBJDIR)/machdep-ml64.exe --env`|" lib/Cilly.pm > lib/Cilly.pm.tmp; \
229-
mv lib/Cilly.pm.tmp lib/Cilly.pm; \
231+
sed -e "s|nogcc64model|`$(EMUL) $(OBJDIR)/machdep-ml64.exe --env`|" cilly/App/Cilly.pm > cilly/App/Cilly.pm.tmp; \
232+
mv cilly/App/Cilly.pm.tmp cilly/App/Cilly.pm; \
230233
fi
231234

232235
# Create the version information module
@@ -238,7 +241,7 @@ $(OBJDIR)/cilversion.ml: src/cilversion.ml.in config.status
238241

239242
# build library
240243
.PHONY: cillib
241-
cillib: $(OBJDIR)/cil.$(CMXA) lib/Cilly.pm
244+
cillib: $(OBJDIR)/cil.$(CMXA) cilly/App/Cilly.pm
242245

243246
$(OBJDIR)/feature_config.ml: config.status
244247
rm -f $(OBJDIR)/feature_config.*
@@ -315,7 +318,7 @@ odoc: $(OBJDIR)/pretty.cmi $(OBJDIR)/cil.cmi
315318
-t "CIL API Documentation (version @CIL_VERSION@)" \
316319
-I $(OBJDIR) -hide Pervasives $(ODOC_FILES)
317320

318-
doc/cilpp.tex: doc/cilcode.pl doc/cil.tex lib/Cilly.pm
321+
doc/cilpp.tex: doc/cilcode.pl doc/cil.tex cilly/App/Cilly.pm
319322
-rm -rf doc/html/cil
320323
-mkdir -p doc/html/cil
321324
-mkdir -p doc/html/cil/examples
@@ -357,9 +360,8 @@ doc: texdoc pdfdoc odoc
357360
distclean: clean
358361
rm -f src/frontc/cparser.output
359362
rm -f src/formatparse.output
360-
rm -f bin/cilly.bat
361-
rm -f bin/patcher.bat
362-
rm -f bin/CilConfig.pm
363+
rm -f cilly/App/CilConfig.pm
364+
rm -f cilly/Makefile.old
363365
rm -f config.log
364366
rm -f config.h
365367
rm -f Makefile
@@ -370,7 +372,8 @@ cleancheck:
370372
rm -f test/small1/vararg1
371373
rm -f test/small1/wchar1
372374

373-
clean: cleancaml cleancheck
375+
clean: cleancaml cleancheck cilly/Makefile
376+
$(MAKE) -C cilly clean
374377

375378

376379
# Now include the compiler specific stuff
@@ -383,13 +386,15 @@ else
383386
endif
384387

385388
test/%:
386-
bin/cilly $(CONLY) test/small1/$*.c $(OBJOUT)test/small1/$*.o
389+
cilly/cilly $(CONLY) test/small1/$*.c $(OBJOUT)test/small1/$*.o
387390

388391
testrun/%:
389-
bin/cilly test/small1/$*.c $(OBJOUT)test/small1/$*
392+
cilly/cilly test/small1/$*.c $(OBJOUT)test/small1/$*
390393
test/small1/$*
391394

392-
395+
.PHONY: regtest
396+
regtest:
397+
cd test; ./testcil -r --regrtest
393398

394399
.PHONY: quicktest
395400
quicktest: $(patsubst %,test/%,func init init1) \
@@ -400,7 +405,6 @@ check: quicktest
400405

401406
########################################################################
402407

403-
404408
INSTALL = @INSTALL@
405409
INSTALL_DATA = @INSTALL_DATA@
406410

@@ -412,31 +416,23 @@ pkglibdir = $(libdir)/cil
412416
libexecdir = @libexecdir@
413417
pkglibexecdir = $(libexecdir)/cil
414418
bindir = @bindir@
415-
# Hack - I don't know how to find perl_vendorlib
416-
perl_vendorlib = $(libdir)
417-
418-
install: install-findlib
419-
$(INSTALL) -d $(DESTDIR)$(perl_vendorlib)
420-
$(INSTALL) -m 0644 lib/*.pm bin/CilConfig.pm $(DESTDIR)$(perl_vendorlib)
421-
sed -e "s,^.*cilhome.*$$,\$$::cilhome = \"$(libexecdir)/cil\";," $(DESTDIR)$(perl_vendorlib)/CilConfig.pm > $(DESTDIR)$(perl_vendorlib)/CilConfig.pm.tmp
422-
mv $(DESTDIR)$(perl_vendorlib)/CilConfig.pm.tmp $(DESTDIR)$(perl_vendorlib)/CilConfig.pm
423-
$(INSTALL) -d $(DESTDIR)$(bindir)
424-
$(INSTALL) -m 0755 bin/cilly $(DESTDIR)$(bindir)
425-
$(INSTALL) -d $(DESTDIR)$(pkglibexecdir)/$(OBJDIR)
426-
$(INSTALL) -m 0755 $(OBJDIR)/cilly.*.exe $(DESTDIR)$(pkglibexecdir)/$(OBJDIR)
419+
420+
install: install-findlib cilly/Makefile
421+
$(MAKE) -C cilly install CILBINDIR="$(libexecdir)/cil"
422+
$(INSTALL) -d $(DESTDIR)$(pkglibexecdir)
423+
$(INSTALL) -m 0755 $(OBJDIR)/cilly.*.exe $(DESTDIR)$(pkglibexecdir)
427424

428425
# FIXME
429-
uninstall: uninstall-findlib
426+
uninstall: uninstall-findlib cilly/Makefile
430427
-rm -rf $(DESTDIR)$(pkglibexecdir)
431-
-rm -f $(DESTDIR)$(bindir)/cilly
432-
-rm -f $(DESTDIR)$(perl_vendorlib)/CilConfig.pm $(DESTDIR)$(perl_vendorlib)/Cilly.pm \
433-
$(DESTDIR)$(perl_vendorlib)/KeptFile.pm $(DESTDIR)$(perl_vendorlib)/OutputFile.pm \
434-
$(DESTDIR)$(perl_vendorlib)/TempFile.pm
428+
$(MAKE) -C cilly uninstall
429+
430+
.PHONY: install-findlib uninstall-findlib
435431

436432
EVERYTHING=$(OBJDIR)/*.cmi $(OBJDIR)/*.cmx $(OBJDIR)/*.cma $(OBJDIR)/*.mli \
437433
$(OBJDIR)/*.cmxa $(OBJDIR)/*.a $(SOURCEDIRS:%=%/*.mli)
438434

439-
install-findlib: all $(EVERYTHING)
435+
install-findlib: all $(EVERYTHING) uninstall-findlib
440436
ocamlfind install cil META $(EVERYTHING)
441437

442438
uninstall-findlib:

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ You can also use CIL as a library to write your own programs. For
4545
instance in the OCaml toplevel using [findlib][]:
4646

4747
$ ocaml
48-
Objective Caml version 3.12.0
48+
Objective Caml version 4.00.1
4949

5050
# #use "topfind";;
5151
[...]
5252
# #require "cil";;
5353
[...]
5454
# Cil.cilVersion;;
55-
- : string = "1.6.0"
55+
- : string = "1.7.0"
5656

5757

5858
More documentation
@@ -83,6 +83,6 @@ Ressources
8383
----------
8484

8585
* [Mailing list](https://lists.sourceforge.net/lists/listinfo/cil-users)
86-
* [Bug tracker](http://sourceforge.net/tracker/?group_id=138953&atid=742140)
86+
* [Bug tracker](http://sourceforge.net/p/cil/bugs/)
8787

8888
CIL is maintained by Gabriel Kerneis <kerneis@pps.univ-paris-diderot.fr>

‎bin/cabsxform‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎bin/cilly.bat.in‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎bin/patcher.bat.in‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/.gdbinit renamed to cilly/.gdbinit

File renamed without changes.

0 commit comments

Comments
 (0)