X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build.sh;h=ba1914b04629dd97ae3556c71bed4c23aef6f0dc;hb=5e0cfcf0b91fadca49e6686d2ff7d2d7290279ed;hp=4f8786197e13713eb8d6d577822c20aaf81c054d;hpb=757e42bda5a0b3267aa525460216b95854f97843;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git diff --git a/build.sh b/build.sh index 4f87861..ba1914b 100755 --- a/build.sh +++ b/build.sh @@ -5,9 +5,8 @@ SCRIPT_DIR=$(dirname $SCRIPT_FILE) OUTDIR=$SCRIPT_DIR/Artifacts -NUGET_CMD="mono $SCRIPT_DIR/tools/NuGet.exe" -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" @@ -47,24 +46,18 @@ cmd_dummy_build() { if [ -d /nuget ]; then NUGET_SOURCE_OPT="/p:RestoreSources=/nuget" fi + $RUN_BUILD /t:restore $NUGET_SOURCE_OPT $RUN_BUILD /t:dummy $NUGET_SOURCE_OPT - $RUN_BUILD /t:afterdummy } cmd_pack() { VERSION=$1 - VERSION_INTERNAL=$2 if [ -z "$VERSION" ]; then TIMESTAMP=$(date +"%s") VERSION="5.0.0-local-$TIMESTAMP" fi - if [ -z "$VERSION_INTERNAL" ]; then - VERSION_INTERNAL=$VERSION - fi - $NUGET_CMD pack $SCRIPT_DIR/pkg/Tizen.NET.nuspec -NoPackageAnalysis -Version $VERSION -BasePath $SCRIPT_DIR -OutputDirectory $OUTDIR - $NUGET_CMD pack $SCRIPT_DIR/pkg/Tizen.NET.API5.nuspec -NoPackageAnalysis -Version $VERSION -BasePath $SCRIPT_DIR -OutputDirectory $OUTDIR - $NUGET_CMD pack $SCRIPT_DIR/pkg/Tizen.NET.Internals.nuspec -NoPackageAnalysis -Version $VERSION_INTERNAL -BasePath $SCRIPT_DIR -OutputDirectory $OUTDIR + $RUN_BUILD /t:pack /p:Version=$VERSION } cmd_clean() {