Author: yusaku
Date: Fri Jan 25 02:46:25 2013
New Revision: 1438300
URL: http://svn.apache.org/viewvc?rev=1438300&view=rev
Log:
AMBARI-1253. Use ember-precompiler-brunch npm plugin. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/config.coffee
incubator/ambari/trunk/ambari-web/package.json
incubator/ambari/trunk/ambari-web/pom.xml
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1438300&r1=1438299&r2=1438300&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Jan 25 02:46:25 2013
@@ -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)
Modified: incubator/ambari/trunk/ambari-web/config.coffee
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/config.coffee?rev=1438300&r1=1438299&r2=1438300&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/config.coffee (original)
+++ incubator/ambari/trunk/ambari-web/config.coffee Fri Jan 25 02:46:25 2013
@@ -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
Modified: incubator/ambari/trunk/ambari-web/package.json
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/package.json?rev=1438300&r1=1438299&r2=1438300&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/package.json (original)
+++ incubator/ambari/trunk/ambari-web/package.json Fri Jan 25 02:46:25 2013
@@ -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":{
Modified: incubator/ambari/trunk/ambari-web/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/pom.xml?rev=1438300&r1=1438299&r2=1438300&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/pom.xml (original)
+++ incubator/ambari/trunk/ambari-web/pom.xml Fri Jan 25 02:46:25 2013
@@ -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">
