[ros-diffs] [dreimer] 41665: Fix two RosBE bugs: - clean did not remove the makefile in the PS Version. - ssvn did not work, because RosBE creates the logdir before the folder emptyness test. Plz test.

Author: dreimer
Date: Sun Jun 28 18:23:17 2009
New Revision: 41665

URL: http://svn.reactos.org/svn/reactos?rev=41665&view=rev
Log:
Fix two RosBE bugs:
- clean did not remove the makefile in the PS Version.
- ssvn did not work, because RosBE creates the logdir before the folder emptyness test.
Plz test.

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

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Sun Jun 28 18:23:17
2009
@@ -38,9 +38,9 @@
     }
 
     if ($ENV:ROS_ARCH -eq "i386") {
+        $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto"
+    } else {
         $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto"
-    } else {
-        $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto"
     }
 
     if (Test-Path "$MAKEFILE") {

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Sun Jun 28 18:23:17
2009
@@ -73,6 +73,7 @@
     if (Test-Path ".svn\.") {
         "ERROR: Folder already contains a repository."
     } else {
+        $null = (Remove-Item "$_ROSBE_LOGDIR" -recurse -force)
         $dir = get-childitem
         if ($dir -eq $null) {
             IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout
svn://svn.reactos.org/reactos/trunk/reactos ."

Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Sun Jun 28 18:23:17 2009
@@ -46,7 +46,7 @@
         echo ERROR: Folder already contains a repository.
         goto :EOC
     )
-
+    rd /s /q "%_ROSBE_LOGDIR%" 1> NUL 2> NUL
     dir /b 2>nul | findstr "." >nul
     if errorlevel 1 (
         "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/reactos .