diff Makefile @ 315:830cf8bdcf24

implemented 'make pagepacks', updated underlay imported from: moin--main--1.5--patch-319
author Thomas Waldmann <tw@waldmann-edv.de>
date Tue, 13 Dec 2005 22:54:31 +0000
parents e341b54060c3
children 63de512afd9b
line wrap: on
line diff
--- a/Makefile	Tue Dec 13 22:49:42 2005 +0000
+++ b/Makefile	Tue Dec 13 22:54:31 2005 +0000
@@ -8,13 +8,6 @@
 all:
 	python setup.py build
 
-dist:
-	-rm MANIFEST
-	python setup.py sdist
-
-pagepacks:
-	python MoinMoin/scripts/packages/create_pagepacks.py
-
 install-docs:
 	-mkdir build
 	wget -U MoinMoin/Makefile -O build/INSTALL.html "http://moinmaster.wikiwikiweb.de/MoinMoin/InstallDocs?action=print"
@@ -64,6 +57,16 @@
 	    $(share)/underlay/pages/MoinPagesEditorGroup/revisions/00000001
 	cd $(share); rm -rf underlay.tar.bz2; tar cjf underlay.tar.bz2 underlay
 
+pagepacks:
+	@python tests/maketestwiki.py
+	@python MoinMoin/scripts/packages/create_pagepacks.py
+	cd $(share) ; rm -rf underlay
+	cp -a $(testwiki)/underlay $(share)/
+	
+dist:
+	-rm MANIFEST
+	python setup.py sdist
+
 # Create patchlevel module
 patchlevel:
 	@echo -e patchlevel = "\"`tla logs | tail -n1`\"\n" >MoinMoin/patchlevel.py
@@ -87,6 +90,7 @@
 	tla star-merge arch@arch.thinkmo.de--2003-archives/moin--main--1.3
 
 test: 
+	@python tests/maketestwiki.py
 	@python tests/runtests.py
 
 clean: clean-testwiki clean-pyc