[ros-diffs] [dreimer] 48552: Preparations for GCC 4.5.1 mingw-w64 and RosBE Version 1.6. Not working yet.

Author: dreimer
Date: Sun Aug 15 12:14:41 2010
New Revision: 48552

URL: http://svn.reactos.org/svn/reactos?rev=48552&view=rev
Log:
Preparations for GCC 4.5.1 mingw-w64 and RosBE Version 1.6. Not working yet.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
    trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt
    trunk/tools/RosBE/RosBE-Windows/Root/README.odt
    trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
    trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
    trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi
    trunk/tools/RosBE/Tools/makefile

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] Sun Aug 15 12:14:41
2010
@@ -53,7 +53,7 @@
 $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 @@
 clear-host

"*******************************************************************************"
 "*                                                                            
*"
-"*                        ReactOS Build Environment $_ROSBE_VERSION                 
    *"
+"*                        ReactOS Build Environment $_ROSBE_VERSION                 
      *"
 "*                                                                            
*"

"*******************************************************************************"
 ""

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] Sun Aug 15 12:14:41
2010
@@ -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)

Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] Sun Aug 15 12:14:41
2010
@@ -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)

Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA…
==============================================================================
Binary files - no diff available.

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 Aug 15 12:14:41 2010
@@ -30,7 +30,7 @@
 
 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 @@
 cls
 echo *******************************************************************************
 echo *                                                                             *
-echo *                        ReactOS Build Environment %_ROSBE_VERSION%                 
    *
+echo *                        ReactOS Build Environment %_ROSBE_VERSION%                 
      *
 echo *                                                                             *
 echo *******************************************************************************
 echo.

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 Aug 15 12:14:41 2010
@@ -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 @@
 ;;
 ;; 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 "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 @@
     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

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 Aug 15 12:14:41 2010
@@ -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 @@
 ;;
 ;; 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 "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

Modified: trunk/tools/RosBE/Tools/makefile
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/makefile?rev=485…
==============================================================================
--- trunk/tools/RosBE/Tools/makefile [iso-8859-1] (original)
+++ trunk/tools/RosBE/Tools/makefile [iso-8859-1] Sun Aug 15 12:14:41 2010
@@ -11,11 +11,16 @@
 	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