[ros-diffs] [cwittich] 25420: fix issues with spaces in path

Author: cwittich
Date: Wed Jan 10 23:35:11 2007
New Revision: 25420

URL: http://svn.reactos.org/svn/reactos?rev=25420&view=rev
Log:
fix issues with spaces in path

Modified:
    trunk/tools/RosBE/Build-Multi.cmd
    trunk/tools/RosBE/Build.cmd
    trunk/tools/RosBE/Clean.cmd
    trunk/tools/RosBE/RosBE.cmd

Modified: trunk/tools/RosBE/Build-Multi.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Build-Multi.cmd?rev=25…
==============================================================================
--- trunk/tools/RosBE/Build-Multi.cmd (original)
+++ trunk/tools/RosBE/Build-Multi.cmd Wed Jan 10 23:35:11 2007
@@ -15,7 +15,7 @@
 :: Get the current date and time for use in
 :: in our build log's file name.
 ::
-call %ROSBEBASEDIR%\TimeDate.cmd
+call "%ROSBEBASEDIR%\TimeDate.cmd"
 
 ::
 :: Get the number of CPUs in the system so we know how
@@ -30,8 +30,8 @@
 :: 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 (
-    %ROSBEBASEDIR%\Tools\test.exe %_ROSSOURCEDIR%\config.template.rbuild -nt
%_ROSSOURCEDIR%\config.rbuild
+if exist "%_ROSSOURCEDIR%\config.rbuild" (
+    %ROSBEBASEDIR%\Tools\test.exe "%_ROSSOURCEDIR%\config.template.rbuild" -nt
"%_ROSSOURCEDIR%\config.rbuild"
     if not errorlevel 1 (
         echo.
         echo *** config.template.rbuild is newer than config.rbuild ***
@@ -46,7 +46,7 @@
 :: Now use mingw32-make to build ReactOS, passing along options, if any.
 ::
 if "%1" == "" (
-    %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% -j %CPUCOUNT% 2>&1 |
%ROSBEBASEDIR%\Tools\tee.exe
%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt
+    %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% -j %CPUCOUNT% 2>&1 |
%ROSBEBASEDIR%\Tools\tee.exe
"%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
 ) else (
-    %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% -j %CPUCOUNT% %* 2>&1 |
%ROSBEBASEDIR%\Tools\tee.exe
%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt
+    %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% -j %CPUCOUNT% %* 2>&1 |
%ROSBEBASEDIR%\Tools\tee.exe
"%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
 )

Modified: trunk/tools/RosBE/Build.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Build.cmd?rev=25420&am…
==============================================================================
--- trunk/tools/RosBE/Build.cmd (original)
+++ trunk/tools/RosBE/Build.cmd Wed Jan 10 23:35:11 2007
@@ -8,14 +8,14 @@
 :: Get the current date and time for use in
 :: in our build log's file name.
 ::
-call %ROSBEBASEDIR%\TimeDate.cmd
+call "%ROSBEBASEDIR%\TimeDate.cmd"
 
 ::
 :: 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 (
-    %ROSBEBASEDIR%\Tools\test.exe %_ROSSOURCEDIR%\config.template.rbuild -nt
%_ROSSOURCEDIR%\config.rbuild
+if exist "%_ROSSOURCEDIR%\config.rbuild" (
+    %ROSBEBASEDIR%\Tools\test.exe "%_ROSSOURCEDIR%\config.template.rbuild" -nt
"%_ROSSOURCEDIR%\config.rbuild"
     if not errorlevel 1 (
         echo.
         echo *** config.template.rbuild is newer than config.rbuild ***
@@ -30,7 +30,7 @@
 :: Now use mingw32-make to build ReactOS, passing along options, if any.
 ::
 if "%1" == "" (
-    %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% 2>&1 |
%ROSBEBASEDIR%\Tools\tee.exe
%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt
+    %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% 2>&1 |
%ROSBEBASEDIR%\Tools\tee.exe
"%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
 ) else (
-    %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% %* 2>&1 |
%ROSBEBASEDIR%\Tools\tee.exe
%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt
-)
+    %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% %* 2>&1 |
%ROSBEBASEDIR%\Tools\tee.exe
"%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
+)

Modified: trunk/tools/RosBE/Clean.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Clean.cmd?rev=25420&am…
==============================================================================
--- trunk/tools/RosBE/Clean.cmd (original)
+++ trunk/tools/RosBE/Clean.cmd Wed Jan 10 23:35:11 2007
@@ -7,15 +7,15 @@
 ::
 :: Check if we have something to clean, if so, clean it.
 ::
-if exist %_ROSSOURCEDIR%\obj-i386\. (
+if exist "%_ROSSOURCEDIR%\obj-i386\." (
     echo Cleaning ReactOS source directory...
 
     ::
     : Run ReactOS's make clean.
     ::
-    if exist %_ROSSOURCEDIR%\makefile.auto (
+    if exist "%_ROSSOURCEDIR%\makefile.auto" (
         if not "%CD%" == "%_ROSSOURCEDIR%" (
-            pushd %_ROSSOURCEDIR%
+            pushd "%_ROSSOURCEDIR%"
             %_MINGWMAKE% clean 1> NUL 2> NUL
             popd
         ) else (
@@ -26,58 +26,58 @@
     ::
     : Remove directories/makefile.auto created by the build.
     ::
-    if exist %_ROSSOURCEDIR%\obj-i386\. (
-        rd /s /q %_ROSSOURCEDIR%\obj-i386 1> NUL 2> NUL
+    if exist "%_ROSSOURCEDIR%\obj-i386\." (
+        rd /s /q "%_ROSSOURCEDIR%\obj-i386" 1> NUL 2> NUL
     )
-    if exist %_ROSSOURCEDIR%\output-i386\. (
-        rd /s /q %_ROSSOURCEDIR%\output-i386 1> NUL 2> NUL
+    if exist "%_ROSSOURCEDIR%\output-i386\." (
+        rd /s /q "%_ROSSOURCEDIR%\output-i386" 1> NUL 2> NUL
     )
-    if exist %_ROSSOURCEDIR%\reactos\. (
-        rd /s /q %_ROSSOURCEDIR%\reactos 1> NUL 2> NUL
+    if exist "%_ROSSOURCEDIR%\reactos\." (
+        rd /s /q "%_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL
     )
-    if exist %_ROSSOURCEDIR%\makefile.auto (
-        del %_ROSSOURCEDIR%\makefile.auto 1> NUL 2> NUL
+    if exist "%_ROSSOURCEDIR%\makefile.auto" (
+        del "%_ROSSOURCEDIR%\makefile.auto" 1> NUL 2> NUL
     )
 
     ::
     : Now delete auto-generated/copied files not removed by make clean.
     ::
-    del /f %_ROSSOURCEDIR%\media\inf\syssetup.inf 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\include\roscfg.h 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\ole32\nodrop.cur 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\ole32\drag_move.cur 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\ole32\drag_copy.cur 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\ole32\drag_link.cur 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idc_divideropen.cur 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idc_copy.cur 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idc_divider.cur 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_small.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_large.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_large.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_info_sm.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idc_movebutton.cur 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_warn_sm.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idi_dragarrow.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_small.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_large.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idt_check.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_error_sm.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_small.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\msi\instabsent.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\msi\instlocal.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\msi\instadvert.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\network.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\fontpics.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_nocollate.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_collate.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\folder.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\cdrom.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\floppy.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_landscape.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\folder2.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\800.bmp 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_portrait.ico 1> NUL 2> NUL
-    del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\hdisk.ico 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\media\inf\syssetup.inf" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\include\roscfg.h" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divideropen.cur" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_copy.cur" 1> NUL 2>
NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divider.cur" 1> NUL 2>
NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_small.bmp" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_large.bmp" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_large.bmp" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_movebutton.cur" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_dragarrow.ico" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_small.bmp" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_large.bmp" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idt_check.bmp" 1> NUL 2>
NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_small.bmp" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\network.ico" 1> NUL 2>
NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\fontpics.bmp" 1> NUL 2>
NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_collate.ico" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_landscape.ico" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder2.ico" 1> NUL 2>
NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_portrait.ico" 1> NUL
2> NUL
+    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL
 
     echo Done cleaning ReactOS source directory.
 ) else (

Modified: trunk/tools/RosBE/RosBE.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE.cmd?rev=25420&am…
==============================================================================
--- trunk/tools/RosBE/RosBE.cmd (original)
+++ trunk/tools/RosBE/RosBE.cmd Wed Jan 10 23:35:11 2007
@@ -38,8 +38,8 @@
 :: Check if our log directory exists, if it doesn't
 :: create it.
 ::
-if not exist %_ROSSOURCEDIR%\RosBE-Logs\. (
-    mkdir %_ROSSOURCEDIR%\RosBE-Logs
+if not exist "%_ROSSOURCEDIR%\RosBE-Logs\." (
+    mkdir "%_ROSSOURCEDIR%\RosBE-Logs"
     set _ROSBELOGDIR=%_ROSSOURCEDIR%\RosBE-Logs
 ) else (
     set _ROSBELOGDIR=%_ROSSOURCEDIR%\RosBE-Logs