From 425f2471b811c898c84cf7f5230037dd3c8b719b Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Wed, 28 Nov 2001 11:23:51 +0000 Subject: [PATCH] META files are now automatically generated from META-*.src files. In this way all the hard-coded file paths have been removed. Installation and uninstallation (still not implemented) should be also easier. Moreover, an error in a sub-directory now stops the whole processing. --- helm/ocaml/.cvsignore | 1 + .../{META.helm-cic => META.helm-cic.src} | 1 - ...otations => META.helm-cic_annotations.src} | 1 - ...he => META.helm-cic_annotations_cache.src} | 1 - ...helm-cic_cache => META.helm-cic_cache.src} | 1 - ...cking => META.helm-cic_proof_checking.src} | 1 - ...{META.helm-getter => META.helm-getter.src} | 1 - .../{META.helm-pxp => META.helm-pxp.src} | 1 - ...lm-urimanager => META.helm-urimanager.src} | 1 - .../{META.helm-xml => META.helm-xml.src} | 1 - helm/ocaml/Makefile | 33 ++++++++++++++++--- 11 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 helm/ocaml/.cvsignore rename helm/ocaml/{META.helm-cic => META.helm-cic.src} (69%) rename helm/ocaml/{META.helm-cic_annotations => META.helm-cic_annotations.src} (69%) rename helm/ocaml/{META.helm-cic_annotations_cache => META.helm-cic_annotations_cache.src} (68%) rename helm/ocaml/{META.helm-cic_cache => META.helm-cic_cache.src} (66%) rename helm/ocaml/{META.helm-cic_proof_checking => META.helm-cic_proof_checking.src} (80%) rename helm/ocaml/{META.helm-getter => META.helm-getter.src} (70%) rename helm/ocaml/{META.helm-pxp => META.helm-pxp.src} (67%) rename helm/ocaml/{META.helm-urimanager => META.helm-urimanager.src} (65%) rename helm/ocaml/{META.helm-xml => META.helm-xml.src} (64%) diff --git a/helm/ocaml/.cvsignore b/helm/ocaml/.cvsignore new file mode 100644 index 000000000..68dd36db7 --- /dev/null +++ b/helm/ocaml/.cvsignore @@ -0,0 +1 @@ +META.helm-cic META.helm-getter META.helm-cic_annotations META.helm-pxp META.helm-cic_annotations_cache META.helm-urimanager META.helm-cic_cache META.helm-xml META.helm-cic_proof_checking diff --git a/helm/ocaml/META.helm-cic b/helm/ocaml/META.helm-cic.src similarity index 69% rename from helm/ocaml/META.helm-cic rename to helm/ocaml/META.helm-cic.src index 4fcb7055b..ee898d894 100644 --- a/helm/ocaml/META.helm-cic +++ b/helm/ocaml/META.helm-cic.src @@ -3,4 +3,3 @@ version="0.0.1" archive(byte)="cic.cma" archive(native)="cic.cmxa" linkopts="" -directory="/home/sacerdot/miohelm/helm/ocaml/cic" diff --git a/helm/ocaml/META.helm-cic_annotations b/helm/ocaml/META.helm-cic_annotations.src similarity index 69% rename from helm/ocaml/META.helm-cic_annotations rename to helm/ocaml/META.helm-cic_annotations.src index db1361816..ec5462fe7 100644 --- a/helm/ocaml/META.helm-cic_annotations +++ b/helm/ocaml/META.helm-cic_annotations.src @@ -3,4 +3,3 @@ version="0.0.1" archive(byte)="cic_annotations.cma" archive(native)="cic_annotations.cmxa" linkopts="" -directory="/home/sacerdot/miohelm/helm/ocaml/cic_annotations" diff --git a/helm/ocaml/META.helm-cic_annotations_cache b/helm/ocaml/META.helm-cic_annotations_cache.src similarity index 68% rename from helm/ocaml/META.helm-cic_annotations_cache rename to helm/ocaml/META.helm-cic_annotations_cache.src index 50654135d..38f5d1da9 100644 --- a/helm/ocaml/META.helm-cic_annotations_cache +++ b/helm/ocaml/META.helm-cic_annotations_cache.src @@ -3,4 +3,3 @@ version="0.0.1" archive(byte)="cic_annotations_cache.cma" archive(native)="cic_annotations_cache.cmxa" linkopts="" -directory="/home/sacerdot/miohelm/helm/ocaml/cic_annotations_cache" diff --git a/helm/ocaml/META.helm-cic_cache b/helm/ocaml/META.helm-cic_cache.src similarity index 66% rename from helm/ocaml/META.helm-cic_cache rename to helm/ocaml/META.helm-cic_cache.src index 0b6b4e636..28ea57e35 100644 --- a/helm/ocaml/META.helm-cic_cache +++ b/helm/ocaml/META.helm-cic_cache.src @@ -3,4 +3,3 @@ version="0.0.1" archive(byte)="cic_cache.cma" archive(native)="cic_cache.cmxa" linkopts="" -directory="/home/sacerdot/miohelm/helm/ocaml/cic_cache" diff --git a/helm/ocaml/META.helm-cic_proof_checking b/helm/ocaml/META.helm-cic_proof_checking.src similarity index 80% rename from helm/ocaml/META.helm-cic_proof_checking rename to helm/ocaml/META.helm-cic_proof_checking.src index 59657d3c2..08b099ec3 100644 --- a/helm/ocaml/META.helm-cic_proof_checking +++ b/helm/ocaml/META.helm-cic_proof_checking.src @@ -5,4 +5,3 @@ archive(native)="cic_proof_checking.cmxa" archive(byte,miniReduction)="cicSubstitution.cmo cicMiniReduction.cmo" archive(native,miniReduction)="cicSubstitution.cmx cicMiniReduction.cmx" linkopts="" -directory="/home/sacerdot/miohelm/helm/ocaml/cic_proof_checking" diff --git a/helm/ocaml/META.helm-getter b/helm/ocaml/META.helm-getter.src similarity index 70% rename from helm/ocaml/META.helm-getter rename to helm/ocaml/META.helm-getter.src index 088aa3bed..8ba941fbd 100644 --- a/helm/ocaml/META.helm-getter +++ b/helm/ocaml/META.helm-getter.src @@ -3,4 +3,3 @@ version="0.0.1" archive(byte)="getter.cma" archive(native)="getter.cmxa" linkopts="" -directory="/home/sacerdot/miohelm/helm/ocaml/getter" diff --git a/helm/ocaml/META.helm-pxp b/helm/ocaml/META.helm-pxp.src similarity index 67% rename from helm/ocaml/META.helm-pxp rename to helm/ocaml/META.helm-pxp.src index 68bdbf291..33210a77d 100644 --- a/helm/ocaml/META.helm-pxp +++ b/helm/ocaml/META.helm-pxp.src @@ -3,4 +3,3 @@ version="0.0.1" archive(byte)="pxp.cma" archive(native)="pxp.cmxa" linkopts="" -directory="/home/sacerdot/miohelm/helm/ocaml/pxp" diff --git a/helm/ocaml/META.helm-urimanager b/helm/ocaml/META.helm-urimanager.src similarity index 65% rename from helm/ocaml/META.helm-urimanager rename to helm/ocaml/META.helm-urimanager.src index 805f9f1c3..ff1874688 100644 --- a/helm/ocaml/META.helm-urimanager +++ b/helm/ocaml/META.helm-urimanager.src @@ -3,4 +3,3 @@ version="0.0.1" archive(byte)="urimanager.cma" archive(native)="urimanager.cmxa" linkopts="" -directory="/home/sacerdot/miohelm/helm/ocaml/urimanager" diff --git a/helm/ocaml/META.helm-xml b/helm/ocaml/META.helm-xml.src similarity index 64% rename from helm/ocaml/META.helm-xml rename to helm/ocaml/META.helm-xml.src index 7f59db45d..1cd68fed8 100644 --- a/helm/ocaml/META.helm-xml +++ b/helm/ocaml/META.helm-xml.src @@ -3,4 +3,3 @@ version="0.0.1" archive(byte)="xml.cma" archive(native)="xml.cmxa" linkopts="" -directory="/home/sacerdot/miohelm/helm/ocaml/xml" diff --git a/helm/ocaml/Makefile b/helm/ocaml/Makefile index e488c6401..d983eea74 100644 --- a/helm/ocaml/Makefile +++ b/helm/ocaml/Makefile @@ -1,6 +1,31 @@ # Warning: the modules must be in compilation order -MODULES= xml urimanager getter pxp cic cic_annotations cic_annotations_cache \ - cic_cache cic_proof_checking +MODULES = xml urimanager getter pxp cic cic_annotations cic_annotations_cache \ + cic_cache cic_proof_checking -all opt depend install uninstall clean: - for i in $(MODULES) ; do (cd $$i ; make $@) ; done +METAS = $(MODULES:%=META.helm-%) +CWD=`pwd` + +all: $(METAS) $(MODULES:%=%.all) +opt: $(METAS) $(MODULES:%=%.opt) +depend: $(MODULES:%=%.depend) +install: $(MODULES:%=%.install) +uninstall: $(MODULES:%=%.uninstall) +clean: $(MODULES:%=%.clean) + rm -f $(METAS) + +$(MODULES:%=%.all): + export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.all=%) ; make all +$(MODULES:%=%.opt): + export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.opt=%) ; make opt +$(MODULES:%=%.depend): + export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.depend=%) ; make depend +$(MODULES:%=%.install): + cd $(@:%.install=%) ; make install +$(MODULES:%=%.uninstall): + cd $(@:%.uninstall=%) ; make uninstall +$(MODULES:%=%.clean): + cd $(@:%.clean=%) ; make clean +$(MODULES:%=META.helm-%): + cp $@.src $@ ; echo "directory=\"$(CWD)/$(@:META.helm-%=%)\"" >> $@ +META.helm-%: META.helm-%.src + cp $< $@ ; echo "directory=\"$(CWD)/$(@:META.helm-%=%)\"" >> $@ -- 2.39.2