[dreimer] 39670: Split off the version displaying and add it to a new command. This speeds up the startup of RosBE. Credits for this Idea go to Colin Finck.
Author: dreimer Date: Wed Feb 18 15:34:48 2009 New Revision: 39670
URL: http://svn.reactos.org/svn/reactos?rev=39670&view=rev Log: Split off the version displaying and add it to a new command. This speeds up the startup of RosBE. Credits for this Idea go to Colin Finck.
Added: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Root/version.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
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] Wed Feb 18 15:34:48 2009 @@ -58,8 +58,6 @@ "* *" "*******************************************************************************" "" - "" - (get-WmiObject Win32_OperatingSystem).caption # # Set the correct path for the build tools and set the MinGW make. # @@ -113,6 +111,8 @@ if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { set-alias UPDATE "$_ROSBE_BASEDIR\update.ps1" -scope Global } + + set-alias VERSION "$_ROSBE_BASEDIR\version.ps1" -scope Global
if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { set-alias OPTIONS "$_ROSBE_BASEDIR\options.ps1" -scope Global
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Wed Feb 18 15:34:48 2009 @@ -18,6 +18,7 @@ # function SYSPARAM { IEX "& '$_ROSBE_BASEDIR\rosbe-gcc-env.ps1'" + version } if ($args.count -eq 0) { #
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Wed Feb 18 15:34:48 2009 @@ -20,6 +20,7 @@ function EOA { IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.cmd' chdefgcc" settitle + version }
#
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] Wed Feb 18 15:34:48 2009 @@ -111,43 +111,3 @@ $ENV:TARGET_CFLAGS = $null $ENV:TARGET_CPPFLAGS = $null } -# -# Display the current version of GCC, NASM, ld and make. -# - -(select-string -path .\gcctvers.tmp "gcc version") -replace ".*: (.+?)\b",'$1' -"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 -} -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." - } - } -} -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." - } -} -& mingw32-make -v | & find "GNU Make"
Added: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Wed Feb 18 15:34:48 2009 @@ -1,0 +1,46 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/version.ps1 +# PURPOSE: Display the current version of GCC, NASM, ld and make. +# COPYRIGHT: Copyright 2009 Daniel Reimer reimer.daniel@freenet.de +# + +(get-WmiObject Win32_OperatingSystem).caption + +(select-string -path .\gcctvers.tmp "gcc version") -replace ".*: (.+?)\b",'$1' +"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 +} +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." + } + } +} +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." + } +} +& mingw32-make -v | & find "GNU Make"
Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosB... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Wed Feb 18 15:34:48 2009 @@ -123,8 +123,6 @@ echo * * echo ******************************************************************************* echo. -echo. -ver
:: :: Set the correct path for the build tools and set the MinGW make.
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosB... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] Wed Feb 18 15:34:48 2009 @@ -15,3 +15,4 @@ SVN = "%_ROSBE_BASEDIR%\Tools\svn.exe" $* UPDATE = "%_ROSBE_BASEDIR%\update.cmd" $* OPTIONS = "%_ROSBE_BASEDIR%\options.cmd" $* +VERSION = "%_ROSBE_BASEDIR%\version.cmd" $*
Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/char... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Wed Feb 18 15:34:48 2009 @@ -37,6 +37,7 @@ :EOA
call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" +"%_ROSBE_BASEDIR%\version.cmd" goto :EOC
::
Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chde... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Wed Feb 18 15:34:48 2009 @@ -57,6 +57,7 @@ :EOA
call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" chdefgcc +"%_ROSBE_BASEDIR%\version.cmd" goto :EOC
:INTERACTIVE
Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rosb... ============================================================================== --- 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] Wed Feb 18 15:34:48 2009 @@ -124,50 +124,3 @@ set TARGET_CFLAGS= set TARGET_CPPFLAGS= ) -:: -:: Display the current version of GCC, NASM, ld and make. -:: -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 -) - -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. - ) - ) -) -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. - ) -) -mingw32-make -v | find "GNU Make"
Added: trunk/tools/RosBE/RosBE-Windows/Root/version.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/vers... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/version.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] Wed Feb 18 15:34:48 2009 @@ -1,0 +1,60 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/version.cmd +:: PURPOSE: Display the current version of GCC, NASM, ld and make. +:: COPYRIGHT: Copyright 2009 Daniel Reimer reimer.daniel@freenet.de +:: +:: +@echo off +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + +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 +) + +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. + ) + ) +) +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. + ) +) +mingw32-make -v | find "GNU Make"
Propchange: trunk/tools/RosBE/RosBE-Windows/Root/version.cmd ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.nsi... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Feb 18 15:34:48 2009 @@ -124,6 +124,7 @@ File /r Root\RosBE.cmd File /r Root\rosbe-gcc-env.cmd File /r Root\TimeDate.cmd + File /r Root\version.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\buildtime.exe @@ -252,6 +253,7 @@ File /r Components\Powershell\scut.ps1 File /r Components\Powershell\sSVN.ps1 File /r Components\Powershell\update.ps1 + File /r Components\Powershell\version.ps1 SectionEnd
Section "Update Script" SEC11 @@ -354,20 +356,26 @@ Delete /REBOOTOK "$INSTDIR\Clean.cmd" Delete /REBOOTOK "$INSTDIR\Clean.ps1" Delete /REBOOTOK "$INSTDIR\Config.cmd" + Delete /REBOOTOK "$INSTDIR\Config.sp1" 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" + Delete /REBOOTOK "$INSTDIR\reladdr2line.ps1" Delete /REBOOTOK "$INSTDIR\RosBE.cmd" Delete /REBOOTOK "$INSTDIR\RosBE.ps1" Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.cmd" Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.ps1" Delete /REBOOTOK "$INSTDIR\scut.cmd" + Delete /REBOOTOK "$INSTDIR\scut.ps1" Delete /REBOOTOK "$INSTDIR\sSVN.cmd" + Delete /REBOOTOK "$INSTDIR\sSVN.ps1" Delete /REBOOTOK "$INSTDIR\TimeDate.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" @@ -378,6 +386,8 @@ Delete /REBOOTOK "$INSTDIR\LICENSE.txt" Delete /REBOOTOK "$INSTDIR\srclist.txt" Delete /REBOOTOK "$INSTDIR\config.rbuild" + Delete /REBOOTOK "$INSTDIR\version.cmd" + Delete /REBOOTOK "$INSTDIR\version.ps1" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR"
-
dreimer＠svn.reactos.org