[ros-diffs] [dreimer] 27861: - Get rid of _ROSBESOURCEDIR Dependency. - Add a security check to prevent RosBE-Logs Folder creation on folders without a SVN Tree.

Author: dreimer
Date: Thu Jul 26 20:46:25 2007
New Revision: 27861

URL: http://svn.reactos.org/svn/reactos?rev=27861&view=rev
Log:
- Get rid of _ROSBESOURCEDIR Dependency.
- Add a security check to prevent RosBE-Logs Folder creation on folders without a SVN
Tree.

Modified:
    trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
    trunk/tools/RosBE-Windows/Root/Config.cmd

Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Thu Jul 26 20:46:25 2007
@@ -29,19 +29,24 @@
 ::
 :: Check if our log directory exists, if it doesn't, create it.
 ::
-if not exist "%_ROSSOURCEDIR%\RosBE-Logs\." (
-    mkdir "%_ROSSOURCEDIR%\RosBE-Logs"
-    set _ROSBELOGDIR=%_ROSSOURCEDIR%\RosBE-Logs
+if not exist "%CD%\RosBE-Logs\." (
+    if not exist "%CD%\.svn\." (
+        echo Folder is empty. No Build can be performed.
+        goto :EOB
+    ) else (
+        mkdir "%CD%\RosBE-Logs"
+        set _ROSBELOGDIR=%CD%\RosBE-Logs
+    )
 ) else (
-    set _ROSBELOGDIR=%_ROSSOURCEDIR%\RosBE-Logs
+    set _ROSBELOGDIR=%CD%\RosBE-Logs
 )
 
 ::
 :: Check if config.template.rbuild is newer than config.rbuild, if it is then
 :: abort the build and inform the user.
 ::
-if exist "%_ROSSOURCEDIR%\config.rbuild" (
-    test "%_ROSSOURCEDIR%\config.template.rbuild" -nt
"%_ROSSOURCEDIR%\config.rbuild"
+if exist "%CD%\config.rbuild" (
+    test "%CD%\config.template.rbuild" -nt "%CD%\config.rbuild"
     if not errorlevel 1 (
         echo.
         echo *** config.template.rbuild is newer than config.rbuild ***

Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Thu Jul 26 20:46:25 2007
@@ -11,8 +11,8 @@
 title ReactOS Build Configurator
 
 if "%1" == "delete" (
-    if exist "%_ROSSOURCEDIR%\config.rbuild" (
-        del "%_ROSSOURCEDIR%\config.rbuild"
+    if exist "%CD%\config.rbuild" (
+        del "%CD%\config.rbuild"
         echo Main Configuration File was found and deleted.
     ) else (
         echo Main Configuration File was not found in ReactOS Source Tree.
@@ -31,7 +31,7 @@
 )
 
 if not exist "%ROSBEBASEDIR%\config.rbuild" (
-    copy "%_ROSSOURCEDIR%\config.template.rbuild"
"%ROSBEBASEDIR%\config.rbuild"
+    copy "%CD%\config.template.rbuild"
"%ROSBEBASEDIR%\config.rbuild"
 )
 
 echo WARNING:
@@ -164,7 +164,7 @@
 del "%ROSBEBASEDIR%\*.rbuild"
 copy "%ROSBEBASEDIR%\config.tmp" "%ROSBEBASEDIR%\config.rbuild"
 del "%ROSBEBASEDIR%\*.tmp"
-copy "%ROSBEBASEDIR%\config.rbuild" "%_ROSSOURCEDIR%\config.rbuild"
+copy "%ROSBEBASEDIR%\config.rbuild" "%CD%\config.rbuild"
 
 goto :NOK