Release 1.7.2

Author: kerneis

META

@@ -2,4 +2,4 @@ description = "C Intermediate Language"
 requires = "unix str num"
 version = "@CIL_VERSION@"
 archive(byte) = "cil.cma"
-archive(opt) = "cil.cmxa"
+archive(native) = "cil.cmxa"

Makefile.in

@@ -98,10 +98,12 @@ ifeq ($(FORCE_PERL_PREFIX), 1)
 	export PERL_MM_OPT
 endif
 
-$(CILLYDIR)/Makefile: Makefile $(CILLYDIR)/Makefile.PL $(CILLYDIR)/App/Cilly.pm
+CILLYMOD := Cilly
+
+$(CILLYDIR)/Makefile: Makefile $(CILLYDIR)/Makefile.PL $(CILLYDIR)/App/$(CILLYMOD).pm
 	cd $(CILLYDIR); $(PERL) Makefile.PL
 
-.PHONY: cilly
+.PHONY: $(CILLY)
 $(CILLY): $(BINDIR)/$(CILLY)$(EXE) $(CILLYDIR)/Makefile
 	$(MAKE) -C $(CILLYDIR)
 
@@ -169,17 +171,17 @@ $(OBJDIR)/machdep.ml : src/machdep-ml.c configure.ac Makefile.in
 			  ;fi
 	@echo "let theMachine : mach ref = ref gcc" >>$@
 
-$(CILLYDIR)/App/Cilly.pm: $(CILLYDIR)/App/Cilly.pm.in src/machdep-ml.c configure.ac Makefile.in
-	cp $(CILLYDIR)/App/Cilly.pm.in $(CILLYDIR)/App/Cilly.pm
-	sed -e "s|CIL_VERSION|@CIL_VERSION@|" $(CILLYDIR)/App/Cilly.pm > $(CILLYDIR)/App/Cilly.pm.tmp; \
-	mv $(CILLYDIR)/App/Cilly.pm.tmp $(CILLYDIR)/App/Cilly.pm; \
+$(CILLYDIR)/App/$(CILLYMOD).pm: $(CILLYDIR)/App/$(CILLYMOD).pm.in src/machdep-ml.c configure.ac Makefile.in
+	cp $(CILLYDIR)/App/$(CILLYMOD).pm.in $(CILLYDIR)/App/$(CILLYMOD).pm
+	sed -e "s|CIL_VERSION|@CIL_VERSION@|" $(CILLYDIR)/App/$(CILLYMOD).pm > $(CILLYDIR)/App/$(CILLYMOD).pm.tmp; \
+	mv $(CILLYDIR)/App/$(CILLYMOD).pm.tmp $(CILLYDIR)/App/$(CILLYMOD).pm; \
 	if $(MACHDEPCC) -m32 src/machdep-ml.c -o $(OBJDIR)/machdep-ml32.exe ;then \
-	  sed -e "s|nogcc32model|`$(EMUL) $(OBJDIR)/machdep-ml32.exe --env`|" $(CILLYDIR)/App/Cilly.pm > $(CILLYDIR)/App/Cilly.pm.tmp; \
-	  mv $(CILLYDIR)/App/Cilly.pm.tmp $(CILLYDIR)/App/Cilly.pm; \
+	  sed -e "s|nogcc32model|`$(EMUL) $(OBJDIR)/machdep-ml32.exe --env`|" $(CILLYDIR)/App/$(CILLYMOD).pm > $(CILLYDIR)/App/$(CILLYMOD).pm.tmp; \
+	  mv $(CILLYDIR)/App/$(CILLYMOD).pm.tmp $(CILLYDIR)/App/$(CILLYMOD).pm; \
 	fi
 	if $(MACHDEPCC) -m64 src/machdep-ml.c -o $(OBJDIR)/machdep-ml64.exe ;then \
-	  sed -e "s|nogcc64model|`$(EMUL) $(OBJDIR)/machdep-ml64.exe --env`|" $(CILLYDIR)/App/Cilly.pm > $(CILLYDIR)/App/Cilly.pm.tmp; \
-	  mv $(CILLYDIR)/App/Cilly.pm.tmp $(CILLYDIR)/App/Cilly.pm; \
+	  sed -e "s|nogcc64model|`$(EMUL) $(OBJDIR)/machdep-ml64.exe --env`|" $(CILLYDIR)/App/$(CILLYMOD).pm > $(CILLYDIR)/App/$(CILLYMOD).pm.tmp; \
+	  mv $(CILLYDIR)/App/$(CILLYMOD).pm.tmp $(CILLYDIR)/App/$(CILLYMOD).pm; \
 	fi
 
 .PHONY: cilversion
@@ -232,7 +234,7 @@ odoc: $(OBJDIR)/doc/cil.docdir/index.html
 	-mkdir -p doc/html/cil/
 	-cp -r $(dir $<) doc/html/cil/api
 
-doc/cilpp.tex: doc/cilcode.pl doc/cil.tex $(CILLYDIR)/App/Cilly.pm
+doc/cilpp.tex: doc/cilcode.pl doc/cil.tex $(CILLYDIR)/App/$(CILLYMOD).pm
 	-rm -rf doc/html/cil
 	-mkdir -p doc/html/cil
 	-mkdir -p doc/html/cil/examples
@@ -254,12 +256,12 @@ pdfdoc: doc/cilpp.tex
 	cd doc; pdflatex cilpp.tex; pdflatex cilpp.tex
 	cd doc; mv cilpp.pdf html/cil/CIL.pdf
 
-.PHONY: distclean cleandoc cleancilly clean
+.PHONY: distclean clean
 distclean: clean
 	$(MAKE) -C test distclean
 	rm -rf autom4te.cache/
 	rm -f Makefile
-	rm -f $(CILLYDIR)/App/Cilly/CilConfig.pm
+	rm -f $(CILLYDIR)/App/$(CILLYMOD)/CilConfig.pm
 	rm -f config.h
 	rm -f config.log
 	rm -f config.mk
@@ -269,11 +271,6 @@ distclean: clean
 	rm -f src/machdep-ml.c
 	rm -f stamp-h
 
-
-cleandoc:
-
-cleancilly:
-
 clean: $(CILLYDIR)/Makefile
 	rm -rf $(OBJDIR)
 	rm -f $(BINDIR)/$(CILLY).*
@@ -282,7 +279,7 @@ clean: $(CILLYDIR)/Makefile
 	rm -f doc/cil.version.*
 	rm -f doc/cilpp.*
 	$(MAKE) -C $(CILLYDIR) clean
-	rm -f $(CILLYDIR)/App/Cilly.pm
+	rm -f $(CILLYDIR)/App/$(CILLYMOD).pm
 	rm -f $(CILLYDIR)/Makefile.old
 	rm -f Makefile.features
 
@@ -303,7 +300,6 @@ install: $(CILLY) install-findlib
 	$(MAKE) -C $(CILLYDIR) pure_install
 	$(INSTALL) -m 0755 $(BINDIR)/$(CILLY).* $(DESTDIR)$(bindir)
 
-# FIXME
 uninstall: $(CILLYDIR)/Makefile uninstall-findlib
 	-rm -f $(DESTDIR)$(bindir)/$(CILLY).*
 	$(MAKE) -C $(CILLYDIR) force_uninstall

README.md

@@ -57,7 +57,7 @@ instance in the OCaml toplevel using [findlib][]:
     # #require "cil";;
     [...]
     # Cil.cilVersion;;           
-    - : string = "1.7.1"
+    - : string = "1.7.2"
 
 
 More documentation

configure

@@ -2207,7 +2207,7 @@ ac_config_files="$ac_config_files stamp-h"
 # Assign here the CIL version numbers
 CIL_VERSION_MAJOR=1
 CIL_VERSION_MINOR=7
-CIL_VERSION_REV=1
+CIL_VERSION_REV=2
 CIL_VERSION=$CIL_VERSION_MAJOR.$CIL_VERSION_MINOR.$CIL_VERSION_REV
 
 # make sure I haven't forgotten to run autoconf

configure.ac

@@ -33,7 +33,7 @@ AC_PREREQ([2.69])
 # Assign here the CIL version numbers
 CIL_VERSION_MAJOR=1
 CIL_VERSION_MINOR=7
-CIL_VERSION_REV=1
+CIL_VERSION_REV=2
 CIL_VERSION=$CIL_VERSION_MAJOR.$CIL_VERSION_MINOR.$CIL_VERSION_REV
 
 # make sure I haven't forgotten to run autoconf

doc/cil.tex

@@ -3363,6 +3363,9 @@ \section{Bug reports}
 
 \section{Changes}\label{sec-changes}\cutname{changes.html}
 \begin{itemize}
+\item{\bf June 27, 2013}: {\bf Released version 1.7.2}.\\
+  Fix building and installation of CIL library (\#138).
+
 \item{\bf June 18, 2013}: {\bf Released version 1.7.1}.\\
 Improve build system, including:
     \begin{itemize}

doc/html/cil/CIL.pdf

@@ -24,7 +24,7 @@
 <link title="Errormsg" rel="Chapter" href="Errormsg.html">
 <link title="Formatcil" rel="Chapter" href="Formatcil.html">
 <link title="Pretty" rel="Chapter" href="Pretty.html">
-<link title="Stats" rel="Chapter" href="Stats.html"><title>CIL API Documentation (version 1.7.1) : Alpha</title>
+<link title="Stats" rel="Chapter" href="Stats.html"><title>CIL API Documentation (version 1.7.2) : Alpha</title>
 </head>
 <body>
 <div class="navbar">&nbsp;<a class="up" href="index.html" title="Index">Up</a>

doc/html/cil/api/Alpha.html

@@ -25,7 +25,7 @@
 <link title="Errormsg" rel="Chapter" href="Errormsg.html">
 <link title="Formatcil" rel="Chapter" href="Formatcil.html">
 <link title="Pretty" rel="Chapter" href="Pretty.html">
-<link title="Stats" rel="Chapter" href="Stats.html"><title>CIL API Documentation (version 1.7.1) : Cfg</title>
+<link title="Stats" rel="Chapter" href="Stats.html"><title>CIL API Documentation (version 1.7.2) : Cfg</title>
 </head>
 <body>
 <div class="navbar"><a class="pre" href="Alpha.html" title="Alpha">Previous</a>

doc/html/cil/api/Cfg.html

@@ -25,7 +25,7 @@
 <link title="Errormsg" rel="Chapter" href="Errormsg.html">
 <link title="Formatcil" rel="Chapter" href="Formatcil.html">
 <link title="Pretty" rel="Chapter" href="Pretty.html">
-<link title="Stats" rel="Chapter" href="Stats.html"><title>CIL API Documentation (version 1.7.1) : Cil.cilPrinter</title>
+<link title="Stats" rel="Chapter" href="Stats.html"><title>CIL API Documentation (version 1.7.2) : Cil.cilPrinter</title>
 </head>
 <body>
 <div class="navbar"><a class="pre" href="Cil.cilVisitor-c.html" title="Cil.cilVisitor">Previous</a>