yellow team mailing list archive

[Gary Poster <gary.poster@xxxxxxxxxxxxx>]

Gary Poster has proposed merging lp:~gary/juju-gui/fix-deploy into lp:juju-gui.

Requested reviews:
  Juju GUI Hackers (juju-gui)

For more details, see:
https://code.launchpad.net/~gary/juju-gui/fix-deploy/+merge/140019

Fix charm deployment

Fix build regression that kept GUI from connecting to remote web socket.  No tests because this is a build artifact; we should have tests for them but do not have infrastructure for this.

https://codereview.appspot.com/6948055/

-- 
https://code.launchpad.net/~gary/juju-gui/fix-deploy/+merge/140019
Your team Juju GUI Hackers is requested to review the proposed merge of lp:~gary/juju-gui/fix-deploy into lp:juju-gui.

=== modified file 'bin/merge-files'
--- bin/merge-files	2012-12-10 17:21:32 +0000
+++ bin/merge-files	2012-12-14 20:42:19 +0000
@@ -36,13 +36,14 @@
   // and the debug version of the modules file. I need to use
   // "syspath.join(process.cwd(), ...)" or else I have... "Error: Cannot find
   // module 'app/config.js'" from node's internal module.js file.
-  // config(-debug).js should also be passed in the ignore list: these files
-  // are included in index.html separately as part of charm configuration,
-  // and should not also be included in the minification.
+  // config-[prod|debug].js should also be passed in the ignore list: these
+  // files are included in index.html separately as part of charm
+  // configuration, and should not also be included in the minification.
   var paths = merge.readdir(syspath.join(process.cwd(), 'app'),
     [syspath.join(process.cwd(), 'app/assets'),
+     syspath.join(process.cwd(), 'app/modules-prod.js'),
      syspath.join(process.cwd(), 'app/modules-debug.js'),
-     syspath.join(process.cwd(), 'app/config.js'),
+     syspath.join(process.cwd(), 'app/config-prod.js'),
      syspath.join(process.cwd(), 'app/config-debug.js')]);
 
   // templates.js is a generated file. It is not part of the app directory.