[z3-checkins] r25242 - z3/sqlos/trunk

[jinty at codespeak.net]

Author: jinty
Date: Mon Apr  3 00:21:40 2006
New Revision: 25242

Added:
   z3/sqlos/trunk/patch-test.py   (contents, props changed)
Modified:
   z3/sqlos/trunk/makefile
Log:
You should now just be able to download the source and run "make test". if I havnt forgotten somethign that is.

Modified: z3/sqlos/trunk/makefile
==============================================================================
--- z3/sqlos/trunk/makefile	(original)
+++ z3/sqlos/trunk/makefile	Mon Apr  3 00:21:40 2006
@@ -2,7 +2,8 @@
 CSV=${HERE}/csv
 ZP=${HERE}/../
 ZH=${HERE}/../../
-PYTHON=python
+PYTHON=python2.4
+z3includes=Zope3/zopeskel/etc/package-includes
 
 all : test clean
 
@@ -17,11 +18,16 @@
 
 coverage_sorted : coverage sorted
 
-test :
-	export PYTHONPATH=${ZP} && cd ${ZH} && $(PYTHON) test.py -vpf --all sqlos
-
-clean :
+.PHONY: clean
+clean:
 	find . \( -name '*~' -o -name '*.py[co]' -o -name '*.bak' -o -name '#*#'  -o -name '\.#*' \) -exec rm {} \; -print
+	$(PYTHON) setup.py clean
+
+.PHONY: realclean
+realclean: clean
+	rm -rf dist
+	rm -rf build
+	rm -rf Zope3
 
 reindent :
 	~/src/reindent.py -r -v .
@@ -39,22 +45,26 @@
 Zope3:
 	$(MAKE) z3-checkout
 
-Zope3/package-includes/sqlos-meta.zcml: Zope3 includes/sqlos-meta.zcml
-	cp includes/sqlos-meta.zcml Zope3/package-includes
-
-Zope3/package-includes/sqlos-configure.zcml: Zope3 includes/sqlos-configure.zcml
-	cp includes/sqlos-configure.zcml Zope3/package-includes
+$(z3includes)/sqlos-%.zcml: includes/sqlos-%.zcml Zope3
+	cp $< $@
 
-Zope3/package-includes/sqlos-ftesting.zcml: Zope3 includes/sqlos-ftesting.zcml
-	cp includes/sqlos-ftesting.zcml Zope3/package-includes
+.PHONY: sqlos-meta
+sqlos-meta: $(z3includes)/sqlos-meta.zcml $(z3includes)/sqlos-configure.zcml $(z3includes)/sqlos-ftesting.zcml
 
-.PHONY: z3-build
-z3-build: Zope3
+.PHONY: develop
+develop: Zope3 sqlos-meta
 	cd Zope3 && $(MAKE) PYTHON=$(PYTHON) inplace
+	touch Zope3/src/easy-install.pth
+	PYTHONPATH=Zope3/src $(PYTHON) setup.py develop -S Zope3/src --install-dir Zope3/src
 
-.PHONY: test-dist
-test-dist: z3-update z3-build \
-	Zope3/package-includes/sqlos-meta.zcml\
-	Zope3/package-includes/sqlos-configure.zcml\
-	Zope3/package-includes/sqlos-ftesting.zcml
-	cd releases && $(PYTHON) SQLOS-test.py
+.PHONY: patch
+patch:
+	# This is butttt ugly pul hopefully temporary
+	set - e;\
+	    if [ `grep 'site.addsitedir(src)' Zope3/test.py -c` == 0 ]; then\
+		cat patch-test.py | patch -p0;\
+	    fi
+
+.PHONY: testall
+test: develop patch
+	cd Zope3 && $(PYTHON) test.py --test-path=../src -s sqlos

Added: z3/sqlos/trunk/patch-test.py
==============================================================================
--- (empty file)
+++ z3/sqlos/trunk/patch-test.py	Mon Apr  3 00:21:40 2006
@@ -0,0 +1,13 @@
+Index: Zope3/test.py
+===================================================================
+--- Zope3/test.py	(revision 65897)
++++ Zope3/test.py	(working copy)
+@@ -26,6 +26,8 @@
+ # add src to path
+ src = os.path.join(here, 'src')
+ sys.path.insert(0, src) # put at beginning to avoid one in site_packages
++import site
++site.addsitedir(src)
+ 
+ from zope.testing import testrunner
+