Repository: incubator-predictionio Updated Branches: refs/heads/feature/xbuild d2ad76df5 -> 441f91236
Fix build scripts Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/441f9123 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/441f9123 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/441f9123 Branch: refs/heads/feature/xbuild Commit: 441f91236cbbcc2873da7d4dfb50c670ef076f8f Parents: d2ad76d Author: Donald Szeto <[email protected]> Authored: Thu Mar 16 21:58:48 2017 -0700 Committer: Donald Szeto <[email protected]> Committed: Thu Mar 16 21:58:48 2017 -0700 ---------------------------------------------------------------------- build.sbt | 4 +++- make-distribution.sh | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/441f9123/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index fdf9a58..4287e50 100644 --- a/build.sbt +++ b/build.sbt @@ -185,7 +185,9 @@ val storageSubprojects = Seq( dataJdbc, dataLocalfs) -val storage = (project in file("storage")).aggregate(storageSubprojects map Project.projectToRef: _*) +val storage = (project in file("storage")) + .aggregate(storageSubprojects map Project.projectToRef: _*) + .disablePlugins(sbtassembly.AssemblyPlugin) val root = (project in file(".")). settings(commonSettings: _*). http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/441f9123/make-distribution.sh ---------------------------------------------------------------------- diff --git a/make-distribution.sh b/make-distribution.sh index b3b650a..e92178f 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -55,9 +55,11 @@ VERSION=$(grep ^version ${FWDIR}/build.sbt | grep ThisBuild | grep -o '".*"' | s echo "Building binary distribution for PredictionIO $VERSION..." cd ${FWDIR} -sbt/sbt clean -sbt/sbt "$JAVA_PROPS" printBuildInfo -sbt/sbt "$JAVA_PROPS" publishLocal assembly storage/assembly +set -x +sbt/sbt "${JAVA_PROPS[@]}" clean +sbt/sbt "${JAVA_PROPS[@]}" printBuildInfo +sbt/sbt "${JAVA_PROPS[@]}" publishLocal assembly storage/assembly +set +x cd ${FWDIR} rm -rf ${DISTDIR}
