[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 1ba09788bd279c2a4bec7434b5ea36d271bff062
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Feb 4 03:27:16 2005 +0100

    checkpointing
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-196)

diff --git a/ChangeLog b/ChangeLog
index 84d23f3..e49d0d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2005-02-03 20:27:16 GMT	John Goerzen <jgoerzen at complete.org>	patch-196
+
+    Summary:
+      checkpointing
+    Revision:
+      missingh--head--0.7--patch-196
+
+
+    modified files:
+     ChangeLog Makefile testsrc/AnyDBMtest.hs
+
+
 2005-02-03 15:40:24 GMT	John Goerzen <jgoerzen at complete.org>	patch-195
 
     Summary:
diff --git a/Makefile b/Makefile
index d351e22..4b53f0e 100644
--- a/Makefile
+++ b/Makefile
@@ -23,20 +23,24 @@ LHSSOURCES := $(wildcard libsrc/MissingH/*/*.lhs) \
 O1 := $(SOURCES:.hs=.o) $(LHSSOURCES)
 OBJS := $(O1:.lhs=.o)
 
-all: libmissingH.a
+.PHONY: all
+all: setup
+	./setup configure
+	./setup build
 
 setup: Setup.lhs MissingH.cabal
 	ghc -package Cabal Setup.lhs -o setup
 
-libmissingH.a: $(OBJS)
-	-rm -f libmissingH.a
-	ar q libmissingH.a $(OBJS)
+#libmissingH.a: $(OBJS)
+#	-rm -f libmissingH.a
+#	ar q libmissingH.a $(OBJS)
 
-%.o: %.hs
-	ghc -O2 -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -ilibsrc --make `echo $< | sed -e s,libsrc/,, -e s,.hs$$,, -e s,/,.,g`
-
-%.o: %.lhs
-	ghc -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -ilibsrc --make `echo $< | sed -e s,libsrc/,, -e s,.lhs$$,, -e s,/,.,g`
+#%.o: %.hs
+#	ghc -O2 -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -ilibsrc --make `echo $< | sed -e s,libsrc/,, -e s,.hs$$,, -e s,/,.,g`
+#
+#%.o: %.lhs
+#	ghc -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -ilibsrc --make `echo $< | sed -e s,libsrc/,, -e s,.lhs$$,, -e s,/,.,g`
+#
 
 .PHONY: doc
 doc:
@@ -44,17 +48,33 @@ doc:
 	mkdir html
 	haddock $(HADDOCKARGS) --package=MissingH \
 	   --dump-interface=html/MissingH.haddock \
-	   -t 'MissingH API Manual' -h -o html $(SOURCES)
+	   -t 'MissingH API Manual' -h -o html $(SOURCES) $(LHSSOURCES)
 
 clean:
 	-./setup clean
 	-rm -rf html `find . -name "*.o"` `find . -name "*.hi"` \
-		`find . -name "*~"` *.a setup dist testsrc/runtests
+		`find . -name "*~"` *.a setup dist testsrc/runtests \
+		local-pkg
 	-rm -rf testtmp/*
 	-cd doc && $(MAKE) clean
 
-testsrc/runtests: all $(shell find testsrc -name "*.hs")
-	ghc6 -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -package HUnit --make -o testsrc/runtests -itestsrc -ilibsrc testsrc/runtests.hs
+.PHONY: local-pkg
+local-pkg: all
+        echo "[" > local-pkg
+        cat .installed-pkg-config >> local-pkg
+        echo "]" >> local-pkg
+
+testsrc/runtests: local-pkg $(SOURCES) $(LHSSOURCES)
+        ghc6 -O2 -o testsrc/runtests -Ldist/build -odir dist/build \
+           -package-conf local-pkg \
+           -hidir dist/build -idist/build -itestsrc \
+	   -fallow-overlapping-instances -fglasgow-exts \
+	   -fallow-undecidable-instances \
+                -package HUnit -package MissingH --make testsrc/runtests.hs
+
+
+#testsrc/runtests: all $(shell find testsrc -name "*.hs")
+#	ghc6 -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -package HUnit --make -o testsrc/runtests -itestsrc -ilibsrc testsrc/runtests.hs
 
 test-ghc6: testsrc/runtests
 	testsrc/runtests 
diff --git a/testsrc/AnyDBMtest.hs b/testsrc/AnyDBMtest.hs
index bb84b89..b8ac1ce 100644
--- a/testsrc/AnyDBMtest.hs
+++ b/testsrc/AnyDBMtest.hs
@@ -16,7 +16,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
-module AnyDBMtest(mf, generic_test, tests) where
+module AnyDBMtest(mf, generic_persist_test, generic_test, tests) where
 import HUnit
 import MissingH.List
 import MissingH.IO.HVFS

-- 
haskell-testpack