merge trunk up to commit 14699safe-string

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/safe-string@14700 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

3 files changed, 57 insertions, 48 deletions

diff --git a/testsuite/external/.ignore b/testsuite/external/.ignore
index 8b57bbb1eb..39e14de915 100644
--- a/testsuite/external/.ignore
+++ b/testsuite/external/.ignore
@@ -26,7 +26,7 @@ camlpdf-0.5
 camlp4
 camlp4-trunk
 camlp5
-camlp5-6.10
+camlp5-git
 camlzip
 camlzip-1.04
 camomile
diff --git a/testsuite/external/Makefile b/testsuite/external/Makefile
index 33acd2ae64..566aaf3921 100644
--- a/testsuite/external/Makefile
+++ b/testsuite/external/Makefile
@@ -44,10 +44,10 @@ all-cygwin: findlib ounit res pcre react ocamltext ocamlssl camlzip cryptokit \
 
 all-macos: findlib res pcre react ocamltext \
            ocamlssl camlzip cryptokit sqlite menhir hevea \
-           xmllight xmlm omake \
+           xmllight xmlm omake zen \
            altergo boomerang vsyml extlib \
            ocamlify calendar \
-           dbm framac
+           dbm geneweb framac coq compcert
 
 platform:
 	case `uname -s` in \
@@ -1573,56 +1573,53 @@ distclean::
 	rm -f ${CSV}.tar.gz
 all: csv
 
-# disabled: need to be updated for new AST stuff
-# # http://pauillac.inria.fr/~ddr/camlp5/
-# CAMLP5=camlp5-6.10
-# ${CAMLP5}.tgz:
-# 	${WGET} http://pauillac.inria.fr/~ddr/camlp5/distrib/src/$@
-# camlp5: ${CAMLP5}.tgz
-# 	printf "%s " "$@" >/dev/tty
-# 	test -d ${PREFIX}
-# 	rm -rf ${CAMLP5}
-# 	tar zxf ${CAMLP5}.tgz
-# 	./Patcher.sh ${CAMLP5}
-# 	( cd ${CAMLP5} && \
-# 	  export PATH=${PREFIX}/bin:$$PATH && \
-# 	  ./configure --transitional && \
-# 	  ${MAKE} world.opt && \
-# 	  ${MAKE} install )
-# 	echo ${VERSION} >$@
-# clean::
-# 	rm -rf ${CAMLP5} camlp5
-# distclean::
-# 	rm -f ${CAMLP5}.tgz
-# all: camlp5
-
-# disabled: depends on camlp5
-# # http://opensource.geneanet.org/projects/geneweb
-# GENEWEB=gw-6.05-src
-# ${GENEWEB}.tgz:
-# 	${WGET} http://opensource.geneanet.org/attachments/download/190/$@
-# geneweb: ${GENEWEB}.tgz camlp5
-# 	printf "%s " "$@" >/dev/tty
-# 	test -d ${PREFIX}
-# 	rm -rf ${GENEWEB}
-# 	tar zxf ${GENEWEB}.tgz
-# 	./Patcher.sh ${GENEWEB}
-# 	( cd ${GENEWEB} && \
-# 	  export PATH=${PREFIX}/bin:$$PATH && \
-# 	  sh ./configure && \
-# 	  ${MAKE} )
-# 	echo ${VERSION} >$@
-# clean::
-# 	rm -rf ${GENEWEB} geneweb
-# distclean::
-# 	rm -f ${GENEWEB}.tgz
-# all: geneweb
+# http://pauillac.inria.fr/~ddr/camlp5/
+CAMLP5=camlp5-git
+camlp5:
+	printf "%s " "$@" >/dev/tty
+	test -d ${PREFIX}
+	rm -rf ${CAMLP5}
+	git clone git://scm.gforge.inria.fr/camlp5/camlp5.git ${CAMLP5}
+	./Patcher.sh ${CAMLP5}
+	( cd ${CAMLP5} && \
+	  export PATH=${PREFIX}/bin:$$PATH && \
+	  ./configure --transitional && \
+	  ${MAKE} world.opt && \
+	  ${MAKE} install )
+	echo ${VERSION} >$@
+clean::
+	rm -rf ${CAMLP5} camlp5
+distclean::
+	rm -f ${CAMLP5}-git
+all: camlp5
+
+disabled: depends on camlp5
+# http://opensource.geneanet.org/projects/geneweb
+GENEWEB=gw-6.05-src
+${GENEWEB}.tgz:
+	${WGET} http://opensource.geneanet.org/attachments/download/190/$@
+geneweb: ${GENEWEB}.tgz camlp5
+	printf "%s " "$@" >/dev/tty
+	test -d ${PREFIX}
+	rm -rf ${GENEWEB}
+	tar zxf ${GENEWEB}.tgz
+	./Patcher.sh ${GENEWEB}
+	( cd ${GENEWEB} && \
+	  export PATH=${PREFIX}/bin:$$PATH && \
+	  sh ./configure && \
+	  ${MAKE} )
+	echo ${VERSION} >$@
+clean::
+	rm -rf ${GENEWEB} geneweb
+distclean::
+	rm -f ${GENEWEB}.tgz
+all: geneweb
 
 # http://coq.inria.fr/download
 COQ=coq-8.4pl2
 ${COQ}.tar.gz:
 	${WGET} http://coq.inria.fr/distrib/V8.4pl2/files/$@
-xxcoq: ${COQ}.tar.gz camlp5
+coq: ${COQ}.tar.gz camlp5
 	printf "%s " "$@" >/dev/tty
 	test -d ${PREFIX}
 	rm -rf ${COQ}
diff --git a/testsuite/external/camlp5-git.patch b/testsuite/external/camlp5-git.patch
new file mode 100644
index 0000000000..8ea012cc5c
--- /dev/null
+++ b/testsuite/external/camlp5-git.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index 13622f7..b33a042 100644
+--- camlp5-git/Makefile.orig
++++ camlp5-git/Makefile
+@@ -54,6 +54,7 @@ depend:
+ 	cd ocaml_stuff; $(MAKE) depend; cd ..
+ 	for i in $(DIRS) compile; do (cd $$i; $(MAKE) depend; cd ..); done
+ 
++.PHONY: install
+ install:
+ 	rm -rf "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)"
+ 	for i in $(DIRS) compile; do \