Remove -Rebuild option from build scripts (#18089)

diff --git a/Documentation/building/cross-building.md b/Documentation/building/cross-building.md
index 20fe26eb9c414d751b697369c3b0ca784f906aec..5a4060c9101d61d291bbeb944b5eaf10decc8733 100644 (file)
--- a/Documentation/building/cross-building.md
+++ b/Documentation/building/cross-building.md
@@ -79,11 +79,11 @@ Once the rootfs has been generated, it will be possible to cross compile CoreCLR
 
 So, without `ROOTFS_DIR`:
 
-    ben@ubuntu ~/git/coreclr/ $ ./build.sh arm debug verbose cross -rebuild
+    ben@ubuntu ~/git/coreclr/ $ ./build.sh arm debug verbose cross
 
 And with:
 
-    ben@ubuntu ~/git/coreclr/ $ ROOTFS_DIR=/home/ben/coreclr-cross/arm ./build.sh arm debug verbose cross -rebuild
+    ben@ubuntu ~/git/coreclr/ $ ROOTFS_DIR=/home/ben/coreclr-cross/arm ./build.sh arm debug verbose cross
 
 As usual the resulting binaries will be found in `bin/Product/BuildOS.BuildArch.BuildType/`
 
@@ -115,7 +115,7 @@ The following instructions assume you are on a Linux machine such as Ubuntu 14.0
 To build System.Private.CoreLib for Linux, run the following command:
 
 ```
-    lgs@ubuntu ~/git/coreclr/ $ build.sh arm debug verbose -rebuild
+    lgs@ubuntu ~/git/coreclr/ $ build.sh arm debug verbose
 ```
 
 The output is at bin/Product/<BuildOS>.arm.Debug/System.Private.CoreLib.dll.

diff --git a/Documentation/building/windows-instructions.md b/Documentation/building/windows-instructions.md
index e21727358759ce84943ad959d6e8227dcc33436f..7e9bfef03e60fb773ae11a95eafcd47582901f61 100644 (file)
--- a/Documentation/building/windows-instructions.md
+++ b/Documentation/building/windows-instructions.md
@@ -144,7 +144,6 @@ Build has a number of options that you can learn about using build -?.   Some of
 
  * -skiptests - don't build the tests.   This can shorten build times quite a bit, but means you can't run tests.
  * -release - build the 'Release' build type that does not have extra development-time checking compiled in.
- * -rebuild - force the build not to be incremental but to recompile everything.   
  You want this if you are going to do performance testing on your build. 
 
 See [Using Your Build](../workflow/UsingYourBuild.md) for instructions on running code with your build.  

diff --git a/build.cmd b/build.cmd
index c7bac26703d1a967593a292ab9730237c5d6da61..bdeebc5875bf385e5c95b468329af1f8d4c74e7d 100644 (file)
--- a/build.cmd
+++ b/build.cmd
@@ -135,6 +135,17 @@ if /i "%1" == "release"             (set __BuildTypeRelease=1&set processedArgs=
 
 if /i "%1" == "-priority"           (set __Priority=%2&shift&set processedArgs=!processedArgs! %1=%2&shift&goto Arg_Loop)
 
+REM Explicitly block -Rebuild.
+if /i "%1" == "Rebuild" (
+    echo "ERROR: 'Rebuild' is not supported.  Please remove it."
+    goto Usage
+)
+if /i "%1" == "-Rebuild" (
+    echo "ERROR: 'Rebuild' is not supported.  Please remove it."
+    goto Usage
+)
+
+
 REM All arguments after this point will be passed through directly to build.cmd on nested invocations
 REM using the "all" argument, and must be added to the __PassThroughArgs variable.
 if [!__PassThroughArgs!]==[] (
@@ -890,7 +901,6 @@ echo -skiprestore: skip restoring packages ^(default: packages are restored duri
 echo -disableoss: Disable Open Source Signing for System.Private.CoreLib.
 echo -priority=^<N^> : specify a set of test that will be built and run, with priority N.
 echo -officialbuildid=^<ID^>: specify the official build ID to be used by this build.
-echo -Rebuild: passes /t:rebuild to the build projects.
 echo -crossgenaltjit ^<JIT dll^>: run crossgen using specified altjit ^(used for JIT testing^).
 echo portable : build for portable RID.
 echo.

diff --git a/build.sh b/build.sh
index 7b433054f6f4875ae00b14a6a7c75d974ae63be9..2c7004f3d4d204567e2cd8030b4828f864576603 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -49,7 +49,6 @@ usage()
     echo "-skiprestore: skip restoring packages ^(default: packages are restored during build^)."
     echo "-disableoss: Disable Open Source Signing for System.Private.CoreLib."
     echo "-officialbuildid=^<ID^>: specify the official build ID to be used by this build."
-    echo "-Rebuild: passes /t:rebuild to the build projects."
     echo "-stripSymbols - Optional argument to strip native symbols during the build."
     echo "-skipgenerateversion - disable version generation even if MSBuild is supported."
     echo "-ignorewarnings - do not treat warnings as errors"
@@ -881,6 +880,10 @@ while :; do
               exit 1
             fi
             ;;
+        rebuild|-rebuild)
+            echo "ERROR: 'Rebuild' is not supported.  Please remove it."
+            exit 1
+            ;;
 
         *)
             __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"

diff --git a/config.json b/config.json
index 84cd2886226057a15af3e6e64c65e9d249804259..406ea5189a1368a6a9d93b33124223760de0cbe0 100644 (file)
--- a/config.json
+++ b/config.json
@@ -282,12 +282,6 @@
       "values": [ "false", "true"],
       "defaultValue": "true"
     },
-    "Rebuild": {
-      "description": "Specifies rebuild target.",
-      "valueType": "target",
-      "values": [],
-      "defaultValue": ""
-    },
     "MsBuildLog": {
       "description": "Specifies build logs for build alias.",
       "valueType": "passThrough",

diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh
index dcc19e24c88c127a256d1fe6a4f10a4a8cf5e61a..06431f2ef2129655592dafff88072d4d4210e649 100755 (executable)
--- a/tests/scripts/arm32_ci_script.sh
+++ b/tests/scripts/arm32_ci_script.sh
@@ -227,7 +227,7 @@ function cross_build_coreclr {
     fi
 
     #Cross building for emulator rootfs
-    ROOTFS_DIR="$__ARMEmulRootfs" CPLUS_INCLUDE_PATH=$LINUX_ARM_INCPATH CXXFLAGS=$LINUX_ARM_CXXFLAGS ./build.sh $__buildArch cross $__verboseFlag $__skipMscorlib clang3.5 $__buildConfig -rebuild
+    ROOTFS_DIR="$__ARMEmulRootfs" CPLUS_INCLUDE_PATH=$LINUX_ARM_INCPATH CXXFLAGS=$LINUX_ARM_CXXFLAGS ./build.sh $__buildArch cross $__verboseFlag $__skipMscorlib clang3.5 $__buildConfig
 
     #Reset the code to the upstream version
     (set +x; echo 'Rewinding HEAD to master code')