[ros-diffs] [dreimer] 29302: Updated everything to NASM 0.99.04. Added a Compatibility Mode to act like the old RosBE regarding the paths. "Simplified" some Variables. (Part 1 of Pierre Schweitzer's Patch)

[dreimer at svn.reactos.org]

Author: dreimer
Date: Sun Sep 30 02:34:24 2007
New Revision: 29302

URL: http://svn.reactos.org/svn/reactos?rev=29302&view=rev
Log:
Updated everything to NASM 0.99.04.
Added a Compatibility Mode to act like the old RosBE regarding the paths.
"Simplified" some Variables. (Part 1 of Pierre Schweitzer's Patch)

Modified:
    trunk/tools/RosBE-Windows/Root/ChangeLog.txt
    trunk/tools/RosBE-Windows/Root/README.txt
    trunk/tools/RosBE-Windows/Root/RosBE.cmd
    trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh

Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog.txt?rev=29302&r1=29301&r2=29302&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original)
+++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Sun Sep 30 02:34:24 2007
@@ -2,7 +2,7 @@
 
 - Updated the Variables for GCC. This is needed in r29185+ because of RBUILD Changes to
   seperate target and host headers by Hervé Poussineau. (Hervé Poussineau, Daniel Reimer)
-- Updated: NASM 0.99.02 to 0.99.03 (Daniel Reimer)
+- Updated: NASM 0.99.02 to 0.99.04 (Daniel Reimer)
 
 *** Sep 11th, 2007 - RosBE 0.3.8 Released
 

Modified: trunk/tools/RosBE-Windows/Root/README.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.txt?rev=29302&r1=29301&r2=29302&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/README.txt (original)
+++ trunk/tools/RosBE-Windows/Root/README.txt Sun Sep 30 02:34:24 2007
@@ -15,7 +15,7 @@
 mingw-runtime-3.13
 w32api-3.10
 mingw32-make-3.81-2
-nasm-0.99.03-win32
+nasm-0.99.04-win32
 mingw-4.1.3-20070829-prerelease
     - Patched to fix a GCC bug concerning
       decorating virtual methods with stdcall

Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd?rev=29302&r1=29301&r2=29302&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sun Sep 30 02:34:24 2007
@@ -21,6 +21,7 @@
 set _ROSSOURCEDIRBASE=%CD%
 set ROSBE_SHOWTIME=1
 set ROSBE_WRITELOG=1
+set ROSBE_MINGWPATH=%ROSBEBASEDIR%\4.1.3
 set _LOGDIR=%CD%\RosBE-Logs
 
 if exist %ROSBEBASEDIR%\options.cmd (
@@ -46,10 +47,18 @@
 ::
 if "%1" == "" (
     cls
+    set HOST_CFLAGS=-I"%ROSBE_MINGWPATH%\include" -I"%ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include"
+    set HOST_CPPFLAGS=-I"%ROSBE_MINGWPATH%\include" -I"%ROSBE_MINGWPATH%\include\c++\4.1.3" -I"%ROSBE_MINGWPATH%\include\c++\4.1.3\mingw32" -I"%ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include"
     call :RosBE4
     goto :EndCommandParse
 )
-if not "%1" == "" (
+if "%1" == "oldmode" (
+    cls
+    set C_INCLUDE_PATH=%ROSBE_MINGWPATH%\include;%ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include
+    set CPLUS_INCLUDE_PATH=%ROSBE_MINGWPATH%\include;%ROSBE_MINGWPATH%\include\c++\4.1.3;%ROSBE_MINGWPATH%\include\c++\4.1.3\mingw32;%ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include
+    call :RosBE4
+    goto :EndCommandParse
+) else (
     cls
     echo Unknown parameter specified. Exiting.
     goto :ExitRosBE
@@ -111,12 +120,10 @@
     ::
     :: Set the correct path for the build tools and set the MinGW make.
     ::
-    set PATH=%ROSBEBASEDIR%\4.1.3\bin;%ROSBEBASEDIR%\4.1.3\libexec\gcc\mingw32\4.1.3;%PATH%
-    set _MINGWMAKE=%ROSBEBASEDIR%\4.1.3\bin\mingw32-make.exe
+    set PATH=%ROSBE_MINGWPATH%\bin;%ROSBE_MINGWPATH%\libexec\gcc\mingw32\4.1.3;%PATH%
+    set _MINGWMAKE=%ROSBE_MINGWPATH%\bin\mingw32-make.exe
     set _MINGWVERSION=4.1.3
-    set HOST_CFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include"
-    set HOST_CPPFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3\mingw32" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include"
-    set LIBRARY_PATH=%ROSBEBASEDIR%\4.1.3\lib;%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3
+    set LIBRARY_PATH=%ROSBE_MINGWPATH%\lib;%ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3
 
     echo *******************************************************************************
     echo *                                                                             *

Modified: trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh?rev=29302&r1=29301&r2=29302&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh (original)
+++ trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh Sun Sep 30 02:34:24 2007
@@ -1,4 +1,4 @@
-Section "-MinGW, GCC v4.1.3 and NASM 0.99.03" SEC01
+Section "-MinGW, GCC v4.1.3 and NASM 0.99.04" SEC01
     SetOutPath "$INSTDIR\4.1.3\"
     SetOverwrite try
     File /r Components\4.1.3\*.*