From 8aaad6413b39541dee9da0579a9ae099c40977f3 Mon Sep 17 00:00:00 2001
From: Nikolay Igotti <nikolay.igotti@jetbrains.com>
Date: Thu, 22 Jun 2017 11:03:50 +0300
Subject: [PATCH] Minor build script tweaks

---
 samples/build.sh                       | 26 +++++++++++++-------------
 samples/concurrent/build.sh            |  3 +--
 samples/csvparser/build.sh             |  2 +-
 samples/gitchurn/build.sh              |  4 ++--
 samples/gtk/build.sh                   | 10 +++++-----
 samples/libcurl/build.sh               |  4 ++--
 samples/nonBlockingEchoServer/build.sh |  4 ++--
 samples/opengl/build.sh                |  4 ++--
 samples/socket/build.sh                |  4 ++--
 samples/tensorflow/build.sh            |  8 ++++----
 samples/tetris/build.sh                |  2 +-
 11 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/samples/build.sh b/samples/build.sh
index fe8b1b5d84b..bf214650b65 100755
--- a/samples/build.sh
+++ b/samples/build.sh
@@ -4,23 +4,23 @@ BUILD_SCRIPT="build.sh"
 function isExcluded() {
     CHECKED="${1}"
     for VALUE in $EXCLUDE; do
-        if [ "x$CHECKED" == "x$VALUE" ]; then
-            return 0
-        fi
+	if [ "x$CHECKED" == "x$VALUE" ]; then
+	    return 0
+	fi
     done
     return -1
 }
 
 for SAMPLE_DIR in *; do
     if [ -d "$SAMPLE_DIR" ] && [ -e "$SAMPLE_DIR/$BUILD_SCRIPT" ]; then
-        echo
-        echo "======================================================"
-        date
-        echo "Building a sample: $SAMPLE_DIR."
-        if ! isExcluded "$SAMPLE_DIR"; then
-            (cd "$SAMPLE_DIR" && . build.sh && cd $OLD_PWD) || (echo "Cannot build a sample: $SAMPLE_DIR. See log for details." && exit 1)
-        else
-            echo "The sample excluded."
-        fi
+	echo
+	echo "======================================================"
+	date
+	echo "Building a sample: $SAMPLE_DIR."
+	if ! isExcluded "$SAMPLE_DIR"; then
+	    bash "$SAMPLE_DIR/$BUILD_SCRIPT" || (echo "Cannot build a sample: $SAMPLE_DIR. See log for details." && exit 1)
+	else
+	    echo "The sample excluded."
+	fi
     fi
-done
\ No newline at end of file
+done
diff --git a/samples/concurrent/build.sh b/samples/concurrent/build.sh
index 4d734bc4176..40f9840a6d6 100755
--- a/samples/concurrent/build.sh
+++ b/samples/concurrent/build.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-
 DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )
 PATH=$DIR/../../dist/bin:$DIR/../../bin:$PATH
 
@@ -25,7 +24,7 @@ mkdir -p $DIR/build/bin
 $DIR/buildCpp.sh
 
 cinterop -def $DIR/src/main/c_interop/MessageChannel.def -copt "-I$DIR/src/main/cpp" -target $TARGET \
-         -o $DIR/build/c_interop/MessageChannel || exit 1
+	 -o $DIR/build/c_interop/MessageChannel || exit 1
 
 konanc $DIR/src/main/kotlin/Concurrent.kt -library $DIR/build/c_interop/MessageChannel \
        -nativelibrary $DIR/build/clang/MessageChannel.bc -o $DIR/build/bin/Concurrent || exit 1
diff --git a/samples/csvparser/build.sh b/samples/csvparser/build.sh
index cf15acf8d0c..5bece90b963 100755
--- a/samples/csvparser/build.sh
+++ b/samples/csvparser/build.sh
@@ -27,4 +27,4 @@ cinterop -def $DIR/src/main/c_interop/stdio.def -compilerOpts "$CFLAGS" -target
 konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin/CsvParser.kt -library $DIR/build/c_interop/stdio \
        -o $DIR/build/bin/CsvParser || exit 1
 
-echo "Artifact path is ./build/bin/CsvParser.kexe"
+echo "Artifact path is $DIR/build/bin/CsvParser.kexe"
diff --git a/samples/gitchurn/build.sh b/samples/gitchurn/build.sh
index c85f1af2b87..c96ebb44174 100755
--- a/samples/gitchurn/build.sh
+++ b/samples/gitchurn/build.sh
@@ -27,9 +27,9 @@ mkdir -p $DIR/build/c_interop/
 mkdir -p $DIR/build/bin/
 
 cinterop -compilerOpts $CFLAGS -def $DIR/src/main/c_interop/libgit2.def -target $TARGET \
-         -o $DIR/build/c_interop/libgit2 || exit 1
+	 -o $DIR/build/c_interop/libgit2 || exit 1
 
 konanc -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/libgit2 -linkerOpts "$LINKER_ARGS" \
        -o $DIR/build/bin/GitChurn || exit 1
 
-echo "Artifact path is ./build/bin/GitChurn.kexe"
+echo "Artifact path is $DIR/build/bin/GitChurn.kexe"
diff --git a/samples/gtk/build.sh b/samples/gtk/build.sh
index 7baec68dad5..d41294cb7eb 100755
--- a/samples/gtk/build.sh
+++ b/samples/gtk/build.sh
@@ -29,11 +29,11 @@ mkdir -p $DIR/build/bin/
 
 echo "Generating GTK stubs, may take few mins depending on the hardware..."
 cinterop -J-Xmx8g -copt $IPREFIX/atk-1.0 -compilerOpts $IPREFIX/gdk-pixbuf-2.0 -copt $IPREFIX/cairo -copt $IPREFIX/pango-1.0 \
-         -copt -I/opt/local/lib/glib-2.0/include -copt -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -copt -I/usr/local/lib/glib-2.0/include \
-         -copt $IPREFIX/gtk-3.0 -copt $IPREFIX/glib-2.0 -def $DIR/src/main/c_interop/gtk3.def \
-         -target $TARGET -o $DIR/build/c_interop/gtk3 || exit 1
+	 -copt -I/opt/local/lib/glib-2.0/include -copt -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -copt -I/usr/local/lib/glib-2.0/include \
+	 -copt $IPREFIX/gtk-3.0 -copt $IPREFIX/glib-2.0 -def $DIR/src/main/c_interop/gtk3.def \
+	 -target $TARGET -o $DIR/build/c_interop/gtk3 || exit 1
 
-konanc -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/gtk3.bc -linkerOpts "$LINKER_ARGS" \
+konanc -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/gtk3 -linkerOpts "$LINKER_ARGS" \
        -o $DIR/build/bin/Gtk3Demo || exit 1
 
-echo "Artifact path is ./build/bin/Gtk3Demo.kexe"
+echo "Artifact path is $DIR/build/bin/Gtk3Demo.kexe"
diff --git a/samples/libcurl/build.sh b/samples/libcurl/build.sh
index 4aa95f50812..579c587c26c 100755
--- a/samples/libcurl/build.sh
+++ b/samples/libcurl/build.sh
@@ -27,9 +27,9 @@ mkdir -p $DIR/build/c_interop/
 mkdir -p $DIR/build/bin/
 
 cinterop -compilerOpts "$CFLAGS" -compilerOpts -I$DIR -compilerOpts -I/usr/include -def $DIR/src/main/c_interop/libcurl.def -target $TARGET \
-         -o $DIR/build/c_interop/libcurl || exit 1
+	 -o $DIR/build/c_interop/libcurl || exit 1
 
 konanc -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/libcurl -linkerOpts "$LINKER_ARGS" \
        -o $DIR/build/bin/Curl || exit 1
 
-echo "Artifact path is ./build/bin/Curl.kexe"
+echo "Artifact path is $DIR/build/bin/Curl.kexe"
diff --git a/samples/nonBlockingEchoServer/build.sh b/samples/nonBlockingEchoServer/build.sh
index 5b1c53d876d..5c649dbc381 100755
--- a/samples/nonBlockingEchoServer/build.sh
+++ b/samples/nonBlockingEchoServer/build.sh
@@ -22,9 +22,9 @@ mkdir -p $DIR/build/c_interop/
 mkdir -p $DIR/build/bin/
 
 cinterop -def $DIR/src/main/c_interop/sockets.def -copt "$CFLAGS" -target $TARGET \
-         -o $DIR/build/c_interop/sockets || exit 1
+	 -o $DIR/build/c_interop/sockets || exit 1
 
 konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin/EchoServer.kt \
        -library $DIR/build/c_interop/sockets -o $DIR/build/bin/EchoServer || exit 1
 
-echo "Artifact path is ./build/bin/EchoServer.kexe"
+echo "Artifact path is $DIR/build/bin/EchoServer.kexe"
diff --git a/samples/opengl/build.sh b/samples/opengl/build.sh
index e2c85c30f36..8c21c88f224 100755
--- a/samples/opengl/build.sh
+++ b/samples/opengl/build.sh
@@ -25,9 +25,9 @@ mkdir -p $DIR/build/c_interop/
 mkdir -p $DIR/build/bin/
 
 cinterop -def $DIR/src/main/c_interop/opengl.def -target $TARGET \
-         -o $DIR/build/c_interop/opengl || exit 1
+	 -o $DIR/build/c_interop/opengl || exit 1
 
 konanc -target $TARGET $DIR/src/main/kotlin/OpenGlTeapot.kt -library $DIR/build/c_interop/opengl \
        -linkerOpts "$LINKER_ARGS" -o $DIR/build/bin/OpenGlTeapot || exit 1
 
-echo "Artifact path is ./build/bin/OpenGlTeapot.kexe"
+echo "Artifact path is $DIR/build/bin/OpenGlTeapot.kexe"
diff --git a/samples/socket/build.sh b/samples/socket/build.sh
index 0bb7fe48e38..a1eea426734 100755
--- a/samples/socket/build.sh
+++ b/samples/socket/build.sh
@@ -22,10 +22,10 @@ mkdir -p $DIR/build/c_interop/
 mkdir -p $DIR/build/bin/
 
 cinterop -def $DIR/src/main/c_interop/sockets.def -copt "$CFLAGS" -target $TARGET \
-         -o $DIR/build/c_interop/sockets || exit 1
+	 -o $DIR/build/c_interop/sockets || exit 1
 
 konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin/EchoServer.kt \
        -library $DIR/build/c_interop/sockets \
        -o $DIR/build/bin/EchoServer || exit 1
 
-echo "Artifact path is ./build/bin/EchoServer.kexe"
+echo "Artifact path is $DIR/build/bin/EchoServer.kexe"
diff --git a/samples/tensorflow/build.sh b/samples/tensorflow/build.sh
index c04aa1a671f..09737c04758 100755
--- a/samples/tensorflow/build.sh
+++ b/samples/tensorflow/build.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-./downloadTensorflow.sh
-
 DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )
 PATH=$DIR/../../dist/bin:$DIR/../../bin:$PATH
 
+$DIR/downloadTensorflow.sh
+
 TF_TARGET_DIRECTORY="$HOME/.konan/third-party/tensorflow"
 TF_TYPE="cpu" # Change to "gpu" for GPU support
 
@@ -30,7 +30,7 @@ mkdir -p $DIR/build/c_interop/
 mkdir -p $DIR/build/bin/
 
 cinterop -def $DIR/src/main/c_interop/tensorflow.def -compilerOpts "$CFLAGS" -target $TARGET \
-         -o $DIR/build/c_interop/tensorflow || exit 1
+	 -o $DIR/build/c_interop/tensorflow || exit 1
 
 konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin/HelloTensorflow.kt \
        -library $DIR/build/c_interop/tensorflow \
@@ -39,4 +39,4 @@ konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin/HelloTensorflow.kt \
 
 echo "Note: You may need to specify LD_LIBRARY_PATH or DYLD_LIBRARY_PATH env variables to $TF_TARGET_DIRECTORY/lib if the TensorFlow dynamic library cannot be found."
 
-echo "Artifact path is ./build/bin/HelloTensorflow.kexe"
+echo "Artifact path is $DIR/build/bin/HelloTensorflow.kexe"
diff --git a/samples/tetris/build.sh b/samples/tetris/build.sh
index 48a14f78c08..12b3989f7d0 100755
--- a/samples/tetris/build.sh
+++ b/samples/tetris/build.sh
@@ -53,4 +53,4 @@ konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin/Tetris.kt \
 
 cp -R $DIR/src/main/resources/ $DIR/build/bin/
 
-echo "Artifact path is ./build/bin/Tetris.kexe"
+echo "Artifact path is $DIR/build/bin/Tetris.kexe"