[dreimer] 45494: - Include the new Tool from Colin into PS1, too. - Update ChangeLog.txt. - Add the new Tool to the Tools makefile. - Add the new Tool to Installer. Last cosmetic thing to fix: Show Target GCC Version in the Versions showup at the startup from RosBE without this evil temp file hack. If anyone finds another bug... KEEP IT :-P (jk)
8 Feb
2010
8 Feb
'10
12:35 a.m.
Author: dreimer
Date: Mon Feb 8 01:35:07 2010
New Revision: 45494
URL: http://svn.reactos.org/svn/reactos?rev=45494&view=rev
Log:
- Include the new Tool from Colin into PS1, too.
- Update ChangeLog.txt.
- Add the new Tool to the Tools makefile.
- Add the new Tool to Installer.
Last cosmetic thing to fix: Show Target GCC Version in the Versions showup at the startup
from RosBE without this evil temp file hack.
If anyone finds another bug... KEEP IT :-P (jk)
Modified:
trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1
trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd
trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
trunk/tools/RosBE/RosBE-Windows/Root/version.cmd
trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/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 Feb 8 01:35:07
2010
@@ -57,7 +57,7 @@
if (!(Test-Path "$_ROSBE_LOGDIR")) {
New-Item -path "$_ROSBE_LOGDIR" -type directory
}
- $file =
"$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt"
+ $file = "$_ROSBE_LOGDIR\BuildLog-$ENV:ROS_ARCH-$DATENAME-$TIMENAME.txt"
&{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args)
2>&1 | tee-object $file
} else {
&{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args)
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 Feb 8
01:35:07 2010
@@ -22,17 +22,9 @@
}
$ENV:PATH =
"$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH"
-$TARGETGCC = "$global:_ROSBE_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'
-remove-item gcctvers.tmp
-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
-$ENV:ROSBE_HOST_CFLAGS =
"-I""$_ROSBE_HOST_MINGWPATH\$_ROSBE_HOST_GCCTARGET\include""
-I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include"""
-$ENV:ROSBE_HOST_CXXFLAGS =
"-I""$_ROSBE_HOST_MINGWPATH\$_ROSBE_HOST_GCCTARGET\include""
-I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include\c++""
-I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include"""
-$ENV:ROSBE_TARGET_CFLAGS =
"-I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include""
-I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include"""
-$ENV:ROSBE_TARGET_CXXFLAGS =
"-I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\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""
-I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include\c++""
-I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include\c++\$_ROSBE_TARGET_GCCVERSION""
-I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include\c++\$_ROSBE_TARGET_GCCVERSION\$_ROSBE_TARGET_GCCTARGET"""
+$ENV:ROSBE_HOST_CFLAGS = "" | cpp.exe -x c -v 2>&1 | getincludes
+$ENV:ROSBE_HOST_CXXFLAGS = "" | cpp.exe -x c++ -v 2>&1 | getincludes
+$TARGETGCC = "$_ROSBE_PREFIX" + "cpp.exe"
+$ENV:ROSBE_TARGET_CFLAGS = "" | &$TARGETGCC -x c -v 2>&1 |
getincludes
+$ENV:ROSBE_TARGET_CXXFLAGS = "" | &$TARGETGCC -x c++ -v 2>&1 |
getincludes
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 Feb 8
01:35:07 2010
@@ -12,7 +12,7 @@
$TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc"
& $TARGETGCC -v 2> gcctvers.tmp
(select-string -path .\gcctvers.tmp "gcc version") -replace
".*:(.*?)\b",'$1'
-"gcc target - $_ROSBE_TARGET_GCCTARGET"
+"gcc target - $ENV:ROS_ARCH"
remove-item gcctvers.tmp
# LD
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Mon Feb 8 01:35:07
2010
@@ -55,7 +55,7 @@
if not exist "%_ROSBE_LOGDIR%\." (
mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL
)
- %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe
"%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt"
+ %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe
"%_ROSBE_LOGDIR%\BuildLog-%ROS_ARCH%-%datename%-%timename%.txt"
) else (
%BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %*
)
Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Mon Feb 8 01:35:07
2010
@@ -1,4 +1,4 @@
-*** Jan XXth, 2010 - RosBE 1.5 Released
+*** Feb 08th, 2010 - RosBE 1.5 Released
- Updated Binutils to 2.20.51-20091222 (snapshot) (Colin Finck)
- Updated GCC to 4.4.3 (including backported GCC r153606) (Colin Finck)
@@ -10,7 +10,7 @@
- Updated SVN to 1.6.9 (Daniel Reimer)
- Added Remake Command (Daniel Reimer)
- Added kdbg Command (Jan Roeloffzen, Daniel Reimer)
-- Replaced raddr2line with log2lines v1.11 (Jan Roeloffzen, Daniel Reimer)
+- Replaced raddr2line with log2lines v1.12 (Jan Roeloffzen, Daniel Reimer)
- Added piperead Tool for log2lines fully working in Powershell (Jan Roeloffzen, Daniel
Reimer)
- Added a chinese translation to the options tool (Elton Chung)
- Added ARM Arch support to RosBE (Daniel Reimer)
@@ -32,6 +32,8 @@
- Removed the address translation from the raddr2line script. Its done in the tools now
(Daniel Reimer)
- Fixed the Core detection in makex for PS. Added a global setting to the variable
containing the number of cores. (Daniel Reimer)
+- Added getincludes from RosBE Unix. This makes the schripts way more logical and fixes a
PS Bug
+ when you open several Windows at once (Colin Finck, Daniel Reimer)
*** Oct 26th, 2009 - RosBE 1.4.5 Released
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] Mon Feb 8 01:35:07
2010
@@ -17,7 +17,7 @@
:: GCC
"%_ROSBE_TARGET_MINGWPATH%\bin\%_ROSBE_PREFIX%gcc" -v 2>&1 | find
"gcc version"
-echo gcc target^: %_ROSBE_TARGET_GCCTARGET%
+echo gcc target^: %ROS_ARCH%
:: LD
"%_ROSBE_TARGET_MINGWPATH%\bin\%_ROSBE_PREFIX%ld" -v
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] Mon Feb 8 01:35:07 2010
@@ -118,45 +118,30 @@
File /r Root\README.pdf
File /r Root\changelog.txt
File /r Root\LICENSE.txt
- ${If} $R4 = '6.1'
- 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
- File /r Components\Powershell\Remake.ps1
- File /r Components\Powershell\RosBE.ps1
- File /r Components\Powershell\rosbe-gcc-env.ps1
- File /r Components\Powershell\version.ps1
- WriteRegStr HKLM
"SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell"
"ExecutionPolicy" "RemoteSigned"
- WriteRegStr HKLM
"SOFTWARE\Wow6432Node\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell"
"ExecutionPolicy" "RemoteSigned"
- ${else}
- File /r Root\Basedir.cmd
- File /r Root\Build-Shared.cmd
- File /r Root\charch.cmd
- File /r Root\chdefgcc.cmd
- File /r Root\Clean.cmd
- File /r Root\Help.cmd
- File /r Root\Make.cmd
- File /r Root\Makex.cmd
- File /r Root\Remake.cmd
- File /r Root\Renv.cmd
- 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\flash.exe
- File /r Components\Tools\buildtime.exe
- File /r Components\Tools\chknewer.exe
- File /r Components\Tools\cpucount.exe
- File /r Components\Tools\getdate.exe
- File /r Components\Tools\rquote.exe
- File /r Components\Tools\tee.exe
- ${Endif}
- SetOutPath "$INSTDIR\Tools"
- SetOverwrite try
+ File /r Root\Basedir.cmd
+ File /r Root\Build-Shared.cmd
+ File /r Root\charch.cmd
+ File /r Root\chdefgcc.cmd
+ File /r Root\Clean.cmd
+ File /r Root\Help.cmd
+ File /r Root\Make.cmd
+ File /r Root\Makex.cmd
+ File /r Root\Remake.cmd
+ File /r Root\Renv.cmd
+ 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\flash.exe
+ File /r Components\Tools\buildtime.exe
+ File /r Components\Tools\chknewer.exe
+ File /r Components\Tools\cpucount.exe
+ File /r Components\Tools\getdate.exe
+ File /r Components\Tools\getincludes.exe
+ File /r Components\Tools\rquote.exe
+ File /r Components\Tools\tee.exe
File /r Components\Tools\make.exe
File /r Components\Tools\libintl3.dll
File /r Components\Tools\libiconv2.dll
@@ -179,11 +164,7 @@
SetShellVarContext current
SetOutPath "$INSTDIR"
SetOverwrite try
- ${If} $R4 = '6.1'
- File /r Components\Powershell\options.ps1
- ${else}
- File /r Root\options.cmd
- ${Endif}
+ File /r Root\options.cmd
SetOutPath "$INSTDIR\Tools"
SetOverwrite try
File /r Components\Tools\options.exe
@@ -199,11 +180,7 @@
SetShellVarContext current
SetOutPath "$INSTDIR"
SetOverwrite try
- ${If} $R4 = '6.1'
- File /r Components\Powershell\sSVN.ps1
- ${else}
- File /r Root\sSVN.cmd
- ${Endif}
+ File /r Root\sSVN.cmd
SetOutPath "$INSTDIR\Tools"
SetOverwrite try
File /r Components\Tools\svn.exe
@@ -232,11 +209,7 @@
SetShellVarContext current
SetOutPath "$INSTDIR"
SetOverwrite try
- ${If} $R4 = '6.1'
- File /r Components\Powershell\scut.ps1
- ${else}
- File /r Root\scut.cmd
- ${Endif}
+ File /r Root\scut.cmd
SetOutPath "$INSTDIR\Tools"
SetOverwrite try
File /r Components\Tools\scut.exe
@@ -262,13 +235,8 @@
SetShellVarContext current
SetOutPath "$INSTDIR"
SetOverwrite try
- ${If} $R4 = '6.1'
- File /r Components\Powershell\reladdr2line.ps1
- File /r Components\Powershell\kdbg.ps1
- ${else}
- File /r Root\raddr2line.cmd
- File /r Root\kdbg.cmd
- ${Endif}
+ File /r Root\raddr2line.cmd
+ File /r Root\kdbg.cmd
SetOutPath "$INSTDIR\Tools"
SetOverwrite try
File /r Components\Tools\echoh.exe
@@ -281,13 +249,8 @@
SetShellVarContext current
SetOutPath "$INSTDIR"
SetOverwrite try
- ${If} $R4 = '6.1'
- File /r Components\Powershell\chdefdir.ps1
- File /r Components\Powershell\Config.ps1
- ${else}
- File /r Root\chdefdir.cmd
- File /r Root\Config.cmd
- ${Endif}
+ File /r Root\chdefdir.cmd
+ File /r Root\Config.cmd
SectionEnd
Section "Update Script" SEC10
@@ -301,73 +264,32 @@
File /r Components\Tools\elevate.exe
SetOutPath "$INSTDIR"
SetOverwrite try
- ${If} $R4 = '6.1'
- File /r Components\Powershell\update.ps1
- ${else}
- File /r Root\update.cmd
- ${Endif}
-SectionEnd
-
-Section "PowerShell (XP, Vista) / CMD (win7) Version" SEC11
+ File /r Root\update.cmd
+SectionEnd
+
+Section "PowerShell Version" SEC11
SetShellVarContext current
- ${If} $R4 = '6.1'
- SetOutPath "$INSTDIR"
- SetOverwrite try
- File /r Root\Basedir.cmd
- File /r Root\Build-Shared.cmd
- File /r Root\chdefgcc.cmd
- File /r Root\Clean.cmd
- File /r Root\Help.cmd
- File /r Root\Make.cmd
- File /r Root\Makex.cmd
- File /r Root\Renv.cmd
- File /r Root\RosBE.cmd
- File /r Root\rosbe-gcc-env.cmd
- File /r Root\TimeDate.cmd
- File /r Root\version.cmd
- File /r Root\charch.cmd
- File /r Root\chdefdir.cmd
- File /r Root\Config.cmd
- File /r Root\options.cmd
- File /r Root\Remake.cmd
- File /r Root\kdbg.cmd
- File /r Root\raddr2line.cmd
- File /r Root\scut.cmd
- File /r Root\sSVN.cmd
- File /r Root\update.cmd
- SetOutPath "$INSTDIR\Tools"
- SetOverwrite try
- File /r Components\Tools\buildtime.exe
- File /r Components\Tools\flash.exe
- File /r Components\Tools\chknewer.exe
- File /r Components\Tools\cpucount.exe
- File /r Components\Tools\getdate.exe
- File /r Components\Tools\rquote.exe
- File /r Components\Tools\tee.exe
- File /r Components\Tools\elevate.exe
- ${else}
- SetOutPath "$INSTDIR"
- SetOverwrite try
- File /r Components\Powershell\Build.ps1
- File /r Components\Powershell\RosBE.ps1
- File /r Components\Powershell\rosbe-gcc-env.ps1
- File /r Components\Powershell\Help.ps1
- File /r Components\Powershell\chdefgcc.ps1
- File /r Components\Powershell\Clean.ps1
- File /r Components\Powershell\version.ps1
- File /r Components\Powershell\charch.ps1
- File /r Components\Powershell\chdefdir.ps1
- File /r Components\Powershell\Config.ps1
- File /r Components\Powershell\options.ps1
- File /r Components\Powershell\Remake.ps1
- File /r Components\Powershell\kdbg.ps1
- File /r Components\Powershell\reladdr2line.ps1
- File /r Components\Powershell\scut.ps1
- File /r Components\Powershell\sSVN.ps1
- File /r Components\Powershell\update.ps1
- WriteRegStr HKLM
"SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell"
"ExecutionPolicy" "RemoteSigned"
- WriteRegStr HKLM
"SOFTWARE\Wow6432Node\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell"
"ExecutionPolicy" "RemoteSigned"
- ${Endif}
+ SetOutPath "$INSTDIR"
+ SetOverwrite try
+ File /r Components\Powershell\Build.ps1
+ File /r Components\Powershell\RosBE.ps1
+ File /r Components\Powershell\rosbe-gcc-env.ps1
+ File /r Components\Powershell\Help.ps1
+ File /r Components\Powershell\chdefgcc.ps1
+ File /r Components\Powershell\Clean.ps1
+ File /r Components\Powershell\version.ps1
+ File /r Components\Powershell\charch.ps1
+ File /r Components\Powershell\chdefdir.ps1
+ File /r Components\Powershell\Config.ps1
+ File /r Components\Powershell\options.ps1
+ File /r Components\Powershell\Remake.ps1
+ File /r Components\Powershell\kdbg.ps1
+ File /r Components\Powershell\reladdr2line.ps1
+ File /r Components\Powershell\scut.ps1
+ File /r Components\Powershell\sSVN.ps1
+ File /r Components\Powershell\update.ps1
+ WriteRegStr HKLM
"SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell"
"ExecutionPolicy" "RemoteSigned"
+ WriteRegStr HKLM
"SOFTWARE\Wow6432Node\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell"
"ExecutionPolicy" "RemoteSigned"
SectionEnd
Section -StartMenuShortcuts SEC12
@@ -422,11 +344,7 @@
Section -Post SEC15
WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
- ${If} $R4 = '6.1'
- WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" ""
"$INSTDIR\RosBE.ps1"
- ${else}
- WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" ""
"$INSTDIR\RosBE.cmd"
- ${Endif}
+ WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" ""
"$INSTDIR\RosBE.cmd"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
"DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
"UninstallString" "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
"DisplayVersion" "${PRODUCT_VERSION}"
5393
days inactive
5393
days old
0 comments
1 participants
participants (1)
-
dreimer＠svn.reactos.org