28 Aug
2008
28 Aug
'08
8:32 a.m.
Author: dreimer
Date: Thu Aug 28 03:32:30 2008
New Revision: 35722
URL: http://svn.reactos.org/svn/reactos?rev=35722&view=rev
Log:
Add another parameter and seperate GCC and Tools loading to skip the parts seperately.
Add the params to Help and do some more cleanup.
Modified:
trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd
trunk/tools/RosBE/RosBE-Windows/Root/update.cmd
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Thu Aug 28 03:32:30 2008
@@ -74,7 +74,7 @@
)
if exist "%_ROSBE_BASEDIR%\update.cmd" (
- echo update - Updates RosBE to the most recent files.
+ echo update [OPTIONS] - Updates RosBE to the most recent files.
)
echo.
@@ -202,9 +202,12 @@
)
if exist "%_ROSBE_BASEDIR%\update.cmd" (
if /i "%1" == "update" (
- echo Usage: update
+ echo Usage: update [OPTIONS]
echo Updates all files of RosBE to the most recent files.
echo.
+ echo nocmds - Skips the Updating of the Script Files.
+ echo nogcc - Skips the Updating of GCC.
+ echo notools - Skips the Updating of the Tools.
goto :EOC
)
)
Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Thu Aug 28 03:32:30 2008
@@ -7,34 +7,61 @@
::
::
@echo off
-
+if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0
+if %_ROSBE_DEBUG% == 1 (
+ @echo on
+)
+::
:: Set Title
+::
title Updating...
+::
:: The Update Server.
+::
set _ROSBE_URL=www.foo.bar
+::
:: Default Variables.
+::
set _ROSBE_CMDS=yes
-set _ROSBE_ZIPS=yes
-
+set _ROSBE_GCC=yes
+set _ROSBE_TOOLS=yes
+set _ROSBE_PARAM=no
+
+::
:: Update the Vars if the params say so.
+::
if "%1" == "nocmds" (
set _ROSBE_CMDS=no
-) else if "%1" == "nozips" (
- set _ROSBE_ZIPS=no
-) else if not "%1" == "" (
- cls
- echo Unknown parameter specified. Exiting.
- goto :EOU
+ set _ROSBE_PARAM=yes
+)
+if "%1" == "nogcc" (
+ set _ROSBE_GCC=no
+ set _ROSBE_PARAM=yes
+)
+if "%1" == "notools" (
+ set _ROSBE_TOOLS=no
+ set _ROSBE_PARAM=yes
+)
+if not "%1" == "" (
+ if _ROSBE_PARAM == no (
+ cls
+ echo Unknown parameter specified. Exiting.
+ goto :EOU
+ )
)
if _ROSBE_CMDS == yes (
+ ::
:: First check for a new Updater
+ ::
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/update.cmd
"%_ROSBE_BASEDIR%\update.cmd"
+ ::
:: PS1 Files.
+ ::
if exist "%_ROSBE_BASEDIR%\Build.ps1" (
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Build.ps1
)
@@ -54,27 +81,37 @@
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe-gcc-env.ps1
)
+ ::
:: Options Files.
+ ::
if exist "%_ROSBE_BASEDIR%\options.cmd" (
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/options.cmd
)
+ ::
:: SVN Files.
+ ::
if exist "%_ROSBE_BASEDIR%\sSVN.cmd" (
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/sSVN.cmd
)
+ ::
:: SCut Files.
+ ::
if exist "%_ROSBE_BASEDIR%\scut.cmd" (
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/scut.cmd
)
+ ::
:: RelAddr2Line Files.
+ ::
if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" (
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/reladdr2line.cmd
)
+ ::
:: Other Tools Files.
+ ::
if exist "%_ROSBE_BASEDIR%\Config.cmd" (
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Config.cmd
)
@@ -82,7 +119,9 @@
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/chdefdir.cmd
)
+ ::
:: Default Files.
+ ::
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Build.cmd
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/ChangeLog.txt
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/chdefgcc.cmd
@@ -100,42 +139,67 @@
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/TimeDate.cmd
)
-if _ROSBE_CMDS == yes (
- :: Add Dates into Vars and load GCC and Tool SRC packages if needed.
+if _ROSBE_GCC == yes (
+ ::
+ :: Add Dates into Vars and load GCC packages if needed.
+ ::
if exist GCC.7z (
for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c
echo @fdate""`) do set _ROSBE_GCCDATE=%%i
)
+
+ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/GCC.7z
+
+ ::
+ :: Add the maybe Updated Dates to another Var.
+ ::
+ for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo
@fdate""`) do set _ROSBE_GCCDATE2=%%i
+
+ ::
+ :: Extract GCC.
+ ::
+ if %_ROSBE_GCCDATE% NEQ %_ROSBE_GCCDATE2% (
+ "%_ROSBE_BASEDIR%\Tools\7z.exe" x GCC.7z
"%_ROSBE_BASEDIR%\4.1.3"
+ )
+)
+if _ROSBE_TOOLS == yes (
+ ::
+ :: Add Dates into Vars and load Tool SRC packages if needed.
+ ::
if exist Tools.7z (
for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c
echo @fdate""`) do set _ROSBE_TOOLSDATE=%%i
)
- "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/GCC.7z
"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Tools.7z
+ ::
:: Add the maybe Updated Dates to another Var.
- for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo
@fdate""`) do set _ROSBE_GCCDATE2=%%i
+ ::
for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c echo
@fdate""`) do set _ROSBE_TOOLSDATE2=%%i
- :: Extract GCC.
- if %_ROSBE_GCCDATE% NEQ %_ROSBE_GCCDATE2% (
- "%_ROSBE_BASEDIR%\Tools\7z.exe" x GCC.7z
"%_ROSBE_BASEDIR%\4.1.3"
- )
if %_ROSBE_TOOLSDATE% NEQ %_ROSBE_TOOLSDATE2% (
"%_ROSBE_BASEDIR%\Tools\7z.exe" x Tools.7z "%TEMP%"
+ ::
:: Build the tools
+ ::
make -f %TEMP%\makefile
copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools"
)
)
:EOU
+::
:: Unload Vars.
+::
set _ROSBE_URL=
set _ROSBE_GCCDATE=
set _ROSBE_TOOLSDATE=
set _ROSBE_GCCDATE2=
set _ROSBE_TOOLSDATE2=
set _ROSBE_CMDS=
-set _ROSBE_ZIPS=
-
-title ReactOS Build Environment %_ROSBE_VERSION%
+set _ROSBE_GCC=
+set _ROSBE_TOOLS=
+set _ROSBE_PARAM=
+
+if defined _ROSBE_VERSION (
+ title ReactOS Build Environment %_ROSBE_VERSION%
+)