- Prepend %_ROSBE_ROSSOURCEDIR% to the files and folders when cleaning.

This makes sure cleaning also works properly when you're not in the source dir. It also prevents your tree from being totally wiped if you're i.e. on S:\ and your source tree is in S:\reactos.
- Set ROS_ARCH already some places before, so we can skip some 'if "%ROS_ARCH%" == ""' checks

Thanks to Caemyr for testing.

svn path=/trunk/tools/RosBE/; revision=921
This commit is contained in:
Colin Finck 2009-01-27 16:52:18 +00:00
parent d8c3b86c66
commit d94341eb7a

View File

@ -58,40 +58,32 @@ goto :EOF
:: Apply modified obj and out paths for deletion.
::
if "%ROS_ARCH%" == "" (
set ROS_ARCH=i386
)
if "%_ROSBE_OBJPATH%" == "" (
if not "%ROS_ARCH%" == "" (
set _ROSBE_OBJCLEANPATH=obj-%ROS_ARCH%
) else (
set _ROSBE_OBJCLEANPATH=obj-i386
)
set _ROSBE_OBJCLEANPATH=%_ROSBE_ROSSOURCEDIR%\obj-%ROS_ARCH%
) else (
set _ROSBE_OBJCLEANPATH=%_ROSBE_OBJPATH%
)
if "%_ROSBE_OUTPATH%" == "" (
if not "%ROS_ARCH%" == "" (
set _ROSBE_OUTCLEANPATH=output-%ROS_ARCH%
) else (
set _ROSBE_OUTCLEANPATH=output-i386
)
set _ROSBE_OUTCLEANPATH=%_ROSBE_ROSSOURCEDIR%\output-%ROS_ARCH%
) else (
set _ROSBE_OUTCLEANPATH=%_ROSBE_OUTPATH%
)
if not "%ROS_ARCH%" == "" (
set _ROSBE_MAKEFILE=makefile-%ROS_ARCH%.auto
if "%ROS_ARCH%" == "i386" (
set _ROSBE_MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile.auto
) else (
set _ROSBE_MAKEFILE=makefile.auto
set _ROSBE_MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto
)
if exist "%_ROSBE_MAKEFILE%" (
del "%_ROSBE_MAKEFILE%" 1> NUL 2> NUL
)
if "%ROS_ARCH%" == "" (
set ROS_ARCH=i386
)
if exist "%_ROSBE_OBJCLEANPATH%\." (
echo Cleaning ReactOS %ROS_ARCH% source directory...
if exist "%_ROSBE_OBJCLEANPATH%\." (
@ -111,8 +103,8 @@ if "%ROS_ARCH%" == "i386" (
:ROS
if exist "reactos\." (
rd /s /q "reactos" 1> NUL 2> NUL
if exist "%_ROSBE_ROSSOURCEDIR%\reactos\." (
rd /s /q "%_ROSBE_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL
)
goto :EOF