Update to code on trunk.

1 files changed, 21 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 49324ca0..b659836f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,32 @@
 CWD=$(shell pwd)
-PY_FILES=$(shell find cloudinit bin tests tools -name "*.py")
+PY_FILES=$(shell find cloudinit bin tests tools -name "*.py" -type f )
 PY_FILES+="bin/cloud-init"
 
-all: test
+YAML_FILES=$(shell find cloudinit bin tests tools -name "*.yaml" -type f )
+YAML_FILES+=$(shell find doc/examples -name "cloud-config*.txt" -type f )
+
+CHANGELOG_VERSION=$(shell $(CWD)/tools/read-version)
+CODE_VERSION=$(shell python -c "from cloudinit import version; print version.version_string()")
+
+all: test check_version
 
 pep8:
-	$(CWD)/tools/run-pep8 $(PY_FILES)
+	@$(CWD)/tools/run-pep8 $(PY_FILES)
 
 pylint:
-	$(CWD)/tools/run-pylint $(PY_FILES)
+	@$(CWD)/tools/run-pylint $(PY_FILES)
 
 pyflakes:
 	pyflakes $(PY_FILES)
 
 test:
-	nosetests $(noseopts) tests/unittests/
+	@nosetests $(noseopts) tests/
+
+check_version:
+	@if [ "$(CHANGELOG_VERSION)" != "$(CODE_VERSION)" ]; then \
+        echo "Error: ChangeLog version $(CHANGELOG_VERSION)" \
+        	  "not equal to code version $(CODE_VERSION)"; exit 2; \
+    else true; fi
 
 2to3:
 	2to3 $(PY_FILES)
@@ -23,11 +35,14 @@ clean:
 	rm -rf /var/log/cloud-init.log \
 		   /var/lib/cloud/
 
+yaml:
+	@$(CWD)/tools/validate-yaml.py $(YAML_FILES)
+		   
 rpm:
 	./packages/brpm
 
 deb:
 	./packages/bddeb
 
-.PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb
+.PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version