[kylin] branch kylin-on-parquet-v2 updated: KYLIN-4660 fix package.sh

[xxyu]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this 
push:
     new dc1a80f  KYLIN-4660 fix package.sh
dc1a80f is described below

commit dc1a80f2c1ad11fbd821014ae7975bb11c6db1d1
Author: XiaoxiangYu <hit_la...@126.com>
AuthorDate: Thu Jul 30 11:25:47 2020 +0800

    KYLIN-4660 fix package.sh
---
 build/bin/kylin.sh           | 14 +++++++-------
 build/script/prepare-libs.sh |  8 +-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh
index c8b15a2..7f7e2e5 100755
--- a/build/bin/kylin.sh
+++ b/build/bin/kylin.sh
@@ -45,9 +45,9 @@ function retrieveDependency() {
             source ${dir}/cached-hbase-dependency.sh
         fi
         source ${dir}/cached-hadoop-conf-dir.sh
-        source ${dir}/cached-kafka-dependency.sh
+        # source ${dir}/cached-kafka-dependency.sh
         source ${dir}/cached-spark-dependency.sh
-        source ${dir}/cached-flink-dependency.sh
+        # source ${dir}/cached-flink-dependency.sh
     else
         source ${dir}/find-hive-dependency.sh
         #retrive $hbase_dependency
@@ -57,9 +57,9 @@ function retrieveDependency() {
             source ${dir}/find-hbase-dependency.sh
         fi
         source ${dir}/find-hadoop-conf-dir.sh
-        source ${dir}/find-kafka-dependency.sh
+        # source ${dir}/find-kafka-dependency.sh
         source ${dir}/find-spark-dependency.sh
-        source ${dir}/find-flink-dependency.sh
+        # source ${dir}/find-flink-dependency.sh
     fi
 
     # get hdp_version
@@ -87,9 +87,9 @@ function retrieveDependency() {
 
     # compose hadoop_dependencies
     hadoop_dependencies=${hadoop_dependencies}:`hadoop classpath`
-    if [ -n "${hbase_dependency}" ]; then
-        hadoop_dependencies=${hadoop_dependencies}:${hbase_dependency}
-    fi
+#    if [ -n "${hbase_dependency}" ]; then
+#        hadoop_dependencies=${hadoop_dependencies}:${hbase_dependency}
+#    fi
     if [ -n "${hive_dependency}" ]; then
         hadoop_dependencies=${hadoop_dependencies}:${hive_dependency}
     fi
diff --git a/build/script/prepare-libs.sh b/build/script/prepare-libs.sh
index d7bbedf..43ce48a 100644
--- a/build/script/prepare-libs.sh
+++ b/build/script/prepare-libs.sh
@@ -30,19 +30,13 @@ echo "version ${version}"
 echo "copy lib file"
 rm -rf build/lib build/tool
 mkdir build/lib build/tool
-mkdir build/lib/streaming
-cp assembly/target/kylin-assembly-${version}-job.jar 
build/lib/kylin-job-${version}.jar
 cp parquet-assembly/target/parquet-assembly-${version}-job.jar 
build/lib/kylin-parquet-job-${version}.jar
-cp storage-hbase/target/kylin-storage-hbase-${version}-coprocessor.jar 
build/lib/kylin-coprocessor-${version}.jar
 cp jdbc/target/kylin-jdbc-${version}.jar build/lib/kylin-jdbc-${version}.jar
 cp tool-assembly/target/kylin-tool-assembly-${version}-assembly.jar 
build/tool/kylin-tool-${version}.jar
 cp datasource-sdk/target/kylin-datasource-sdk-${version}-lib.jar 
build/lib/kylin-datasource-sdk-${version}.jar
-cp stream-receiver/target/kylin-stream-receiver-${version}-all.jar 
build/lib/streaming/kylin-stream-receiver-${version}-all.jar
 
 # Copied file becomes 000 for some env (e.g. my Cygwin)
-chmod 644 build/lib/kylin-job-${version}.jar
-chmod 644 build/lib/kylin-coprocessor-${version}.jar
+#chmod 644 build/lib/kylin-job-${version}.jar
 chmod 644 build/lib/kylin-jdbc-${version}.jar
 chmod 644 build/tool/kylin-tool-${version}.jar
 chmod 644 build/lib/kylin-datasource-sdk-${version}.jar
-chmod 644 build/lib/streaming/kylin-stream-receiver-${version}-all.jar