Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 40885: Some more cleanup. As in Batch with setlocal all variables are only available inside the script file, not globally. So I removed the Var nulling. Fixed a lil bug in rosbe.ps1 Still tbd: Find out why it sometimes fails with buildno.h not found. Get a proper tee-object for logging
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 18:38:35 2009 New Revision: 40885 URL: http://svn.reactos.org/svn/reactos?rev=40885&view=rev Log: Some more cleanup. As in Batch with setlocal all variables are only available inside the script file, not globally. So I removed the Var nulling. Fixed a lil bug in rosbe.ps1 Still tbd: Find out why it sometimes fails with buildno.h not found. Get a proper tee-object for logging Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -89,7 +89,8 @@ if ($_ROSBE_WRITELOG -eq 1) { $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" + $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" + IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" | tee-object $file $sw.Stop() } else { $sw.Start() @@ -101,23 +102,3 @@ # Highlight the fact that building has ended. "$_ROSBE_BASEDIR\Tools\flash.exe" $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$ENV:ROS_BUILDNOSTRIP = $null -$ENV:ROS_LEAN_AND_MEAN = $null -$ENV:CCACHE_DIR = $null -$ENV:HOST_CC = $null -$ENV:HOST_CPP = $null -$ENV:TARGET_CC = $null -$ENV:TARGET_CPP = $null -$ENV:ROS_INTERMEDIATE = $null -$ENV:ROS_OUTPUT = $null -$ENV:ROS_TEMPORARY = $null -$TIMERAW = $null -$DATENAME = $null -$TIMENAME = $null -$CPUCOUNT = $null -$sw = $null -$_ROSBE_CCACHE = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -67,14 +67,6 @@ function end { $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - - # - # Unload all used Vars. - # - $OBJCLEANPATH = $null - $OUTCLEANPATH = $null - $MAKEFILE = $null - exit } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -249,32 +249,4 @@ $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -# -# Unload all used Vars. -# -$YESNO = $null -$BUILD_MP = $null -$BUILD_MP_CH = $null -$TUNE = $null -$TUNE_CH = $null -$SARCH_CH = $null -$OARCH_CH = $null -$OPTIMIZE_CH = $null -$KDBG_CH = $null -$DBG_CH = $null -$GDB_CH = $null -$NSWPAT_CH = $null -$WINKD_CH = $null -$ELF_CH = $null -$SARCH = $null -$OARCH = $null -$OPTIMIZE = $null -$KDBG = $null -$DBG = $null -$GDB = $null -$NSWPAT = $null -$WINKD = $null -$ELF = $null -$XML = $null - settitle Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -41,8 +41,8 @@ $global:_ROSBE_OBJPATH = $null $global:_ROSBE_OUTPATH = $null $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" -$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386" -$global:_ROSBE_ORIGINALPATH = "$ENV:PATH" +$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" +$global:_ROSBE_ORIGINALPATH = "$_ROSBE_HOST_MINGWPATH\bin;$ENV:PATH" $global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" # Get the number of CPUs in the system so we know how many jobs to execute. @@ -144,7 +144,7 @@ & "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" -clear +clear-host "*******************************************************************************" "* *" "* ReactOS Build Environment $_ROSBE_VERSION *" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -29,8 +29,3 @@ chdefgcc $ENV:ROS_ARCH target $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$ARCH = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -30,8 +30,3 @@ $global:_ROSBE_ROSSOURCEDIR = "$pwd" $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$SOURCEDIR = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -63,9 +63,3 @@ "ERROR: You specified wrong parameters." settitle } - -# -# Unload all used Vars. -# -$TOOLPATH = $null -$TOOLMODE = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -32,6 +32,3 @@ } $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -$options = $null -$cfgfile = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -46,11 +46,3 @@ } $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$FILEPATH = $null -$ADDRESS = $null -$baseaddr = $null -$relbase = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -97,14 +97,3 @@ } $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$OFFSVN = $null -$ONSVN = $null -$UP = $null -$CL = $null -$dir = dir -$temparg = $null -$_ROSBE_SSVN_JOB = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -34,8 +34,3 @@ else {parse($args)} $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$OUT = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -149,13 +149,4 @@ "Unknown parameter specified. Try 'help update'." } -$arg1 = $null -$arg2 = $null -$_ROSBE_UPDFINISH = $null -$_ROSBE_OPATH = $null -$_ROSBE_UPDDATE = $null -$_ROSBE_UPDATES = $null -$_ROSBE_UPDDATE2 = $null -$_ROSBE_MULTIUPD = $null -$_ROSBE_STATCOUNT = $null EOC

1 0

[dreimer] 40884: Nitty gritty more fixes I found. Just cosmetical.
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 05:19:58 2009 New Revision: 40884 URL: http://svn.reactos.org/svn/reactos?rev=40884&view=rev Log: Nitty gritty more fixes I found. Just cosmetical. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon May 11 05:19:58 2009 @@ -73,10 +73,10 @@ if ($args[0] -eq "multi") { $args.setvalue($null, 0) $MAKE_JOBS = "$_ROSBE_MAKEX_JOBS" - $TITLE_COMMAND = "makex $args[2]" + $TITLE_COMMAND = "makex $($args)" } else { $MAKE_JOBS = 1 - $TITLE_COMMAND = "make $args[1]" + $TITLE_COMMAND = "make $($args)" } $host.ui.RawUI.WindowTitle = "'$TITLE_COMMAND' build started: $TIMERAW ($ENV:ROS_ARCH)" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon May 11 05:19:58 2009 @@ -25,7 +25,7 @@ if ("$ENV:ROS_ARCH" -eq "") { $ENV:ROS_ARCH = "i386" } else { - $ENV:ROS_ARCH = "$args[1]" + $ENV:ROS_ARCH = "$($args)" } $global:0 = $myInvocation.MyCommand.Definition

1 0

[dreimer] 40883: This fixes the worst errors. Now the Scripts build ROS again. I could need a tester.
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 04:53:37 2009 New Revision: 40883 URL: http://svn.reactos.org/svn/reactos?rev=40883&view=rev Log: This fixes the worst errors. Now the Scripts build ROS again. I could need a tester. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon May 11 04:53:37 2009 @@ -63,7 +63,6 @@ $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++" $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "gcc" $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "g++" -} # Get the current date and time for use in in our build log's file name. $TIMERAW = get-date -f t Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon May 11 04:53:37 2009 @@ -23,9 +23,9 @@ # Set defaults to work with and override them if edited by # the options utility. if ("$ENV:ROS_ARCH" -eq "") { - set $ENV:ROS_ARCH = "i386" + $ENV:ROS_ARCH = "i386" } else { - set $ENV:ROS_ARCH = "$args[1]" + $ENV:ROS_ARCH = "$args[1]" } $global:0 = $myInvocation.MyCommand.Definition @@ -144,7 +144,7 @@ & "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" -clear-screen +clear "*******************************************************************************" "* *" "* ReactOS Build Environment $_ROSBE_VERSION *" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Mon May 11 04:53:37 2009 @@ -15,8 +15,8 @@ } $ENV:PATH = "$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" - -& "$ENV:ROS_PREFIXgcc" -v 2> gcctvers.tmp +$TARGETGCC = "$ENV:ROS_PREFIX" + "gcc" +& $TARGETGCC -v 2> gcctvers.tmp $global:_ROSBE_TARGET_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' $global:_ROSBE_TARGET_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' gcc -v 2> gcchvers.tmp

1 0

[dreimer] 40882: First run through the PS1 Scripts to get them in sync to Colin's fixes again. Not tested yet.
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 04:40:11 2009 New Revision: 40882 URL: http://svn.reactos.org/svn/reactos?rev=40882&view=rev Log: First run through the PS1 Scripts to get them in sync to Colin's fixes again. Not tested yet. Removed: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -7,10 +7,8 @@ # # -# # Check if config.template.rbuild is newer than config.rbuild, if it is then # abort the build and inform the user. -# if (Test-Path ".\config.rbuild") { if ((gi .\config.template.rbuild).LastWriteTime -gt (gi .\config.rbuild).LastWriteTime) { "" @@ -22,9 +20,7 @@ } } -# # Check if strip, no Debug Symbols or ccache are being used and set the appropriate options. -# if ($_ROSBE_NOSTRIP -ne $null) { if ($_ROSBE_NOSTRIP -eq 1) { $ENV:ROS_BUILDNOSTRIP = "yes" @@ -39,162 +35,73 @@ $ENV:ROS_LEAN_AND_MEAN = "no" } } -# Small Security Check to prevent useless apps. -if ($ENV:ROS_LEAN_AND_MEAN -eq "yes") { - if ($ENV:ROS_BUILDNOSTRIP -eq "yes") { - clear-host - "Selecting Stripping and removing Debug Symbols together will most likely cause useless apps. Please deselect one of them." - exit - } -} -if ($_ROSBE_USECCACHE -ne $null) { - if ($_ROSBE_USECCACHE -eq 1) { - $ENV:CCACHE_DIR = "$APPDATA\RosBE\.ccache" - $_ROSBE_CCACHE = "ccache " - } - $ENV:HOST_CC = "$_ROSBE_CCACHE" + "gcc" - $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++" - - # - #Target defaults to host(i386) - # - - $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "gcc" - $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++" - if ($ENV:ROS_ARCH -ne $null) { - $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$ROS_ARCH-pc-mingw32-gcc" - $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$ROS_ARCH-pc-mingw32-g++" - } -} - -# # Check if the user has chosen to use a different object or output path and set # it accordingly. -# if ($_ROSBE_OBJPATH -ne $null) { if (Test-Path "$_ROSBE_OBJPATH") { "WARNING: The Object-Path specified doesn't seem to exist. Creating..." - if (Test-Path "makefile*.auto") { - "WARNING: makefile.auto exists. Deleting..." - clean - } } $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH" + $ENV:ROS_TEMPORARY = "$_ROSBE_OBJPATH" } if ($_ROSBE_OUTPATH -ne $null) { if (Test-Path "$_ROSBE_OUTPATH") { "WARNING: The Output-Path specified doesn't seem to exist. Creating..." - if (Test-Path "makefile*.auto") { - "WARNING: makefile.auto exists. Deleting..." - clean - } } $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH" - $ENV:ROS_TEMPORARY = "$_ROSBE_OUTPATH" } -# +if ($_ROSBE_USECCACHE -eq 1) { + $_ROSBE_CCACHE = "ccache " +} else { + $_ROSBE_CCACHE = $null +} + $ENV:HOST_CC = "$_ROSBE_CCACHE" + "gcc" + $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++" + $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "gcc" + $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++" + $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "gcc" + $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "g++" +} + # Get the current date and time for use in in our build log's file name. -# $TIMERAW = get-date -f t $DATENAME = get-date -f dyMMyyyy $TIMENAME = get-date -f HHmm -# -# Check if writing logs is enabled, if so check if our log directory exists, if -# it doesn't, create it. -# -if ($_ROSBE_WRITELOG -eq 1) { - if (!(Test-Path "$_ROSBE_LOGDIR")) { - $null = (New-Item -path "$_ROSBE_ROSSOURCEDIR" -name "RosBE-Logs" -type directory) - } +# Check whether we were called as "makex" or "make" +if ($args[0] -eq "multi") { + $args.setvalue($null, 0) + $MAKE_JOBS = "$_ROSBE_MAKEX_JOBS" + $TITLE_COMMAND = "makex $args[2]" +} else { + $MAKE_JOBS = 1 + $TITLE_COMMAND = "make $args[1]" } -function BUILD { - if ($_ROSBE_SHOWTIME -eq 1) { - [System.Diagnostics.Stopwatch] $sw; - $sw = New-Object System.Diagnostics.StopWatch - if ($_ROSBE_WRITELOG -eq 1) { - if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) - } - $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" - $sw.Stop() - write-host "Total Build Time:" $sw.Elapsed.ToString() - } else { - $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' $($args)" - $sw.Stop() - write-host "Total Build Time:" $sw.Elapsed.ToString() - } - } else { - if ($_ROSBE_WRITELOG -eq 1) { - if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) - } - IEX "&'$_ROSBE_MINGWMAKE' $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" - } else { - IEX "&'$_ROSBE_MINGWMAKE' $($args)" - } - } +$host.ui.RawUI.WindowTitle = "'$TITLE_COMMAND' build started: $TIMERAW ($ENV:ROS_ARCH)" + +# Do the actual building +if ($_ROSBE_SHOWTIME -eq 1) { + [System.Diagnostics.Stopwatch] $sw; + $sw = New-Object System.Diagnostics.StopWatch } -function BUILDMULTI { - # - # Get the number of CPUs in the system so we know how many jobs to execute. - $CPUCOUNT = (gwmi win32_processor).numberofcores + 1 +if ($_ROSBE_WRITELOG -eq 1) { + $sw.Start() + IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" + $sw.Stop() +} else { + $sw.Start() + IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" + $sw.Stop() +} +write-host "Total Build Time:" $sw.Elapsed.ToString() - if ($_ROSBE_SHOWTIME -eq 1) { - [System.Diagnostics.Stopwatch] $sw; - $sw = New-Object System.Diagnostics.StopWatch - if ($_ROSBE_WRITELOG -eq 1) { - if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) - } - $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" - $sw.Stop() - write-host "Total Build Time:" $sw.Elapsed.ToString() - } else { - $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" - $sw.Stop() - write-host "Total Build Time:" $sw.Elapsed.ToString() - } - } else { - if ($_ROSBE_WRITELOG -eq 1) { - if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) - } - IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" - } else { - IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" - } - } -} - -# -# Check if we are using -j or not. -# -if ($args[0] -eq "multi") { - $args.setvalue($null, 0) - $host.ui.RawUI.WindowTitle = "''makex $($args)'' parallel build started: $TIMERAW $ENV:ROS_ARCH" - BUILDMULTI $args -} else { - $host.ui.RawUI.WindowTitle = "''make $($args)'' build started: $TIMERAW $ENV:ROS_ARCH" - BUILD $args -} - -# # Highlight the fact that building has ended. -# "$_ROSBE_BASEDIR\Tools\flash.exe" - -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -10,9 +10,7 @@ $host.ui.RawUI.WindowTitle = "Cleaning..." function remlog { - # # Check if we have any logs to clean, if so, clean them. - # if (Test-Path "$_ROSBE_LOGDIR") { "Cleaning build logs..." $null = (Remove-Item -path "$_ROSBE_LOGDIR\*.txt" -force) @@ -23,55 +21,43 @@ } function rembin { - # # Check if we have something to clean, if so, clean it. - # - # # Apply modified obj and out paths for deletion. - # - - if ($ENV:ROS_ARCH -eq $null) { - $ENV:ROS_ARCH = "i386" - } if ($_ROSBE_OBJPATH -eq $null) { - $_ROSBE_OBJCLEANPATH = "$_ROSBE_ROSSOURCEDIR\obj-$ENV:ROS_ARCH" + $OBJCLEANPATH = "$_ROSBE_ROSSOURCEDIR\obj-$ENV:ROS_ARCH" } else { - $_ROSBE_OBJCLEANPATH = "$_ROSBE_OBJPATH" + $OBJCLEANPATH = "$_ROSBE_OBJPATH" } if ($_ROSBE_OUTPATH -eq $null) { - $_ROSBE_OUTCLEANPATH = "$_ROSBE_ROSSOURCEDIR\output-$ENV:ROS_ARCH" + $OUTCLEANPATH = "$_ROSBE_ROSSOURCEDIR\output-$ENV:ROS_ARCH" } else { - $_ROSBE_OUTCLEANPATH = "$_ROSBE_OUTPATH" + $OUTCLEANPATH = "$_ROSBE_OUTPATH" } if ($ENV:ROS_ARCH -eq "i386") { - $_ROSBE_MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto" + $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto" } else { - $_ROSBE_MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto" + $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto" } - if (Test-Path "$_ROSBE_MAKEFILE") { - $null = (Remove-Item "$_ROSBE_MAKEFILE" -force) + if (Test-Path "$MAKEFILE") { + $null = (Remove-Item "$MAKEFILE" -force) } - if (Test-Path "$_ROSBE_OBJCLEANPATH\.") { + if (Test-Path "$OBJCLEANPATH\.") { "Cleaning ReactOS $ENV:ROS_ARCH source directory..." - if (Test-Path "$_ROSBE_OBJCLEANPATH\.") { - $null = (Remove-Item "$_ROSBE_OBJCLEANPATH" -recurse -force) + if (Test-Path "$OBJCLEANPATH\.") { + $null = (Remove-Item "$OBJCLEANPATH" -recurse -force) } - if (Test-Path "$_ROSBE_OUTCLEANPATH\.") { - $null = (Remove-Item "$_ROSBE_OUTCLEANPATH" -recurse -force) + if (Test-Path "$OUTCLEANPATH\.") { + $null = (Remove-Item "$OUTCLEANPATH" -recurse -force) } "Done cleaning ReactOS $ENV:ROS_ARCH source directory." } else { "ERROR: There is no $ENV:ROS_ARCH compiler output to clean." - } - - if ($ENV:ROS_ARCH -eq "i386") { - $ENV:ROS_ARCH = $null } if (Test-Path "$_ROSBE_ROSSOURCEDIR\reactos") { @@ -85,9 +71,9 @@ # # Unload all used Vars. # - $_ROSBE_OBJCLEANPATH = $null - $_ROSBE_OUTCLEANPATH = $null - $_ROSBE_MAKEFILE = $null + $OBJCLEANPATH = $null + $OUTCLEANPATH = $null + $MAKEFILE = $null exit } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -10,15 +10,11 @@ $host.ui.RawUI.WindowTitle = "ReactOS Build Configurator" function settitle { - if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - } + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" exit } -# # Receive the first Parameter and decide what to do. -# if ($args[0] -eq "delete") { "config.rbuild will be permanently deleted. All your settings will be gone." "Continue?" @@ -57,16 +53,12 @@ settitle } -# # Check if config.rbuild already exists. If not, get a working copy. -# if (!(Test-Path "$ENV:APPDATA\RosBE\config.rbuild")) { copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" } -# # Help prevent non-useful bug reports/questions. -# "" "*** Configurations other than release/debug are not useful for ***" "*** posting bug reports, and generally not very useful for ***" @@ -77,10 +69,8 @@ $YESNO = Read-Host "(yes), (no)" if (($YESNO -ne "yes") -and ($YESNO -ne "y")) {settitle} -# # Check if config.template.rbuild is newer than config.rbuild, if it is then # inform the user and offer an update. -# if (Test-Path ".\config.rbuild") { if ((gi .\config.template.rbuild).LastWriteTime -gt (gi .\config.rbuild).LastWriteTime) { "" @@ -95,14 +85,10 @@ } } -# # Prepare XML Parser. -# [xml] $XML = get-content "$ENV:APPDATA\RosBE\config.rbuild" -# # Start with reading settings from config.rbuild and let the user edit them. -# "Sub-Architecture to build for." "Default is: none" "" @@ -246,9 +232,7 @@ } clear-host -# # Generate a config.rbuild, copy it to the Source Tree and delete temp files. -# $xml.group.property | ? { $_.Name -eq "SARCH" } | % { $_.Value = "$SARCH_CH"} $xml.group.property | ? { $_.Name -eq "OARCH" } | % { $_.Value = "$OARCH_CH"} $xml.group.property | ? { $_.Name -eq "TUNE" } | % { $_.Value = "$TUNE_CH"} @@ -263,9 +247,7 @@ $xml.save("$ENV:APPDATA\RosBE\config.rbuild") copy-item "$ENV:APPDATA\RosBE\config.rbuild" ".\config.rbuild" -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -7,9 +7,9 @@ # # -# # Check if we are displaying help on all commands, if so, display it. -# +# Otherwise check if we are displaying help on individual commands, if so, +# display the help for that command. if ("$args" -eq "") { "" "Available Commands:" @@ -73,13 +73,7 @@ "" exit -} - -# -# Now check if we are displaying help on individual commands, if so, -# display the help for that command. -# -if ("$args" -eq "make") { +} elseif ("$args" -eq "make") { " Usage: make [OPTIONS]" " Make does a standard build of ReactOS. OPTIONS are the standard ReactOS build" " options:" @@ -100,9 +94,7 @@ " and generates a new makefile. This will take a while." " ""module""-depends - Does a dependency check for one module with the" " appropiate name." - exit -} -if ("$args" -eq "makex") { +} elseif ("$args" -eq "makex") { " Usage: makex [OPTIONS]" " Same as 'make' but automatically determines the number of CPU Cores in the" " system and uses ""make -j x"" with the appropriate number. OPTIONS are the" @@ -127,42 +119,32 @@ " NOTE: The number makex uses can be modified by editing Build.cmd" " located in the RosBE directory, instructions for doing so are" " contained within the file." - exit -} -if ("$args" -eq "basedir") { +} elseif ("$args" -eq "basedir") { " Usage: basedir" " Switches back to the ReactOS source directory." - exit -} -if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { - if ("$args" -eq "charch") { +} elseif ("$args" -eq "charch") { + if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { " Usage: charch [OPTIONS]" " Change the Architecture to build ReactOS for, for the current RosBE session." " Possible Architectures are: i386, ppc, arm, amd64." "" - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { - if ("$args" -eq "chdefdir") { + } +} elseif ("$args" -eq "chdefdir") { + if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { " Usage: chdefdir [OPTIONS]" " Change the ReactOS source directory for the current RosBE session." "" " previous - Switch to the previous ReactOS source directory." - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { - if ("$args" -eq "chdefgcc") { + } +} elseif ("$args" -eq "chdefgcc") { + if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { " Usage: chdefgcc [PATH]" " Change the MinGW/GCC directory for the current RosBE session." "" " ""Path"" - Path to set the Host or Target GCC to." " ""Type"" - Set it to ""target"" or ""host""" - exit - } -} -if ("$args" -eq "clean") { + } +} elseif ("$args" -eq "clean") { " Usage: clean [logs]" " Fully clean the ReactOS source directory." "" @@ -170,10 +152,8 @@ " logs - Removes all build logs in the RosBE-Logs directory." " All other commands will be parsed as ""make COMMAND_clean"" and cleans the" " specific command." - exit -} -if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { - if ("$args" -eq "config") { +} elseif ("$args" -eq "config") { + if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { " Usage: config [OPTIONS]" " Creates a configuration file, which tells RosBE how to build the tree." "" @@ -181,16 +161,12 @@ " default settings." " update - Deletes the old created configuration file and updates it with a" " new, default one." - exit - } -} -if ("$args" -eq "help") { + } +} elseif ("$args" -eq "help") { " Usage: help [COMMAND]" " Shows help for the specified command or lists all available commands." - exit -} -if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { - if ("$args" -eq "raddr2line") { +} elseif ("$args" -eq "raddr2line") { + if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { " Usage: raddr2line [FILE] [ADDRESS]" " Translates program addresses into file names and line numbers to assist" " developers with finding specific bugs in ReactOS. If either of the options" @@ -202,17 +178,13 @@ " sub-directories are searched." " ADDRESS - The address to be translated." "" - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { - if ("$args" -eq "scut") { + } +} elseif ("$args" -eq "scut") { + if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { IEX "&'$_ROSBE_BASEDIR\Tools\scut.exe' --help" - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { - if ("$args" -eq "ssvn") { + } +} elseif ("$args" -eq "ssvn") { + if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { " Usage: ssvn [OPTIONS]" " Creates, updates or cleans up your ReactOS source tree or shows the revision" " number of the local and online trees." @@ -222,19 +194,15 @@ " create - Creates a new ReactOS source tree." " cleanup - Cleans up and fixes errors in the source tree." " status - Show the current local and online revision numbers." - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { - if ("$args" -eq "options") { + } +} elseif ("$args" -eq "options") { + if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { " Usage: options" " Starts the RosBE configurator and sets the changes active in the current." " RosBE session." - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { - if ("$args" -eq "update") { + } +} elseif ("$args" -eq "update") { + if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { " Usage: update [OPTIONS]" " Updates all files of RosBE to the most recent files." "" @@ -243,10 +211,7 @@ " 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 - } + } +} else { + " Unknown command specified. No help available for $args." } -if ("$args" -ne $null) { - " Unknown command specified. No help available for $args." - exit -} Removed: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 (removed) @@ -1,41 +1,0 @@ -# -# PROJECT: RosBE - ReactOS Build Environment for Windows -# LICENSE: GNU General Public License v2. (see LICENSE.txt) -# FILE: Root/MinGW.ps1 -# PURPOSE: This script provides/sets up a standard MinGW build environment. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> -# -# - -if ($args -ne "") { - cls - "Unknown parameter specified. Exiting." - exit -} - -(Get-Host).UI.RawUI.ForegroundColor = "Green" -(Get-Host).UI.RawUI.BackgroundColor = "Black" -clear-host -$ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" -$global:0 = $myInvocation.MyCommand.Definition -$global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) -$global:_ROSBE_MODE = "MinGW" -$global:_ROSBE_ORIGINALPATH = "$ENV:PATH" -$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" -$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386" - -& "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" -& "$_ROSBE_BASEDIR\version.ps1" - -# -# Get the number of CPUs in the system so we know how many jobs to execute. -$CPUCOUNT = (gwmi win32_processor).numberofcores + 1 - -if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { - set-alias CHDEFGCC "$_ROSBE_BASEDIR\chdefgcc.ps1" -scope Global -} -set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global -function global:MAKEX {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi"} -if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { - set-alias SCUT "$_ROSBE_BASEDIR\scut.ps1" -scope Global -} Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -8,32 +8,51 @@ # # -# +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + # Set defaults to work with and override them if edited by the options utility. -# (Get-Host).UI.RawUI.ForegroundColor = "Green" (Get-Host).UI.RawUI.BackgroundColor = "Black" clear-host +# For NT4 compatibility if ($ENV:APPDATA.Length -lt 1) { $ENV:APPDATA = $ENV:USERPROFILE } -$global:_ROSBE_VERSION = "1.4.2" + +# Set defaults to work with and override them if edited by +# the options utility. +if ("$ENV:ROS_ARCH" -eq "") { + set $ENV:ROS_ARCH = "i386" +} else { + set $ENV:ROS_ARCH = "$args[1]" +} + $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) -$global:_ROSBE_MODE = "RosBE" +$global:_ROSBE_VERSION = "1.4.2" $global:_ROSBE_ROSSOURCEDIR = "$pwd" -$global:_ROSBE_ORIGINALPATH = "$ENV:PATH" $global:_ROSBE_SHOWTIME = 1 $global:_ROSBE_WRITELOG = 1 $global:_ROSBE_USECCACHE = 0 $global:_ROSBE_STRIP = 0 $global:_ROSBE_NOSTRIP = 0 +$global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs" +$global:_ROSBE_OBJPATH = $null +$global:_ROSBE_OUTPATH = $null $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386" -$global:_ROSBE_LOGDIR = "$_ROSBE_ROSSOURCEDIR\RosBE-Logs" -$global:_ROSBE_OBJPATH = $null -$global:_ROSBE_OUTPATH = $null +$global:_ROSBE_ORIGINALPATH = "$ENV:PATH" +$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" + +# Get the number of CPUs in the system so we know how many jobs to execute. +# To modify the number used, see the cpucount usage for getting to know about the possible options +$_ROSBE_MAKEX_JOBS = (gwmi win32_processor).numberofcores + 1 + +$ENV:CCACHE_DIR = "$ENV:APPDATA\RosBE\.ccache" +$ENV:C_INCLUDE_PATH = $null +$ENV:CPLUS_INCLUDE_PATH = $null +$ENV:LIBRARY_PATH = $null function global:Get-WebFile { param( @@ -46,28 +65,8 @@ $local:ErrorActionPreference = "Continue" } -# -# Display the banner and set up the environment for the GCC 4.x.x build -# environment. -# -function RosBE { - "*******************************************************************************" - "* *" - "* ReactOS Build Environment $_ROSBE_VERSION *" - "* *" - "*******************************************************************************" - "" - # - # Set the correct path for the build tools and set the MinGW make. - # - & "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" -} - -# # Load the doskey macros and delete any macros for components # that are not actually present. -# - function LoadAliases { function global:BASEDIR { set-location "$_ROSBE_ROSSOURCEDIR" @@ -118,68 +117,55 @@ } } -# # Check if RosBE data directory exists, if not, create it. -# if (!(Test-Path "$ENV:APPDATA\RosBE")) { New-Item -path "$ENV:APPDATA" -name "RosBE" -type directory } -# -# Check if the user has used the options utility and if so, load their options. -# +# Load the user's options if any if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { & "$ENV:APPDATA\RosBE\rosbe-options.ps1" } -# arch specific settings. if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$args.ps1") { & "$ENV:APPDATA\RosBE\rosbe-options-$args.ps1" } -$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Check if we are using oldmode or if any unknown parameters were specified. -# -if ($args.count -gt 0) { - if ($args -eq "oldmode") { - clear-host - $_ROSBE_MODE = "MinGW" - } else { - clear-host - $_ROSBE_ARCH = $args +# Check if writing logs is enabled, if so check if our log directory +# exists, if it doesn't, create it. +if ($_ROSBE_WRITELOG -eq 1) { + if (!(Test-Path "$_ROSBE_LOGDIR")) { + New-Item -path "$_ROSBE_LOGDIR" -type directory } } -RosBE -# -# Load the base directory from srclist.txt and set it as the new source -# directory. -# +# Load the doskey macros that serve as our commands. +LoadAliases + +& "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" + +clear-screen +"*******************************************************************************" +"* *" +"* ReactOS Build Environment $_ROSBE_VERSION *" +"* *" +"*******************************************************************************" +"" + +# Load the base directory from srclist.txt and set it as the +# new source directory. if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { & "$_ROSBE_BASEDIR\scut.ps1" } -# # Tell how to display the available commands. -# "" "For a list of all included commands, type: ""help""" "-------------------------------------------------" "" -# IEX "'$_ROSBE_BASEDIR\sSVN.ps1' status" -# "" -# -# Load the doskey macros that serve as our commands. -# -LoadAliases - -# -# Look if the ReactOS source directory is empty. If so, inform the user and -# mention 'ssvn create' (only if ssvn is installed). -# +# Look if the ReactOS source directory is empty. If so, +# inform the user and mention 'ssvn create' (only if ssvn is installed). if (!(Test-Path "$_ROSBE_BASEDIR\sSVN.ps1")) { if ((get-childitem $_ROSBE_ROSSOURCEDIR).Count -le 0) { "No ReactOS source detected. Please use ""ssvn create"" to download it." Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -8,47 +8,29 @@ $host.ui.RawUI.WindowTitle = "Change the Architecture to build for..." -# -# Parse the command line arguments. -# ROSBE_ARCH: Default is i386, can be set to amd64, ppc or arm. -# - -# -# Refresh all needed Params by recalling the main Path setting CMD File. -# -function SYSPARAM { - - # arch specific settings. - if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1") { - IEX "& '$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1'" - } - - IEX "& '$_ROSBE_BASEDIR\rosbe-gcc-env.ps1'" - version -} if ($args.count -eq 0) { - # - # If Parameters were set, parse them, if not, ask the user to add them. - # - $_1 = Read-Host "Please enter a Architecture you want to build ReactOS for: " - if ($_1.length -eq 0) { + # Parse the command line arguments. + $ARCH = Read-Host "Please enter a Architecture you want to build ReactOS for: " + if ($ARCH.length -eq 0) { "ERROR: You must enter a Architecture." } } else { - $_1 = $args + $ARCH = $args } -if ($_1 -eq "i386") { - $_ROSBE_ARCH = $null -} else { - $_ROSBE_ARCH = $_1 + +# Modify ROS_ARCH for the current environment +$ENV:ROS_ARCH = $ARCH + +# Refresh all needed Params by recalling the main Path setting CMD File. +if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1") { + IEX "& '$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1'" } -SYSPARAM -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +chdefgcc $ENV:ROS_ARCH target + +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. # -$_1 = $null +$ARCH = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -10,36 +10,28 @@ $host.ui.RawUI.WindowTitle = "Change the current working ReactOS source directory..." -# # Parse the command line arguments. -# if ($args.count -eq 0) { - # - # If Parameters were set, parse them, if not, ask the user to add them. - # - $_1 = Read-Host "Please enter a ReactOS source directory, or 'previous': " - if ($_1.length -eq 0) { + $SOURCEDIR = Read-Host "Please enter a ReactOS source directory, or 'previous': " + if ($SOURCEDIR.length -eq 0) { "ERROR: You must enter a ReactOS source directory, or 'previous'." } } else { - $_1 = $args + $SOURCEDIR = $args } -if ($_1 -eq "previous") { +if ($SOURCEDIR -eq "previous") { pop-location } else { - if (!(Test-Path "$_1\.")) { + if (!(Test-Path "$SOURCEDIR\.")) { "ERROR: The path specified doesn't seem to exist." - } - push-location "$_1" + push-location "$SOURCEDIR" } + $global:_ROSBE_ROSSOURCEDIR = "$pwd" - -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. # -$_1 = $null +$SOURCEDIR = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -6,61 +6,57 @@ # COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # -if ($_ROSBE_MODE -eq "RosBE") { - $host.ui.RawUI.WindowTitle = "Change the current MinGW/GCC Host/Target directory..." -} +$host.ui.RawUI.WindowTitle = "Change the current MinGW/GCC Host/Target directory..." function settitle { - if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - } + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" exit } function EOA { - IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.cmd' chdefgcc" + IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.cmd'" + version settitle - version } -# -# Parse the command line arguments. -# -$_1 = $args[0] -$_2 = $args[1] -if ($_1 -eq $null) { - $_1 = Read-Host "Please enter a MinGW/GCC directory (don't use quotes): " - if ($_1.length -eq 0) { +# Parse the command line arguments. Ask the user if certain parameters are missing. +$TOOLPATH = $args[0] +$TOOLMODE = $args[1] +if ($TOOLPATH -eq $null) { + $TOOLPATH = Read-Host "Please enter a MinGW/GCC directory (don't use quotes): " + if ($TOOLPATH.length -eq 0) { "ERROR: You must enter a MinGW/GCC directory." settitle } } -if ($_2 -eq $null) { - $_2 = Read-Host "Please specify, if this will be the Target or Host GCC: " - if ($_2.length -eq 0) { +if ($TOOLMODE -eq $null) { + $TOOLMODE = Read-Host "Please specify, if this will be the Target or Host GCC: " + if ($TOOLMODE.length -eq 0) { "ERROR: You must enter ""target"" or ""host""." settitle } } -if (Test-Path "$_ROSBE_BASEDIR\$_1\.") { - $_1 = "$_ROSBE_BASEDIR\$_1" -} elseif (!(Test-Path "$_1\.")) { + +# Verify the entered values +if (Test-Path "$_ROSBE_BASEDIR\$TOOLPATH\.") { + $TOOLPATH = "$_ROSBE_BASEDIR\$TOOLPATH" +} elseif (!(Test-Path "$TOOLPATH\.")) { "ERROR: The path specified doesn't seem to exist." settitle } -if (!(Test-Path "$_1\bin\*gcc.exe")) { +if (!(Test-Path "$TOOLPATH\bin\*gcc.exe")) { "ERROR: No MinGW/GCC found in the specified path." settitle } -if ($_2 -eq "target") { - $_ROSBE_TARGET_MINGWPATH = $_1 +# Set the values +if ($TOOLMODE -eq "target") { + $_ROSBE_TARGET_MINGWPATH = $TOOLPATH "Target Location: $_ROSBE_TARGET_MINGWPATH" EOA -} -if ($_2 -eq "host") { - $_ROSBE_HOST_MINGWPATH = $_1 +} elseif ($TOOLMODE -eq "host") { + $_ROSBE_HOST_MINGWPATH = $TOOLPATH "Host Location: $_ROSBE_HOST_MINGWPATH" EOA } else { @@ -71,5 +67,5 @@ # # Unload all used Vars. # -$_1 = $null -$_2 = $null +$TOOLPATH = $null +$TOOLMODE = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -18,9 +18,7 @@ $cfgfile="$ENV:APPDATA\RosBE\rosbe-options.cmd" } -# # Run options.exe -# if (Test-Path "$options") { Push-Location "$_ROSBE_BASEDIR" @@ -33,9 +31,7 @@ "ERROR: options executable was not found." } -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" $options = $null $cfgfile = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -9,69 +9,48 @@ $host.ui.RawUI.WindowTitle = "reladdr2line..." -# -# Check if the user supplied a path, if they didn't look for -# the specified file in the current directory and any -# sub-directories. -# -function CHECKPATH { - if ($_1.Contains("\")) { - $_1 = get-childitem "$_1\*" -name -recurse 2>NUL | select-string "$_1" +# Receive all parameters. +$FILEPATH = $args[0] +$ADDRESS = $args[1] +if ($args.length -lt 1) { + if ($FILEPATH -eq $null) { + $FILEPATH = Read-Host "Please enter the path/file to be examined: " + if ($FILEPATH.Contains("\")) { + $FILEPATH = get-childitem "$FILEPATH\*" -name -recurse 2>NUL | select-string "$FILEPATH" + } + } +} +elseif ($args.length -lt 2) { + if ($ADDRESS -eq $null) { + $ADDRESS = Read-Host "Please enter the address you would like to analyze: " } } -# -# Receive the Parameters and decide what to do. -# -$_1 = $args[0] -$_2 = $args[1] -if ($args.length -gt 2) { - "ERROR: Too many parameters specified." -} -elseif ($args.length -lt 1) { - if ($_1 -eq $null) { - $_1 = Read-Host "Please enter the path/file to be examined: " - CHECKPATH - } -} -elseif ($args.length -lt 2) { - if ($_2 -eq $null) { - $_2 = Read-Host "Please enter the address you would like to analyze: " - } -} - -# -# 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. -# -if ($_1 -eq $null) { +# Check if parameters were really given +if ($FILEPATH -eq $null) { "ERROR: You must specify a path/file to examine." } -if ($_2 -eq $null) { +if ($ADDRESS -eq $null) { "ERROR: You must specify a address to analyze." } -$baseaddr = (objdump -p $_1 | select-string "ImageBase").tostring().split() +$baseaddr = (objdump -p $FILEPATH | select-string "ImageBase").tostring().split() $baseaddr = "0x" + ($baseaddr.get($baseaddr.length - 1)) -if ($baseaddr -lt $_2) { - IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$_1' '$_2'" +if ($baseaddr -lt $ADDRESS) { + IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$FILEPATH' '$ADDRESS'" } else { - $baseaddr = ($baseaddr | % {[Convert]::ToInt32($_,16)}) + ($_2 | % {[Convert]::ToInt32($_,16)}) + $baseaddr = ($baseaddr | % {[Convert]::ToInt32($_,16)}) + ($ADDRESS | % {[Convert]::ToInt32($_,16)}) $relbase = "0x" + ("{0:X}" -f $baseaddr) - IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$_1' '$relbase'" + IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$FILEPATH' '$relbase'" } -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. # -$_1 = $null -$_2 = $null +$FILEPATH = $null +$ADDRESS = $null $baseaddr = $null $relbase = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -7,105 +7,24 @@ # # -# -# Check if we are running within the RosBE, and if not initialize GCC for the -# current directory. -# -if ($_ROSBE_HOST_MINGWPATH -eq $null) { - $_ROSBE_MODE = "MinGW" - $_ROSBE_HOST_MINGWPATH = "$pwd" - $_ROSBE_ORIGINALPATH = "$ENV:PATH" +# Check if we're switching to the AMD64 architecture +if ("$ENV:ROS_ARCH" -eq "amd64") { + $ENV:ROS_PREFIX = "x86_64-pc-mingw32-" +} else { + $ENV:ROS_PREFIX = $null } +$ENV:PATH = "$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" -# -# Set the Arch Variables -# - -$ENV:ROS_ARCH = $null -$ENV:ROS_PREFIX = $null -$_ROSBE_OBJPATH = "$_ROSBE_i386_OBJPATH" -$_ROSBE_OUTPATH = "$_ROSBE_i386_OUTPATH" - - -if ($_ROSBE_ARCH -ne $null) { - $ENV:ROS_ARCH = $_ROSBE_ARCH - $ENV:ROS_PREFIX = "$_ROSBE_ARCH-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$_ROSBE_ARCH" - - # HAXX - if ($_ROSBE_ARCH -eq "arm") { - $_ROSBE_OBJPATH = "$_ROSBE_ARM_OBJPATH" - $_ROSBE_OUTPATH = "$_ROSBE_ARM_OUTPATH" - } - if ($_ROSBE_ARCH -eq "ppc") { - $_ROSBE_OBJPATH = "$_ROSBE_PPC_OBJPATH" - $_ROSBE_OUTPATH = "$_ROSBE_PPC_OUTPATH" - } - if ($_ROSBE_ARCH -eq "amd64") { - $_ROSBE_OBJPATH = "$_ROSBE_AMD64_OBJPATH" - $_ROSBE_OUTPATH = "$_ROSBE_AMD64_OUTPATH" - $ENV:ROS_PREFIX = "x86_64-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\x86_64" - } - - # Check if existant arch - - if (Test-Path "$_ROSBE_TARGET_MINGWPATH\.") { - "Unsupported arch specified. Fallback to Default." - pause - $_ROSBE_OBJPATH = "$_ROSBE_i386_OBJPATH" - $_ROSBE_OUTPATH = "$_ROSBE_i386_OUTPATH" - $ENV:ROS_ARCH = $null - $ENV:ROS_PREFIX = $null - $_ROSBE_TARGET_MINGWPATH = $null - } -} - -# -# Set up the GCC 4.x.x build environment. -# -$ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" -$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" - -if ($ENV:ROS_ARCH -ne $null) { - & "$ENV:ROS_PREFIX-gcc" -v 2> gcctvers.tmp - $global:_ROSBE_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' - $global:_ROSBE_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' -} else { - gcc -v 2> gcctvers.tmp - $global:_ROSBE_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' - $global:_ROSBE_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' -} +& "$ENV:ROS_PREFIXgcc" -v 2> gcctvers.tmp +$global:_ROSBE_TARGET_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' +$global:_ROSBE_TARGET_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' gcc -v 2> gcchvers.tmp $global:_ROSBE_HOST_GCCVERSION = (select-string -path .\gcchvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' $global:_ROSBE_HOST_GCCTARGET = (select-string -path .\gcchvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' remove-item gcchvers.tmp -if ($_ROSBE_MODE -eq "MinGW") { - $ENV:C_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" - $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" - $ENV:ROSBE_HOST_CFLAGS = $null - $ENV:ROSBE_HOST_CXXFLAGS = $null - $ENV:ROSBE_TARGET_CFLAGS = $null - $ENV:ROSBE_TARGET_CXXFLAGS = $null -} else { - $ENV:C_INCLUDE_PATH = $null - $ENV:CPLUS_INCLUDE_PATH = $null - $ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" - $ENV:ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" - $ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" - $ENV:ROSBE_TARGET_CXXFLAGS = "-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:ROSBE_HOST_CFLAGS = $null - $ENV:ROSBE_HOST_CXXFLAGS = $null - $ENV:ROSBE_TARGET_CFLAGS = $null - $ENV:ROSBE_TARGET_CXXFLAGS = $null -} +$ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" +$ENV:ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" +$ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" +$ENV:ROSBE_TARGET_CXXFLAGS = "-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""" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -47,16 +47,12 @@ } } -# # Receive the first parameter and decide what to do. -# if ($args[0] -eq $null) { "No parameter specified. Try 'help [COMMAND]'." } -# # These two are directly parsed to svn. -# elseif ($args[0] -eq "update") { $host.ui.RawUI.WindowTitle = "SVN Updating..." "This might take a while, so please be patient." @@ -71,9 +67,7 @@ IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' cleanup" } -# # Check if the folder is empty. If not, output an error. -# elseif ($args[0] -eq "create") { $host.ui.RawUI.WindowTitle = "SVN Creating..." if (Test-Path ".svn\.") { @@ -88,10 +82,8 @@ } } -# # Output the revision of the local and online trees and tell the user if # its up to date or not. -# elseif ($args[0] -eq "status") { $host.ui.RawUI.WindowTitle = "SVN Status" "This might take a while, so please be patient." @@ -104,9 +96,7 @@ "Unknown parameter specified. Try 'help ssvn'." } -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -33,9 +33,7 @@ elseif ($args[0] -eq "--help") {paramcall($args)} else {parse($args)} -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -7,16 +7,11 @@ # # -# -# Set Title -# $host.ui.RawUI.WindowTitle = "Updating..." function EOC { set-location "$_ROSBE_OPATH" - if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - } + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" exit } @@ -64,14 +59,10 @@ } } -# # The Update Server. -# -$_ROSBE_URL = "http://danielreimer.5x.to/rosbe" +$_ROSBE_URL = "http://dreimer.dr.funpic.org/rosbe" -# # Save the recent dir to cd back there at the end. -# $_ROSBE_OPATH = "$pwd" if (!(Test-Path "$_ROSBE_BASEDIR\Tools\7z.exe")) { @@ -82,9 +73,7 @@ set-location $_ROSBE_BASEDIR -# # First check for a new Updater. -# rename-item update.ps1 update2.ps1 get-webfile $_ROSBE_URL/update.ps1 $PWD\update.ps1 if ((gi .\update.ps1).LastWriteTime -gt (gi .\update2.ps1).LastWriteTime) { @@ -96,15 +85,15 @@ remove-item update.ps1 -force rename-item update2.ps1 update.ps1 } -# # Get to the Updates Subfolder. -# if (!(Test-Path "$ENV:APPDATA\RosBE\Updates")) {New-Item -path "$ENV:APPDATA\RosBE" -name "Updates" -type directory} set-location "$ENV:APPDATA\RosBE\Updates" -# # Parse the args. -# + +$arg1 = $args[0] +$arg2 = $args[1] + if ("$args" -eq "") { $_ROSBE_MULTIUPD = 1 $_ROSBE_STATCOUNT = 1 @@ -112,27 +101,17 @@ UPDCHECK $_ROSBE_STATCOUNT += 1 } - EOC -} -if ("$args" -eq "reset") { +} elseif ("$args" -eq "reset") { remove-item "$ENV:APPDATA\RosBE\Updates\*.*" -force -recurse -EA SilentlyContinue remove-item "$ENV:APPDATA\RosBE\Updates\tmp\*.*" -force -recurse -EA SilentlyContinue - EOC -} -$arg1 = $args[0] -$arg2 = $args[1] -if ("$arg1" -eq "nr") { +} elseif ("$arg1" -eq "nr") { $_ROSBE_STATCOUNT = $arg2 UPDCHECK - EOC -} -if ("$arg1" -eq "delete") { +} elseif ("$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") { +} elseif ("$arg1" -eq "info") { $_ROSBE_STATCOUNT = $arg2 set-location tmp if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { @@ -145,11 +124,7 @@ } set-location .. remove-item "tmp\*.*" -force -EA SilentlyContinue - EOC -} -$arg1 = $null -$arg2 = $null -if ("$args" -eq "status") { +} elseif ("$args" -eq "status") { $_ROSBE_STATCOUNT = 1 if (!(test-path "tmp")) {New-Item -name "tmp" -type directory} copy-item *.txt .\tmp\. @@ -170,13 +145,12 @@ } else { "RosBE is up to Date." } - EOC -} -if ("$args" -ne "") { +} else { "Unknown parameter specified. Try 'help update'." - EOC } +$arg1 = $null +$arg2 = $null $_ROSBE_UPDFINISH = $null $_ROSBE_OPATH = $null $_ROSBE_UPDDATE = $null @@ -184,3 +158,4 @@ $_ROSBE_UPDDATE2 = $null $_ROSBE_MULTIUPD = $null $_ROSBE_STATCOUNT = $null +EOC Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -8,40 +8,24 @@ (get-WmiObject Win32_OperatingSystem).caption +# GCC (select-string -path .\gcctvers.tmp "gcc version") -replace ".*: (.+?)\b",'$1' | % { $str = $_ -replace '^.*14:',''} $str "gcc target - $_ROSBE_GCCTARGET" remove-item gcctvers.tmp -if ($ENV:ROS_ARCH -ne $null) { - & "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-ld" -v -} else { - & ld -v -} +# LD +& "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIXld" -v + +# NASM or YASM if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\nasm.exe") { & nasm -v } else { - if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\yasm.exe") { - & yasm --version | select-string "yasm 0" - } else { - if ($_ROSBE_MODE -eq "RosBE") { - "ERROR: NASM or YASM is required to build ReactOS, none was found in the current MinGW/GCC." - } - } + & yasm --version | select-string "yasm 0" } -if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\bison.exe") { - & bison '--version' | select-string "GNU Bison" -} else { - if ($_ROSBE_MODE -eq "RosBE") { - "WARNING: Bison will soon be required to build ReactOS, none was found in the current MinGW/GCC." - } -} -if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\flex.exe") { - $fver = (& flex '--version') -replace ".*version ((\d|\.)+).*",'$1' - "flex $fver" -} else { - if ($_ROSBE_MODE -eq "RosBE") { - "WARNING: Flex will soon be required to build ReactOS, none was found in the current MinGW/GCC." - } -} + +# Bison, Flex and Make +& bison '--version' | select-string "GNU Bison" +$fver = (& flex '--version') -replace ".*version ((\d|\.)+).*",'$1' +"flex $fver" & mingw32-make -v | & find "GNU Make"

1 0

[cgutman] 40881: - Don't cast NDIS_SPIN_LOCK directly to KSPIN_LOCK
by cgutman＠svn.reactos.org 10 May '09

10 May '09

Author: cgutman Date: Mon May 11 03:55:45 2009 New Revision: 40881 URL: http://svn.reactos.org/svn/reactos?rev=40881&view=rev Log: - Don't cast NDIS_SPIN_LOCK directly to KSPIN_LOCK Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Mon May 11 03:55:45 2009 @@ -17,7 +17,7 @@ IN ULONG Increment, IN PNDIS_SPIN_LOCK SpinLock) { - ExInterlockedAddUlong ( Addend, Increment, (PKSPIN_LOCK)SpinLock ); + ExInterlockedAddUlong ( Addend, Increment, &SpinLock->SpinLock ); } @@ -32,7 +32,7 @@ IN PLIST_ENTRY ListEntry, IN PNDIS_SPIN_LOCK SpinLock) { - return ExInterlockedInsertHeadList ( ListHead, ListEntry, (PKSPIN_LOCK)SpinLock ); + return ExInterlockedInsertHeadList ( ListHead, ListEntry, &SpinLock->SpinLock ); } @@ -47,7 +47,7 @@ IN PLIST_ENTRY ListEntry, IN PNDIS_SPIN_LOCK SpinLock) { - return ExInterlockedInsertTailList ( ListHead, ListEntry, (PKSPIN_LOCK)SpinLock ); + return ExInterlockedInsertTailList ( ListHead, ListEntry, &SpinLock->SpinLock ); } @@ -61,7 +61,7 @@ IN PLIST_ENTRY ListHead, IN PNDIS_SPIN_LOCK SpinLock) { - return ExInterlockedRemoveHeadList ( ListHead, (PKSPIN_LOCK)SpinLock ); + return ExInterlockedRemoveHeadList ( ListHead, &SpinLock->SpinLock ); } typedef struct _NDIS_HANDLE_OBJECT

1 0

[cgutman] 40880: - Allocate space for the packet extension located at NdisPacketOobOffset + sizeof(NDIS_PACKET_OOB_DATA) - Fixes more packet corruption
by cgutman＠svn.reactos.org 10 May '09

10 May '09

Author: cgutman Date: Mon May 11 01:43:55 2009 New Revision: 40880 URL: http://svn.reactos.org/svn/reactos?rev=40880&view=rev Log: - Allocate space for the packet extension located at NdisPacketOobOffset + sizeof(NDIS_PACKET_OOB_DATA) - Fixes more packet corruption Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Mon May 11 01:43:55 2009 @@ -428,7 +428,9 @@ Temp->Private.Pool = Pool; Temp->Private.ValidCounts = TRUE; Temp->Private.NdisPacketFlags = fPACKET_ALLOCATED_BY_NDIS; - Temp->Private.NdisPacketOobOffset = Pool->PacketLength - sizeof(NDIS_PACKET_OOB_DATA); + Temp->Private.NdisPacketOobOffset = Pool->PacketLength - + (sizeof(NDIS_PACKET_OOB_DATA) + + sizeof(NDIS_PACKET_EXTENSION)); *Packet = Temp; *Status = NDIS_STATUS_SUCCESS; @@ -507,7 +509,8 @@ NumberOfDescriptors = 0xffff; } - Length = sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) + ProtocolReservedLength; + Length = sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) + + sizeof(NDIS_PACKET_EXTENSION) + ProtocolReservedLength; Size = sizeof(NDISI_PACKET_POOL) + Length * NumberOfDescriptors; Pool = ExAllocatePool(NonPagedPool, Size); @@ -712,7 +715,9 @@ Temp->Private.Pool = Pool; Temp->Private.ValidCounts = TRUE; Temp->Private.NdisPacketFlags = fPACKET_ALLOCATED_BY_NDIS; - Temp->Private.NdisPacketOobOffset = Pool->PacketLength - sizeof(NDIS_PACKET_OOB_DATA); + Temp->Private.NdisPacketOobOffset = Pool->PacketLength - + (sizeof(NDIS_PACKET_OOB_DATA) + + sizeof(NDIS_PACKET_EXTENSION)); *Packet = Temp; *Status = NDIS_STATUS_SUCCESS; @@ -762,7 +767,9 @@ Temp->Private.Pool = Pool; Temp->Private.ValidCounts = TRUE; Temp->Private.NdisPacketFlags = fPACKET_ALLOCATED_BY_NDIS; - Temp->Private.NdisPacketOobOffset = Pool->PacketLength - sizeof(NDIS_PACKET_OOB_DATA); + Temp->Private.NdisPacketOobOffset = Pool->PacketLength - + (sizeof(NDIS_PACKET_OOB_DATA) + + sizeof(NDIS_PACKET_EXTENSION)); *Packet = Temp; *Status = NDIS_STATUS_SUCCESS;

1 0

[dgoette] 412: now unload rich text editors, when loading a new entry table in general
by dgoette＠svn.reactos.org 10 May '09

10 May '09

Author: dgoette Date: Sun May 10 23:58:22 2009 New Revision: 412 URL: http://svn.reactos.org/svn/reactos?rev=412&view=rev Log: now unload rich text editors, when loading a new entry table in general Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] Sun May 10 23:58:22 2009 @@ -1468,6 +1468,9 @@ // page table main case 'ptm': buildEntryTable(http_request, objid); + + // stop richt text editors + rtestop(); break; // main edit frame @@ -1530,6 +1533,7 @@ http_request.setRequestHeader("Content-length", parameters.length); http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache http_request.setRequestHeader("Connection", "close"); + http_request.setRequestHeader("Accept-Charset","UTF-8"); http_request.send(parameters); } else { @@ -1811,9 +1815,6 @@ window.clearTimeout(autosave_timer); autosave_cache = ''; - - // stop richt text editors - rtestop(); if (document.getElementById('smenutab'+objid.substring(8)).className !== 'lmItemTopSelected') { highlightTab(objid);

1 0

[dgoette] 411: add missing style class
by dgoette＠svn.reactos.org 10 May '09

10 May '09

Author: dgoette Date: Sun May 10 23:32:03 2009 New Revision: 411 URL: http://svn.reactos.org/svn/reactos?rev=411&view=rev Log: add missing style class Modified: branches/danny-web/www/www.reactos.org/style.css Modified: branches/danny-web/www/www.reactos.org/style.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/style.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/style.css [iso-8859-1] Sun May 10 23:32:03 2009 @@ -442,3 +442,13 @@ font-size: 10px; color: #367d10; } + + +/* Quotes */ +.catchyquotes { + font-family: Georgia, "Times New Roman", Times, serif; + font-style: italic; + font-size: 24px; +} + +

1 0

[dreimer] 40879: Get the installer in sync with Colin's recent changes. TBD: Sync the PS Scripts too.
by dreimer＠svn.reactos.org 10 May '09

10 May '09

Author: dreimer Date: Sun May 10 23:26:40 2009 New Revision: 40879 URL: http://svn.reactos.org/svn/reactos?rev=40879&view=rev Log: Get the installer in sync with Colin's recent changes. TBD: Sync the PS Scripts too. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sun May 10 23:26:40 2009 @@ -120,8 +120,8 @@ File /r Root\changelog.txt File /r Root\LICENSE.txt ${If} $R4 = '6.1' - File /r Components\Powershell\MinGW.ps1 File /r Components\Powershell\Build.ps1 + File /r Components\Powershell\charch.ps1 File /r Components\Powershell\chdefgcc.ps1 File /r Components\Powershell\Clean.ps1 File /r Components\Powershell\Help.ps1 @@ -130,9 +130,8 @@ File /r Components\Powershell\version.ps1 WriteRegStr HKLM "Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" ${else} - File /r Root\MinGW.cmd - File /r Root\MinGW.mac File /r Root\Build.cmd + File /r Root\charch.cmd File /r Root\chdefgcc.cmd File /r Root\Clean.cmd File /r Root\Help.cmd @@ -140,6 +139,7 @@ File /r Root\RosBE.mac File /r Root\rosbe-gcc-env.cmd File /r Root\TimeDate.cmd + File /r Root\TranslateOptions.cmd File /r Root\version.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try @@ -296,8 +296,6 @@ ${If} $R4 = '6.1' SetOutPath "$INSTDIR" SetOverwrite try - File /r Root\MinGW.cmd - File /r Root\MinGW.mac File /r Root\Build.cmd File /r Root\chdefgcc.cmd File /r Root\Clean.cmd @@ -306,6 +304,7 @@ File /r Root\RosBE.mac File /r Root\rosbe-gcc-env.cmd File /r Root\TimeDate.cmd + File /r Root\TranslateOptions.cmd File /r Root\version.cmd File /r Root\charch.cmd File /r Root\chdefdir.cmd @@ -327,7 +326,6 @@ SetOutPath "$INSTDIR" SetOverwrite try File /r Components\Powershell\Build.ps1 - File /r Components\Powershell\MinGW.ps1 File /r Components\Powershell\RosBE.ps1 File /r Components\Powershell\rosbe-gcc-env.ps1 File /r Components\Powershell\Help.ps1 @@ -360,17 +358,11 @@ CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - IfFileExists "$INSTDIR\MinGW.cmd" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" - IfFileExists "$INSTDIR\MinGW.ps1" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\MinGW.ps1'" "$INSTDIR\mingw.ico" - - SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ - "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" \ - "$INSTDIR\README.pdf" + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ + "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" \ + "$INSTDIR\README.pdf" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd @@ -386,12 +378,6 @@ CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$DESKTOP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" - - SetOutPath $PROFILE - IfFileExists "$INSTDIR\MinGW.cmd" 0 +2 - CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" - IfFileExists "$INSTDIR\MinGW.ps1" 0 +2 - CreateShortCut "$DESKTOP\Standard MinGW Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\MinGW.ps1'" "$INSTDIR\mingw.ico" SectionEnd Section /o "Quick Launch Shortcuts" SEC14 @@ -406,12 +392,6 @@ CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" - - SetOutPath $PROFILE - IfFileExists "$INSTDIR\MinGW.cmd" 0 +2 - CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" - IfFileExists "$INSTDIR\MinGW.ps1" 0 +2 - CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\MinGW.ps1'" "$INSTDIR\mingw.ico" SectionEnd Section -Post SEC15 @@ -452,12 +432,8 @@ IDNO +9 Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" - Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - Powershell.lnk" Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" - Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment - Powershell.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment - Powershell.lnk" FunctionEnd Section Uninstall @@ -482,8 +458,6 @@ Delete /REBOOTOK "$INSTDIR\Config.ps1" Delete /REBOOTOK "$INSTDIR\Help.cmd" Delete /REBOOTOK "$INSTDIR\Help.ps1" - Delete /REBOOTOK "$INSTDIR\MinGW.cmd" - Delete /REBOOTOK "$INSTDIR\MinGW.ps1" Delete /REBOOTOK "$INSTDIR\options.cmd" Delete /REBOOTOK "$INSTDIR\options.ps1" Delete /REBOOTOK "$INSTDIR\reladdr2line.cmd" @@ -497,13 +471,13 @@ Delete /REBOOTOK "$INSTDIR\sSVN.cmd" Delete /REBOOTOK "$INSTDIR\sSVN.ps1" Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" + Delete /REBOOTOK "$INSTDIR\TranslateOptions.cmd" Delete /REBOOTOK "$INSTDIR\update.cmd" Delete /REBOOTOK "$INSTDIR\update.ps1" Delete /REBOOTOK "$INSTDIR\README.pdf" Delete /REBOOTOK "$INSTDIR\rosbe.ico" Delete /REBOOTOK "$INSTDIR\mingw.ico" Delete /REBOOTOK "$INSTDIR\uninstall.ico" - Delete /REBOOTOK "$INSTDIR\MinGW.mac" Delete /REBOOTOK "$INSTDIR\RosBE.mac" Delete /REBOOTOK "$INSTDIR\ChangeLog.txt" Delete /REBOOTOK "$INSTDIR\LICENSE.txt" Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Sun May 10 23:26:40 2009 @@ -126,9 +126,9 @@ SectionEnd Section -MinGWGCCNASM SEC02 - SetOutPath "$INSTDIR\x86_64" + SetOutPath "$INSTDIR\amd64" SetOverwrite try - File /r Components\x86_64\*.* + File /r Components\amd64\*.* SectionEnd Section -StartMenuShortcuts SEC03

1 0

[cfinck] 40878: RosBE-Windows spring cleaning: - Rewrite most of the RosBE-Windows CMD scripts resulting in more compact and cleaner code - Remove the Standard MinGW Build Environment. We don't need it any longer since we have a new GCC - Get rid of the GCC 3.4.5-specific hacks: A properly compiled GCC 3.4.5 shouldn't need them. I've uploaded two GCC 3.4.5 packages for testing to http://reactos.colinfinck.de/. Testers, who often dig into old revisions, shall please try whether the current script
by cfinck＠svn.reactos.org 10 May '09

10 May '09

Author: cfinck Date: Sun May 10 22:47:10 2009 New Revision: 40878 URL: http://svn.reactos.org/svn/reactos?rev=40878&view=rev Log: RosBE-Windows spring cleaning: - Rewrite most of the RosBE-Windows CMD scripts resulting in more compact and cleaner code - Remove the Standard MinGW Build Environment. We don't need it any longer since we have a new GCC - Get rid of the GCC 3.4.5-specific hacks: A properly compiled GCC 3.4.5 shouldn't need them. I've uploaded two GCC 3.4.5 packages for testing to http://reactos.colinfinck.de/. Testers, who often dig into old revisions, shall please try whether the current scripts can compile those old builds with one of these packages. - Get rid of the experimental ARM and PPC compiler support: It simply won't work that way and we can readd that later, when we have proper compilers - Use setlocal wherever possible, so that we don't need to unload the used variables explicitly - Make the coding style more consistent Testers, please try the new scripts on a RosBE 1.4.2 installation. If you compile for AMD64, you will also need to rename RosBE's "x86_64" directory to "amd64". Added: trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd (with props) Removed: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/MinGW.mac Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd trunk/tools/RosBE/RosBE-Windows/Root/version.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -4,21 +4,20 @@ :: FILE: Root/Build.cmd :: PURPOSE: Perform the build of ReactOS. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> -:: Colin Finck <mail(a)colinfinck.de> +:: Colin Finck <colin(a)reactos.org> :: Peter Ward <dralnix(a)gmail.com> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) -:: +setlocal enabledelayedexpansion + :: Check if config.template.rbuild is newer than config.rbuild, if it is then :: abort the build and inform the user. -:: -setlocal enabledelayedexpansion if exist .\config.rbuild ( "%_ROSBE_BASEDIR%\Tools\chknewer.exe" .\config.template.rbuild .\config.rbuild if !errorlevel! == 1 ( @@ -27,184 +26,53 @@ echo *** aborting build. Please check for changes and *** echo *** update your config.rbuild. *** echo. - endlocal - goto :EOC - ) -) -endlocal - -:: -:: Check if strip, no Debug Symbols or ccache are being used and set the appropriate options. -:: -if "%_ROSBE_NOSTRIP%" == "1" ( - set ROS_BUILDNOSTRIP=yes -) else ( - set ROS_BUILDNOSTRIP=no -) - -if "%_ROSBE_STRIP%" == "1" ( - set ROS_LEAN_AND_MEAN=yes -) else ( - set ROS_LEAN_AND_MEAN=no -) - -:: Small Security Check to prevent useless apps. -if "%ROS_LEAN_AND_MEAN%" == "yes" ( - if "%ROS_BUILDNOSTRIP%" == "yes" ( - cls - echo Selecting Stripping and removing Debug Symbols together will most likely cause useless apps. Please deselect one of them. goto :EOC ) ) +call "%_ROSBE_BASEDIR%\TranslateOptions.cmd" + if "%_ROSBE_USECCACHE%" == "1" ( - set CCACHE_DIR=%APPDATA%\RosBE\.ccache set _ROSBE_CCACHE=ccache +) else ( + set _ROSBE_CCACHE= ) - -:: Target defaults to host(i386) set HOST_CC=%_ROSBE_CCACHE%gcc set HOST_CPP=%_ROSBE_CCACHE%g++ +set TARGET_CC=%_ROSBE_CCACHE%%ROS_PREFIX%gcc +set TARGET_CPP=%_ROSBE_CCACHE%%ROS_PREFIX%g++ -set TARGET_CC=%_ROSBE_CCACHE%gcc -set TARGET_CPP=%_ROSBE_CCACHE%g++ +:: Get the current date and time for use in in our build log's file name. +call "%_ROSBE_BASEDIR%\TimeDate.cmd" -if not "%ROS_ARCH%" == "" ( - set TARGET_CC=%_ROSBE_CCACHE%%ROS_PREFIX%-gcc - set TARGET_CPP=%_ROSBE_CCACHE%%ROS_PREFIX%-g++ +:: Check whether we were called as "makex" or "make" +if "%1" == "multi" ( + shift + set MAKE_JOBS=%_ROSBE_MAKEX_JOBS% + set TITLE_COMMAND=makex %2 +) else ( + set MAKE_JOBS=1 + set TITLE_COMMAND=make %1 ) -:: -:: Check if the user has chosen to use a different object or output path -:: and set it accordingly. -:: -if defined _ROSBE_OBJPATH ( - if not exist "%_ROSBE_OBJPATH%\." ( - echo WARNING: The Object-Path specified doesn't seem to exist. Creating... - if exist "makefile*.auto" ( - echo WARNING: makefile.auto exists. Deleting... - call "%_ROSBE_BASEDIR%\Clean.cmd" - ) - ) - set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% -) -if defined _ROSBE_OUTPATH ( - if not exist "%_ROSBE_OUTPATH%\." ( - echo WARNING: The Output-Path specified doesn't seem to exist. Creating... - if exist "makefile*.auto" ( - echo WARNING: makefile.auto exists. Deleting... - call "%_ROSBE_BASEDIR%\Clean.cmd" - ) - ) - set ROS_OUTPUT=%_ROSBE_OUTPATH% - set ROS_TEMPORARY=%_ROSBE_OUTPATH% +title '%TITLE_COMMAND%' build started: %TIMERAW% (%ROS_ARCH%) + +:: Do the actual building +if %_ROSBE_SHOWTIME% == 1 ( + set BUILDTIME_COMMAND="%_ROSBE_BASEDIR%\Tools\buildtime.exe" +) else ( + set BUILDTIME_COMMAND= ) -:: -:: Get the current date and time for use in in our build log's file name. -:: -call "%_ROSBE_BASEDIR%\TimeDate.cmd" - -:: -:: Check if writing logs is enabled, if so check if our log directory -:: exists, if it doesn't, create it. -:: if %_ROSBE_WRITELOG% == 1 ( - if not exist "%_ROSBE_LOGDIR%\." ( - mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL - ) + %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" +) else ( + %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 ) -:: -:: Check if we are using -j or not. -:: -if "%1" == "multi" ( - if not "%2" == "" ( - title 'makex %2' parallel build started: %TIMERAW% %ROS_ARCH% - ) else ( - title 'makex' parallel build started: %TIMERAW% %ROS_ARCH% - ) - call :BUILDMULTI %* -) else ( - if not "%1" == "" ( - title 'make %1' build started: %TIMERAW% %ROS_ARCH% - ) else ( - title 'make' build started: %TIMERAW% %ROS_ARCH% - ) - call :BUILD %* -) -goto :EOC - -:BUILD - -if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* - ) -) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" %* - ) -) -goto :EOF - -:: -:: Get the number of CPUs in the system so we know how many jobs to execute. -:: To modify the number used alter the options used with cpucount: -:: No Option - Number of CPUs. -:: -x1 - Number of CPUs, plus 1. -:: -x2 - Number of CPUs, doubled. -:: -a - Determine the cpu count based on the inherited process affinity mask. -:: - -:BUILDMULTI - -for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i - -if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 - ) -) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 - ) -) -goto :EOF - -:: +:EOC :: Highlight the fact that building has ended. -:: - -:EOC - "%_ROSBE_BASEDIR%\Tools\flash.exe" - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) - -:: -:: Unload all used Vars. -:: -set ROS_BUILDNOSTRIP= -set ROS_LEAN_AND_MEAN= -set HOST_CC= -set HOST_CPP= -set TARGET_CC= -set TARGET_CPP= -set ROS_INTERMEDIATE= -set ROS_OUTPUT= -set ROS_TEMPORARY= -set CPUCOUNT= -set CCACHE_DIR= -set _ROSBE_CCACHE= +title ReactOS Build Environment %_ROSBE_VERSION% +endlocal Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -5,40 +5,36 @@ :: PURPOSE: Clean the ReactOS source directory. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> +:: Colin Finck <colin(a)reactos.org> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) +setlocal enabledelayedexpansion title Cleaning... if "%1" == "" ( call :DEL goto :EOC -) -if /i "%1" == "logs" ( +) else if /i "%1" == "logs" ( call :LOG goto :EOC -) -if /i "%1" == "all" ( +) else if /i "%1" == "all" ( call :DEL call :LOG goto :EOC -) -if not "%1" == "" ( +) else ( "%_ROSBE_BASEDIR%\Build.cmd" %1_clean goto :EOC ) -:: + :: Check if we have any logs to clean, if so, clean them. -:: - :LOG - if exist "%_ROSBE_LOGDIR%\*.txt" ( echo Cleaning build logs... del /f "%_ROSBE_LOGDIR%\*.txt" 1> NUL 2> NUL @@ -48,75 +44,56 @@ ) goto :EOF -:: + :: Check if we have something to clean, if so, clean it. -:: - :DEL -:: :: Apply modified obj and out paths for deletion. -:: - -if "%ROS_ARCH%" == "" ( - set ROS_ARCH=i386 -) - if "%_ROSBE_OBJPATH%" == "" ( - set _ROSBE_OBJCLEANPATH=%_ROSBE_ROSSOURCEDIR%\obj-%ROS_ARCH% + set OBJCLEANPATH=%_ROSBE_ROSSOURCEDIR%\obj-%ROS_ARCH% ) else ( - set _ROSBE_OBJCLEANPATH=%_ROSBE_OBJPATH% + set OBJCLEANPATH=%_ROSBE_OBJPATH% ) if "%_ROSBE_OUTPATH%" == "" ( - set _ROSBE_OUTCLEANPATH=%_ROSBE_ROSSOURCEDIR%\output-%ROS_ARCH% + set OUTCLEANPATH=%_ROSBE_ROSSOURCEDIR%\output-%ROS_ARCH% ) else ( - set _ROSBE_OUTCLEANPATH=%_ROSBE_OUTPATH% + set OUTCLEANPATH=%_ROSBE_OUTPATH% ) if "%ROS_ARCH%" == "i386" ( - set _ROSBE_MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile.auto + set MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile.auto ) else ( - set _ROSBE_MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto + set MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto ) -if exist "%_ROSBE_MAKEFILE%" ( - del "%_ROSBE_MAKEFILE%" 1> NUL 2> NUL +if exist "%MAKEFILE%" ( + del "%MAKEFILE%" 1> NUL 2> NUL ) -if exist "%_ROSBE_OBJCLEANPATH%\." ( +if exist "%OBJCLEANPATH%\." ( echo Cleaning ReactOS %ROS_ARCH% source directory... - if exist "%_ROSBE_OBJCLEANPATH%\." ( - rd /s /q "%_ROSBE_OBJCLEANPATH%" 1> NUL 2> NUL + + if exist "%OBJCLEANPATH%\." ( + rd /s /q "%OBJCLEANPATH%" 1> NUL 2> NUL ) - if exist "%_ROSBE_OUTCLEANPATH%\." ( - rd /s /q "%_ROSBE_OUTCLEANPATH%" 1> NUL 2> NUL + + if exist "%OUTCLEANPATH%\." ( + rd /s /q "%OUTCLEANPATH%" 1> NUL 2> NUL ) + echo Done cleaning ReactOS %ROS_ARCH% source directory. ) else ( echo ERROR: There is no %ROS_ARCH% compiler output to clean. ) -if "%ROS_ARCH%" == "i386" ( - set ROS_ARCH= -) - -:ROS - if exist "%_ROSBE_ROSSOURCEDIR%\reactos\." ( rd /s /q "%_ROSBE_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL ) + goto :EOF + :EOC - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) - -:: -:: Unload all used Vars. -:: -set _ROSBE_OBJCLEANPATH= -set _ROSBE_OUTCLEANPATH= -set _ROSBE_MAKEFILE= +title ReactOS Build Environment %_ROSBE_VERSION% +endlocal Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -5,7 +5,7 @@ :: PURPOSE: A Basic Config.rbuild Creator for ReactOS. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @@ -13,12 +13,9 @@ ) setlocal enabledelayedexpansion - title ReactOS Build Configurator -:: :: Receive the first Parameter and decide what to do. -:: if /i "%1" == "delete" ( echo config.rbuild will be permanently deleted. All your settings will be gone. echo Continue? @@ -34,14 +31,17 @@ ) else ( echo Main Configuration File was not found in ReactOS Source Tree. ) + if exist "%APPDATA%\RosBE\config.rbuild" ( del "%APPDATA%\RosBE\config.rbuild" echo Working Configuration File was found and deleted. ) else ( echo Working Configuration File was not found in ReactOS Source Tree. ) -goto :NOK -) + + goto :NOK +) + if /i "%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. @@ -58,21 +58,18 @@ echo Successfully 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 "%APPDATA%\RosBE\config.rbuild" ( copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" ) -:: :: Help prevent non-useful bug reports/questions. -:: echo. echo *** Configurations other than release/debug are not useful for *** echo *** posting bug reports, and generally not very useful for *** @@ -86,11 +83,8 @@ 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 ".\config.rbuild" ( "%_ROSBE_BASEDIR%\Tools\chknewer.exe" ".\config.template.rbuild" ".\config.rbuild" if !errorlevel! == 1 ( @@ -109,13 +103,11 @@ del "config.rbuild" copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" goto :OK - endlocal ) ) -:: + :: Start with reading settings from config.rbuild and let the user edit them. -:: echo Sub-Architecture to build for. echo Default is: none echo. @@ -270,9 +262,7 @@ ) cls -:: :: Generate a config.rbuild, copy it to the Source Tree and delete temp files. -:: echo ^<?xml version="1.0"?^>>%TEMP%\config.tmp echo ^<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"^>>%TEMP%\config.tmp echo ^<group^>>%TEMP%\config.tmp @@ -293,38 +283,6 @@ del %TEMP%\config.tmp copy "%APPDATA%\RosBE\config.rbuild" "config.rbuild" >NUL -goto :NOK - :NOK - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) - -:: -:: Unload all used Vars. -:: -set YESNO= -set BUILD_MP= -set BUILD_MP_CH= -set TUNE= -set TUNE_CH= -set SARCH_CH= -set OARCH_CH= -set OPTIMIZE_CH= -set KDBG_CH= -set DBG_CH= -set GDB_CH= -set NSWPAT_CH= -set WINKD_CH= -set ELF_CH= -set SARCH= -set OARCH= -set OPTIMIZE= -set KDBG= -set DBG= -set GDB= -set NSWPAT= -set WINKD= -set ELF= -endlocal +title ReactOS Build Environment %_ROSBE_VERSION% +endlocal 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] Sun May 10 22:47:10 2009 @@ -5,17 +5,18 @@ :: PURPOSE: Display help for the commands included with the ReactOS Build Environment. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> +:: Colin Finck <colin(a)reactos.org> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) -:: :: Check if we are displaying help on all commands, if so, display it. -:: +:: Otherwise check if we are displaying help on individual commands, if so, +:: display the help for that command. if "%1" == "" ( echo. echo Available Commands: @@ -78,14 +79,7 @@ ) echo. - goto :EOC -) - -:: -:: Now check if we are displaying help on individual commands, if so, -:: display the help for that command. -:: -if /i "%1" == "make" ( +) else if /i "%1" == "make" ( echo Usage: make [OPTIONS] echo Make does a standard build of ReactOS. OPTIONS are the standard ReactOS build echo options: @@ -106,9 +100,7 @@ echo and generates a new makefile. This will take a while. echo "module"-depends - Does a dependency check for one module with the echo appropiate name. - goto :EOC -) -if /i "%1" == "makex" ( +) else if /i "%1" == "makex" ( echo Usage: makex [OPTIONS] echo Same as 'make' but automatically determines the number of CPU Cores in the echo system and uses "make -j x" with the appropriate number. OPTIONS are the @@ -133,42 +125,32 @@ echo NOTE: The number makex uses can be modified by editing Build.cmd echo located in the RosBE directory, instructions for doing so are echo contained within the file. - goto :EOC -) -if /i "%1" == "basedir" ( +) else if /i "%1" == "basedir" ( echo Usage: basedir echo Switches back to the ReactOS source directory. - goto :EOC -) -if exist "%_ROSBE_BASEDIR%\charch.cmd" ( - if /i "%1" == "charch" ( +) else if /i "%1" == "charch" ( + if exist "%_ROSBE_BASEDIR%\charch.cmd" ( echo Usage: charch [OPTIONS] echo Change the Architecture to build ReactOS for, for the current RosBE session. echo Possible Architectures are: i386, ppc, arm, amd64. echo. - goto :EOC - ) -) -if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( - if /i "%1" == "chdefdir" ( + ) +) else if /i "%1" == "chdefdir" ( + if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( echo Usage: chdefdir [OPTIONS] echo Change the ReactOS source directory for the current RosBE session. echo. echo previous - Switch to the previous ReactOS source directory. - goto :EOC - ) -) -if exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( - if /i "%1" == "chdefgcc" ( + ) +) else if /i "%1" == "chdefgcc" ( + if exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( echo Usage: chdefgcc [OPTIONS] echo Change the MinGW/GCC Target/Host directory for the current RosBE session. echo. echo "Path" - Path to set the Host or Target GCC to. echo "Type" - Set it to "target" or "host" - goto :EOC - ) -) -if /i "%1" == "clean" ( + ) +) else if /i "%1" == "clean" ( echo Usage: clean [logs] echo Fully clean the ReactOS source directory. echo. @@ -176,10 +158,8 @@ echo logs - Removes all build logs in the RosBE-Logs directory. echo All other commands will be parsed as "make COMMAND_clean" and cleans the echo specific command. - goto :EOC -) -if exist "%_ROSBE_BASEDIR%\Config.cmd" ( - if /i "%1" == "config" ( +) else if /i "%1" == "config" ( + if exist "%_ROSBE_BASEDIR%\Config.cmd" ( echo Usage: config [OPTIONS] echo Creates a configuration file, which tells RosBE how to build the tree. echo. @@ -187,16 +167,12 @@ echo settings. echo update - Deletes the old created configuration file and updates it with a echo new, default one. - goto :EOC - ) -) -if /i "%1" == "help" ( + ) +) else if /i "%1" == "help" ( echo Usage: help [COMMAND] echo Shows help for the specified command or lists all available commands. - goto :EOC -) -if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( - if /i "%1" == "raddr2line" ( +) else if /i "%1" == "raddr2line" ( + if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( echo Usage: raddr2line [FILE] [ADDRESS] echo Translates program addresses into file names and line numbers to assist echo developers with finding specific bugs in ReactOS. If either of the options @@ -208,17 +184,13 @@ echo sub-directories are searched. echo ADDRESS - The address to be translated. echo. - goto :EOC - ) -) -if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - if /i "%1" == "scut" ( + ) +) else if /i "%1" == "scut" ( + if exist "%_ROSBE_BASEDIR%\scut.cmd" ( "%_ROSBE_BASEDIR%\Tools\scut.exe" --help - goto :EOC - ) -) -if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( - if /i "%1" == "ssvn" ( + ) +) else if /i "%1" == "ssvn" ( + if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( echo Usage: ssvn [OPTIONS] echo Creates, updates or cleans up your ReactOS source tree or shows the revision echo number of the local and online trees. @@ -228,19 +200,15 @@ echo create - Creates a new ReactOS source tree. echo cleanup - Cleans up and fixes errors in the source tree. echo status - Show the current local and online revision numbers. - goto :EOC - ) -) -if exist "%_ROSBE_BASEDIR%\options.cmd" ( - if /i "%1" == "options" ( + ) +) else if /i "%1" == "options" ( + if exist "%_ROSBE_BASEDIR%\options.cmd" ( echo Usage: options echo Starts the RosBE configurator and sets the changes active in the current echo RosBE session. - goto :EOC - ) -) -if exist "%_ROSBE_BASEDIR%\update.cmd" ( - if /i "%1" == "update" ( + ) +) else if /i "%1" == "update" ( + if exist "%_ROSBE_BASEDIR%\update.cmd" ( echo Usage: update [OPTIONS] echo Updates all files of RosBE to the most recent files. echo. @@ -249,16 +217,9 @@ 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 - ) + ) +) else ( + echo Unknown command specified. No help available for %1. ) -if not "%1" == "" ( - echo Unknown command specified. No help available for %1. - goto :EOC -) - -:EOC - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) + +title ReactOS Build Environment %_ROSBE_VERSION% Removed: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (removed) @@ -1,46 +1,0 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GNU General Public License v2. (see LICENSE.txt) -:: FILE: Root/MinGW.cmd -:: PURPOSE: This script provides/sets up a standard MinGW build environment. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> -:: Peter Ward <dralnix(a)gmail.com> -:: -:: -@echo off -if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 1 ( - @echo on -) - -if not "%1" == "" ( - cls - echo Unknown parameter specified. Exiting. - goto :EOF -) - -color 0A -set PATH=%SystemRoot%\system32;%SystemRoot% -set _ROSBE_BASEDIR=%~dp0 -set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% -set _ROSBE_MODE=MinGW -set _ROSBE_ORIGINALPATH=%PATH% -set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 -set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\i386 - -call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" -call "%_ROSBE_BASEDIR%\version.cmd" - -:: -:: Get the number of CPUs in the system so we know how many jobs to execute. -:: To modify the number used alter the options used with cpucount: -:: No Option - Number of CPUs. -:: -x1 - Number of CPUs, plus 1. -:: -x2 - Number of CPUs, doubled. -:: -a - Determine the cpu count based on the inherited process affinity mask. -:: -for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i - -doskey /macrofile="%_ROSBE_BASEDIR%\MinGW.mac" - -if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= ) Removed: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.mac [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.mac (removed) @@ -1,4 +1,0 @@ -CHDEFGCC = "%_ROSBE_BASEDIR%\chdefgcc.cmd" $* -MAKE = "%_ROSBE_MINGWMAKE%" $* -MAKEX = "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% $* -SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $* Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -6,7 +6,7 @@ :: ReactOS. Currently it provides a GCC 4.1.3 build environment. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> -:: +:: Colin Finck <colin(a)reactos.org> :: @echo off @@ -15,132 +15,68 @@ @echo on ) -:: +title ReactOS Build Environment %_ROSBE_VERSION% + +:: For NT4 compatibility +if not defined APPDATA set APPDATA=%USERPROFILE% + :: Set defaults to work with and override them if edited by :: the options utility. -:: -if not defined APPDATA set APPDATA=%USERPROFILE% -set _ROSBE_VERSION=1.4.2 +if "%ROS_ARCH%" == "" ( + set ROS_ARCH=i386 +) else ( + set ROS_ARCH=%1 +) + set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% -set _ROSBE_MODE=RosBE +set _ROSBE_VERSION=1.4.2 set _ROSBE_ROSSOURCEDIR=%CD% -set _ROSBE_ORIGINALPATH=%PATH% set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 set _ROSBE_USECCACHE=0 set _ROSBE_STRIP=0 set _ROSBE_NOSTRIP=0 -set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 -set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_LOGDIR=%CD%\RosBE-Logs set _ROSBE_OBJPATH= set _ROSBE_OUTPATH= +set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 +set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% +set _ROSBE_ORIGINALPATH=%_ROSBE_HOST_MINGWPATH%\bin;%PATH% +set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe -:: +:: Get the number of CPUs in the system so we know how many jobs to execute. +:: To modify the number used, see the cpucount usage for getting to know about the possible options +for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set _ROSBE_MAKEX_JOBS=%%i + +set CCACHE_DIR=%APPDATA%\RosBE\.ccache +set C_INCLUDE_PATH= +set CPLUS_INCLUDE_PATH= +set LIBRARY_PATH= + +:: Load the user's options if any +if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( + call "%APPDATA%\RosBE\rosbe-options.cmd" +) + +if exist "%APPDATA%\RosBE\rosbe-options-%1.cmd" ( + call "%APPDATA%\RosBE\rosbe-options-%1.cmd" +) + :: Check if RosBE data directory exists, if not, create it. -:: if not exist "%APPDATA%\RosBE\." ( mkdir "%APPDATA%\RosBE" 1> NUL 2> NUL ) -:: -:: Check if the user has used the options utility and -:: if so, load their options. -:: -if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( - call "%APPDATA%\RosBE\rosbe-options.cmd" +:: Check if writing logs is enabled, if so check if our log directory +:: exists, if it doesn't, create it. +if %_ROSBE_WRITELOG% == 1 ( + if not exist "%_ROSBE_LOGDIR%\." ( + mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL + ) ) -:: arch specific settings. -if exist "%APPDATA%\RosBE\rosbe-options-%1.cmd" ( - call "%APPDATA%\RosBE\rosbe-options-%1.cmd" -) - -title ReactOS Build Environment %_ROSBE_VERSION% - -:: -:: Check if we are using oldmode or if any unknown parameters -:: were specified. -:: -if /i "%1" == "oldmode" ( - cls - set _ROSBE_MODE=MinGW - call :RosBE4 - goto :EndCommandParse -) else ( - cls - set ROS_ARCH=%1 - call :RosBE4 -) -:: -:: Load the base directory from srclist.txt and set it as the -:: new source directory. -:: - -:EndCommandParse - -if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - call "%_ROSBE_BASEDIR%\scut.cmd" -) - -:: -:: Tell how to display the available commands. -:: -echo. -echo For a list of all included commands, type: "help" -echo ------------------------------------------------- -echo. -REM "%_ROSBE_BASEDIR%\sSVN.cmd" status -REM echo. - -:: -:: Load the doskey macros that serve as our commands. -:: -call :LOADDOSKEYMACROS - -:: -:: Look if the ReactOS source directory is empty. If so, -:: inform the user and mention 'ssvn create' (only if ssvn is installed). -:: -setlocal enabledelayedexpansion -if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( - dir /b "%_ROSBE_ROSSOURCEDIR%" 2>nul | findstr "." >nul - if !errorlevel! == 1 ( - echo No ReactOS source detected. Please use "ssvn create" to download it. - ) -) -endlocal - -goto :EOF - -:: -:: Display the banner and set up the environment for the GCC 4.x.x build -:: environment. -:: - -:RosBE4 - -echo ******************************************************************************* -echo * * -echo * ReactOS Build Environment %_ROSBE_VERSION% * -echo * * -echo ******************************************************************************* -echo. - -:: -:: Set the correct path for the build tools and set the MinGW make. -:: -call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" -goto :EOF - -:: -:: Load the doskey macros and delete any macros for components -:: that are not actually present. -:: - -:LOADDOSKEYMACROS - +:: Load the DOSKEY macros and remove non-existent ones doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac" if not exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( doskey CHDEFDIR= ) @@ -153,4 +89,36 @@ if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SVN= ) if not exist "%_ROSBE_BASEDIR%\update.cmd" ( doskey UPDATE= ) if not exist "%_ROSBE_BASEDIR%\options.cmd" ( doskey OPTIONS= ) -goto :EOF + +call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" + +cls +echo ******************************************************************************* +echo * * +echo * ReactOS Build Environment %_ROSBE_VERSION% * +echo * * +echo ******************************************************************************* +echo. + +:: Load the base directory from srclist.txt and set it as the +:: new source directory. +if exist "%_ROSBE_BASEDIR%\scut.cmd" ( + call "%_ROSBE_BASEDIR%\scut.cmd" +) + +:: Tell how to display the available commands. +echo. +echo For a list of all included commands, type: "help" +echo ------------------------------------------------- +echo. + +:: Look if the ReactOS source directory is empty. If so, +:: inform the user and mention 'ssvn create' (only if ssvn is installed). +setlocal enabledelayedexpansion +if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( + dir /b "%_ROSBE_ROSSOURCEDIR%" 2>nul | findstr "." >nul + if !errorlevel! == 1 ( + echo No ReactOS source detected. Please use "ssvn create" to download it. + ) +) +endlocal Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tim… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -5,37 +5,24 @@ :: PURPOSE: Get the current date and time for use in our build log's file name. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> +:: Colin Finck <colin(a)reactos.org> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) -:: -:: Clear variables before use. -:: -set DATERAW= -set TIMERAW= -set DATENAME= -set TIMENAME= - -:: :: Get the raw date and time. -:: for /f "usebackq tokens=1" %%u in (`"%_ROSBE_BASEDIR%\Tools\getdate.exe"`) do set DATERAW=%%u for /f "usebackq tokens=1" %%u in (`time /t`) do set TIMERAW=%%u -:: :: Check if we need to pad the time with a zero. -:: if "%TIMERAW:~1,1%" == ":" ( set TIMERAW=0%TIMERAW% ) -:: :: Format the date and time for use in a file name. -:: set DATENAME=%DATERAW:~6, 4%%DATERAW:~3, 2%%DATERAW:~0, 2% set TIMENAME=%TIMERAW:~0, 2%%TIMERAW:~3, 2% Added: trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tra… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -1,0 +1,30 @@ +:: This file is entirely a HACK!!! +:: The ROS_* variables set here should later be set by the Options utility, so we can drop the translations from _ROSBE_* variables here + +if "%_ROSBE_NOSTRIP%" == "1" ( + set ROS_BUILDNOSTRIP=yes +) else ( + set ROS_BUILDNOSTRIP=no +) + +if "%_ROSBE_STRIP%" == "1" ( + set ROS_LEAN_AND_MEAN=yes +) else ( + set ROS_LEAN_AND_MEAN=no +) + +:: Check if the user has chosen to use a different object or output path +:: and set it accordingly. +if defined _ROSBE_OBJPATH ( + if not exist "%_ROSBE_OBJPATH%\." ( + echo WARNING: The Object-Path specified doesn't seem to exist. Creating... + ) + set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% + set ROS_TEMPORARY=%_ROSBE_OBJPATH% +) +if defined _ROSBE_OUTPATH ( + if not exist "%_ROSBE_OUTPATH%\." ( + echo WARNING: The Output-Path specified doesn't seem to exist. Creating... + ) + set ROS_OUTPUT=%_ROSBE_OUTPATH% +) Propchange: trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -4,68 +4,39 @@ :: FILE: Root/charch.cmd :: PURPOSE: Tool to change the current Arch to build ROS for in RosBE. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Colin Finck <colin(a)reactos.org> :: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) +setlocal enabledelayedexpansion title Change the Architecture to build for... -:: :: Parse the command line arguments. -:: ROSBE_ARCH: Default is i386, can be set to amd64, ppc or arm. -:: +if "%1" == "" ( + set /p ARCH="Please enter an Architecture you want to build ReactOS for: " + + if "!ARCH!" == "" ( + echo ERROR: You must enter an Architecture. + goto :EOC + ) +) else ( + set ARCH=%1 +) -if "%1" == "" ( - call :INTERACTIVE -) else ( - set _1=%1 -) -if /i "%_1%" == "i386" ( - set ROS_ARCH= -) else ( - set ROS_ARCH=%_1% -) -goto :EOA +:: Modify ROS_ARCH for the current environment +endlocal & set ROS_ARCH=%ARCH% -:: :: Refresh all needed Params by recalling the main Path setting CMD File. -:: - -:EOA - -:: arch specific settings. if exist "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" ( call "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" ) -call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" - -"%_ROSBE_BASEDIR%\version.cmd" -goto :EOC - -:: -:: If Parameters were set, parse them, if not, ask the user to add them. -:: - -:INTERACTIVE - -set /p _1="Please enter a Architecture you want to build ReactOS for: " -if "%_1%" == "" ( - echo ERROR: You must enter a Architecture. - goto :EOC -) -goto :EOF +call "%_ROSBE_BASEDIR%\chdefgcc.cmd" %ROS_ARCH% target :EOC - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) - -:: -:: Unload all used Vars. -:: -set _1= +title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -6,56 +6,42 @@ :: in RosBE. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> +:: Colin Finck <colin(a)reactos.org> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) +setlocal enabledelayedexpansion title Change the current working ReactOS source directory... -:: :: Parse the command line arguments. -:: if "%1" == "" ( - call :INTERACTIVE + set /p SOURCEDIR="Please enter a ReactOS source directory, or 'previous': " + + if "!SOURCEDIR!" == "" ( + echo ERROR: You must enter a ReactOS source directory, or 'previous'. + goto :EOC + ) ) else ( - set _1=%1 + set SOURCEDIR=%1 ) -if /i "%_1%" == "previous" ( + +if /i "%SOURCEDIR%" == "previous" ( popd ) else ( - if not exist "%_1%\." ( + if not exist "%SOURCEDIR%\." ( echo ERROR: The path specified doesn't seem to exist. goto :EOC ) - pushd %_1% + + pushd %SOURCEDIR% ) -set _ROSBE_ROSSOURCEDIR=%CD% -goto :EOC - -:: -:: If Parameters were set, parse them, if not, ask the user to add them. -:: - -:INTERACTIVE - -set /p _1="Please enter a ReactOS source directory, or 'previous': " -if "%_1%" == "" ( - echo ERROR: You must enter a ReactOS source directory, or 'previous'. - goto :EOC -) -goto :EOF :EOC - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) - -:: -:: Unload all used Vars. -:: -set _1= +set _ROSBE_ROSSOURCEDIR=%CD% +title ReactOS Build Environment %_ROSBE_VERSION% +endlocal Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -5,86 +5,69 @@ :: PURPOSE: Tool to change the current gcc in RosBE. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> +:: Colin Finck <colin(a)reactos.org> :: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) -if "%_ROSBE_MODE%" == "RosBE" ( - title Change the current MinGW/GCC Host/Target directory... +setlocal enabledelayedexpansion +title Change the current MinGW/GCC Host/Target directory... + +:: Parse the command line arguments. Ask the user if certain parameters are missing. +if "%1" == "" ( + set /p TOOLPATH="Please enter a MinGW/GCC directory (don't use quotes): " + + if "!TOOLPATH!" == "" ( + echo ERROR: You must enter a MinGW/GCC directory. + goto :EOC + ) +) else ( + for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\rquote.exe" %1"`) do set TOOLPATH=%%i ) -:: -:: Parse the command line arguments. -:: -for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\rquote.exe" %1"`) do set _1=%%i -set _2=%2 -if "%_1%" == "" ( - call :INTERACTIVE -) -if "%_2%" == "" ( - call :INTERACTIVE2 +if "%2" == "" ( + set /p TOOLMODE="Please specify, if this will be the Target or Host GCC: " + + if "!TOOLMODE!" == "" ( + echo ERROR: You must enter "target" or "host". + goto :EOC + ) +) else ( + set TOOLMODE=%2 ) -if exist "%_ROSBE_BASEDIR%\%_1%\." ( - set _1="%_ROSBE_BASEDIR%\%_1%" -) else if not exist "%_1%\." ( +:: Verify the entered values +if exist "%_ROSBE_BASEDIR%\%TOOLPATH%\." ( + set TOOLPATH=%_ROSBE_BASEDIR%\%TOOLPATH% +) else if not exist "%TOOLPATH%\." ( echo ERROR: The path specified doesn't seem to exist. goto :EOC ) -if not exist "%_1%\bin\*gcc.exe" ( +if not exist "%TOOLPATH%\bin\*gcc.exe" ( echo ERROR: No MinGW/GCC found in the specified path. goto :EOC ) -if /i "%_2%" == "target" ( - set _ROSBE_TARGET_MINGWPATH=%_1% - echo Target Location: %_ROSBE_TARGET_MINGWPATH% - goto :EOA -) -if /i "%_2%" == "host" ( - set _ROSBE_HOST_MINGWPATH=%_1% - echo Host Location: %_ROSBE_HOST_MINGWPATH% - goto :EOA +:: Set the values +if /i "%TOOLMODE%" == "target" ( + echo Target Location: %TOOLPATH% + endlocal & set _ROSBE_TARGET_MINGWPATH=%TOOLPATH% +) else if /i "%TOOLMODE%" == "host" ( + echo Host Location: %TOOLPATH% + endlocal & set _ROSBE_HOST_MINGWPATH=%TOOLPATH% ) else ( echo ERROR: You specified wrong parameters. + endlocal goto :EOC ) -:EOA - -call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" chdefgcc -"%_ROSBE_BASEDIR%\version.cmd" -goto :EOC - -:INTERACTIVE - -set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " -if "%_1%" == "" ( - echo ERROR: You must enter a MinGW/GCC directory. - goto :EOC -) - -:INTERACTIVE2 - -set /p _2="Please specify, if this will be the Target or Host GCC: " -if "%_2%" == "" ( - echo ERROR: You must enter "target" or "host". - goto :EOC -) -goto :EOF +call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" +call "%_ROSBE_BASEDIR%\version.cmd" :EOC - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) - -:: -:: Unload all used Vars. -:: -set _1= -set _2= +title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -5,30 +5,30 @@ :: PURPOSE: Starts options.exe and restarts RosBE afterwards. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) +setlocal enabledelayedexpansion title Options if "%ROS_ARCH%" == "amd64" ( set options=%_ROSBE_BASEDIR%\Tools\options64.exe set cfgfile=%APPDATA%\RosBE\rosbe-options-amd64.cmd -else +) else ( set options=%_ROSBE_BASEDIR%\Tools\options.exe set cfgfile=%APPDATA%\RosBE\rosbe-options.cmd ) -:: :: Run options.exe -:: if exist "%options%" ( pushd "%_ROSBE_BASEDIR%" call "%options%" popd + if exist "%cfgfile%" ( call "%cfgfile%" ) @@ -36,9 +36,5 @@ echo ERROR: options executable was not found. ) -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) - -set options= -set cfgfile= +title ReactOS Build Environment %_ROSBE_VERSION% +endlocal Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -6,97 +6,71 @@ :: COPYRIGHT: Copyright 2009 Christoph von Wittich <Christoph_vW(a)reactos.org> :: Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> +:: Colin Finck <colin(a)reactos.org> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) +setlocal enabledelayedexpansion title reladdr2line... -:: -:: Receive the Parameters and decide what to do. -:: if not "%3" == "" ( echo ERROR: Too many parameters specified. goto :EOC ) -if not "%1" == "" ( - set _1=%1 - call :CHECKPATH + +:: Receive all parameters +if "%1" == "" ( + set /p FILEPATH="Please enter the path/file to be examined: " +) else ( + set FILEPATH=%1 ) -if not "%2" == "" ( - set _2=%2 + +if "%2" == "" ( + set /p ADDRESS="Please enter the address you would like to analyze: " +) else ( + set ADDRESS=%2 ) -call :INTERACTIVE -:: +:: Check if parameters were really given +if "%FILEPATH%" == "" ( + echo ERROR: You must specify a path/file to examine. + goto :EOC +) +if "%ADDRESS%" == "" ( + echo ERROR: You must specify a address to analyze. + goto :EOC +) + +:: Check if the user supplied a path, if they didn't look for +:: the specified file in the current directory and any +:: sub-directories. +"%_ROSBE_BASEDIR%\Tools\chkslash.exe" %FILEPATH% +if errorlevel 2 ( + for /f "usebackq" %%i in (`"dir /a:-d /s /b %FILEPATH% 2>NUL | findstr "%FILEPATH%""`) do set FILEPATH=%%i +) + :: 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. -:: +echo %FILEPATH% -if "%_1%" == "" ( - echo ERROR: You must specify a path/file to examine. - goto :EOC +for /f "tokens=2" %%i in ('"objdump -p %FILEPATH% 2>NUL | findstr ImageBase"') do set BASEADDRESS=0x%%i + +if %%i lss %ADDRESS% ( + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%FILEPATH%" "%ADDRESS%" +) else ( + set /a BASEADDRESS+=0x%ADDRESS% + + for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" !BASEADDRESS!"') do set RELBASE=%%i + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "!FILEPATH!" "!RELBASE!" ) -if "%_2%" == "" ( - echo ERROR: You must specify a address to analyze. - goto :EOC -) -echo %_1% -for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i -if %%i lss %_2% ( - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" -) else ( - set /a baseaddr+=0x%_2% - for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" -) -goto :EOC - -:: -:: If Parameters were set, parse them, if not, ask the user to add them. -:: - -:INTERACTIVE - -if "%_1%" == "" ( - set /p _1="Please enter the path/file to be examined: " - call :CHECKPATH -) -if "%_2%" == "" ( - set /p _2="Please enter the address you would like to analyze: " -) -goto :EOF - -:: -:: Check if the user supplied a path, if they didn't look for -:: the specified file in the current directory and any -:: sub-directories. -:: - -:CHECKPATH - -"%_ROSBE_BASEDIR%\Tools\chkslash.exe" %_1% -if errorlevel 2 ( - for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% 2>NUL | findstr "%_1%""`) do set _1=%%i -) -goto :EOF :EOC - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) - -:: -:: Unload all used Vars. -:: -set _1= -set _2= -set baseaddr= -set relbase= +title ReactOS Build Environment %_ROSBE_VERSION% +endlocal Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -2,113 +2,33 @@ :: PROJECT: RosBE - ReactOS Build Environment for Windows :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/rosbe-gcc-env.cmd -:: PURPOSE: Set up the GCC 4.x.x build environment. +:: PURPOSE: Set up toolchain-specific settings when initializing RosBE and when using "charch" or "chdefgcc" :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> +:: Colin Finck <colin(a)reactos.org> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) -:: -:: Check if we are running within the RosBE, and if not -:: initialize GCC for the current directory. -:: -if not defined _ROSBE_HOST_MINGWPATH ( - set _ROSBE_MODE=MinGW - set _ROSBE_HOST_MINGWPATH=%CD% - set _ROSBE_ORIGINALPATH=%PATH% +:: Check if we're switching to the AMD64 architecture +if "%ROS_ARCH%" == "amd64" ( + set ROS_PREFIX=x86_64-pc-mingw32- +) else ( + set ROS_PREFIX= ) -if "%1" == "chdefgcc" ( - goto :main -) +set PATH=%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% -set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% -set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% - -if not "%ROS_ARCH%" == "" ( - set ROS_PREFIX=%ROS_ARCH%-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% - - if "%ROS_ARCH%" == "arm" ( - set _ROSBE_OBJPATH=%_ROSBE_ARM_OBJPATH% - set _ROSBE_OUTPATH=%_ROSBE_ARM_OUTPATH% - ) - if "%ROS_ARCH%" == "ppc" ( - set _ROSBE_OBJPATH=%_ROSBE_PPC_OBJPATH% - set _ROSBE_OUTPATH=%_ROSBE_PPC_OUTPATH% - ) - if "%ROS_ARCH%" == "amd64" ( - set _ROSBE_OBJPATH=%_ROSBE_AMD64_OBJPATH% - set _ROSBE_OUTPATH=%_ROSBE_AMD64_OUTPATH% - set ROS_PREFIX=x86_64-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 - ) -) - -REM Check if existant arch - -if not exist "%_ROSBE_TARGET_MINGWPATH%\." ( - echo Unsupported arch specified. Fallback to Default. - pause - set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% - set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% - set ROS_ARCH= - set ROS_PREFIX= - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_HOST_MINGWPATH% -) - -REM HAXX - -:: -:: Set up the GCC 4.x.x build environment. -:: - -:main - -set PATH=%_ROSBE_HOST_MINGWPATH%\bin;%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% -set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe - -if not .%ROS_ARCH%. == .. ( -for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i -for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i -) else ( -for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i -for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i -) - +for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_TARGET_GCCVERSION=%%i +for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%gcc -v 2>&1 | find "Target""`) do set _ROSBE_TARGET_GCCTARGET=%%i for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_HOST_GCCVERSION=%%i for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_HOST_GCCTARGET=%%i -if "%_ROSBE_MODE%" == "MinGW" ( - set C_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include - set CPLUS_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include - set ROSBE_HOST_CFLAGS= - set ROSBE_HOST_CXXFLAGS= - set ROSBE_TARGET_CFLAGS= - set ROSBE_TARGET_CXXFLAGS= - -) else ( - set C_INCLUDE_PATH= - set CPLUS_INCLUDE_PATH= - set ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" - set ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%\%_ROSBE_HOST_GCCTARGET%" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" - set ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" - set ROSBE_TARGET_CXXFLAGS=-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 ROSBE_HOST_CFLAGS= - set ROSBE_HOST_CXXFLAGS= - set ROSBE_TARGET_CFLAGS= - set ROSBE_TARGET_CXXFLAGS= -) +set ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" +set ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%\%_ROSBE_HOST_GCCTARGET%" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" +set ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include" +set ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_TARGET_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_TARGET_GCCVERSION%\%_ROSBE_TARGET_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include" Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -5,110 +5,97 @@ :: PURPOSE: Integrated SVN Client. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) -:: +setlocal enabledelayedexpansion + :: Receive the first parameter and decide what to do. -:: if "%1" == "" ( echo No parameter specified. Try 'help [COMMAND]'. goto :EOC ) -:: :: These two are directly parsed to svn. -:: if /i "%1" == "update" ( title SVN Updating... echo This might take a while, so please be patient. echo. + if not "%2" == "" ( "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 ) else ( "%_ROSBE_BASEDIR%\Tools\svn.exe" update ) + goto :EOC ) + if /i "%1" == "cleanup" ( title SVN Cleaning... echo This might take a while, so please be patient. echo. + "%_ROSBE_BASEDIR%\Tools\svn.exe" cleanup + goto :EOC ) -:: :: Check if the folder is empty. If not, output an error. -:: if /i "%1" == "create" ( title SVN Creating... if exist ".svn\." ( echo ERROR: Folder already contains a repository. goto :EOC ) + dir /b 2>nul | findstr "." >nul if errorlevel 1 ( "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/reactos . ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) + goto :EOC ) -:: :: Output the revision of the local and online trees and tell the user if :: its up to date or not. -:: if /i "%1" == "status" ( title SVN Status echo This might take a while, so please be patient. echo. + for /f "usebackq tokens=2" %%i in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info | find "Revision:""`) do set OFFSVN=%%i for /f "usebackq tokens=2" %%j in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j - call :UP + + echo Local Revision: !OFFSVN! + echo Online HEAD Revision: !ONSVN! + echo. + + if !OFFSVN! lss !ONSVN! ( + echo Your tree is not up to date. Do you want to update it? + + set /p UP="Please enter 'yes' or 'no': " + if /i "!UP!"=="yes" "%_ROSBE_BASEDIR%\ssvn" update + if /i "!UP!"=="y" "%_ROSBE_BASEDIR%\ssvn" update + ) + + if !OFFSVN! equ !ONSVN! ( + echo Your tree is up to date. + ) + goto :EOC ) if not "%1" == "" ( echo Unknown parameter specified. Try 'help ssvn'. - goto :EOC ) -:UP - -echo Local Revision: %OFFSVN% -echo Online HEAD Revision: %ONSVN% -echo. -if %OFFSVN% lss %ONSVN% ( - echo Your tree is not up to date. Do you want to update it? - goto :UP2 -) -if %OFFSVN% equ %ONSVN% ( - echo Your tree is up to date. - goto :EOF -) - -:UP2 - -set /p UP="Please enter 'yes' or 'no': " -if /i "%UP%"=="yes" "%_ROSBE_BASEDIR%\ssvn" update -if /i "%UP%"=="y" "%_ROSBE_BASEDIR%\ssvn" update -goto :EOF - :EOC - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) - -:: -:: Unload all used Vars. -:: -set OFFSVN= -set ONSVN= -set UP= +title ReactOS Build Environment %_ROSBE_VERSION% +endlocal Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -7,6 +7,7 @@ :: Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @@ -35,11 +36,7 @@ goto :EOC :paramcall - call "%_ROSBE_BASEDIR%\Tools\scut.exe" "%1" %2 %3 :EOC - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) +title ReactOS Build Environment %_ROSBE_VERSION% 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] Sun May 10 22:47:10 2009 @@ -5,7 +5,7 @@ :: PURPOSE: RosBE Updater. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 @@ -13,19 +13,13 @@ @echo on ) -:: -:: Set Title -:: +setlocal enabledelayedexpansion title Updating... -:: :: The Update Server. -:: -set _ROSBE_URL=http://danielreimer.5x.to/rosbe +set _ROSBE_URL=http://dreimer.dr.funpic.org/rosbe -:: :: Save the recent dir to cd back there at the end. -:: set _ROSBE_OPATH=%CD% if not exist "%_ROSBE_BASEDIR%\Tools\7z.exe" ( @@ -36,10 +30,7 @@ cd /d %_ROSBE_BASEDIR% -:: :: First check for a new Updater -:: -setlocal enabledelayedexpansion for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF @@ -48,17 +39,12 @@ echo Updater got updated and needs to be restarted. goto :EOC ) -endlocal -:: :: Get to the Updates Subfolder. -:: if not exist "%APPDATA%\RosBE\Updates" mkdir "%APPDATA%\RosBE\Updates" 1> NUL 2> NUL cd /d "%APPDATA%\RosBE\Updates" -:: :: Parse the args. -:: if "%1" == "" ( set _ROSBE_MULTIUPD=1 set _ROSBE_STATCOUNT=1 @@ -79,30 +65,20 @@ call :UPDCHECK set /a _ROSBE_STATCOUNT+=1 call :UPDCHECK - goto :EOC -) -if /i "%1" == "reset" ( +) else if /i "%1" == "reset" ( del /F /Q "%APPDATA%\RosBE\Updates\*.*" 1> NUL 2> NUL del /F /Q "%APPDATA%\RosBE\Updates\tmp\*.*" 1> NUL 2> NUL - goto :EOC -) -if /i "%1" == "nr" ( +) else if /i "%1" == "nr" ( set _ROSBE_STATCOUNT=%2 call :UPDCHECK - goto :EOC -) -if /i "%1" == "delete" ( +) else 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" ( +) else if /i "%1" == "info" ( set _ROSBE_STATCOUNT=%2 call :UPDINFO - goto :EOC -) -if /i "%1" == "status" ( +) else if /i "%1" == "status" ( if not exist "tmp" mkdir tmp 1> NUL 2> NUL copy *.txt .\tmp\. 1> NUL 2> NUL set _ROSBE_STATCOUNT=1 @@ -124,15 +100,12 @@ set /a _ROSBE_STATCOUNT+=1 call :STATUS call :UPDFIN - goto :EOC +) else ( + echo Unknown parameter specified. Try 'help update'. ) -if not "%1" == "" ( - echo Unknown parameter specified. Try 'help update'. - goto :EOC -) +goto :EOC :STATUS - cd tmp if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL @@ -144,7 +117,6 @@ goto :EOF :UPDINFO - cd tmp if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL @@ -160,7 +132,6 @@ goto :EOF :UPDFIN - del /F /Q tmp\*.* 1> NUL 2> NUL if not "%_ROSBE_UPDATES%" == "" ( echo Following Updates available: %_ROSBE_UPDATES% @@ -170,20 +141,20 @@ goto :EOF :UPDCHECK - cd /d "%APPDATA%\RosBE\Updates" if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( goto :EOF ) + if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL ) + if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( type "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" echo. echo Install? - setlocal enabledelayedexpansion set /p YESNO="(yes), (no)" if /i "!YESNO!"=="yes" goto :updyes if /i "!YESNO!"=="y" goto :updyes @@ -213,7 +184,6 @@ del "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" 1> NUL 2> NUL goto :EOF ) - endlocal ) else ( if not "%_ROSBE_MULTIUPD%" == "1" ( echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. @@ -223,16 +193,6 @@ goto :EOF :EOC - cd /d "%_ROSBE_OPATH%" -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -) - -set _ROSBE_UPDFINISH= -set _ROSBE_OPATH= -set _ROSBE_UPDDATE= -set _ROSBE_UPDATES= -set _ROSBE_UPDDATE2= -set _ROSBE_MULTIUPD= -set _ROSBE_STATCOUNT= +title ReactOS Build Environment %_ROSBE_VERSION% +endlocal Modified: trunk/tools/RosBE/RosBE-Windows/Root/version.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ver… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] Sun May 10 22:47:10 2009 @@ -4,8 +4,9 @@ :: FILE: Root/version.cmd :: PURPOSE: Display the current version of GCC, NASM, ld and make. :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Colin Finck <colin(a)reactos.org> :: -:: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @@ -14,47 +15,21 @@ ver -if not "%ROS_ARCH%" == "" ( - "%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%-gcc" -v 2>&1 | find "gcc version" - if "%ROS_PREFIX%" == "" ( - echo gcc target^: %_ROSBE_GCCTARGET% - ) else ( - echo gcc target^: %ROS_PREFIX:~0,-11% - ) - "%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%-ld" -v -) else ( - gcc -v 2>&1 | find "gcc version" - if "%ROS_PREFIX%" == "" ( - echo gcc target^: %_ROSBE_GCCTARGET% - ) else ( - echo gcc target^: %ROS_PREFIX:~0,-11% - ) - ld -v -) +:: GCC +"%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%gcc" -v 2>&1 | find "gcc version" +echo gcc target^: %_ROSBE_TARGET_GCCTARGET% +:: LD +"%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%ld" -v + +:: NASM or YASM if exist "%_ROSBE_HOST_MINGWPATH%\bin\nasm.exe" ( nasm -v ) else ( - if exist "%_ROSBE_HOST_MINGWPATH%\bin\yasm.exe" ( - yasm --version | find "yasm 0" - ) else ( - if "%_ROSBE_MODE%" == "RosBE" ( - echo ERROR: NASM or YASM is required to build ReactOS, none was found in the current MinGW/GCC. - ) - ) + yasm --version | find "yasm 0" ) -if exist "%_ROSBE_HOST_MINGWPATH%\bin\bison.exe" ( - bison --version | find "GNU Bison" -) else ( - if "%_ROSBE_MODE%" == "RosBE" ( - echo WARNING: Bison will soon be required to build ReactOS, none was found in the current MinGW/GCC. - ) -) -if exist "%_ROSBE_HOST_MINGWPATH%\bin\flex.exe" ( - flex --version -) else ( - if "%_ROSBE_MODE%" == "RosBE" ( - echo WARNING: Flex will soon be required to build ReactOS, none was found in the current MinGW/GCC. - ) -) + +:: Bison, Flex and Make +bison --version | find "GNU Bison" +flex --version mingw32-make -v | find "GNU Make"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs