dev/make-distribution.sh should also support multi-spark-version

README.md

@@ -35,11 +35,11 @@ You also can refer this: [Compile Assistance](https://streamingpro.rebiekong.com
 git clone https://github.com/allwefantasy/streamingpro .
 cd streamingpro
 
-./dev/make-distribution.sh
+export MLSQL_SPARK_VERSIOIN=2.3;export DRY_RUN=false && ./dev/make-distribution.sh
 
 
-cp streamingpro-bin-1.1.3.tgz /tmp
-cd /tmp && tar xzvf  streamingpro-bin-1.1.3.tgz
+cp streamingpro-bin-x.x.x.tgz /tmp
+cd /tmp && tar xzvf  streamingpro-bin-x.x.x.tgz
 cd /tmp/streamingpro
 
 export SPARK_HOME="....." ; ./start-local.sh
@@ -51,14 +51,16 @@ export SPARK_HOME="....." ; ./start-local.sh
 * Chen Fu/cfmcgrady#gmail.com
 * Geng Yifei/pigeongeng#gmail.com
 * wanp1989/wanp1989#126.com
+* chenliang613
+* RebieKong
 * CoderOverflow
 * ghsuzzy
 * xubo245
 * zhuohuwu0603
 * liyubin117
-* RebieKong
 * 9bbword
 
+
 ----------
 [![HitCount](http://hits.dwyl.io/allwefantasy/streamingpro.svg)](http://hits.dwyl.io/allwefantasy/streamingpro)
 

dev/make-distribution.sh

@@ -1,19 +1,3 @@
 #!/bin/bash
-rm -rf /tmp/temp_ServiceFramework
-git clone --depth 1 https://github.com/allwefantasy/ServiceFramework.git /tmp/temp_ServiceFramework
-cd /tmp/temp_ServiceFramework
-mvn install -DskipTests -Pjetty-9 -Pweb-include-jetty-9
-
-cd -
-
-mvn -DskipTests clean package \
--Pspark-2.3.0 \
--Pstreamingpro-spark-2.3.0-adaptor \
--Ponline \
--Pscala-2.11 \
--Pdsl \
--Passembly \
--Pcrawler \
--Phive-thrift-server \
--Pxgboost \
--Pcarbondata
+export DISTRIBUTION=true
+./dev/package.sh

dev/package.sh

@@ -8,6 +8,7 @@ Inputs are specified with the following environment variables:
 
 MLSQL_SPARK_VERSIOIN - the spark version, 2.2/2.3/2.4
 DRY_RUN true|false
+DISTRIBUTION true|false
 EOF
   exit 1
 }
@@ -19,20 +20,23 @@ if [[ $@ == *"help"* ]]; then
   exit_with_usage
 fi
 
-for env in MLSQL_SPARK_VERSIOIN DRY_RUN; do
+for env in MLSQL_SPARK_VERSIOIN DRY_RUN DISTRIBUTION; do
   if [[ -z "${!env}" ]]; then
     echo "===$env must be set to run this script==="
     echo "===Please run ./dev/package.sh help to get how to use.==="
     exit 1
   fi
 done
 
+if [[ ${DRY_RUN} != "true" ]];then
 rm -rf /tmp/temp_ServiceFramework
 git clone --depth 1 https://github.com/allwefantasy/ServiceFramework.git /tmp/temp_ServiceFramework
 cd /tmp/temp_ServiceFramework
 mvn install -DskipTests -Pjetty-9 -Pweb-include-jetty-9
 
 cd -
+fi
+
 
 BASE_PROFILES="-Pscala-2.11 -Ponline -Phive-thrift-server -Pcarbondata  -Pcrawler"
 
@@ -44,20 +48,22 @@ fi
 
 BASE_PROFILES="$BASE_PROFILES -Pspark-$MLSQL_SPARK_VERSIOIN.0 -Pstreamingpro-spark-$MLSQL_SPARK_VERSIOIN.0-adaptor"
 
+if [[ ${DISTRIBUTION} == "true" ]];then
+BASE_PROFILES="$BASE_PROFILES -Passembly"
+else
+BASE_PROFILES="$BASE_PROFILES -Pshade -pl streamingpro-mlsql -am"
+fi
+
 export MAVEN_OPTS="-Xmx6000m"
 
 if [[ ${DRY_RUN} == "true" ]];then
 
 cat << EOF
-mvn clean package \
--Pshade \
--DskipTests \
--pl streamingpro-mlsql \
--am ${BASE_PROFILES}
+mvn clean package  -DskipTests ${BASE_PROFILES}
 EOF
 
 else
-mvn clean package -Pshade -DskipTests -pl streamingpro-mlsql -am ${BASE_PROFILES}
+mvn clean package  -DskipTests ${BASE_PROFILES}
 fi