[dreimer] 36966: Updated changelog to nasm 2.03. Started to sync the Powershell Version. Almost ready, but still some slight problems.
Author: dreimer Date: Sat Oct 25 14:52:33 2008 New Revision: 36966
URL: http://svn.reactos.org/svn/reactos?rev=36966&view=rev Log: Updated changelog to nasm 2.03. Started to sync the Powershell Version. Almost ready, but still some slight problems.
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Sat Oct 25 14:52:33 2008 @@ -6,6 +6,68 @@ # COPYRIGHT: Copyright 2008 Daniel Reimer reimer.daniel@freenet.de # # + +function DELA { +! set /p ROSA_DEL="rosapps.bak exists! Delete it? [yes/no] " + if ($ROSA_DEL -eq "no") exit +! if ($ROSA_DEL -eq "yes") rd /q /s ".\modules\rosapps.bak" +} + +function DELB { +! set /p ROSB_DEL="rostests.bak exists! Delete it? [yes/no] " + if ($ROSB_DEL -eq "no") exit +! if ($ROSB_DEL -eq "yes") rd /q /s ".\modules\rostests.bak" +} + +if ($_ROSBE_MODULES -ne 1) { + if (Test-Path ".\modules\rosapps") { + if (Test-Path ".\modules\rosapps.bak") { + DELA + } + "Renaming rosapps to rosapps.bak..." +! ren ".\modules\rosapps" "rosapps.bak" +! if ($ENV:ROS_ARCH -eq $null) { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto + } else { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto + } + } + if (Test-Path ".\modules\rostests") { + if (Test-Path ".\modules\rostests.bak") { + DELB + } + "Renaming rostests to rostests.bak..." +! ren ".\modules\rostests" "rostests.bak" +! if ($ENV:ROS_ARCH -eq $null) { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto + } else { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto + } + } +} else { + if (Test-Path ".\modules\rosapps.bak") { + if !(Test-Path ".\modules\rosapps") { + "Renaming rosapps.bak to rosapps..." +! ren ".\modules\rosapps.bak" "rosapps" +! if ($ENV:ROS_ARCH -eq $null) { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto + } else { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto + } + } + } + if (Test-Path ".\modules\rostests.bak") { + if !(Test-Path ".\modules\rostests") { + "Renaming rostests.bak to rostests..." +! ren ".\modules\rostests.bak" "rostests" +! if ($ENV:ROS_ARCH -eq $null) { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto + } else { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto + } + } + } +}
# # Check if config.template.rbuild is newer than config.rbuild, if it is then @@ -23,8 +85,15 @@ }
# -# Check if strip or ccache are being used and set the appropriate options. -# +# 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" + } else { + $ENV:ROS_BUILDNOSTRIP = "no" + } +} if ($_ROSBE_STRIP -ne $null) { if ($_ROSBE_STRIP -eq 1) { $ENV:ROS_LEAN_AND_MEAN = "yes" @@ -32,18 +101,61 @@ $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") { +! cls + "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" $ENV:HOST_CC = "ccache gcc" $ENV:HOST_CPP = "ccache g++" + + # + #Target defaults to host(i386) + # + $ENV:TARGET_CC = "ccache gcc" $ENV:TARGET_CPP = "ccache g++" + if ($ENV:ROS_ARCH -eq "arm") { + $ENV:TARGET_CC = "ccache arm-pc-mingw32-gcc" + $ENV:TARGET_CPP = "ccache arm-pc-mingw32-g++" + } + if ($ENV:ROS_ARCH -eq "amd64") { + $ENV:TARGET_CC = "ccache x86_64-pc-mingw32-gcc" + $ENV:TARGET_CPP = "ccache x86_64-pc-mingw32-g++" + } + if $ENV:ROS_ARCH -eq "ppc") { + $ENV:TARGET_CC = "ccache ppc-pc-mingw32-gcc" + $ENV:TARGET_CPP = "ccache ppc-pc-mingw32-g++" + } } else { $ENV:HOST_CC = "gcc" $ENV:HOST_CPP = "g++" + + # + #Target defaults to host(i386) + # + $ENV:TARGET_CC = "gcc" $ENV:TARGET_CPP = "g++" + if ($ENV:ROS_ARCH -eq "arm") { + $ENV:TARGET_CC = "arm-pc-mingw32-gcc" + $ENV:TARGET_CPP = "arm-pc-mingw32-g++" + } + if ($ENV:ROS_ARCH -eq "amd64") { + $ENV:TARGET_CC = "x86_64-pc-mingw32-gcc" + $ENV:TARGET_CPP = "x86_64-pc-mingw32-g++" + } + if $ENV:ROS_ARCH -eq "ppc") { + $ENV:TARGET_CC = "ppc-pc-mingw32-gcc" + $ENV:TARGET_CPP = "ppc-pc-mingw32-g++" + } } }
@@ -178,6 +290,7 @@ # # Unload all used Vars. # +$ENV:ROS_BUILDNOSTRIP = $null $ENV:ROS_LEAN_AND_MEAN = $null $ENV:HOST_CC = $null $ENV:HOST_CPP = $null @@ -188,3 +301,5 @@ $ENV:ROS_TEMPORARY = $null $ENV:CPUCOUNT = $null $ENV:CCACHE_DIR = $null +$ENV:ROSA_DEL = $null +$ENV:ROSB_DEL = $null
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Sat Oct 25 14:52:33 2008 @@ -26,26 +26,89 @@ # # Check if we have something to clean, if so, clean it. # - if (Test-Path "obj-i386") { - "Cleaning ReactOS source directory..." - # - # Remove directories/makefile.auto created by the build. - # + + if ($ENV:ROS_ARCH -eq "arm") { + if (Test-Path "obj-arm") { + "Cleaning ReactOS source directory..." + # + # Remove directories/makefile.auto created by the build. + # + if (Test-Path "obj-arm") { + $null = (Remove-Item "obj-arm" -recurse -force) + } + if (Test-Path "output-arm") { + $null = (Remove-Item "output-arm" -recurse -force) + } + if (Test-Path "makefile-arm.auto") { + $null = (Remove-Item "makefile-arm.auto" -force) + } + "Done cleaning ReactOS source directory." + } else { + "ERROR: There is no compiler output to clean." + } + } + if ($ENV:ROS_ARCH -eq "ppc") { + if (Test-Path "obj-ppc") { + "Cleaning ReactOS source directory..." + # + # Remove directories/makefile.auto created by the build. + # + if (Test-Path "obj-ppc") { + $null = (Remove-Item "obj-ppc" -recurse -force) + } + if (Test-Path "output-ppc") { + $null = (Remove-Item "output-ppc" -recurse -force) + } + if (Test-Path "makefile-ppc.auto") { + $null = (Remove-Item "makefile-ppc.auto" -force) + } + "Done cleaning ReactOS source directory." + } else { + "ERROR: There is no compiler output to clean." + } + } + if ($ENV:ROS_ARCH -eq "amd64") { + if (Test-Path "obj-amd64") { + "Cleaning ReactOS source directory..." + # + # Remove directories/makefile.auto created by the build. + # + if (Test-Path "obj-amd64") { + $null = (Remove-Item "obj-amd64" -recurse -force) + } + if (Test-Path "output-amd64") { + $null = (Remove-Item "output-amd64" -recurse -force) + } + if (Test-Path "makefile-amd64.auto") { + $null = (Remove-Item "makefile-amd64.auto" -force) + } + "Done cleaning ReactOS source directory." + } else { + "ERROR: There is no compiler output to clean." + } + } + if ($ENV:ROS_ARCH -eq $null) { if (Test-Path "obj-i386") { - $null = (Remove-Item "obj-i386" -recurse -force) + "Cleaning ReactOS source directory..." + # + # Remove directories/makefile.auto created by the build. + # + if (Test-Path "obj-i386") { + $null = (Remove-Item "obj-i386" -recurse -force) + } + if (Test-Path "output-i386") { + $null = (Remove-Item "output-i386" -recurse -force) + } + if (Test-Path "makefile.auto") { + $null = (Remove-Item "makefile.auto" -force) + } + "Done cleaning ReactOS source directory." + } else { + "ERROR: There is no compiler output to clean." } - if (Test-Path "output-i386") { - $null = (Remove-Item "output-i386" -recurse -force) - } - if (Test-Path "reactos") { - $null = (Remove-Item "reactos" -recurse -force) - } - if (Test-Path "makefile.auto") { - $null = (Remove-Item "makefile.auto" -force) - } - "Done cleaning ReactOS source directory." - } else { - "ERROR: There is no compiler output to clean." + } + if (Test-Path "reactos") { + $null = (Remove-Item "reactos" -recurse -force) } }
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Sat Oct 25 14:52:33 2008 @@ -67,6 +67,10 @@ " options - Starts the RosBE configurator." }
+ if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { + " update [OPTIONS] - Updates RosBE to the most recent files. + } + "" exit } @@ -99,7 +103,7 @@ if ("$args" -eq "charch") { " Usage: charch [OPTIONS]" " Change the ReactOS source directory for the current RosBE session." - " Possible Architectures are: x86, ppc, arm." + " Possible Architectures are: i386, ppc, arm, amd64." "" exit } @@ -190,6 +194,17 @@ exit } } +if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { + if ("$args" -eq "update") { + " Usage: update [OPTIONS]" + " Updates all files of RosBE to the most recent files." + "" + " nocmds - Skips the Updating of the Script Files." + " nogcc - Skips the Updating of GCC." + " notools - Skips the Updating of the Tools." + exit + } +} if ("$args" -ne $null) { " Unknown command specified. No help available for $args." exit
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] Sat Oct 25 14:52:33 2008 @@ -21,7 +21,8 @@ $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "MinGW" $global:_ROSBE_ORIGINALPATH = "$ENV:PATH" -$global:_ROSBE_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3"
"" ""
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sat Oct 25 14:52:33 2008 @@ -19,7 +19,7 @@ $APPDATA = $ENV:USERPROFILE } $ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" -$global:_ROSBE_VERSION = 1.2 +$global:_ROSBE_VERSION = 1.3 $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "RosBE" @@ -29,7 +29,10 @@ $global:_ROSBE_WRITELOG = 1 $global:_ROSBE_USECCACHE = 0 $global:_ROSBE_STRIP = 0 -$global:_ROSBE_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_NOSTRIP = 0 +$global:_ROSBE_MODULES = 1 +$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" $global:_ROSBE_LOGDIR = "$_ROSBE_ROSSOURCEDIR\RosBE-Logs" $global:_ROSBE_OBJPATH = $null $global:_ROSBE_OUTPATH = $null @@ -95,6 +98,10 @@ if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global set-alias SVN "$_ROSBE_BASEDIR\Tools\svn.exe" -scope Global + } + + if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { + set-alias UPDATE "$_ROSBE_BASEDIR\update.ps1" -scope Global }
if (Test-Path "$_ROSBE_BASEDIR\options.ps1") {
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- 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] Sat Oct 25 14:52:33 2008 @@ -17,36 +17,78 @@ $ENV:_ROSBE_ORIGINALPATH = "$PATH" }
+ +# +# Set the Arch Variables +# + +$ENV:ROS_ARCH = $null +$ENV:ROS_PREFIX = $null + +if ($_ROSBE_ARCH -eq 1) { + $ENV:ROS_ARCH = "arm" + $ENV:ROS_PREFIX = "arm-pc-mingw32" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" +} +if ($_ROSBE_ARCH -eq 2) { + $ENV:ROS_ARCH = "ppc" + $ENV:ROS_PREFIX = "ppc-pc-mingw32" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" +} +if ($_ROSBE_ARCH -eq 3) { + $ENV:ROS_ARCH = "amd64" + $ENV:ROS_PREFIX = "x86_64-pc-mingw32" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" +} + # # Set up the GCC 4.x.x build environment. # -$ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" +$ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin; $_ROSBE_ORIGINALPATH" +$global:_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe" $global:_ROSBE_GCCVERSION = $null $global:_ROSBE_GCCTARGET = $null -$global:_ROSBE_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|.)+).*",'$1' -$global:_ROSBE_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' -$ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_MINGWPATH\libexec\gcc$_ROSBE_GCCTARGET$_ROSBE_GCCVERSION;$_ROSBE_ORIGINALPATH" -$global:_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe" +if ($ENV:ROS_ARCH -ne $null) { + $global:_ROSBE_GCCVERSION = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|.)+).*",'$1' + $global:_ROSBE_GCCTARGET = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' +} else { + $global:_ROSBE_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|.)+).*",'$1' + $global:_ROSBE_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' +} +$global:_ROSBE_HOST_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|.)+).*",'$1' +$global:_ROSBE_HOST_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' + if ($_ROSBE_MODE -eq "MinGW") { - $ENV:C_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\lib\gcc$_ROSBE_GCCTARGET$_ROSBE_GCCVERSION\include" - $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\include\c++$_ROSBE_GCCVERSION;$_ROSBE_MINGWPATH\include\c++$_ROSBE_GCCVERSION$_ROSBE_GCCTARGET;$_ROSBE_MINGWPATH\lib\gcc$_ROSBE_GCCTARGET$_ROSBE_GCCVERSION\include" + $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" } else { - $ENV:HOST_CFLAGS = "-I""$_ROSBE_MINGWPATH\include"" -I""$_ROSBE_MINGWPATH\lib\gcc$_ROSBE_GCCTARGET$_ROSBE_GCCVERSION\include""" - $ENV:HOST_CPPFLAGS = "-I""$_ROSBE_MINGWPATH\include"" -I""$_ROSBE_MINGWPATH\include\c++$_ROSBE_GCCVERSION"" -I""$_ROSBE_MINGWPATH\include\c++$_ROSBE_GCCVERSION$_ROSBE_GCCTARGET"" -I""$_ROSBE_MINGWPATH\lib\gcc$_ROSBE_GCCTARGET$_ROSBE_GCCVERSION\include""" + $ENV:HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc$_ROSBE_HOST_GCCTARGET$_ROSBE_HOST_GCCVERSION\include""" + $ENV:HOST_CPPFLAGS = "-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:TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc$_ROSBE_GCCTARGET$_ROSBE_GCCVERSION\include""" + $ENV:TARGET_CPPFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++$_ROSBE_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++$_ROSBE_GCCVERSION$_ROSBE_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc$_ROSBE_GCCTARGET$_ROSBE_GCCVERSION\include""" } -$ENV:LIBRARY_PATH = "$_ROSBE_MINGWPATH\lib;$_ROSBE_MINGWPATH\lib\gcc$_ROSBE_GCCTARGET$_ROSBE_GCCVERSION"
# # Display the current version of GCC, NASM, ld and make. # +if ($ENV:ROS_ARCH -ne $null) { +& "$_ROSBE_TARGET_MINGWPATH\bin$ENV:ROS_PREFIX-gcc" -v 2>&1 | select-string "gcc version" +"gcc target - $_ROSBE_GCCTARGET" +& "$_ROSBE_TARGET_MINGWPATH\bin$ENV:ROS_PREFIX-ld" -v +} else { & gcc -v 2>&1 | select-string "gcc version" "gcc target - $_ROSBE_GCCTARGET" & ld -v +} if (Test-Path "$_ROSBE_MINGWPATH\bin\nasm.exe") { & nasm -v } else { - if ($_ROSBE_MODE -eq "RosBE") { - "ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC." + if (Test-Path "$_ROSBE_MINGWPATH\bin\yasm.exe") { + & yasm --version | select-string "yasm 0" + } else { + if ($_ROSBE_MODE -eq "RosBE") { + "ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC." + } } } if (Test-Path "$_ROSBE_MINGWPATH\bin\bison.exe") {
Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Chan... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sat Oct 25 14:52:33 2008 @@ -1,7 +1,7 @@ *** October 26th, 2008 - RosBE 1.3 Released
- Added: Tool to set the Architecture to build ROS for. (Daniel Reimer) -- Updated: NASM to 2.05 RC8 (Daniel Reimer) +- Updated: NASM to 2.03 (Daniel Reimer) - Updated: NSIS to 2.40 (Daniel Reimer) - Updated: Subversion to 1.5.3 (Daniel Reimer) - Updated: GDB to 6.8-3 (Daniel Reimer)
Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/READ... ============================================================================== Binary files - no diff available.
-
dreimer＠svn.reactos.org