Repository: ambari Updated Branches: refs/heads/trunk dcbdcdfa7 -> e222d2f5d
AMBARI-8583. Ambari-Web build generates incorrect 'app.js.map' file (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2e7b019e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2e7b019e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2e7b019e Branch: refs/heads/trunk Commit: 2e7b019e300caea925a056b3f4e5a4fcab1fb05e Parents: dcbdcdf Author: Alex Antonenko <hiv...@gmail.com> Authored: Mon Dec 8 18:02:26 2014 +0200 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Mon Dec 8 20:04:10 2014 +0200 ---------------------------------------------------------------------- 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/2e7b019e/ambari-web/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml index db6951e..628bd36 100644 --- a/ambari-web/pom.xml +++ b/ambari-web/pom.xml @@ -117,12 +117,6 @@ </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}"/> @@ -138,6 +132,12 @@ <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/2e7b019e/ambari-web/set-ambari-version.sh ---------------------------------------------------------------------- diff --git a/ambari-web/set-ambari-version.sh b/ambari-web/set-ambari-version.sh index e1cead4..a5eb907 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" - sed "s/App.version.*=.*;/App.version = '$1';/" public/javascripts/app.js > public/javascripts/tmp.js; mv public/javascripts/tmp.js public/javascripts/app.js + find app -type f -name "*.js" -exec sed -i "s/App.version.*=.*;/App.version = '$1';/" {} \; fi http://git-wip-us.apache.org/repos/asf/ambari/blob/2e7b019e/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 c95e485..9eb8147 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'" - 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 + 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}';/" {} \; fi http://git-wip-us.apache.org/repos/asf/ambari/blob/2e7b019e/ambari-web/toggle-experimental.sh ---------------------------------------------------------------------- diff --git a/ambari-web/toggle-experimental.sh b/ambari-web/toggle-experimental.sh index eda05c6..a320acb 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...' - sed 's/App.enableExperimental.*=.*;/App.enableExperimental = true;/' public/javascripts/app.js > public/javascripts/tmp.js; mv public/javascripts/tmp.js public/javascripts/app.js + find app -type f -name "*.js" -exec sed -i "s/App.enableExperimental.*=.*;/App.enableExperimental = true;/" {} \; fi
