X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=f8b91df1ce719df6504aee1ef8f4a672e78ca040;hb=55318cc354e514953bca429618150bb069e9920d;hp=e10f8ed12ef56e08f5247bb6eac8e0e1e04c4efb;hpb=148494ecb9d27a993e1b0537fd3ac770fbc38ef8;p=perl4caml.git

diff --git a/Makefile b/Makefile
index e10f8ed..f8b91df 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.
-# $Id: Makefile,v 1.16 2003-11-08 11:35:22 rich Exp $
+# $Id: Makefile,v 1.30 2005-01-31 15:23:23 rich Exp $
 
 include Makefile.config
 
@@ -16,21 +16,22 @@ OCAMLOPTINCS := $(OCAMLCINCS)
 OCAMLCFLAGS := -w s -g $(OCAMLCINCS)
 OCAMLOPTFLAGS := -w s $(OCAMLOPTINCS)
 
+PERLCFLAGS := $(shell perl -e 'use Config; print $$Config{ccflags};')
+
 CC := gcc
-CFLAGS := -Wall -Wno-unused -I$(PERLINCDIR)
+CFLAGS := -fPIC -Wall -Wno-unused -I$(PERLINCDIR) $(PERLCFLAGS) $(EXTRA_CFLAGS)
 
 LIBPERL := $(shell perl -MExtUtils::Embed -e ldopts)
 
 SED := sed
 
-# XXX Hack required by ocamlopt, and sometimes ocamlc.
-# To work out what this should be, try:
-# `perl -MExtUtils::Embed -e ldopts'
-DYNALOADER_HACK := /usr/lib/perl/5.8.1/auto/DynaLoader/DynaLoader.a
-
 OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS)
 
 WRAPPERS := \
+	wrappers/pl_Data_Dumper.cmo \
+	wrappers/pl_Date_Calc.cmo \
+	wrappers/pl_Date_Format.cmo \
+	wrappers/pl_Date_Parse.cmo \
 	wrappers/pl_Net_Google_Cache.cmo \
 	wrappers/pl_Net_Google_Response.cmo \
 	wrappers/pl_Net_Google_Search.cmo \
@@ -40,10 +41,16 @@ WRAPPERS := \
 	wrappers/pl_HTML_Parser.cmo \
 	wrappers/pl_HTML_TreeBuilder.cmo \
 	wrappers/pl_URI.cmo \
+	wrappers/pl_HTTP_Cookies.cmo \
+	wrappers/pl_HTTP_Headers.cmo \
 	wrappers/pl_HTTP_Message.cmo \
 	wrappers/pl_HTTP_Request.cmo \
+	wrappers/pl_HTTP_Request_Common.cmo \
 	wrappers/pl_HTTP_Response.cmo \
-	wrappers/pl_LWP_UserAgent.cmo
+	wrappers/pl_HTML_Form.cmo \
+	wrappers/pl_LWP_UserAgent.cmo \
+	wrappers/pl_Template.cmo \
+	wrappers/pl_WWW_Mechanize.cmo
 
 all:	perl4caml.cma perl4caml.cmxa META all-examples html
 
@@ -53,27 +60,39 @@ perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS)
 perl4caml.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx)
 	$(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
 
-all-examples: examples/test examples/loadpage examples/google \
-	examples/test.opt examples/loadpage.opt examples/google.opt
-
-examples/test: examples/test.cmo
-	$(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
-
-examples/test.opt: examples/test.cmx
-	$(OCAMLOPT) $(OCAMLOPTFLAGS) -cclib -L. perl4caml.cmxa \
-	$(DYNALOADER_HACK) $^ -o $@
-
-examples/loadpage: examples/loadpage.cmo
-	$(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
-
-examples/loadpage.opt: examples/loadpage.cmx
-	$(OCAMLOPT) $(OCAMLOPTFLAGS) -cclib -L. perl4caml.cmxa \
-	$(DYNALOADER_HACK) $^ -o $@
+all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \
+	examples/test.opt examples/loadpage.opt examples/google.opt \
+	examples/parsedate.bc examples/parsedate.opt
+
+TEST_PROGRAMS := $(patsubst %.ml,%.bc,$(wildcard test/*.ml)) \
+	$(patsubst %.ml,%.opt,$(wildcard test/*.ml))
+
+test: $(TEST_PROGRAMS) run-tests
+
+check: test
+
+run-tests:
+	@fails=0; count=0; \
+	export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH; \
+	for prog in $(TEST_PROGRAMS); do \
+	  if ! $$prog; then \
+	    echo Test $$prog failed; \
+	    fails=$$(($$fails+1)); \
+	  fi; \
+	  count=$$(($$count+1)); \
+	done; \
+	if [ $$fails -eq 0 ]; then \
+	  echo All tests succeeded.; \
+	  exit 0; \
+	else \
+	  echo $$fails/$$count tests failed.; \
+	  exit 1; \
+	fi
 
-examples/google: examples/google.cmo
+%.bc: %.cmo
 	$(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
 
-examples/google.opt: examples/google.cmx
+%.opt: %.cmx
 	$(OCAMLOPT) $(OCAMLOPTFLAGS) -cclib -L. perl4caml.cmxa \
 	$(DYNALOADER_HACK) $^ -o $@
 
@@ -95,11 +114,14 @@ META:	META.in Makefile.config
 
 # Clean.
 
-JUNKFILES = core *~ *.bak *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so
+JUNKFILES = core *~ *.bak *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so \
+	*.bc *.opt
 
 clean:
-	rm -f META examples/test examples/loadpage examples/google
-	for d in . examples wrappers; do (cd $$d; rm -f $(JUNKFILES)); done
+	rm -f META
+	for d in . examples test wrappers; do \
+	  (cd $$d; rm -f $(JUNKFILES)); \
+	done
 
 # Build dependencies.
 
@@ -129,6 +151,7 @@ install:
 # Distribution.
 
 dist:
+	$(MAKE) check-manifest
 	rm -rf $(PACKAGE)-$(VERSION)
 	mkdir $(PACKAGE)-$(VERSION)
 	tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
@@ -137,23 +160,37 @@ dist:
 	ls -l $(PACKAGE)-$(VERSION).tar.gz
 
 check-manifest:
-	@for d in `find -type d -name CVS`; \
+	@for d in `find -type d -name CVS | grep -v '^\./debian/'`; \
 	do \
 	b=`dirname $$d`/; \
 	awk -F/ '$$1 != "D" {print $$2}' $$d/Entries | \
 	sed -e "s|^|$$b|" -e "s|^\./||"; \
 	done | sort > .check-manifest; \
 	sort MANIFEST > .orig-manifest; \
-	diff -u .orig-manifest .check-manifest; \
-	rm -f .orig-manifest .check-manifest
+	diff -u .orig-manifest .check-manifest; rv=$$?; \
+	rm -f .orig-manifest .check-manifest; \
+	exit $$rv
 
 # Debian packages.
 
 dpkg:
-	@if [ `cvs -q update | wc -l` ]; then \
+	@if [ 0 != `cvs -q update | wc -l` ]; then \
 	echo Please commit all changes to CVS first.; \
 	exit 1; \
 	fi
+	$(MAKE) dist
+	rm -rf /tmp/dbuild
+	mkdir /tmp/dbuild
+	cp $(PACKAGE)-$(VERSION).tar.gz \
+	  /tmp/dbuild/$(PACKAGE)_$(VERSION).orig.tar.gz
+	export CVSROOT=`cat CVS/Root`; \
+	  cd /tmp/dbuild && \
+	  cvs export \
+	  -d $(PACKAGE)-$(VERSION) \
+	  -D now merjis/test/perl4caml
+	cd /tmp/dbuild/$(PACKAGE)-$(VERSION) && dpkg-buildpackage -rfakeroot
+	rm -rf /tmp/dbuild/$(PACKAGE)-$(VERSION)
+	ls -l /tmp/dbuild
 
 # Documentation.
 
@@ -164,4 +201,4 @@ html/index.html: $(wildcard *.ml) $(wildcard *.mli) $(wildcard wrappers/*.ml)
 	mkdir html
 	-$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html $^
 
-.PHONY: depend dist check-manifest html dpkg
\ No newline at end of file
+.PHONY: depend dist check-manifest html dpkg test run-tests
\ No newline at end of file