[ros-diffs] [dreimer] 35634: More and more pain in the ass, this batch... More work on Update. Now it only extracts the zips if they are really newer than before.
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Mon Aug 25 20:38:08 CEST 2008
Author: dreimer
Date: Mon Aug 25 13:38:07 2008
New Revision: 35634
URL: http://svn.reactos.org/svn/reactos?rev=35634&view=rev
Log:
More and more pain in the ass, this batch... More work on Update. Now it only extracts the zips if they are really newer than before.
Modified:
trunk/tools/RosBE/RosBE-Windows/Root/update.cmd
Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/update.cmd?rev=35634&r1=35633&r2=35634&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Mon Aug 25 13:38:07 2008
@@ -9,87 +9,104 @@
@echo off
:: The Update Server
-set url=www.foo.bar
+set _ROSBE_URL=www.foo.bar
:: First check for a new Updater
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/update.cmd
+"%_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 %url%/Build.ps1
+ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Build.ps1
)
if exist "%_ROSBE_BASEDIR%\Clean.ps1" (
- "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Clean.ps1
+ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Clean.ps1
)
if exist "%_ROSBE_BASEDIR%\Help.ps1" (
- "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Help.ps1
+ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Help.ps1
)
if exist "%_ROSBE_BASEDIR%\MinGW.ps1" (
- "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/MinGW.ps1
+ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.ps1
)
if exist "%_ROSBE_BASEDIR%\RosBE.ps1" (
- "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/RosBE.ps1
+ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.ps1
)
if exist "%_ROSBE_BASEDIR%\rosbe-gcc-env.ps1" (
- "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/rosbe-gcc-env.ps1
+ "%_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 %url%/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 %url%/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 %url%/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 %url%/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 %url%/Config.cmd
+ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Config.cmd
)
if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" (
- "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/chdefdir.cmd
+ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/chdefdir.cmd
)
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Build.cmd
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/ChangeLog.txt
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/chdefgcc.cmd
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Clean.cmd
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Help.cmd
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/LICENSE.TXT
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/MinGW.cmd
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/mingw.ico
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/MinGW.mac
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/README.pdf
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/RosBE.cmd
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/rosbe.ico
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/RosBE.mac
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/rosbe-gcc-env.cmd
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/TimeDate.cmd
+"%_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
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Clean.cmd
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Help.cmd
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/LICENSE.TXT
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.cmd
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/mingw.ico
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.mac
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/README.pdf
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.cmd
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe.ico
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.mac
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe-gcc-env.cmd
+"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/TimeDate.cmd
:: Load GCC and Tool SRC packages
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/GCC.7z
-"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Tools.7z
+if exist GCC.7z (
+ for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo @fdate""`) do set _ROSBE_GCCDATE=%%i
+)
+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
+
+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
-"%_ROSBE_BASEDIR%\Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\4.1.3"
-"%_ROSBE_BASEDIR%\Tools\7z.exe" x Tools.7z "%TEMP%"
-
-:: Build the tools
-make -f %TEMP%\makefile
-copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools"
+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"
+)
:: Unload Vars
-set url=
+set _ROSBE_URL=
+set _ROSBE_GCCDATE=
+set _ROSBE_TOOLSDATE=
+set _ROSBE_GCCDATE2=
+set _ROSBE_TOOLSDATE2=
More information about the Ros-diffs
mailing list