From c84e96bf662f4372a1732926f28429b0f73f8a61 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Thu, 12 Jan 2006 10:56:18 +0000 Subject: [PATCH] enable building with ocaml 3.08.x - do not build the GUI (which requires lablgtksourceview) - do not append -for-pack - checkout from the tests branch --- helm/matita/Makefile.in | 2 +- helm/matita/configure.ac | 1 - helm/matita/scripts/crontab.sh | 2 +- helm/matita/scripts/profile_svn.sh | 2 +- helm/ocaml/paramodulation/Makefile | 3 --- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in index 0614bda3d..d498e37a1 100644 --- a/helm/matita/Makefile.in +++ b/helm/matita/Makefile.in @@ -72,7 +72,7 @@ MAKECMOS = \ buildTimeConf.cmo \ matitamakeLib.cmo \ $(NULL) -PROGRAMS_BYTE = matita matitac cicbrowser matitadep matitaclean matitamake dump_moo +PROGRAMS_BYTE = matitac matitadep matitaclean matitamake PROGRAMS = $(PROGRAMS_BYTE) matitatop PROGRAMS_OPT = $(patsubst %,%.opt,$(PROGRAMS_BYTE)) diff --git a/helm/matita/configure.ac b/helm/matita/configure.ac index 1075d605d..f448eb767 100644 --- a/helm/matita/configure.ac +++ b/helm/matita/configure.ac @@ -54,7 +54,6 @@ FINDLIB_REQUIRES="\ $FINDLIB_CREQUIRES \ lablgtk2.glade \ lablgtkmathview \ -lablgtksourceview \ helm-xmldiff \ helm-paramodulation \ " diff --git a/helm/matita/scripts/crontab.sh b/helm/matita/scripts/crontab.sh index 5ad50de5e..3f5dfb978 100644 --- a/helm/matita/scripts/crontab.sh +++ b/helm/matita/scripts/crontab.sh @@ -3,7 +3,7 @@ TODAY=`date +%Y%m%d` YESTERDAY=`date -d yesterday +%Y%m%d` TMPDIRNAME=$HOME/__${TODAY}_crontab TMPDIRNAMEOLD=$HOME/__${YESTERDAY}_crontab -SVNROOT="svn+ssh://mowgli.cs.unibo.it/local/svn/helm/trunk/" +SVNROOT="svn+ssh://mowgli.cs.unibo.it/local/svn/helm/branches/tests/" SHELLTIME2CENTSPHP=scripts/shell_time2cents.php SHELLADDERPHP=scripts/shell_adder.php COMMONPHP=scripts/public_html/common.php diff --git a/helm/matita/scripts/profile_svn.sh b/helm/matita/scripts/profile_svn.sh index eca457ecc..4642b3538 100755 --- a/helm/matita/scripts/profile_svn.sh +++ b/helm/matita/scripts/profile_svn.sh @@ -1,7 +1,7 @@ #!/bin/bash MARK=`date +%Y%m%d%H%M` TMPDIRNAME=__${MARK}_compilation -SVNROOT="svn+ssh://mowgli.cs.unibo.it/local/svn/helm/trunk/" +SVNROOT="svn+ssh://mowgli.cs.unibo.it/local/svn/helm/branches/tests/" function testit { LOGTOOPT=/dev/null diff --git a/helm/ocaml/paramodulation/Makefile b/helm/ocaml/paramodulation/Makefile index 35b650ea7..900aca6b8 100644 --- a/helm/ocaml/paramodulation/Makefile +++ b/helm/ocaml/paramodulation/Makefile @@ -14,12 +14,9 @@ include ../Makefile.common paramodulation.cmo: $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(OCAMLC) -pack -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmo) -paramodulation.cmx: OCAMLOPTIONS=-package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread paramodulation.cmx: $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(OCAMLOPT) -pack -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmx) -OCAMLOPTIONS+=-for-pack Paramodulation - $(ARCHIVE): paramodulation.cmo $(LIBRARIES) $(OCAMLC) $(OCAMLARCHIVEOPTIONS) -a -o $@ \ paramodulation.cmo -- 2.39.2