Merge lp:~tribaal/charms/trusty/landscape-client/add-sync-makefile-target into lp:charms/trusty/landscape-client

[Chris Glass]

This branch adds a "sync" target to the Makefile to easily sync changes made in charm helpers.

[lp:~tribaal/charms/trusty/landscape-client/add-sync-makefile-target]

42. By Chris Glass on 2014-07-16

Added small comment about the target name

[Alberto Donato (ack)]

Nice! +1

review: Approve

[lp:~tribaal/charms/trusty/landscape-client/add-sync-makefile-target]

43. By Chris Glass on 2014-07-16

Made use of more variables (its now cleaner)

[David Britton (dpb)]

nice work, much easier. :) +1

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-07-16 09:03:43 +0000
@@ -0,0 +1,1 @@
+bin/

=== modified file 'Makefile'
--- Makefile	2013-10-09 14:47:18 +0000
+++ Makefile	2014-07-16 09:03:43 +0000
@@ -1,5 +1,19 @@
+#!/usr/bin/make
+PYTHON := /usr/bin/env python
+SYNC_SCRIPT := bin/charm_helpers_sync.py
+CONFIG := charm-helpers-sync.yaml
+
 test:
 	cd hooks && trial test_hooks.py
 
 lint:
 	bzr ls-lint
+
+$(SYNC_SCRIPT):
+	@mkdir -p bin
+	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
+        > $(SYNC_SCRIPT)
+
+# Note: The target name is unfortunate, but that's what other charms use.
+sync: $(SYNC_SCRIPT)
+	@$(PYTHON) $(SYNC_SCRIPT) -c $(CONFIG)