yellow team mailing list archive

[Brad Crittenden <bac@xxxxxxxxxxxxx>]

Brad Crittenden has proposed merging lp:~bac/juju-gui/1091787 into lp:juju-gui.

Requested reviews:
  Juju GUI Hackers (juju-gui)
Related bugs:
  Bug #1091787 in juju-gui: "Releases don't have required directories"
  https://bugs.launchpad.net/juju-gui/+bug/1091787

For more details, see:
https://code.launchpad.net/~bac/juju-gui/1091787/+merge/140528

Correct build targets for releases.

There was confusion between build, build-prod, and build-debug.  A new target
called build-devel has been introduced to replace the old build target.  A new
build target now depends on build-prod and build-debug.
-- 
https://code.launchpad.net/~bac/juju-gui/1091787/+merge/140528
Your team Juju GUI Hackers is requested to review the proposed merge of lp:~bac/juju-gui/1091787 into lp:juju-gui.

=== modified file 'HACKING'
--- HACKING	2012-12-12 13:26:46 +0000
+++ HACKING	2012-12-18 19:35:23 +0000
@@ -159,7 +159,7 @@
   release target) will cause the release to be uploaded to the stable series
   rather than the trunk series. Example usage::
 
-    $ FINAL=1 make release
+    $ FINAL=1 make distfile
 
 PROD
   By default, releases will be uploaded to staging.launchpad.net, which is a
@@ -176,22 +176,22 @@
 
   Example usage::
 
-    $ PROD=1 make release
+    $ PROD=1 make distfile
 
-IS_TRUNK_CHECKOUT
+IS_TRUNK_BRANCH
   Set this to any non-empty value to force the Makefile to believe it is
   working with a trunk checkout. Example usage::
 
-    $ IS_TRUNK_CHECKOUT=1 make release
+    $ IS_TRUNK_BRANCH=1 make distfile
 
-HAS_NO_CHANGES
+BRANCH_IS_CLEAN
   Set this to any non-empty value to force the Makefile to believe that the
   current code tree has no changes. Example usage::
 
-    $ HAS_NO_CHANGES=1 make release
+    $ BRANCH_IS_CLEAN=1 make distfile
 
-IS_SAFE_RELEASE
+BRANCH_IS_GOOD
   Set this to any non-empty value to force the Makefile to bypass checks of
-  IS_TRUNK_CHECKOUT and HAS_NO_CHANGES. Example usage::
+  IS_TRUNK_BRANCH and BRANCH_IS_CLEAN. Example usage::
 
-    $ IS_SAFE_RELEASE=1 make release
+    $ BRANCH_IS_GOOD=1 make distfile

=== modified file 'Makefile'
--- Makefile	2012-12-17 14:54:25 +0000
+++ Makefile	2012-12-18 19:35:23 +0000
@@ -21,11 +21,11 @@
 	-o -wholename './test/assets*' -prune \
 	-o -wholename './yuidoc*' -prune \
 	-o \( \
-    		-name '*.js' \
-    		-o -name '*.json' \
-    		-o -name 'generateTemplates' \
-  	\) -print \
-  	| sort | sed -e 's/^\.\///' \
+		-name '*.js' \
+		-o -name '*.json' \
+		-o -name 'generateTemplates' \
+	\) -print \
+	| sort | sed -e 's/^\.\///' \
 	| grep -Ev -e '^manifest\.json$$' \
 		-e '^app/assets/javascripts/d3.v2.*.js$$' \
 		-e '^app/assets/javascripts/reconnecting-websocket.js$$' \
@@ -125,7 +125,7 @@
 	PWD=$(shell pwd)
 endif
 
-all: build-debug build-prod
+all: build
 	@echo "\nDebug and production environments built."
 	@echo "Run 'make help' to list the main available targets."
 
@@ -335,7 +335,7 @@
 	@echo "to start the production or debug environments respectively."
 	@echo "Run 'make help' to list the main available targets."
 
-devel: build
+devel: build-devel
 	@echo "Running the development environment from node.js ."
 	@echo "Customize config.js to modify server settings."
 	node server.js
@@ -363,12 +363,14 @@
 
 clean-all: clean clean-deps clean-docs
 
-build: $(APPCACHE) $(NODE_TARGETS) spritegen \
+build: build-prod build-debug
+
+build-devel: $(APPCACHE) $(NODE_TARGETS) spritegen \
 	  $(BUILD_FILES) build/juju-ui/version.js
 
-build-debug: build | $(LINK_DEBUG_FILES)
+build-debug: build-devel | $(LINK_DEBUG_FILES)
 
-build-prod: build | $(LINK_PROD_FILES)
+build-prod: build-devel | $(LINK_PROD_FILES)
 
 $(APPCACHE): manifest.appcache.in
 	mkdir -p build/juju-ui/assets