Merge remote-tracking branch 'github/master' into tizen

[platform/core/csapi/tizenfx.git] / build.sh

diff --git a/build.sh b/build.sh
index 9354268..7dcc299 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -5,14 +5,16 @@ SCRIPT_DIR=$(dirname $SCRIPT_FILE)
 
 OUTDIR=$SCRIPT_DIR/Artifacts
 
-RETRY_CMD="$SCRIPT_DIR/tools/retry.sh"
-TIMEOUT_CMD="$SCRIPT_DIR/tools/timeout.sh"
+RETRY_CMD="$SCRIPT_DIR/tools/scripts/retry.sh"
+TIMEOUT_CMD="$SCRIPT_DIR/tools/scripts/timeout.sh"
 DOTNET_CMD="$RETRY_CMD $TIMEOUT_CMD 600 dotnet"
 
 RUN_BUILD="$DOTNET_CMD msbuild $SCRIPT_DIR/build/build.proj /nologo"
 
+VERSION_PREFIX=6.0.0
+
 usage() {
-  echo "Usage: %0 [command] [args]"
+  echo "Usage: $0 [command] [args]"
   echo "Commands:"
   echo "    build [module]     Build a specific module"
   echo "    full               Build all modules in src/ directory"
@@ -29,8 +31,9 @@ cmd_build() {
   if [ -d /nuget ]; then
     NUGET_SOURCE_OPT="/p:RestoreSources=/nuget"
   fi
-  $RUN_BUILD /t:restore /p:Project=$1 $NUGET_SOURCE_OPT
-  $RUN_BUILD /t:build /p:Project=$1
+  PROJECT=$1; shift
+  $RUN_BUILD /t:restore /p:Project=$PROJECT $NUGET_SOURCE_OPT $@
+  $RUN_BUILD /t:build /p:Project=$PROJECT $@
 }
 
 cmd_full_build() {
@@ -38,8 +41,8 @@ cmd_full_build() {
     NUGET_SOURCE_OPT="/p:RestoreSources=/nuget"
   fi
   $RUN_BUILD /t:clean
-  $RUN_BUILD /t:restore $NUGET_SOURCE_OPT
-  $RUN_BUILD /t:build
+  $RUN_BUILD /t:restore $NUGET_SOURCE_OPT $@
+  $RUN_BUILD /t:build $@
 }
 
 cmd_dummy_build() {
@@ -53,8 +56,7 @@ cmd_dummy_build() {
 cmd_pack() {
   VERSION=$1
   if [ -z "$VERSION" ]; then
-    TIMESTAMP=$(date +"%s")
-    VERSION="5.0.0-local-$TIMESTAMP"
+    VERSION=$VERSION_PREFIX.$((10000+$(git rev-list --count HEAD)))
   fi
 
   $RUN_BUILD /t:pack /p:Version=$VERSION