Merge lp://staging/~gary/juju-gui/fix-deploy into lp://staging/juju-gui/experimental

Reviewers: mp+140019_code.launchpad.net,

Message:
Please take a look.

Description:
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://code.launchpad.net/~gary/juju-gui/fix-deploy/+merge/140019

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/6948055/

Affected files:
   A [revision details]
   M bin/merge-files

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: bin/merge-files
=== modified file 'bin/merge-files'
--- bin/merge-files 2012-12-10 17:21:32 +0000
+++ bin/merge-files 2012-12-14 20:39:08 +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.

These changes look good.

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

*** Submitted:

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.

R=bac, benji
CC=
https://codereview.appspot.com/6948055

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