Merge lp:~nuclearbob/utah/parser-packaging into lp:utah

[Max Brustkern]

This branch creates a utah-parser binary package, built from the same utah source package as the existing packages. It contains only the utah/parser.py python module, which is now no longer in the main utah package.

[Joe Talbott (joetalbott)]

Looks good. Thanks

review: Approve

=== modified file 'debian/control'
--- debian/control	2012-11-08 17:23:31 +0000
+++ debian/control	2012-11-29 15:54:12 +0000
@@ -29,3 +29,10 @@
 Recommends: git
 Description: Ubuntu Test Automation Harness Client
  Automation framework for testing in Ubuntu, client portion
+ 
+Package: utah-parser
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends},
+         python-jsonschema (>= 0.5~), python-yaml
+Description: Ubuntu Test Automation Harness Parser
+ Automation framework for testing in Ubuntu, result parser

=== modified file 'debian/rules'
--- debian/rules	2012-09-26 15:22:25 +0000
+++ debian/rules	2012-11-29 15:54:12 +0000
@@ -18,12 +18,16 @@
 
 override_dh_auto_install:
 	# utah and utah-client both live in the utah directory
+	# utah-parser lives in that tree as well
 	# utah should only install the provisioning subdirectory, and utah-client should install everything else
+	# except parser.py, which is now its own package
 	# If we just use dh_auto_install, both packages will get everything
 	# We start by building the whole thing
 	set -e && for pyvers in $(PYVERS); do python$$pyvers setup.py install --install-layout=deb --root=$(CURDIR); done
 	# Next, we move the built provisioning directory aside for later use
 	mv build/*/utah/provisioning .
+	# Same with parser.py
+	mv build/*/utah/parser.py .
 	# Now we install into the utah-client directory, since provisioning is removed, using --skip-build to not rebuild it
 	set -e && for pyvers in $(PYVERS); do python$$pyvers setup.py install --skip-build --install-layout=deb --root=$(CURDIR)/debian/utah-client; done
 	# Now we remove everything we don't want in the utah package (i.e., everything that's still there)
@@ -32,15 +36,21 @@
 	mv provisioning build/*/utah
 	# Now we install just the provisioning directory, again using --skip-build into the utah package tree
 	set -e && for pyvers in $(PYVERS); do python$$pyvers setup.py install --skip-build --install-layout=deb --root=$(CURDIR)/debian/utah; done
+	# And now we put back the parser and install that
+	rm -r build/*/utah/*
+	mv parser.py build/*/utah
+	set -e && for pyvers in $(PYVERS); do python$$pyvers setup.py install --skip-build --install-layout=deb --root=$(CURDIR)/debian/utah-parser; done
 	# Since the client changes names from client.py to utah, we can't use utah-client.install for that
 	# We also need to make our directory since we do this before dh_auto_install
 	mkdir -p $(CURDIR)/debian/utah-client/usr/bin
 	cp -aL client.py $(CURDIR)/debian/utah-client/usr/bin/utah
 	# phoenix.py needs to be in here to lose the .py
 	cp -aL utah/client/phoenix.py $(CURDIR)/debian/utah-client/usr/bin/phoenix
-	# Since utah and utah-client both got install using python distutils, they both get an egg info directory
+	# Since utah and utah-client both got installed using python distutils, they both get an egg info directory
 	# This will conflict if we leave it in both of them, so we remove it from the client
 	rm -r $(CURDIR)/debian/utah-client/usr/lib/python*/dist-packages/utah-*.egg-info
+	# Let's remove it from the parser as well
+	rm -r $(CURDIR)/debian/utah-parser/usr/lib/python*/dist-packages/utah-*.egg-info
 	# We want to symlink the utah example scripts into /usr/bin, and we need a directory for that
 	mkdir -p $(CURDIR)/debian/utah/usr/bin
 	for script in $$(find examples -type f -name "*.py" -printf "%f\n"); do\