small patch to package scripts
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/be5e23f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/be5e23f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/be5e23f2 Branch: refs/heads/inverted-index Commit: be5e23f2200f907c67dd4997bbf416a44072e2a8 Parents: 4726314 Author: Li, Yang <yang...@ebay.com> Authored: Thu Feb 12 13:20:11 2015 +0800 Committer: Li, Yang <yang...@ebay.com> Committed: Thu Feb 12 13:20:11 2015 +0800 ---------------------------------------------------------------------- script/build.sh | 12 ++++++------ script/compress.sh | 4 +++- script/prepare.sh | 6 +++++- 3 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/be5e23f2/script/build.sh ---------------------------------------------------------------------- diff --git a/script/build.sh b/script/build.sh index 3014123..de6f76c 100644 --- a/script/build.sh +++ b/script/build.sh @@ -5,13 +5,13 @@ echo "package back-end" dir=$(dirname ${0}) cd ${dir}/.. -mvn clean install -DskipTests +mvn clean install -DskipTests || { exit 1; } #package webapp echo 'package front-end' cd webapp -npm install -g bower -bower --allow-root install -npm install -npm install -g grunt-cli -grunt dev --buildEnv=dev +npm install -g bower || { exit 1; } +bower --allow-root install || { exit 1; } +npm install || { exit 1; } +npm install -g grunt-cli || { exit 1; } +grunt dev --buildEnv=dev || { exit 1; } http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/be5e23f2/script/compress.sh ---------------------------------------------------------------------- diff --git a/script/compress.sh b/script/compress.sh index 20b4257..4dd91f3 100644 --- a/script/compress.sh +++ b/script/compress.sh @@ -17,4 +17,6 @@ rm -rf kylin-${version} mkdir kylin-${version} cp -r lib bin conf tomcat kylin-${version} tar -cvzf kylin-${version}.tgz kylin-${version} -rm -rf kylin-${version} \ No newline at end of file +rm -rf kylin-${version} + +echo "Package ready kylin-${version}.tgz" http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/be5e23f2/script/prepare.sh ---------------------------------------------------------------------- diff --git a/script/prepare.sh b/script/prepare.sh index 3b30ac2..a1c8537 100644 --- a/script/prepare.sh +++ b/script/prepare.sh @@ -7,8 +7,8 @@ if [ -z "$version" ] then echo 'version not set' version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['` - echo "${version}" fi +echo "version ${version}" echo "copy lib file" rm -rf lib @@ -16,6 +16,10 @@ mkdir lib cp server/target/kylin-server-${version}.war tomcat/webapps/kylin.war cp job/target/kylin-job-${version}-job.jar lib/kylin-job-${version}.jar cp storage/target/kylin-storage-${version}-coprocessor.jar lib/kylin-coprocessor-${version}.jar +# Copied file becomes 000 for some env (e.g. my Cygwin) +chmod 644 tomcat/webapps/kylin.war +chmod 644 lib/kylin-job-${version}.jar +chmod 644 lib/kylin-coprocessor-${version}.jar echo "add js css to war" if [ ! -d "webapp/dist" ]