Preparations for GCC 4.5.1 mingw-w64 and RosBE Version 1.6. Not working yet.

svn path=/trunk/tools/RosBE/; revision=1225
This commit is contained in:
Daniel Reimer 2010-08-15 12:14:41 +00:00
parent cfb7533b3d
commit 072ab6106b
8 changed files with 37 additions and 16 deletions

View File

@ -53,7 +53,7 @@ clear-host
$global:0 = $myInvocation.MyCommand.Definition
$global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0)
$global:_ROSBE_PREFIX = $null
$global:_ROSBE_VERSION = "1.5.1"
$global:_ROSBE_VERSION = "1.6"
$global:_ROSBE_ROSSOURCEDIR = "$pwd"
$global:_ROSBE_SHOWTIME = 1
$global:_ROSBE_WRITELOG = 1
@ -205,7 +205,7 @@ LoadAliases
clear-host
"*******************************************************************************"
"* *"
"* ReactOS Build Environment $_ROSBE_VERSION *"
"* ReactOS Build Environment $_ROSBE_VERSION *"
"* *"
"*******************************************************************************"
""

View File

@ -1,3 +1,19 @@
*** Aug XXth, 2010 - RosBE 1.6 Released
- Updated Binutils to 2.20.51-20100801 (snapshot) (Daniel Reimer)
- Updated GCC to 4.5.1 (Daniel Reimer)
* gmp 5.0.1
* mpfr 3.0.0
* mpc 0.8.2
* MinGW-w64 Runtime 20100730
- Updated NASM to 2.08.02 (Daniel Reimer)
- Updated YASM to 1.0.1 (Daniel Reimer)
- Updated SVN to 1.6.12 (Daniel Reimer)
- Bug 5426 resolved (Adam Kachwalla)
- Cleanup the options tool (Christoph von Wittich)
- Add Support for the cmake bringup branch. Just install cmake and type make inside the branch (Daniel Reimer)
- Renamed make back to mingw32-make to make cmake happy (Daniel Reimer)
*** May 19th, 2010 - RosBE 1.5.1.1 Released
- fix a bug in ssvn batch version which always ran through the update function even if the 1st param was crap. (Crocodile)

View File

@ -1,4 +1,4 @@
ReactOS Build Environment v1.5.1.1
ReactOS Build Environment v1.6
Various parts of the ReactOS Build Environment are under different license's, the license's are as follows.
(The complete text for each license is included in this document excluding Subversion)

Binary file not shown.

View File

@ -30,7 +30,7 @@ if "%1" == "" (
set _ROSBE_BASEDIR=%~dp0
set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1%
set _ROSBE_VERSION=1.5.1
set _ROSBE_VERSION=1.6
set _ROSBE_ROSSOURCEDIR=%CD%
set _ROSBE_SHOWTIME=1
set _ROSBE_WRITELOG=1
@ -91,7 +91,7 @@ doskey update="%_ROSBE_BASEDIR%\Tools\elevate.exe" "%_ROSBE_BASEDIR%\update.cmd"
cls
echo *******************************************************************************
echo * *
echo * ReactOS Build Environment %_ROSBE_VERSION% *
echo * ReactOS Build Environment %_ROSBE_VERSION% *
echo * *
echo *******************************************************************************
echo.

View File

@ -1,5 +1,5 @@
!define PRODUCT_NAME "ReactOS Build Environment for Windows"
!define PRODUCT_VERSION "1.5.1.1"
!define PRODUCT_VERSION "1.6"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKCU"
@ -17,7 +17,7 @@ ShowUnInstDetails show
;;
;; Add version/product information metadata to the installation file.
;;
VIAddVersionKey /LANG=1033 "FileVersion" "1.5.1.1"
VIAddVersionKey /LANG=1033 "FileVersion" "1.6.0.0"
VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}"
VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}"
VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)"
@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team"
VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2010 ReactOS Team"
VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2010 ReactOS Team"
VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup"
VIProductVersion "1.5.1.1"
VIProductVersion "1.6.0.0"
CRCCheck force
SetDatablockOptimize on
@ -144,7 +144,7 @@ Section -BaseFiles SEC01
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\mingw32-make.exe
File /r Components\Tools\libintl3.dll
File /r Components\Tools\libiconv2.dll
File /r Components\Tools\regex2.dll

View File

@ -1,5 +1,5 @@
!define PRODUCT_NAME "ReactOS Build Environment for Windows - 64 Bit Target Compiler"
!define PRODUCT_VERSION "1.4"
!define PRODUCT_VERSION "1.4.1"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKCU"
@ -17,7 +17,7 @@ ShowUnInstDetails show
;;
;; Add version/product information metadata to the installation file.
;;
VIAddVersionKey /LANG=1033 "FileVersion" "1.4.0.0"
VIAddVersionKey /LANG=1033 "FileVersion" "1.4.1.0"
VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}"
VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}"
VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)"
@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team"
VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2010 ReactOS Team"
VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2010 ReactOS Team"
VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup"
VIProductVersion "1.4.0.0"
VIProductVersion "1.4.1.0"
CRCCheck force
SetDatablockOptimize on

View File

@ -11,12 +11,17 @@ ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
RM := del /f
SUFFIX := .exe
else
# Unix host
RM := rm -f
SUFFIX :=
ifeq ($(word 1,$(shell gcc -dumpmachine)),i686-w64-mingw32)
# Windows host
RM := del /f
SUFFIX := .exe
else
# Unix host
RM := rm -f
SUFFIX :=
endif
endif
all: cpucount scut getincludes
cpucount: cpucount.c