Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
Merge pull request #14882 from 4creators/cleanall
Browse files Browse the repository at this point in the history
[Infrastructure] Improve clean.{cmd|sh} by adding git clean -xdf cleanup step, unifying implementation with corefx and adding VBCScompiler.exe kill logic and
  • Loading branch information
weshaggard committed Nov 9, 2017
2 parents 7a0c6b6 + 3bc27d5 commit b45e91e
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 156 deletions.
7 changes: 7 additions & 0 deletions build.proj
Expand Up @@ -11,6 +11,8 @@

<Import Project="dir.traversal.targets" />

<Import Project="$(ToolsDir)clean.targets" />

<!-- The following properties are in place to keep the behavior of build.cmd while we work on the dev workflow steps. -->
<PropertyGroup>
<!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.-->
Expand Down Expand Up @@ -45,5 +47,10 @@
<Exec Command="$(DotnetRestoreCommand) $(SourceDir).nuget/init/init.csproj"
StandardOutputImportance="Low" />
</Target>

<Target Name="CleanAllProjects">
<Message Condition="Exists($(RootBinDir))" Importance="High" Text="Removing $(RootBinDir)"/>
<RemoveDir Directories="$(RootBinDir)" />
</Target>

</Project>
117 changes: 27 additions & 90 deletions clean.cmd
@@ -1,105 +1,42 @@
@if not defined _echo @echo off
setlocal EnableDelayedExpansion

echo Running clean.cmd
set NO_DASHES_ARG=%1
if /I [%NO_DASHES_ARG:-=%] == [?] goto Usage
if /I [%NO_DASHES_ARG:-=%] == [h] goto Usage

set bin=false
set packages=false
set tools = false

if [%1]==[] (
set bin=true
set packages=true
set tools=true
goto Begin
)

:Loop
if [%1]==[] goto Begin

if /I [%1] == [-?] goto Usage
if /I [%1] == [-help] goto Usage

if /I [%1] == [-p] (
set packages=true
set thisArgs=!thisArgs!%1
goto Next
)

if /I [%1] == [-b] (
set bin=true
set thisArgs=!thisArgs!%1
goto Next
)

if /I [%1] == [-t] (
set tools=true
set thisArgs=!thisArgs!%1
goto Next
)

if /I [%1] == [-all] (
set tools=true
set bin=true
set packages=true
goto Begin
)

:Next
shift /1
goto Loop

:Begin
:: Set __ProjectDir to be the directory of this script
set "__ProjectDir=%~dp0"
:: remove trailing slash
if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%"
set "__RootBinDir=%__ProjectDir%\bin"

if [%bin%] == [true] (
if exist "%__RootBinDir%" (
echo Deleting bin directory
rd /s /q "%__RootBinDir%"
if NOT [!ERRORLEVEL!]==[0] (
echo ERROR: An error occurred while deleting the bin directory - error code is !ERRORLEVEL!
exit /b 1
)
)
)

if [%tools%] == [true] (
if exist "%__ProjectDir%\Tools" (
echo Deleting tools directory
rd /s /q "%__ProjectDir%\Tools"
if NOT [!ERRORLEVEL!]==[0] (
echo ERROR: An error occurred while deleting the Tools directory - error code is !ERRORLEVEL!
exit /b 1
)
)
:: Check if VBCSCompiler.exe is running
tasklist /fi "imagename eq VBCSCompiler.exe" |find ":" > nul
:: Compiler is running if errorlevel == 1
if errorlevel 1 (
echo Stop VBCSCompiler.exe execution.
for /f "tokens=2 delims=," %%F in ('tasklist /nh /fi "imagename eq VBCSCompiler.exe" /fo csv') do taskkill /f /PID %%~F
)

if [%packages%] == [true] (
if exist "%__ProjectDir%\packages" (
echo Deleting packages directory
rd /s /q "%__ProjectDir%\packages"
if NOT [!ERRORLEVEL!]==[0] (
echo ERROR: An error occurred while deleting the packages directory - error code is !ERRORLEVEL!
exit /b 1
)
)
:: Strip all dashes off the argument and use invariant
:: compare to match as many versions of "all" that we can
:: All other argument validation happens inside Run.exe
if not defined NO_DASHES_ARG goto no_args
if /I [%NO_DASHES_ARG:-=%] == [all] (
echo Cleaning entire working directory ...
call git clean -xdf
exit /b !ERRORLEVEL!
)

echo Clean was successful
exit /b 0
:no_args
if [%1]==[] set __args=-b
call %~dp0run.cmd clean %__args% %*
exit /b %ERRORLEVEL%

:Usage
echo.
echo Usage: clean [-b] [-p] [-c] [-all]
echo Repository cleaning script.
echo Options:
echo -b - Cleans the bin directory
echo -p - Cleans the packages directory
echo -t - Cleans the tools directory
echo -all - Cleans everything
echo -b - Delete the binary output directory.
echo -p - Delete the repo-local NuGet package directory.
echo -c - Deletes the user-local NuGet package cache.
echo -all - Cleans repository and restores it to pristine state.
echo.
echo If no option is specified then clean.cmd -b -p -t is implied.
echo ^If no option is specified then "clean -b" is implied.
exit /b
85 changes: 19 additions & 66 deletions clean.sh
Expand Up @@ -2,82 +2,35 @@

usage()
{
echo "Usage: clean [-b] [-t] [-p]"
echo "Usage: clean [-b] [-p] [-c] [-all]"
echo "Repository cleaning script."
echo " -b Clean bin directory"
echo " -t Clean tools directory"
echo " -p Clean packages directory"
echo " -all Clean everything"
echo " -b Delete the binary output directory."
echo " -p Delete the repo-local NuGet package directory."
echo " -c Delete the user-local NuGet package caches."
echo " -all Cleans repository and restores it to pristine state."
echo
echo "If no option is specified, then \"clean.sh -b -t -p\" is implied."
echo "If no option is specified, then \"clean.sh -b\" is implied."
exit 1
}

# Obtain the location of the bash script to figure out where the root of the repo is.
__ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

echo Cleaning previous output for the selected configuration

# Parse arguments
if [ $# == 0 ]; then
clean_bin=true
clean_tools=true
clean_packages=true
if [ "$1" == "-?" ] || [ "$1" == "-h" ]; then
usage
fi

while [[ $# -gt 0 ]]
do
opt="$1"
case $opt in
-h|--help)
usage
;;
-b)
clean_bin=true
;;
-t)
clean_tools=true
;;
-p)
clean_packages=true
;;
-all)
clean_bin=true
clean_tools=true
clean_packages=true
;;
*)
esac
shift
done
# Implement VBCSCompiler.exe kill logic once VBCSCompiler.exe is ported to unixes

if [ "$clean_bin" == true ]; then
echo "Deleting bin directory"
rm -rf "$__ProjectRoot/bin"
if [ $? -ne 0 ]; then
echo "Error while deleting bin directory - error code was $?"
exit 1
fi
fi
__working_tree_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

if [ "$clean_tools" == true ]; then
echo "Deleting tools directory"
rm -rf "$__ProjectRoot/Tools"
if [ $? -ne 0 ]; then
echo "Error while deleting tools directory - error code was $?"
exit 1
fi
if [ "$*" == "-all" ]
then
echo "Removing all untracked files in the working tree"
git clean -xdf $__working_tree_root
exit $?
fi

if [ "$clean_packages" == true ]; then
echo "Deleting packages directory"
rm -rf "$__ProjectRoot/packages"
if [ $? -ne 0 ]; then
echo "Error while deleting packages directory - error code was $?"
exit 1
fi
if [ $# == 0 ]; then
__args=-b
fi

echo "Clean was successful"

exit 0
$__working_tree_root/run.sh clean $__args $*
exit $?
46 changes: 46 additions & 0 deletions config.json
Expand Up @@ -36,6 +36,24 @@
"values": [],
"defaultValue": ""
},
"CleanAllProjects": {
"description": "MsBuild target that deletes the binary output directory.",
"valueType": "target",
"values": [],
"defaultValue": ""
},
"CleanPackages": {
"description": "MsBuild target that deletes the repo-local nuget package directory.",
"valueType": "target",
"values": [],
"defaultValue": ""
},
"CleanPackagesCache": {
"description": "MsBuild target that deletes the user-local nuget package cache.",
"valueType": "target",
"values": [],
"defaultValue": ""
},
"ContainerName": {
"description": "Container name for Azure upload.",
"valueType": "property",
Expand Down Expand Up @@ -519,6 +537,34 @@
}
}
},
"clean": {
"alias": {
"b": {
"description": "Deletes the binary output directory.",
"settings": {
"CleanAllProjects": "default"
}
},
"p": {
"description": "Deletes the repo-local nuget package directory.",
"settings": {
"CleanPackages": "default"
}
},
"c": {
"description": "Deletes the user-local nuget package cache.",
"settings": {
"CleanPackagesCache": "default"
}
}
},
"defaultValues": {
"toolName": "msbuild",
"settings": {
"MsBuildLog":"/flp:v=normal;LogFile=clean.log"
}
}
},
"sync": {
"alias": {
"p": {
Expand Down

0 comments on commit b45e91e

Please sign in to comment.