tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject tez git commit: TEZ-1882. Tez UI build does not work on Windows (Prakash Ramachandran via bikas)
Date Wed, 07 Jan 2015 21:25:37 GMT
Repository: tez
Updated Branches:
  refs/heads/master 102346901 -> b9c834a28


TEZ-1882. Tez UI build does not work on Windows (Prakash Ramachandran via bikas)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/b9c834a2
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/b9c834a2
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/b9c834a2

Branch: refs/heads/master
Commit: b9c834a283c0711655f84f51570e70ac38753426
Parents: 1023469
Author: Bikas Saha <bikas@apache.org>
Authored: Wed Jan 7 13:25:32 2015 -0800
Committer: Bikas Saha <bikas@apache.org>
Committed: Wed Jan 7 13:25:32 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt    |  1 +
 tez-ui/pom.xml | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/b9c834a2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 84aec4b..a91e7c6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,7 @@ Release 0.6.0: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-1882. Tez UI build does not work on Windows
   TEZ-1915. Add public key to KEYS
   TEZ-1907. Fix javadoc warnings in tez codebase
   TEZ-1891. Incorrect number of Javadoc warnings reported

http://git-wip-us.apache.org/repos/asf/tez/blob/b9c834a2/tez-ui/pom.xml
----------------------------------------------------------------------
diff --git a/tez-ui/pom.xml b/tez-ui/pom.xml
index b32c6b0..e608093 100644
--- a/tez-ui/pom.xml
+++ b/tez-ui/pom.xml
@@ -28,7 +28,7 @@
 
   <properties>
     <webappDir>src/main/webapp</webappDir>
-    <nodeBinDir>node_modules/.bin</nodeBinDir>
+    <node.executable>${basedir}/src/main/webapp/node/node</node.executable>
     <fileName>${artifactId}-${parent.version}</fileName>
     <nodeVersion>v0.10.18</nodeVersion>
     <npmVersion>1.3.8</npmVersion>
@@ -99,9 +99,9 @@
             </goals>
             <configuration>
               <workingDirectory>${webappDir}</workingDirectory>
-              <executable>node/node</executable>
+              <executable>${node.executable}</executable>
               <arguments>
-                <argument>${nodeBinDir}/bower</argument>
+                <argument>node_modules/bower/bin/bower</argument>
                 <argument>install</argument>
                 <argument>--remove-unnecessary-resolutions=false</argument>
               </arguments>
@@ -115,9 +115,9 @@
             </goals>
             <configuration>
               <workingDirectory>${webappDir}</workingDirectory>
-              <executable>node/node</executable>
+              <executable>${node.executable}</executable>
               <arguments>
-                <argument>${nodeBinDir}/grunt</argument>
+                <argument>node_modules/grunt-cli/bin/grunt</argument>
                 <argument>build</argument>
               </arguments>
             </configuration>


Mime
View raw message