[ros-diffs] [dreimer] 28039: - Update comments. - Update changelog. - Add new option called update to config.cmd an add it into help.cmd. - Update build-shared the way that you get a message to use "config update" instead of a nonsens sentence.
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Mon Jul 30 12:08:05 CEST 2007
Author: dreimer
Date: Mon Jul 30 14:08:05 2007
New Revision: 28039
URL: http://svn.reactos.org/svn/reactos?rev=28039&view=rev
Log:
- Update comments.
- Update changelog.
- Add new option called update to config.cmd an add it into help.cmd.
- Update build-shared the way that you get a message to use "config update" instead of a nonsens sentence.
Modified:
trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
trunk/tools/RosBE-Windows/Root/ChangeLog.txt
trunk/tools/RosBE-Windows/Root/Config.cmd
trunk/tools/RosBE-Windows/Root/Help.cmd
trunk/tools/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE-Windows/Root/reladdr2line.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=28039&r1=28038&r2=28039&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Mon Jul 30 14:08:05 2007
@@ -11,7 +11,7 @@
@echo off
::
-:: Take over the 2nd parameter of Build.cmd, which enables/disables stripping
+:: Take over the 2nd parameter of Build.cmd, which enables/disables stripping.
::
if "%1" == "strip" (
set ROS_LEAN_AND_MEAN = yes
@@ -25,7 +25,9 @@
:Build
::
-:: Check if our log directory exists, if it doesn't, create it.
+:: Check if our log directory exists, if it doesn't, create it. Also check
+:: if the default Path was editied by Config Tool. If so, update the
+:: path.
::
if %logdiff% == 0 (
if not exist "RosBE-Logs\." (
@@ -43,10 +45,10 @@
if %logdiff% == 1 (
if not exist "%ROSBE_LOGPATH%\." (
echo LogFolder does not exist.
- ) else (
+ ) else (
set _ROSBELOGDIR=%ROSBE_LOGPATH%
- )
-)
+ )
+ )
)
::
@@ -58,8 +60,8 @@
if not errorlevel 1 (
echo.
echo *** config.template.rbuild is newer than config.rbuild ***
- echo *** aborting build. Please check for changes and ***
- echo *** update your config.rbuild. ***
+ echo *** aborting build. Please update your config.rbuild ***
+ echo *** by typeing "config update". ***
echo.
goto :EOB
)
Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog.txt?rev=28039&r1=28038&r2=28039&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original)
+++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Mon Jul 30 14:08:05 2007
@@ -10,6 +10,7 @@
- Updated Tools. (Daniel Reimer)
- sSVN asks you if you wanna update if Offline Source Tree is old. (Daniel Reimer)
- Fixed DOZENS of bugs/stupid coded parts/things you could get easier... (Daniel Reimer)
+- Add a new option called update to Config.cmd and add some security stuff. (Daniel Reimer)
*** July 26th, 2007 - RosBE 0.3.7.1 Released
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cmd?rev=28039&r1=28038&r2=28039&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Mon Jul 30 14:08:05 2007
@@ -6,11 +6,22 @@
:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel at freenet.de>
::
::
- at echo off
+::@echo off
title ReactOS Build Configurator
+::
+:: Receive the first Parameter and decide what to do.
+::
if "%1" == "delete" (
+ echo config.rbuild will be permanently deleted. All your settings will be gone.
+ echo Continue?
+:: SET /P XY=(yes), (no)
+:: if /I "%XY%"=="yes" goto :CONT
+:: if /I "%XY%"=="no" goto :NOK
+:: goto :NOK
+
+ :CONT
if exist "config.rbuild" (
del "config.rbuild"
echo Main Configuration File was found and deleted.
@@ -25,15 +36,35 @@
)
goto :NOK
)
+if "%1" == "update" (
+ echo old config.rbuild will be deleted and will be updated with a recent,
+ echo default one. You will need to reconfigure it to your wishes later.
+ echo Continue?
+:: SET /P XY=(yes), (no)
+:: if /I "%XY%"=="yes" goto :CONT2
+:: if /I "%XY%"=="no" goto :NOK
+ :CONT2
+ del "%ROSBEBASEDIR%\*.rbuild"
+ del "config.rbuild"
+ copy "config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild"
+ echo Updated.
+ goto :NOK
+)
if not "%1" == "" (
echo Unknown parameter specified. Try 'help [COMMAND]'.
goto :NOK
)
+::
+:: Check if config.rbuild already exists. If not, get a working copy.
+::
if not exist "%ROSBEBASEDIR%\config.rbuild" (
copy "config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild"
)
+::
+:: N00b Blocker :-P
+::
echo WARNING:
echo Non-Default-Configurations are not useable for pasteing Bugs to
echo Bugzilla or asking quesions about in Forum/Chat!
@@ -47,6 +78,30 @@
goto :NOK
:OK
+
+::
+:: Check if config.template.rbuild is newer than config.rbuild, if it is then
+:: inform the user and offer an update.
+::
+if exist "%ROSBEBASEDIR%\config.rbuild" (
+ test "config.template.rbuild" -nt "%ROSBEBASEDIR%\config.rbuild"
+ if not errorlevel 1 (
+ echo.
+ echo *** config.template.rbuild is newer than working config.rbuild ***
+ echo *** The Editor cannot continue with this file. Do you wanna ***
+ echo *** update to the most recent one? You need to reset all your ***
+ cho *** previously made settings. ***
+ echo.
+ SET /P XY=(yes), (no)
+ if /I "%XY%"=="yes" del "%ROSBEBASEDIR%\*.rbuild" | del "config.rbuild" | copy "config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild" | goto :OK
+ if /I "%XY%"=="no" goto :NOK
+ goto :NOK
+ )
+)
+
+::
+:: Start with reading settings from config.rbuild and let the user edit them.
+::
echo Architecture to build for. Not Editable.
echo.
echo Right now
@@ -160,6 +215,9 @@
SET /P F= (0), (1)
sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%ROSBEBASEDIR%\config9.rbuild" > "%ROSBEBASEDIR%\config10.rbuild"
+::
+:: Generate a config.rbuild, copy it to the Source Tree and delete temp files.
+::
copy "%ROSBEBASEDIR%\config10.rbuild" "%ROSBEBASEDIR%\config.tmp"
del "%ROSBEBASEDIR%\*.rbuild"
copy "%ROSBEBASEDIR%\config.tmp" "%ROSBEBASEDIR%\config.rbuild"
Modified: trunk/tools/RosBE-Windows/Root/Help.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?rev=28039&r1=28038&r2=28039&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Help.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Help.cmd Mon Jul 30 14:08:05 2007
@@ -11,6 +11,9 @@
title ReactOS Build Environment %_VER%
+::
+:: Receive the first Parameter and decide what to do.
+::
if "%1" == "" (
echo.
echo Available Commands:
@@ -85,6 +88,8 @@
echo.
echo delete - Deletes the created configuration File and so sets back
echo to default settings.
+ echo update - Deletes the old created configuration File and updats
+ echo with a new, default one.
goto :EOF
)
if "%1" == "raddr2line" (
Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd?rev=28039&r1=28038&r2=28039&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Jul 30 14:08:05 2007
@@ -11,7 +11,8 @@
@echo off
::
-:: Set Defaults to work with and override if needed.
+:: Set Defaults to work with and override them if edited by
+:: Config Tool.
::
color 0A
set _VER=0.3.7.2
@@ -21,7 +22,7 @@
del "C:\aaa.tmp"
set ROSBE_SHOWTIME=1
set ROSBE_WRITELOG=1
-set _LOGDIR=RosBE-Logs
+set _LOGDIR=%CD%\RosBE-Logs
if exist %ROSBEBASEDIR%\options.cmd (
goto :PREV
@@ -41,6 +42,9 @@
:NEXT
title ReactOS Build Environment %_VER%
+::
+:: Make sure RosBE was initialized right.
+::
if "%1" == "" (
cls
call :RosBE4
Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2line.cmd?rev=28039&r1=28038&r2=28039&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Mon Jul 30 14:08:05 2007
@@ -11,12 +11,12 @@
title relAddr2Line...
+::
+:: Receive the Parameters and decide what to do.
+::
set _1=%1
set _2=%2
-::
-:: Receive the Parameters and decide what to do.
-::
if "%_1%" == "" (
goto :MAN
)
@@ -46,6 +46,12 @@
goto :EOC
:EOC
+::
+:: First get the ImageBase of the File. If its smaller than the given
+:: Parameter, everything is ok, because it was already added onto the
+:: adress and can be given directly to raddr2line. If not, add it and
+:: give the result to raddr2line.
+::
for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i
if %%i LSS %_2% (
raddr2line "%_1%" "%_2%" 2>NUL
Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?rev=28039&r1=28038&r2=28039&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Mon Jul 30 14:08:05 2007
@@ -15,6 +15,9 @@
echo No parameter specified. Try 'help [COMMAND]'.
goto :ExitSVN
)
+::
+:: These two are directly parsed to svn.
+::
if "%1" == "update" (
title Updating...
if not "%2" == "" (
@@ -47,6 +50,10 @@
)
goto :ExitSVN
)
+::
+:: Output the rev of your and the Online Tree and tell the User if
+:: its Up to Date or not.
+::
if "%1" == "status" (
title Status
for /f "usebackq" %%i IN (`svnversion .`) DO @set OFFSVN=%%i
More information about the Ros-diffs
mailing list