[ros-diffs] [peterw] 30044: - Fix the config.rbuild checks... variable expansion in cmd sucks :P.

peterw at svn.reactos.org peterw at svn.reactos.org
Thu Nov 1 16:45:52 CET 2007


Author: peterw
Date: Thu Nov  1 18:45:51 2007
New Revision: 30044

URL: http://svn.reactos.org/svn/reactos?rev=30044&view=rev
Log:
- Fix the config.rbuild checks... variable expansion in cmd sucks :P.

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

Modified: trunk/tools/RosBE-Windows/Root/Build.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd?rev=30044&r1=30043&r2=30044&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build.cmd Thu Nov  1 18:45:51 2007
@@ -16,9 +16,10 @@
 :: Check if config.template.rbuild is newer than config.rbuild, if it is then
 :: abort the build and inform the user.
 ::
+setlocal enabledelayedexpansion
 if exist .\config.rbuild (
     chknewer .\config.template.rbuild .\config.rbuild
-    if errorlevel 1 (
+    if !errorlevel! == 1 (
         echo.
         echo *** config.template.rbuild is newer than config.rbuild ***
         echo *** aborting build. Please check for changes and       ***
@@ -27,6 +28,7 @@
         goto :EOC
     )
 )
+endlocal
 
 ::
 :: Check if strip or ccache are being used and set the appropriate options.

Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cmd?rev=30044&r1=30043&r2=30044&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Thu Nov  1 18:45:51 2007
@@ -84,9 +84,10 @@
 :: Check if config.template.rbuild is newer than config.rbuild, if it is then
 :: inform the user and offer an update.
 ::
+setlocal enabledelayedexpansion
 if exist ".\config.rbuild" (
     chknewer ".\config.template.rbuild" ".\config.rbuild"
-    if errorlevel 1 (
+    if !errorlevel! == 1 (
         echo.
         echo *** config.template.rbuild is newer than working config.rbuild ***
         echo *** The Editor cannot continue with this file. Do you wanna    ***
@@ -99,6 +100,7 @@
         goto :NOK
     )
 )
+endlocal
 
 ::
 :: Start with reading settings from config.rbuild and let the user edit them.




More information about the Ros-diffs mailing list