For our regression testers Olaf Siejka and Maciej Bialas out there. Experimental GCC 3.4.5 Support readded to RosBE. Plz test

Added delete command to updater.

svn path=/trunk/tools/RosBE/; revision=898
This commit is contained in:
Daniel Reimer 2008-11-26 06:56:16 +00:00
parent 65b7bd1f2e
commit 51c0669d78
6 changed files with 49 additions and 11 deletions

View File

@ -236,10 +236,11 @@ if (Test-Path "$_ROSBE_BASEDIR\update.ps1") {
" Usage: update [OPTIONS]"
" Updates all files of RosBE to the most recent files."
""
" reset - Removes the Updates Cache. Not recommended."
" nr X - Re/Installs Update Nr X."
" info X - Shows info about Update Nr X."
" status - Shows the recent status of available, non installed updates."
" delete X - Deletes Update Nr X."
" info X - Shows info about Update Nr X."
" nr X - Re/Installs Update Nr X."
" reset - Removes the Updates Cache. Not recommended."
" status - Shows the recent status of available, non installed updates."
exit
}
}

View File

@ -14,7 +14,7 @@
if ($_ROSBE_HOST_MINGWPATH -eq $null) {
$_ROSBE_MODE = "MinGW"
$_ROSBE_HOST_MINGWPATH = "$pwd"
$_ROSBE_ORIGINALPATH = "$PATH"
$_ROSBE_ORIGINALPATH = "$ENV:PATH"
}
@ -69,7 +69,18 @@ if ($_ROSBE_MODE -eq "MinGW") {
$ENV:TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"""
$ENV:TARGET_CPPFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"""
}
if ($_ROSBE_HOST_GCCVERSION -eq "3.4.5") {
$ENV:PATH = $_ROSBE_BASEDIR\3.4.5\bin;$_ROSBE_BASEDIR\3.4.5\libexec\gcc\mingw32\3.4.5;$ENV:PATH
$_ROSBE_MINGWMAKE = $_ROSBE_BASEDIR\3.4.5\bin\mingw32-make.exe
# Set all paths (needed by Windows Vista)
$ENV:C_INCLUDE_PATH = $_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include
$ENV:CPLUS_INCLUDE_PATH = $_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5\mingw32;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include
$ENV:LIBRARY_PATH = $_ROSBE_BASEDIR\3.4.5\lib;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5
$ENV:HOST_CFLAGS = $null
$ENV:HOST_CPPFLAGS = $null
$ENV:TARGET_CFLAGS = $null
$ENV:TARGET_CPPFLAGS = $null
)
#
# Display the current version of GCC, NASM, ld and make.
#
@ -109,4 +120,5 @@ if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\flex.exe") {
"WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC."
}
}
$ENV:PATH = $_ROSBE_ORIGINALPATH
& mingw32-make -v | & find "GNU Make"

View File

@ -126,6 +126,12 @@ if ("$arg1" -eq "nr") {
UPDCHECK
EOC
}
if ("$arg1" -eq "delete") {
$_ROSBE_STATCOUNT = $arg2
remove-item "$ENV:APPDATA\RosBE\Updates\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.*" -force -recurse -EA SilentlyContinue
remove-item "$ENV:APPDATA\RosBE\Updates\tmp\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.*" -force -recurse -EA SilentlyContinue
EOC
}
if ("$arg1" -eq "info") {
$_ROSBE_STATCOUNT = $arg2
set-location tmp

View File

@ -242,10 +242,11 @@ if exist "%_ROSBE_BASEDIR%\update.cmd" (
echo Usage: update [OPTIONS]
echo Updates all files of RosBE to the most recent files.
echo.
echo reset - Removes the Updates Cache. Not recommended.
echo nr X - Re/Installs Update Nr X.
echo info X - Shows info about Update Nr X.
echo status - Shows the recent status of available, non installed updates.
echo delete X - Deletes Update Nr X.
echo info X - Shows info about Update Nr X.
echo nr X - Re/Installs Update Nr X.
echo reset - Removes the Updates Cache. Not recommended.
echo status - Shows the recent status of available, non installed updates.
goto :EOC
)
)

View File

@ -78,7 +78,18 @@ if "%_ROSBE_MODE%" == "MinGW" (
set TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include"
set TARGET_CPPFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include"
)
if "%_ROSBE_HOST_GCCVERSION%" == "3.4.5" (
set PATH=%_ROSBE_BASEDIR%\3.4.5\bin;%_ROSBE_BASEDIR%\3.4.5\libexec\gcc\mingw32\3.4.5;%PATH%
set _ROSBE_MINGWMAKE=%_ROSBE_BASEDIR%\3.4.5\bin\mingw32-make.exe
:: Set all paths (needed by Windows Vista)
set C_INCLUDE_PATH=%_ROSBE_BASEDIR%\3.4.5\include;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5\include
set CPLUS_INCLUDE_PATH=%_ROSBE_BASEDIR%\3.4.5\include;%_ROSBE_BASEDIR%\3.4.5\include\c++\3.4.5;%_ROSBE_BASEDIR%\3.4.5\include\c++\3.4.5\mingw32;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5\include
set LIBRARY_PATH=%_ROSBE_BASEDIR%\3.4.5\lib;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5
set HOST_CFLAGS=
set HOST_CPPFLAGS=
set TARGET_CFLAGS=
set TARGET_CPPFLAGS=
)
::
:: Display the current version of GCC, NASM, ld and make.
::
@ -125,4 +136,5 @@ if exist "%_ROSBE_HOST_MINGWPATH%\bin\flex.exe" (
echo WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC.
)
)
set PATH=%_ROSBE_ORIGINALPATH%
mingw32-make -v | find "GNU Make"

View File

@ -92,6 +92,12 @@ if /i "%1" == "nr" (
call :UPDCHECK
goto :EOC
)
if /i "%1" == "delete" (
set _ROSBE_STATCOUNT=%2
del /F /Q "%APPDATA%\RosBE\Updates\%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.*" 1> NUL 2> NUL
del /F /Q "%APPDATA%\RosBE\Updates\tmp\%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.*" 1> NUL 2> NUL
goto :EOC
)
if /i "%1" == "info" (
set _ROSBE_STATCOUNT=%2
call :UPDINFO