You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/01/06 01:37:22 UTC
[1/2] ambari git commit: Revert "AMBARI-8583. Ambari-Web build
generates incorrect 'app.js.map' file (alexantonenko)"
Repository: ambari
Updated Branches:
refs/heads/trunk e4b2d34b6 -> 685f9dd73
Revert "AMBARI-8583. Ambari-Web build generates incorrect 'app.js.map' file (alexantonenko)"
This reverts commit 2e7b019e300caea925a056b3f4e5a4fcab1fb05e.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ddbd346c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ddbd346c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ddbd346c
Branch: refs/heads/trunk
Commit: ddbd346c2a764c0a8938367decf85ab5abcb52a0
Parents: e4b2d34
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Mon Jan 5 16:05:48 2015 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Mon Jan 5 16:05:48 2015 -0800
----------------------------------------------------------------------
ambari-web/pom.xml | 12 ++++++------
ambari-web/set-ambari-version.sh | 2 +-
ambari-web/set-default-stack-version.sh | 4 ++--
ambari-web/toggle-experimental.sh | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddbd346c/ambari-web/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index 628bd36..db6951e 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -117,6 +117,12 @@
</goals>
<configuration>
<target name="ambari-web-compile">
+ <exec dir="${basedir}" executable="${executable.npm}" failonerror="true">
+ <arg value="${args.npm.install}"/>
+ </exec>
+ <exec dir="${basedir}" executable="${executable.brunch}" failonerror="true">
+ <arg value="${args.brunch.build}"/>
+ </exec>
<!-- sets Ambari version to make it accessible from code -->
<exec dir="${basedir}" executable="${executable.shell}" failonerror="true">
<arg value="${basedir}${dirsep}set-ambari-version.${fileextension.shell}"/>
@@ -132,12 +138,6 @@
<arg value="${basedir}${dirsep}toggle-experimental.${fileextension.shell}"/>
<arg value="${enableExperimental}"/>
</exec>
- <exec dir="${basedir}" executable="${executable.npm}" failonerror="true">
- <arg value="${args.npm.install}"/>
- </exec>
- <exec dir="${basedir}" executable="${executable.brunch}" failonerror="true">
- <arg value="${args.brunch.build}"/>
- </exec>
</target>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddbd346c/ambari-web/set-ambari-version.sh
----------------------------------------------------------------------
diff --git a/ambari-web/set-ambari-version.sh b/ambari-web/set-ambari-version.sh
index a5eb907..e1cead4 100644
--- a/ambari-web/set-ambari-version.sh
+++ b/ambari-web/set-ambari-version.sh
@@ -21,6 +21,6 @@
if [ "$1" != '${ambariVersion}' ]
then
echo "Setting Ambari version to $1"
- find app -type f -name "*.js" -exec sed -i "s/App.version.*=.*;/App.version = '$1';/" {} \;
+ sed "s/App.version.*=.*;/App.version = '$1';/" public/javascripts/app.js > public/javascripts/tmp.js; mv public/javascripts/tmp.js public/javascripts/app.js
fi
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddbd346c/ambari-web/set-default-stack-version.sh
----------------------------------------------------------------------
diff --git a/ambari-web/set-default-stack-version.sh b/ambari-web/set-default-stack-version.sh
index 9eb8147..c95e485 100644
--- a/ambari-web/set-default-stack-version.sh
+++ b/ambari-web/set-default-stack-version.sh
@@ -23,6 +23,6 @@ then
STACK=${1%-*}
VERSION=${1##*-}
echo "Setting default stack to '$STACK' and version to '$VERSION'"
- find app -type f -name "*.js" -exec sed -i "s/App.defaultStackVersion.*=.*;/App.defaultStackVersion = '${STACK}-${VERSION}';/" {} \;
- find app -type f -name "*.js" -exec sed -i "s/App.defaultLocalStackVersion.*=.*;/App.defaultLocalStackVersion = '${STACK}Local-${VERSION}';/" {} \;
+ sed "s/App.defaultStackVersion.*=.*;/App.defaultStackVersion = '${STACK}-${VERSION}';/" public/javascripts/app.js > public/javascripts/tmp.js; mv public/javascripts/tmp.js public/javascripts/app.js
+ sed "s/App.defaultLocalStackVersion.*=.*;/App.defaultLocalStackVersion = '${STACK}Local-${VERSION}';/" public/javascripts/app.js > public/javascripts/tmp.js; mv public/javascripts/tmp.js public/javascripts/app.js
fi
http://git-wip-us.apache.org/repos/asf/ambari/blob/ddbd346c/ambari-web/toggle-experimental.sh
----------------------------------------------------------------------
diff --git a/ambari-web/toggle-experimental.sh b/ambari-web/toggle-experimental.sh
index a320acb..eda05c6 100644
--- a/ambari-web/toggle-experimental.sh
+++ b/ambari-web/toggle-experimental.sh
@@ -21,5 +21,5 @@
if [ "$1" == "true" ]
then
echo 'Enabling experimental features...'
- find app -type f -name "*.js" -exec sed -i "s/App.enableExperimental.*=.*;/App.enableExperimental = true;/" {} \;
+ sed 's/App.enableExperimental.*=.*;/App.enableExperimental = true;/' public/javascripts/app.js > public/javascripts/tmp.js; mv public/javascripts/tmp.js public/javascripts/app.js
fi
[2/2] ambari git commit: AMBARI-8583. Ambari-Web build generates
incorrect 'app.js.map' file - no map files. (srimanth)
Posted by sr...@apache.org.
AMBARI-8583. Ambari-Web build generates incorrect 'app.js.map' file - no map files. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/685f9dd7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/685f9dd7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/685f9dd7
Branch: refs/heads/trunk
Commit: 685f9dd7313a85e9adf90c23824bdf9fea887b9a
Parents: ddbd346
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Mon Jan 5 16:23:44 2015 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Mon Jan 5 16:23:44 2015 -0800
----------------------------------------------------------------------
ambari-web/config.coffee | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/685f9dd7/ambari-web/config.coffee
----------------------------------------------------------------------
diff --git a/ambari-web/config.coffee b/ambari-web/config.coffee
index c7a3239..6f1970d 100644
--- a/ambari-web/config.coffee
+++ b/ambari-web/config.coffee
@@ -91,4 +91,4 @@ exports.config =
base: '/'
run: no
-
+ sourceMaps: false