From 33a962a9d4eedc84fd20abaf3dc1ec0de57d35dc Mon Sep 17 00:00:00 2001
From: Philipp Hug <philipp@hug.cx>
Date: Thu, 22 Sep 2016 11:26:19 +0200
Subject: [PATCH 1/2] Add gradle support

---
 sti/bin/assemble | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/sti/bin/assemble b/sti/bin/assemble
index f1f0686..83e4a6f 100755
--- a/sti/bin/assemble
+++ b/sti/bin/assemble
@@ -73,6 +73,42 @@ if [ -f "$LOCAL_SOURCE_DIR/pom.xml" ]; then
   # optionally clear the local maven repository after the build
   clear_maven_repository
 
+  popd &> /dev/null
+elif [ -f "$LOCAL_SOURCE_DIR/build.gradle" ]; then
+   echo "Building with gradle. $LOCAL_SOURCE_DIR/build.gradle found."
+
+   pushd $LOCAL_SOURCE_DIR &> /dev/null
+
+  if [ -z "$BUILDER_ARGS" ]; then
+    export BUILDER_ARGS="build -x test"
+    # TODO: Specify setting file with -c sss
+  fi
+
+  echo "Found gradle.build ... attempting to build with 'gradle -s ${BUILDER_ARGS}'"
+
+  echo "Gradle version:"
+  gradle --version
+
+  # Execute the actual build
+  gradle -s $BUILDER_ARGS
+
+  ERR=$?
+  if [ $ERR -ne 0 ]; then
+    echo "Aborting due to error code $ERR from Gradle build"
+    exit $ERR
+  fi
+
+  # Copy built artifacts (if any!) from the target/ directory
+  # to the $DEPLOY_DIR directory for later deployment
+  copy_artifacts build/libs
+
+
+  # clean up after maven
+  gradle clean
+#  if [ -d "$HOME/.m2/repository" ]; then
+#    rm -r "$HOME/.m2/repository"
+#  fi
+
   popd &> /dev/null
 else
   # For binary builds

From d204c184d5f24cae111c06e8c98484094779742c Mon Sep 17 00:00:00 2001
From: Philipp Hug <philipp@hug.cx>
Date: Thu, 22 Sep 2016 12:59:51 +0200
Subject: [PATCH 2/2] Make ARTIFACT_DIR configurable

---
 sti/bin/assemble | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/sti/bin/assemble b/sti/bin/assemble
index 83e4a6f..95a42c3 100755
--- a/sti/bin/assemble
+++ b/sti/bin/assemble
@@ -11,10 +11,6 @@ mkdir -p $LOCAL_SOURCE_DIR
 # Resulting artifact files will be deployed to /opt/openshift
 DEPLOY_DIR=/opt/openshift
 
-# the subdirectory within LOCAL_SOURCE_DIR from where we should copy build
-# artifacts (*.war, *.jar)
-ARTIFACT_DIR=${ARTIFACT_DIR:-target}
-
 # Copy the source for compilation
 # TODO: Remove. Why do we need to move the source???
 if compgen -G "/tmp/src/*" >/dev/null; then
@@ -43,6 +39,10 @@ manage_incremental_build
 # If a pom.xml is present, this is a normal build scenario
 # so run maven.
 if [ -f "$LOCAL_SOURCE_DIR/pom.xml" ]; then
+  # the subdirectory within LOCAL_SOURCE_DIR from where we should copy build
+  # artifacts (*.war, *.jar)
+  ARTIFACT_DIR=${ARTIFACT_DIR:-target}
+
   pushd $LOCAL_SOURCE_DIR &> /dev/null
 
   MAVEN_ARGS=${MAVEN_ARGS--e -Popenshift -DskipTests -Dcom.redhat.xpaas.repo.redhatga package}
@@ -66,8 +66,7 @@ if [ -f "$LOCAL_SOURCE_DIR/pom.xml" ]; then
 
   # Copy built artifacts (if any!) from the target/ directory
   # (or $ARTIFACT_DIR if specified)
-  # to the $JBOSS_HOME/standalone/deployments/ directory for
-  # later deployment
+  # to the $DEPLOY_DIR directory for later deployment
   copy_artifacts "$ARTIFACT_DIR" war ear rar jar
 
   # optionally clear the local maven repository after the build
@@ -75,9 +74,13 @@ if [ -f "$LOCAL_SOURCE_DIR/pom.xml" ]; then
 
   popd &> /dev/null
 elif [ -f "$LOCAL_SOURCE_DIR/build.gradle" ]; then
-   echo "Building with gradle. $LOCAL_SOURCE_DIR/build.gradle found."
+  # the subdirectory within LOCAL_SOURCE_DIR from where we should copy build
+  # artifacts (*.war, *.jar)
+  ARTIFACT_DIR=${ARTIFACT_DIR:-build/libs}
 
-   pushd $LOCAL_SOURCE_DIR &> /dev/null
+  echo "Building with gradle. $LOCAL_SOURCE_DIR/build.gradle found."
+
+  pushd $LOCAL_SOURCE_DIR &> /dev/null
 
   if [ -z "$BUILDER_ARGS" ]; then
     export BUILDER_ARGS="build -x test"
@@ -99,8 +102,9 @@ elif [ -f "$LOCAL_SOURCE_DIR/build.gradle" ]; then
   fi
 
   # Copy built artifacts (if any!) from the target/ directory
+  # (or $ARTIFACT_DIR if specified)
   # to the $DEPLOY_DIR directory for later deployment
-  copy_artifacts build/libs
+  copy_artifacts "$ARTIFACT_DIR" war ear rar jar
 
 
   # clean up after maven
@@ -112,7 +116,11 @@ elif [ -f "$LOCAL_SOURCE_DIR/build.gradle" ]; then
   popd &> /dev/null
 else
   # For binary builds
-  copy_artifacts "." war ear rar jar
+  # the subdirectory within LOCAL_SOURCE_DIR from where we should copy build
+  # artifacts (*.war, *.jar)
+  ARTIFACT_DIR=${ARTIFACT_DIR:-.}
+
+  copy_artifacts "$ARTIFACT_DIR" war ear rar jar
 fi
 
 # As Microservices you should only have 1 fat jar