Allow running targets without using bzr

Makefile

 # Makefile debugging hack: uncomment the two lines below and make will tell you
 # more about what is happening.  The output generated is of the form
 # "FILE:LINE [TARGET (DEPENDENCIES) (NEWER)]" where DEPENDENCIES are all the
 # things TARGET depends on and NEWER are all the files that are newer than
 # TARGET.  DEPENDENCIES will be colored green and NEWER will be blue.
 #
 #OLD_SHELL := $(SHELL)
 #SHELL = $(warning [$@ ($^) ($?) ])$(OLD_SHELL)
 
-JSFILES=$(shell bzr ls -RV -k file | \
-        grep -E -e '.+\.js(on)?$$|generateTemplates$$' | \
-        grep -Ev -e '^manifest\.json$$' \
-                -e '^test/assets/' \
+# Build a target for JavaScript files.  The find command exclused directories
+# as needed through the -prune directive, and the grep command removes
+# individual unwanted JavaScript and JSON files from the list.
+JSFILES=$(shell find . -wholename './node_modules*' -prune \

[gary.poster, 2012/12/12 22:20:07]

Before this, I think we need a comment explaining the two use cases for not
using bzr commands: we want to make releases without bzr access, so working with
a branch is fast; and we want to allow devs to work with a release (per Kapil; I
really don't like this.  devs should work with a branch.)

[benjamin.saller, 2012/12/13 04:02:59]

Looking at how this is used (and I realize its pre-existing) I think it might be
better to make a clearer separation of runtime vs devel files. I'd also suggest
we clearly move 
3rd party libs away from our libraries, 
app/assets/javascripts/3rd-party.


This could lead to simpler rules. 

find app -name \*.js | grep -e app/assets/javascipts/third-party/

might yield the runtime files.

I don't think we need to do this now, but I think we should make a card.

[matthew.scott, 2012/12/13 17:34:04]

I agree that it would be nice to have this be more positive, but I also agree
that it probably needs to be in a card of its own that moves some files around. 
It'd be clearer to just specify valid directories, but now things are kind of
scattered.  I'll make a card.

On 2012/12/13 04:02:59, benjamin.saller wrote:

[matthew.scott, 2012/12/13 17:34:04]

Done.

+        -o -wholename './build*' -prune \
+        -o -wholename './test/assets*' -prune \
+        -o \( \
+                -name '*.js' \
+                -o -name '*.json' \
+                -o -name '*generateTemplates' \

[gary.poster, 2012/12/12 22:20:07]

This could simply be 'generateTemplates', without the wildcard.

[matthew.scott, 2012/12/13 17:34:04]

Done.

+        \) -print \
+        | sort | sed -e 's/^\.\///' \
+        | grep -Ev -e '^manifest\.json$$' \
+                -e '^app/assets/javascripts/d3.v2.*.js$$' \
                 -e '^app/assets/javascripts/reconnecting-websocket.js$$' \
                 -e '^server.js$$')
 THIRD_PARTY_JS=app/assets/javascripts/reconnecting-websocket.js
 NODE_TARGETS=node_modules/chai node_modules/cryptojs node_modules/d3 \
         node_modules/expect.js node_modules/express node_modules/graceful-fs \
         node_modules/grunt node_modules/jshint node_modules/less \
         node_modules/minimatch node_modules/mocha node_modules/node-markdown \
         node_modules/node-minify node_modules/node-spritesheet \
         node_modules/rimraf node_modules/should node_modules/yui \
         node_modules/yuidocjs
 EXPECTED_NODE_TARGETS=$(shell echo "$(NODE_TARGETS)" | tr ' ' '\n' | sort \
         | tr '\n' ' ')
 
 ### Release-specific variables - see docs/process.rst for an overview. ###
+# Provide the ability to build a release package without using bzr, for
+# lightweight checkouts.
+ifdef NO_BZR

[gary.poster, 2012/12/12 22:20:07]

Good solution, given our use cases and the other problems you encountered.

+BZR_REVNO=0
+BRANCH_IS_GOOD=1
+else
 BZR_REVNO=$(shell bzr revno)
+endif
 # Figure out the two most recent version numbers.
 ULTIMATE_VERSION=$(shell grep '^-' CHANGES.yaml | head -n 1 | sed 's/[ :-]//g')
 PENULTIMATE_VERSION=$(shell grep '^-' CHANGES.yaml | head -n 2 | tail -n 1 \
     | sed 's/[ :-]//g')
 # If the user specified (via setting an environment variable on the command
 # line) that this is a final (non-development) release, set the version number
 # and series appropriately.
 ifdef FINAL
 # If this is a FINAL (non-development) release, then the most recent version
 # number should not be "unreleased".
@@ skipping 15 matching lines @@
 endif
 # If we are doing a production release (as opposed to a trial-run release) we
 # use the "real" Launchpad site, if not we use the Launchpad staging site.
 ifndef PROD
 LAUNCHPAD_API_ROOT=staging
 endif
 RELEASE_NAME=juju-gui-$(RELEASE_VERSION)
 RELEASE_FILE=releases/$(RELEASE_NAME).tgz
 RELEASE_SIGNATURE=releases/$(RELEASE_NAME).asc
 # Is the branch being released a branch of trunk?
+ifndef BRANCH_IS_GOOD
 ifndef IS_TRUNK_BRANCH
 IS_TRUNK_BRANCH=$(shell bzr info | grep \
         'parent branch: bzr+ssh://bazaar.launchpad.net/+branch/juju-gui/' \
         > /dev/null && echo 1)
 endif
 # Does the branch on disk have uncomitted/unpushed changes?
 ifndef BRANCH_IS_CLEAN
 BRANCH_IS_CLEAN=$(shell [ -z "`bzr status`" ] && bzr missing --this && echo 1)
 endif
 # Is it safe to do a release of the branch?  For trial-run releases you can
 # override this check on the command line by setting the BRANCH_IS_GOOD
 # environment variable.
-ifndef BRANCH_IS_GOOD
 ifneq ($(strip $(IS_TRUNK_BRANCH)),)
 ifneq ($(strip $(BRANCH_IS_CLEAN)),)
 BRANCH_IS_GOOD=1
 endif
 endif
 endif
 ### End of release-specific variables ###
 
-TEMPLATE_TARGETS=$(shell bzr ls -k file app/templates)
+TEMPLATE_TARGETS=$(shell find app/templates -type f -print)

[gary.poster, 2012/12/12 22:20:07]

Please exclude standard editor effluvia.

[benjamin.saller, 2012/12/13 04:02:59]

This and the var below it are clear wins.

[matthew.scott, 2012/12/13 17:34:04]

Done.

 
-SPRITE_SOURCE_FILES=$(shell bzr ls -R -k file app/assets/images)
+SPRITE_SOURCE_FILES=$(shell find app/assets/images -type f -print)

[gary.poster, 2012/12/12 22:20:07]

Please exclude standard editor effluvia.

[matthew.scott, 2012/12/13 17:34:04]

Done.

 SPRITE_GENERATED_FILES=build/juju-ui/assets/sprite.css \
         build/juju-ui/assets/sprite.png
 BUILD_FILES=build/juju-ui/assets/app.js \
         build/juju-ui/assets/all-yui.js \
         build/juju-ui/assets/combined-css/all-static.css
 DATE=$(shell date -u)
 APPCACHE=build/juju-ui/assets/manifest.appcache
 
 # Some environments, notably sudo, do not populate the PWD environment
 # variable, which is used to set $(PWD); however, getting the current
@@ skipping 268 matching lines @@
         @echo "release."
         @echo
         @echo "See the README for more information."
         @echo
         @false
 endif
 
 $(RELEASE_SIGNATURE): $(RELEASE_FILE)
         gpg --armor --sign --detach-sig $(RELEASE_FILE)
 
 dist: $(RELEASE_FILE) $(RELEASE_SIGNATURE) upload_release.py

[gary.poster, 2012/12/12 22:20:07]

I would like the Makefile to refuse to run the upload_release.py file if NO_BZR
is defined.  We should then have a phony target that only creates the release
file (e.g. "distfile: $(RELEASE_FILE)" that the charm can use (that is, it will
run fine if NO_BZR is true).  See "ifdef BRANCH_IS_GOOD" above for an example of
one way to do this kind of thing.

         python2 upload_release.py juju-gui $(SERIES) $(RELEASE_VERSION) \
             $(RELEASE_FILE) $(LAUNCHPAD_API_ROOT)
 
 appcache: $(APPCACHE)
 
 # A target used only for forcibly updating the appcache.
 appcache-touch:
         touch manifest.appcache.in
 
 # This is the real target.  appcache-touch needs to be executed before
 # appcache, and this provides the correct order.
 appcache-force: appcache-touch appcache
 
 # targets are alphabetically sorted, they like it that way :-)
 .PHONY: appcache appcache-force appcache-touch beautify build \
         build-debug build-files build-prod clean clean clean-all \
         clean-deps clean-docs debug devel doc dist gjslint help \
         javascript-libraries jshint link-debug-files link-prod-files \
         lint prep prod server spritegen test test-debug test-prod \
         undocumented yuidoc yuidoc-lint
 
 .DEFAULT_GOAL := all