Permalink
Browse files

update to use the git version of camlp5

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14679 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
  • Loading branch information...
1 parent 2633ff7 commit 9639370d40a4dd5d880b4aba4dd570c8c8b7b343 Damien Doligez committed Apr 25, 2014
Showing with 57 additions and 48 deletions.
  1. +1 −1 testsuite/external/.ignore
  2. +44 −47 testsuite/external/Makefile
  3. +12 −0 testsuite/external/camlp5-git.patch
@@ -26,7 +26,7 @@ camlpdf-0.5
camlp4
camlp4-trunk
camlp5
-camlp5-6.10
+camlp5-git
camlzip
camlzip-1.04
camomile
@@ -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}
@@ -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 \

0 comments on commit 9639370

Please sign in to comment.