[ros-diffs] [dreimer] 28117: - Rename test to its real and final name. - Add it to help, Changelog and Macros. - Simplify reladdr2line. - Get rid of Temp File use in ssvn.cmd and Rosbe.cmd.
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Fri Aug 3 11:34:38 CEST 2007
Author: dreimer
Date: Fri Aug 3 13:34:37 2007
New Revision: 28117
URL: http://svn.reactos.org/svn/reactos?rev=28117&view=rev
Log:
- Rename test to its real and final name.
- Add it to help, Changelog and Macros.
- Simplify reladdr2line.
- Get rid of Temp File use in ssvn.cmd and Rosbe.cmd.
Added:
trunk/tools/RosBE-Windows/Root/scut.cmd
Removed:
trunk/tools/RosBE-Windows/Root/test.cmd
Modified:
trunk/tools/RosBE-Windows/Root/ChangeLog.txt
trunk/tools/RosBE-Windows/Root/Help.cmd
trunk/tools/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE-Windows/Root/RosBE.mac
trunk/tools/RosBE-Windows/Root/reladdr2line.cmd
trunk/tools/RosBE-Windows/Root/sSVN.cmd
Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog.txt?rev=28117&r1=28116&r2=28117&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original)
+++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Fri Aug 3 13:34:37 2007
@@ -1,6 +1,7 @@
*** Oct XXth, 2007 - RosBE 0.3.8 Released
- Added DrFred's Config Tool. (Daniel Reimer)
+- Added ShortCut Tool (Daniel Reimer)
*** Aug XXst, 2007 - RosBE 0.3.7.2 Released (Unsupported)
Modified: trunk/tools/RosBE-Windows/Root/Help.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?rev=28117&r1=28116&r2=28117&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Help.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Help.cmd Fri Aug 3 13:34:37 2007
@@ -26,6 +26,8 @@
echo with the appropriate number.
echo basedir - Switch back to the ReactOS source directory.
echo.
+ echo scut - Define, Remove and Switch to Shortcutted Source-
+ echo Directories.
echo config [OPTIONS] - Configures the way, ReactOS will be built.
echo.
echo clean [logs] - Fully clean the ReactOS source directory and/or
@@ -108,6 +110,16 @@
echo Switches back to the ReactOS source directory.
goto :EOF
)
+if "%1" == "scut" (
+ echo Usage: scut [OPTIONS]
+ echo Defines, Removes and Switches to Shortcutted Source Directories.
+ echo.
+ echo add - Adds a Shortcut.
+ echo (Optional: "Shortcut" "Directory" as second and third parameter)
+ echo remove - Removes a shortcut.
+ echo (Optional: "Shortcut" as second parameter)
+ goto :EOF
+)
if not "%1" == "" (
echo Unknown parameter specified. Try 'help [COMMAND]'.
goto :EOF
Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd?rev=28117&r1=28116&r2=28117&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Fri Aug 3 13:34:37 2007
@@ -17,9 +17,7 @@
color 0A
set _VER=0.3.7.2
set ROSBEBASEDIR=%~dp0
-echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed "s/.$//g" > "%Temp%\aaa.tmp"
-set /P ROSBEBASEDIR=< "%Temp%\aaa.tmp"
-del "%Temp%\aaa.tmp"
+for /f "usebackq" %%i in (`"echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed s/.$//g"`) do @SET ROSBEBASEDIR=%%i
set ROSBE_SHOWTIME=1
set ROSBE_WRITELOG=1
set _LOGDIR=%CD%\RosBE-Logs
Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac?rev=28117&r1=28116&r2=28117&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.mac (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.mac Fri Aug 3 13:34:37 2007
@@ -6,3 +6,4 @@
MAKE = "%ROSBEBASEDIR%\Build.cmd" $*
MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $*
RADDR2LINE = "%ROSBEBASEDIR%\reladdr2line.cmd" $*
+SCUT = "%ROSBEBASEDIR%\scut.cmd" $*
Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2line.cmd?rev=28117&r1=28116&r2=28117&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Fri Aug 3 13:34:37 2007
@@ -14,16 +14,16 @@
::
:: Receive the Parameters and decide what to do.
::
-set _1=%1
-set _2=%2
-if "%_1%" == "" (
+if "%1" == "" (
goto :MAN
)
-if not "%_1%" == "" (
- if "%_2%" == "" (
+if not "%1" == "" (
+ set _1=%1
+ if "%2" == "" (
goto :AUTO1
) else (
+ set _2=%2
goto :EOC
)
)
@@ -34,16 +34,9 @@
:MAN
echo Set the Path to the Executable to be examined.
SET /P _1=
+:AUTO1
echo Set the Address you wanna analyze inside the Executable.
SET /P _2=
-echo.
-goto :EOC
-
-:AUTO1
-echo Set the Address you wanna analyze inside the Executable.
-echo.
-SET /P _2=
-goto :EOC
:EOC
::
Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?rev=28117&r1=28116&r2=28117&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Fri Aug 3 13:34:37 2007
@@ -57,8 +57,7 @@
if "%1" == "status" (
title Status
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"
+ for /f "usebackq" %%j IN (`"svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn"`) DO @set ONSVN=%%j
call :UP
goto :ExitSVN
)
@@ -71,7 +70,6 @@
: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?
Added: trunk/tools/RosBE-Windows/Root/scut.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?rev=28117&view=auto
==============================================================================
--- trunk/tools/RosBE-Windows/Root/scut.cmd (added)
+++ trunk/tools/RosBE-Windows/Root/scut.cmd Fri Aug 3 13:34:37 2007
@@ -1,0 +1,79 @@
+::
+:: PROJECT: RosBE - ReactOS Build Environment for Windows
+:: LICENSE: GPL - See COPYING in the top level directory
+:: FILE: Root/scut.cmd
+:: PURPOSE: Shortcut Creator, Remover and Switcher.
+:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel at freenet.de>
+::
+::
+ at echo off
+
+title Choose your Source Folder...
+
+if /I "%1"=="" (
+ goto :DEF
+)
+if /I "%1"=="add" (
+ goto :ADD
+)
+if /I "%1"=="remove" (
+ goto :REM
+)
+) else (
+ set XY=%1
+ goto :RUN
+)
+goto :END
+
+:DEF
+echo Choose your Source Folder:
+SET /P XY=
+goto :RUN
+
+:RUN
+for /f "usebackq" %%i in (`"grep \"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir"`) do @SET dir=%%i
+cd /D %dir%
+goto :END
+
+:ADD
+if not "%2" == "" (
+ if not "%3" == "" (
+ set CUT=%2
+ set DIR=%3
+ goto :ADD23
+ ) else (
+ set CUT=%2
+ goto :ADD2
+ )
+) else (
+ goto :ADD1
+)
+
+:ADD1
+echo Choose your Shortcut:
+SET /P CUT=
+:ADD2
+echo Choose your Source Folder:
+SET /P DIR=
+:ADD23
+echo ^<property name="%CUT%" value="%DIR%" /^> > "%ROSBEBASEDIR%\aaa.tmp"
+copy "%ROSBEBASEDIR%\srclist.xml" + "%ROSBEBASEDIR%\aaa.tmp" "%ROSBEBASEDIR%\srclist2.xml"
+del "%ROSBEBASEDIR%\srclist.xml"
+ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml
+goto :END
+
+:REM
+if not "%2" == "" (
+ set CUTREM=%2
+ goto :REM1
+)
+echo Choose your Shortcut:
+SET /P CUTREM=
+:REM1
+grep -v \"%CUTREM%\" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml"
+del "%ROSBEBASEDIR%\srclist.xml"
+ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml
+goto :END
+
+:END
+title ReactOS Build Environment %_VER%
Removed: trunk/tools/RosBE-Windows/Root/test.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/test.cmd?rev=28116&view=auto
==============================================================================
--- trunk/tools/RosBE-Windows/Root/test.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/test.cmd (removed)
@@ -1,60 +1,0 @@
-::
-:: PROJECT: RosBE - ReactOS Build Environment for Windows
-:: LICENSE: GPL - See COPYING in the top level directory
-:: FILE: Root/test.cmd
-:: PURPOSE: First step in the direction of a Multiple Source Tree "Compatible" RosBE.
-:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel at freenet.de>
-::
-::
- at echo off
-
-title Choose your Source Folder...
-
-if /I "%1"=="" (
- goto :DEF
-)
-if /I "%1"=="add" (
- goto :ADD
-)
-if /I "%1"=="remove" (
- goto :REM
-)
-) else (
- set XY=%1
- goto :RUN
-)
-goto :END
-
-:DEF
-echo Choose your Source Folder:
-SET /P XY=
-goto :RUN
-
-:RUN
-grep \"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp"
-set /P dir=< "%ROSBEBASEDIR%\aaa.tmp"
-del "%ROSBEBASEDIR%\aaa.tmp"
-cd /D %dir%
-goto :END
-
-:ADD
-echo Choose your Shortcut:
-SET /P CUT=
-echo Choose your Source Folder:
-SET /P DIR=
-echo ^<property name="%CUT%" value="%DIR%" /^> > "%ROSBEBASEDIR%\aaa.tmp"
-copy "%ROSBEBASEDIR%\srclist.xml" + "%ROSBEBASEDIR%\aaa.tmp" "%ROSBEBASEDIR%\srclist2.xml"
-del "%ROSBEBASEDIR%\srclist.xml"
-ren "%ROSBEBASEDIR%\srclist2.xml" "srclist.xml"
-goto :END
-
-:REM
-echo Choose your Shortcut:
-SET /P CUTREM=
-grep -v \"%CUTREM%\" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml"
-del "%ROSBEBASEDIR%\srclist.xml"
-ren "%ROSBEBASEDIR%\srclist2.xml" "srclist.xml"
-goto :END
-
-:END
-title ReactOS Build Environment %_VER%
More information about the Ros-diffs
mailing list