Author: dreimer Date: Mon Oct 26 21:40:46 2009 New Revision: 43785
URL: http://svn.reactos.org/svn/reactos?rev=43785&view=rev Log: Move all tools from BASE/gcc/bin to BASE/tools.
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon Oct 26 21:40:46 2009 @@ -61,9 +61,9 @@ New-Item -path "$_ROSBE_LOGDIR" -type directory } $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" - &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file + &{IEX "&'mingw32-make' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file } else { - &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $($args) + &{IEX "&'mingw32-make' -j $MAKE_JOBS $($args)"} $($args) } if ($_ROSBE_SHOWTIME -eq 1) { $sw.Stop()
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon Oct 26 21:40:46 2009 @@ -45,7 +45,7 @@ $global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs" $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR$ENV:ROS_ARCH" -$global:_ROSBE_ORIGINALPATH = "$_ROSBE_HOST_MINGWPATH\bin;$ENV:PATH" +$global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$_ROSBE_HOST_MINGWPATH\bin;$ENV:PATH"
# Fix Bison package path (just in case RosBE is installed in a path which contains spaces) $ENV:BISON_PKGDATADIR = ((New-Object -ComObject Scripting.FileSystemObject).GetFolder("$_ROSBE_HOST_MINGWPATH\share\bison")).ShortPath @@ -142,8 +142,6 @@ & "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1" }
-$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" - if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG") { $ENV:ROS_RBUILDFLAGS = get-content "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" }
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Mon Oct 26 21:40:46 2009 @@ -15,7 +15,6 @@
function EOA { IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.ps1'" - $_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" version settitle }
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Buil... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Mon Oct 26 21:40:46 2009 @@ -55,9 +55,9 @@ if not exist "%_ROSBE_LOGDIR%." ( mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL ) - %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" + %BUILDTIME_COMMAND% "mingw32-make" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" ) else ( - %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %* + %BUILDTIME_COMMAND% "mingw32-make" -j %MAKE_JOBS% %* )
:EOC
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosB... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Mon Oct 26 21:40:46 2009 @@ -67,8 +67,6 @@ call "%APPDATA%\RosBE\rosbe-options-%1.cmd" )
-set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe - if exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( for /f "usebackq tokens=* delims= " %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG""`) do set ROS_RBUILDFLAGS=%%i )
Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chde... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Mon Oct 26 21:40:46 2009 @@ -67,7 +67,6 @@ )
call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" -set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe call "%_ROSBE_BASEDIR%\version.cmd"
:EOC
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.nsi... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Mon Oct 26 21:40:46 2009 @@ -144,6 +144,7 @@ File /r Root\version.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try + File /r Components\Tools\flash.exe File /r Components\Tools\buildtime.exe File /r Components\Tools\chknewer.exe File /r Components\Tools\cpucount.exe @@ -153,7 +154,16 @@ ${Endif} SetOutPath "$INSTDIR\Tools" SetOverwrite try - File /r Components\Tools\flash.exe + File /r Components\Tools\mingw32-make.exe + File /r Components\Tools\libintl3.dll + File /r Components\Tools\libiconv2.dll + File /r Components\Tools\regex2.dll + File /r Components\Tools\bison.exe + File /r Components\Tools\flex.exe + File /r Components\Tools\flex++.exe + File /r Components\Tools\iconv.exe + File /r Components\Tools\m4.exe + File /r Components\Tools\patch.exe SectionEnd
Section -MinGWGCCNASM SEC02 @@ -231,7 +241,7 @@
Section "ccache - Compiler Cache" SEC06 SetShellVarContext current - SetOutPath "$INSTDIR\i386\bin" + SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\ccache.exe File /r Components\Tools\cygwin1.dll @@ -239,7 +249,7 @@
Section "GDB - The GNU Project Debugger" SEC07 SetShellVarContext current - SetOutPath "$INSTDIR\i386\bin" + SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\gdb.exe File /r Components\Tools\gdbserver.exe @@ -280,10 +290,8 @@ SetOverwrite try File /r Components\Tools\wget.exe File /r Components\Tools\7z.exe - File /r Components\Tools\libintl3.dll File /r Components\Tools\libeay32.dll File /r Components\Tools\libssl32.dll - File /r Components\Tools\libiconv2.dll File /r Components\Tools\elevate.exe SetOutPath "$INSTDIR" SetOverwrite try @@ -322,6 +330,7 @@ SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\buildtime.exe + File /r Components\Tools\flash.exe File /r Components\Tools\chknewer.exe File /r Components\Tools\cpucount.exe File /r Components\Tools\getdate.exe
-
dreimer＠svn.reactos.org