thomas - r7159 - in flumotion/trunk: . common conf misc

[flumotion-commit at lists.fluendo.com]

Author: thomas
Date: Fri Aug  1 00:09:32 2008
New Revision: 7159

Log:
	* Makefile.am:
	* common/Makefile.am:
	* conf/Makefile.am:
	* misc/validate-config.py (deleted):
	* common/validate-config.py (added):
	  Move to common since we want to use it in other projects.
	  Change to setup package path so we can use it in other projects.
	* common/common.mk:
	  Remove check-local target since it can't be overridden properly.



Added:
   flumotion/trunk/common/validate-config.py
      - copied, changed from r7142, /flumotion/trunk/misc/validate-config.py
Removed:
   flumotion/trunk/misc/validate-config.py
Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/Makefile.am
   flumotion/trunk/common/Makefile.am
   flumotion/trunk/common/common.mk
   flumotion/trunk/conf/Makefile.am

Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Fri Aug  1 00:09:32 2008
@@ -1,5 +1,17 @@
 2008-08-01  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* Makefile.am:
+	* common/Makefile.am:
+	* conf/Makefile.am:
+	* misc/validate-config.py (deleted):
+	* common/validate-config.py (added):
+	  Move to common since we want to use it in other projects.
+	  Change to setup package path so we can use it in other projects.
+	* common/common.mk:
+	  Remove check-local target since it can't be overridden properly.
+
+2008-08-01  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* flumotion/common/registry.py:
 	  Write out the registry with _description tags.
 	* flumotion/test/test_registry.py:

Modified: flumotion/trunk/Makefile.am
==============================================================================
--- flumotion/trunk/Makefile.am	(original)
+++ flumotion/trunk/Makefile.am	Fri Aug  1 00:09:32 2008
@@ -18,7 +18,6 @@
 	flumotion.spec \
 	flumotion.doap \
 	misc/pycheckerhelp.py \
-	misc/validate-config.py \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in

Modified: flumotion/trunk/common/Makefile.am
==============================================================================
--- flumotion/trunk/common/Makefile.am	(original)
+++ flumotion/trunk/common/Makefile.am	Fri Aug  1 00:09:32 2008
@@ -16,5 +16,6 @@
 	setup.m4		\
 	trial.mk		\
 	twisted-module.m4	\
+	validate-config.py	\
 	validate-registry.py	\
 	gen-locale-xml.py

Modified: flumotion/trunk/common/common.mk
==============================================================================
--- flumotion/trunk/common/common.mk	(original)
+++ flumotion/trunk/common/common.mk	Fri Aug  1 00:09:32 2008
@@ -1,5 +1,4 @@
-check-local: check-local-pychecker check-local-registry
-
+# these are toplevel targets
 test:
 	@make check -C flumotion/test
 
@@ -9,6 +8,10 @@
 check-local-registry:
 	$(top_builddir)/env bash -c "export PYTHONPATH=$(FLUMOTION_DIR):$(top_srcdir)${PYTHONPATH:+:$PYTHONPATH} && $(PYTHON) $(top_srcdir)/common/validate-registry.py"
 
+# this is a target for any directory containing CONFIG in its Makefile.am
+check-local-config:
+	for f in $(CONFIG); do $(top_builddir)/env bash -c "export PYTHONPATH=$(FLUMOTION_DIR):$(top_srcdir)${PYTHONPATH:+:$PYTHONPATH} && $(PYTHON) $(top_srcdir)/common/validate-config.py $(srcdir)/$$f"; done
+
 coverage:
 	@trial --temp-directory=_trial_coverage --coverage flumotion.test
 	make show-coverage

Copied: flumotion/trunk/common/validate-config.py (from r7142, /flumotion/trunk/misc/validate-config.py)
==============================================================================
--- /flumotion/trunk/misc/validate-config.py	(original)
+++ flumotion/trunk/common/validate-config.py	Fri Aug  1 00:09:32 2008
@@ -5,6 +5,10 @@
 
 from flumotion.manager import manager
 
+from flumotion.common import setup
+setup.setup()
+setup.setupPackagePath()
+
 vishnu = manager.Vishnu('validate')
 
 vishnu.loadManagerConfigurationXML(sys.argv[1])

Modified: flumotion/trunk/conf/Makefile.am
==============================================================================
--- flumotion/trunk/conf/Makefile.am	(original)
+++ flumotion/trunk/conf/Makefile.am	Fri Aug  1 00:09:32 2008
@@ -1,3 +1,5 @@
+include $(top_srcdir)/common/common.mk
+
 CONFIG = 						\
 	examples/bouncer.xml				\
 	examples/ipbouncer.xml				\
@@ -17,5 +19,4 @@
 	workers/default.xml 				\
 	$(CONFIG)
 
-check:
-	for f in $(CONFIG); do $(top_builddir)/env python $(top_srcdir)/misc/validate-config.py $(srcdir)/$$f; done
+check-local: check-local-config