You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/07/15 14:48:13 UTC
[6/7] incubator-kylin git commit: KYLIN-842 update package script,
move target file to dist folder
KYLIN-842 update package script, move target file to dist folder
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/ce155464
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/ce155464
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/ce155464
Branch: refs/heads/0.7-staging
Commit: ce1554646b2cbee54626978ddc32464770b99217
Parents: d0c84f6
Author: Luke Han <lu...@apache.org>
Authored: Wed Jul 15 20:13:59 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Wed Jul 15 20:13:59 2015 +0800
----------------------------------------------------------------------
.gitignore | 3 ++-
script/compress.sh | 19 ++++++++++++-------
script/download-tomcat.sh | 4 +++-
script/package.sh | 21 +++------------------
script/prepare.sh | 11 ++++++++---
website/_layouts/docs.html | 4 ++--
website/download/index.md | 3 ++-
7 files changed, 32 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce155464/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9208623..6742b8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,7 +86,8 @@ target
logs
# package file and folder
+dist
tomcat
lib
webapp/app/components/*
-/commit_SHA1
+commit.sha1
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce155464/script/compress.sh
----------------------------------------------------------------------
diff --git a/script/compress.sh b/script/compress.sh
index ff606bc..aaa8cd8 100755
--- a/script/compress.sh
+++ b/script/compress.sh
@@ -29,13 +29,18 @@ fi
#package tar.gz
echo 'package tar.gz'
-rm -rf kylin-${version}
-mkdir kylin-${version}
-cp -r lib bin conf tomcat examples/sample_cube commit_SHA1 kylin-${version}
-find kylin-${version} -type d -exec chmod 755 {} \;
-find kylin-${version} -type f -exec chmod 644 {} \;
-find kylin-${version} -type f -name "*.sh" -exec chmod 755 {} \;
+rm -rf dist/kylin-${version}
+mkdir dist/kylin-${version}
+# copy files
+cp -r lib bin conf dist/tomcat examples/sample_cube commit.sha1 dist/kylin-${version}
+# copy license files
+cp LICENSE README.md NOTICE DISCLAIMER dist/kylin-${version}
+
+find dist/kylin-${version} -type d -exec chmod 755 {} \;
+find dist/kylin-${version} -type f -exec chmod 644 {} \;
+find dist/kylin-${version} -type f -name "*.sh" -exec chmod 755 {} \;
+cd dist
tar -cvzf kylin-${version}.tar.gz kylin-${version}
rm -rf kylin-${version}
-echo "Package ready kylin-${version}.tar.gz"
+echo "Package ready dist/kylin-${version}.tar.gz"
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce155464/script/download-tomcat.sh
----------------------------------------------------------------------
diff --git a/script/download-tomcat.sh b/script/download-tomcat.sh
index f43d202..d743514 100755
--- a/script/download-tomcat.sh
+++ b/script/download-tomcat.sh
@@ -19,6 +19,7 @@
dir=$(dirname ${0})
cd ${dir}/..
+cd dist
rm -rf tomcat
if [ ! -f "apache-tomcat-7.0.59.tar.gz" ]
@@ -35,9 +36,10 @@ else
fi
tar -zxvf apache-tomcat-7.0.59.tar.gz
+
mv apache-tomcat-7.0.59 tomcat
rm -rf tomcat/webapps/*
mv tomcat/conf/server.xml tomcat/conf/server.xml.bak
-cp deploy/server.xml tomcat/conf/server.xml
+cp ../deploy/server.xml tomcat/conf/server.xml
echo "server.xml overwritten..."
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce155464/script/package.sh
----------------------------------------------------------------------
diff --git a/script/package.sh b/script/package.sh
index ad8ee26..da2a9fb 100755
--- a/script/package.sh
+++ b/script/package.sh
@@ -52,27 +52,12 @@ echo "kylin version: ${version}"
export version
#commit id
-cat << EOF > commit_SHA1
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+cat << EOF > dist/commit.sha1
EOF
-git rev-parse HEAD >> commit_SHA1
+git rev-parse HEAD >> dist/commit.sha1
-sh script/download-tomcat.sh || { exit 1; }
sh script/build.sh || { exit 1; }
+sh script/download-tomcat.sh || { exit 1; }
sh script/prepare.sh || { exit 1; }
sh script/compress.sh || { exit 1; }
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce155464/script/prepare.sh
----------------------------------------------------------------------
diff --git a/script/prepare.sh b/script/prepare.sh
index f0702f8..d1a31b0 100755
--- a/script/prepare.sh
+++ b/script/prepare.sh
@@ -29,13 +29,18 @@ echo "version ${version}"
echo "copy lib file"
rm -rf lib
mkdir lib
-cp server/target/kylin-server-${version}.war tomcat/webapps/kylin.war
+# copy war file
+cp server/target/kylin-server-${version}.war dist/tomcat/webapps/kylin.war
+# copy job jar
cp job/target/kylin-job-${version}-job.jar lib/kylin-job-${version}.jar
+# copy coprocessor jar
cp storage/target/kylin-storage-${version}-coprocessor.jar lib/kylin-coprocessor-${version}.jar
+# copy jdbc driver
cp jdbc/target/kylin-jdbc-${version}.jar lib/kylin-jdbc-${version}.jar
+# copy monitor jar
cp monitor/target/kylin-monitor-${version}.jar lib/kylin-monitor-${version}.jar
# Copied file becomes 000 for some env (e.g. my Cygwin)
-chmod 644 tomcat/webapps/kylin.war
+chmod 644 dist/tomcat/webapps/kylin.war
chmod 644 lib/kylin-job-${version}.jar
chmod 644 lib/kylin-coprocessor-${version}.jar
chmod 644 lib/kylin-jdbc-${version}.jar
@@ -52,5 +57,5 @@ cd webapp/dist
for f in * .[^.]*
do
echo "Adding $f to war"
- jar -uf ../../tomcat/webapps/kylin.war $f
+ jar -uf ../../dist/tomcat/webapps/kylin.war $f
done
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce155464/website/_layouts/docs.html
----------------------------------------------------------------------
diff --git a/website/_layouts/docs.html b/website/_layouts/docs.html
index 2755322..51908b3 100755
--- a/website/_layouts/docs.html
+++ b/website/_layouts/docs.html
@@ -30,8 +30,8 @@
<div id="pjax">
<h1 class="post-title">{{ page.title }}</h1>
{% if page.version == NULL %}
- {% else %}
- version: {{page.version}}, since: {{page.since}}
+ {% else %}
+ <p>version: {{page.version}}, since: {{page.since}}</p>
{% endif %}
{{ content }}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce155464/website/download/index.md
----------------------------------------------------------------------
diff --git a/website/download/index.md b/website/download/index.md
index 9810685..1417dff 100644
--- a/website/download/index.md
+++ b/website/download/index.md
@@ -29,6 +29,7 @@ And ODBC Driver could be find here:
* [Kylin ODBC Driver](KylinODBC.zip)
* _ODBC Driver's source sode avaliable with 0.8 branch_
+<!--
__Development Version (v0.7.x)__
Here's latest development version binary package:
@@ -36,6 +37,6 @@ Here's latest development version binary package:
* [kylin-v0.7.3-incubating-SNAPSHOT](kylin-0.7.3-incubating-SNAPSHOT.tar.gz)
* Updated Date: 2015-06-30
* Commit ID: e7fcc20d8ab6f824eb6b88b8f8fa133e284dc34f
-
+-->