[ros-diffs] [dreimer] 28023: - Stop the abuse of %CD% and of the call command. - Revert my previous commit. It CAN be put in one file.
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Sun Jul 29 22:32:01 CEST 2007
Author: dreimer
Date: Mon Jul 30 00:32:00 2007
New Revision: 28023
URL: http://svn.reactos.org/svn/reactos?rev=28023&view=rev
Log:
- Stop the abuse of %CD% and of the call command.
- Revert my previous commit. It CAN be put in one file.
Removed:
trunk/tools/RosBE-Windows/Root/sSVNs.cmd
Modified:
trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
trunk/tools/RosBE-Windows/Root/Clean.cmd
trunk/tools/RosBE-Windows/Root/Config.cmd
trunk/tools/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE-Windows/Root/sSVN.cmd
Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Shared.cmd?rev=28023&r1=28022&r2=28023&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Mon Jul 30 00:32:00 2007
@@ -28,16 +28,16 @@
:: Check if our log directory exists, if it doesn't, create it.
::
if %logdiff% == 0 (
-if not exist "%CD%\RosBE-Logs\." (
- if not exist "%CD%\.svn\." (
+if not exist "RosBE-Logs\." (
+ if not exist ".svn\." (
echo Folder is empty. No Build can be performed.
goto :EOB
) else (
- mkdir "%CD%\RosBE-Logs"
- set _ROSBELOGDIR=%CD%\RosBE-Logs
+ mkdir "RosBE-Logs"
+ set _ROSBELOGDIR=RosBE-Logs
)
) else (
- set _ROSBELOGDIR=%CD%\RosBE-Logs
+ set _ROSBELOGDIR=RosBE-Logs
)
)
if %logdiff% == 1 (
@@ -53,8 +53,8 @@
:: Check if config.template.rbuild is newer than config.rbuild, if it is then
:: abort the build and inform the user.
::
-if exist "%CD%\config.rbuild" (
- test "%CD%\config.template.rbuild" -nt "%CD%\config.rbuild"
+if exist "config.rbuild" (
+ test "config.template.rbuild" -nt "config.rbuild"
if not errorlevel 1 (
echo.
echo *** config.template.rbuild is newer than config.rbuild ***
@@ -77,25 +77,25 @@
if %ROSBE_SHOWTIME% == 1 (
if %ROSBE_WRITELOG% == 1 (
- call buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
+ buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
)
if %ROSBE_WRITELOG% == 0 (
- call buildtime "%MAKE_COMMAND%" 2>&1
+ buildtime "%MAKE_COMMAND%" 2>&1
)
)
if %ROSBE_SHOWTIME% == 0 (
if %ROSBE_WRITELOG% == 1 (
- call "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
+ "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
)
if %ROSBE_WRITELOG% == 0 (
- call "%MAKE_COMMAND%" 2>&1
+ "%MAKE_COMMAND%" 2>&1
)
)
::
:: Highlight the fact that building has ended.
::
-call flash
+flash
:EOB
title ReactOS Build Environment %_VER%
Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd?rev=28023&r1=28022&r2=28023&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Clean.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Clean.cmd Mon Jul 30 00:32:00 2007
@@ -15,7 +15,7 @@
::
: Check if we have something to clean, if so, clean it.
::
- if exist "%CD%\obj-i386\." (
+ if exist "obj-i386\." (
echo Cleaning ReactOS source directory...
::
@@ -26,58 +26,58 @@
::
: Remove directories/makefile.auto created by the build.
::
- if exist "%CD%\obj-i386\." (
- rd /s /q "%CD%\obj-i386" 1> NUL 2> NUL
+ if exist "obj-i386\." (
+ rd /s /q "obj-i386" 1> NUL 2> NUL
)
- if exist "%CD%\output-i386\." (
- rd /s /q "%CD%\output-i386" 1> NUL 2> NUL
+ if exist "output-i386\." (
+ rd /s /q "output-i386" 1> NUL 2> NUL
)
- if exist "%CD%\reactos\." (
- rd /s /q "%CD%\reactos" 1> NUL 2> NUL
+ if exist "reactos\." (
+ rd /s /q "reactos" 1> NUL 2> NUL
)
- if exist "%CD%\makefile.auto" (
- del "%CD%\makefile.auto" 1> NUL 2> NUL
+ if exist "makefile.auto" (
+ del "makefile.auto" 1> NUL 2> NUL
)
::
: Now delete auto-generated/copied files not removed by make clean.
::
- del /f "%CD%\media\inf\syssetup.inf" 1> NUL 2> NUL
- del /f "%CD%\include\roscfg.h" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\network.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\fontpics.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\pd32_collate.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\pd32_landscape.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\folder2.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\pd32_portrait.ico" 1> NUL 2> NUL
- del /f "%CD%\dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL
+ del /f "media\inf\syssetup.inf" 1> NUL 2> NUL
+ del /f "include\roscfg.h" 1> NUL 2> NUL
+ del /f "dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL
+ del /f "dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL
+ del /f "dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL
+ del /f "dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\network.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\fontpics.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\pd32_collate.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\pd32_landscape.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\folder2.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\pd32_portrait.ico" 1> NUL 2> NUL
+ del /f "dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL
echo Done cleaning ReactOS source directory.
) else (
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cmd?rev=28023&r1=28022&r2=28023&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Mon Jul 30 00:32:00 2007
@@ -11,8 +11,8 @@
title ReactOS Build Configurator
if "%1" == "delete" (
- if exist "%CD%\config.rbuild" (
- del "%CD%\config.rbuild"
+ if exist "config.rbuild" (
+ del "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 "%CD%\config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild"
+ copy "config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild"
)
echo WARNING:
@@ -50,16 +50,16 @@
echo Architecture to build for. Not Editable.
echo.
echo Right now
-call grep \"ARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
+grep \"ARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
echo.
echo Sub-architecture to build for.
echo Default is: none
echo.
echo Right now
-call grep \"SARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
+grep \"SARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P X= (), (xbox)
-call sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%ROSBEBASEDIR%\config.rbuild" > "%ROSBEBASEDIR%\config2.rbuild"
+sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%ROSBEBASEDIR%\config.rbuild" > "%ROSBEBASEDIR%\config2.rbuild"
cls
echo Which CPU ReactOS should be optimized for.
@@ -70,9 +70,9 @@
echo Default is: pentium
echo.
echo Right now
-call grep \"OARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
+grep \"OARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P XX=
-call sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" "%ROSBEBASEDIR%\config2.rbuild" > "%ROSBEBASEDIR%\config21.rbuild"
+sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" "%ROSBEBASEDIR%\config2.rbuild" > "%ROSBEBASEDIR%\config21.rbuild"
cls
echo What level do you want ReactOS to be optimized at.
@@ -83,27 +83,27 @@
echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk.
echo.
echo Right now
-call grep \"OPTIMIZE\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
+grep \"OPTIMIZE\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P Y= (0), (1), (2), (3), (4), (5)
-call sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" "%ROSBEBASEDIR%\config21.rbuild" > "%ROSBEBASEDIR%\config3.rbuild"
+sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" "%ROSBEBASEDIR%\config21.rbuild" > "%ROSBEBASEDIR%\config3.rbuild"
cls
echo Whether to compile for an uniprocessor or multiprocessor machine.
echo Default is: 0
echo.
echo Right now
-call grep \"MP\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
+grep \"MP\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P Z= (0), (1)
-call sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" "%ROSBEBASEDIR%\config3.rbuild" > "%ROSBEBASEDIR%\config4.rbuild"
+sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" "%ROSBEBASEDIR%\config3.rbuild" > "%ROSBEBASEDIR%\config4.rbuild"
cls
echo Whether to compile in the integrated kernel debugger.
echo Default is: 0
echo.
echo Right now
-call grep \"KDBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
+grep \"KDBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P A= (0), (1)
-call sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" "%ROSBEBASEDIR%\config4.rbuild" > "%ROSBEBASEDIR%\config5.rbuild"
+sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" "%ROSBEBASEDIR%\config4.rbuild" > "%ROSBEBASEDIR%\config5.rbuild"
cls
echo Whether to compile for debugging. No compiler optimizations will be
@@ -111,9 +111,9 @@
echo Default is: 1
echo.
echo Right now
-call grep \"DBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
+grep \"DBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P B= (0), (1)
-call sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" "%ROSBEBASEDIR%\config5.rbuild" > "%ROSBEBASEDIR%\config6.rbuild"
+sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" "%ROSBEBASEDIR%\config5.rbuild" > "%ROSBEBASEDIR%\config6.rbuild"
cls
echo Whether to compile for debugging with GDB. If you don't use GDB,
@@ -121,9 +121,9 @@
echo Default is: 0
echo.
echo Right now
-call grep \"GDB\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
+grep \"GDB\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P C= (0), (1)
-call sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" "%ROSBEBASEDIR%\config6.rbuild" > "%ROSBEBASEDIR%\config7.rbuild"
+sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" "%ROSBEBASEDIR%\config6.rbuild" > "%ROSBEBASEDIR%\config7.rbuild"
cls
echo Whether to compile apps/libs with features covered software patents
@@ -133,18 +133,18 @@
echo Default is: 0
echo.
echo Right now
-call grep \"NSWPAT\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
+grep \"NSWPAT\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P D= (0), (1)
-call sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%ROSBEBASEDIR%\config7.rbuild" > "%ROSBEBASEDIR%\config8.rbuild"
+sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%ROSBEBASEDIR%\config7.rbuild" > "%ROSBEBASEDIR%\config8.rbuild"
cls
echo Whether to compile with NT-compatible LPC Semantics. This should
echo always be 1.
echo.
echo Right now
-call grep \"NTLPC\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
+grep \"NTLPC\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P E= (0), (1)
-call sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" "%ROSBEBASEDIR%\config8.rbuild" > "%ROSBEBASEDIR%\config9.rbuild"
+sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" "%ROSBEBASEDIR%\config8.rbuild" > "%ROSBEBASEDIR%\config9.rbuild"
cls
echo Whether to compile with the KD protocol. This will disable support for
@@ -156,15 +156,15 @@
echo Default is: 0
echo.
echo Right now
-call grep \"_WINKD_\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
+grep \"_WINKD_\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P F= (0), (1)
-call sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%ROSBEBASEDIR%\config9.rbuild" > "%ROSBEBASEDIR%\config10.rbuild"
+sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%ROSBEBASEDIR%\config9.rbuild" > "%ROSBEBASEDIR%\config10.rbuild"
copy "%ROSBEBASEDIR%\config10.rbuild" "%ROSBEBASEDIR%\config.tmp"
del "%ROSBEBASEDIR%\*.rbuild"
copy "%ROSBEBASEDIR%\config.tmp" "%ROSBEBASEDIR%\config.rbuild"
del "%ROSBEBASEDIR%\*.tmp"
-copy "%ROSBEBASEDIR%\config.rbuild" "%CD%\config.rbuild"
+copy "%ROSBEBASEDIR%\config.rbuild" "config.rbuild"
goto :NOK
Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd?rev=28023&r1=28022&r2=28023&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Jul 30 00:32:00 2007
@@ -21,7 +21,7 @@
del "C:\aaa.tmp"
set ROSBE_SHOWTIME=1
set ROSBE_WRITELOG=1
-set _LOGDIR=%CD%\RosBE-Logs
+set _LOGDIR=RosBE-Logs
if exist %ROSBEBASEDIR%\options.cmd (
goto :PREV
Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?rev=28023&r1=28022&r2=28023&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Mon Jul 30 00:32:00 2007
@@ -35,7 +35,7 @@
if "%1" == "create" (
title Creating...
- if exist "%CD%\.svn\." (
+ if exist ".svn\." (
echo Folder already cotains a Reposority. Exiting
goto :ExitSVN
)
@@ -52,7 +52,7 @@
for /f "usebackq" %%i IN (`svnversion .`) DO @set OFFSVN=%%i
svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn > "%ROSBEBASEDIR%\onsvn.tmp"
set /P ONSVN=< "%ROSBEBASEDIR%\onsvn.tmp"
- call "%ROSBEBASEDIR%\sSVNs.cmd"
+ call :UP
goto :ExitSVN
)
@@ -61,5 +61,24 @@
goto :ExitSVN
)
+:UP
+echo Recent Offline Revision: %OFFSVN%
+echo Online HEAD Revision: %ONSVN%
+del "%ROSBEBASEDIR%\onsvn.tmp"
+echo.
+if %OFFSVN% LSS %ONSVN% (
+ echo Your Tree is not Up to date. Do you want to update it?
+ goto :UP2
+)
+if %OFFSVN% EQU %ONSVN% (
+ echo Your Tree is Up to date.
+ goto :ExitSVN
+)
+
+:UP2
+SET /P XY=(yes), (no)
+if /I "%XY%"=="yes" %ROSBEBASEDIR%\ssvn update
+if /I "%XY%"=="no" goto :ExitSVN
+
:ExitSVN
title ReactOS Build Environment %_VER%
Removed: trunk/tools/RosBE-Windows/Root/sSVNs.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVNs.cmd?rev=28022&view=auto
==============================================================================
--- trunk/tools/RosBE-Windows/Root/sSVNs.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/sSVNs.cmd (removed)
@@ -1,28 +1,0 @@
-::
-:: PROJECT: RosBE - ReactOS Build Environment for Windows
-:: LICENSE: GPL - See COPYING in the top level directory
-:: FILE: Root/sv.cmd
-:: PURPOSE: Integrated SVN Client, status step 2.
-:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel at freenet.de>
-::
-::
- at echo off
-
-echo Recent Offline Revision: %OFFSVN%
-echo Online HEAD Revision: %ONSVN%
-del "%ROSBEBASEDIR%\onsvn.tmp"
-echo.
-if %OFFSVN% LSS %ONSVN% (
- echo Your Tree is not Up to date. Do you want to update it?
- goto :UP
-)
-if %OFFSVN% EQU %ONSVN% (
-echo Your Tree is Up to date.
-)
-goto :EOF
-
-:UP
-SET /P XY=(yes), (no)
-
-if /I "%XY%"=="yes" call %ROSBEBASEDIR%\ssvn update
-if /I "%XY%"=="no" goto :ExitSVN
More information about the Ros-diffs
mailing list