浏览代码

AMBARI-1253. Use ember-precompiler-brunch npm plugin. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1438300 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako 12 年之前
父节点
当前提交
c1abb5a0e8
共有 4 个文件被更改,包括 8 次插入1 次删除
  1. 2 0
      CHANGES.txt
  2. 4 0
      ambari-web/config.coffee
  3. 1 1
      ambari-web/package.json
  4. 1 0
      ambari-web/pom.xml

+ 2 - 0
CHANGES.txt

@@ -25,6 +25,8 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-1253. Use ember-precompiler-brunch npm plugin. (yusaku)
+
  AMBARI-1236. Display a progress bar during deploy prep. (yusaku)
 
  AMBARI-1249. Update mock data to make App.testMode work. (yusaku)

+ 4 - 0
ambari-web/config.coffee

@@ -78,6 +78,10 @@ exports.config =
       precompile: true
       defaultExtension: 'hbs'
       joinTo: 'javascripts/app.js' : /^app/
+      paths:
+        jquery: 'vendor/scripts/jquery-1.7.2.min.js'
+        handlebars: 'vendor/scripts/handlebars-1.0.0.beta.6.js'
+        ember: 'vendor/scripts/ember-latest.js'
 
   server:
     port: 3333

+ 1 - 1
ambari-web/package.json

@@ -18,7 +18,7 @@
     "css-brunch":">= 1.0 < 1.5",
     "uglify-js-brunch":">= 1.0 < 1.5",
     "clean-css-brunch":">= 1.0 < 1.5",
-    "ember-handlebars-brunch":"git://github.com/icholy/ember-handlebars-brunch.git",
+    "ember-precompiler-brunch":">= 1.0 < 1.5",
     "less-brunch":">= 1.0 < 1.5"
   },
   "devDependencies":{

+ 1 - 0
ambari-web/pom.xml

@@ -80,6 +80,7 @@
             <configuration>
               <target name="ambari-web-compile">
                 <exec dir="${basedir}" executable="npm" failonerror="false">
+                  <env key="PYTHON" value="python2.6" />
                   <arg value="install"/>
                 </exec>
                 <exec dir="${basedir}" executable="brunch" failonerror="false">