[dreimer] 47083: Weaken the ROS Source Dir check in clean a bit so that it does remove the built stuff even if it did not even build any tool yet. Simplify Sound Output a bit

Author: dreimer
Date: Sun May  2 19:38:45 2010
New Revision: 47083

URL: http://svn.reactos.org/svn/reactos?rev=47083&view=rev
Log:
Weaken the ROS Source Dir check in clean a bit so that it does remove the built stuff even if it did not even build any tool yet.
Simplify Sound Output a bit

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Sun May  2 19:38:45 2010
@@ -45,7 +45,7 @@
         $ROS_CDOUTPUT = $ENV:ROS_CDOUTPUT
     }

-    if ((Test-Path "$ROS_INTERMEDIATE.") -and (Test-Path "$ROS_OUTPUT.")) {
+    if (Test-Path "$ROS_INTERMEDIATE.")) {
         "Cleaning ReactOS $ENV:ROS_ARCH source directory..."

$null = (Remove-Item "$ROS_AUTOMAKE" -force)

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Buil...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Sun May  2 19:38:45 2010
@@ -64,10 +64,8 @@
 :: Highlight the fact that building has ended.

if !errorlevel! GEQ 1 (
-    cd /d "%_ROSBE_BASEDIR%\samples"
     playwav.exe error.wav
 ) else (
-    cd /d "%_ROSBE_BASEDIR%\samples"
     playwav.exe notification.wav
 )

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Clea...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Sun May  2 19:38:45 2010
@@ -60,7 +60,7 @@
 :: Do some basic sanity checks to verify that we are working in a ReactOS source tree.
 :: Consider that we also want to clean half-complete builds, so don't depend on too many existing files.
 set IS_SOURCE_DIRECTORY=1
-call :BIN_CHECKEXISTENCE "%ROS_INTERMEDIATE%." "%ROS_OUTPUT%."
+call :BIN_CHECKEXISTENCE "%ROS_INTERMEDIATE%."

if "%IS_SOURCE_DIRECTORY%" == "1" (
     echo Cleaning ReactOS %ROS_ARCH% source directory...

Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosB...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sun May  2 19:38:45 2010
@@ -42,9 +42,9 @@
 set _BUILDBOT_SVNSKIPMAINTRUNK=0

if "%_ROSBE_NOSYSPATH%" == "1" (
-    set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem
+    set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem
 ) else (
-    set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%PATH%
+    set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%PATH%
 )

:: Fix Bison package path (just in case RosBE is installed in a path which contains spaces)