[ros-diffs] [dreimer] 33194: build.ps1 does still not work, but you can build now with "mingw32-make bootcd".

[dreimer at svn.reactos.org]

Author: dreimer
Date: Tue Apr 29 16:46:25 2008
New Revision: 33194

URL: http://svn.reactos.org/svn/reactos?rev=33194&view=rev
Log:
build.ps1 does still not work, but you can build now with "mingw32-make bootcd".

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1?rev=33194&r1=33193&r2=33194&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Apr 29 16:46:25 2008
@@ -97,10 +97,6 @@
 if (Test-Path "$_ROSBE_BASEDIR\options.ps1") {
 set-alias OPTIONS "& $_ROSBE_BASEDIR\options.ps1"
 }
-
-set-alias test "ddd"
-
-test
 }
 
 #
@@ -126,11 +122,12 @@
 if ($args[0] = "oldmode") {
 #    cls
     $_ROSBE_MODE = "MinGW"
-}
+
 } else {
 #    cls
     "Unknown parameter specified. Exiting."
 exit
+}
 }
 RosBE4
 #cls

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1?rev=33194&r1=33193&r2=33194&view=diff
==============================================================================
--- 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] Tue Apr 29 16:46:25 2008
@@ -12,56 +12,56 @@
 # Check if we are running within the RosBE, and if not
 # initialize GCC for the current directory.
 #
-if not defined _ROSBE_MINGWPATH (
-    set _ROSBE_MODE=MinGW
-    set _ROSBE_MINGWPATH=%CD%
-    set _ROSBE_ORIGINALPATH=%PATH%
-)
+if ($ENV:_ROSBE_MINGWPATH = $null) {
+    $ENV:_ROSBE_MODE = "MinGW"
+    $ENV:_ROSBE_MINGWPATH = "$pwd"
+    $ENV:_ROSBE_ORIGINALPATH = "$PATH"
+}
 
 #
 # Set up the GCC 4.x.x build environment.
 #
-set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH%
-set _ROSBE_GCCVERSION=
-set _ROSBE_GCCTARGET=
-for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i
-for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i
-set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH%
-set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe
-if "%_ROSBE_MODE%" == "MinGW" (
-    set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include
-    set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include
-) else (
-    set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include"
-    set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include"
-)
-set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%
+$ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_ORIGINALPATH"
+$_ROSBE_GCCVERSION = $null
+$_ROSBE_GCCTARGET = $null
+#for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i
+#for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i
+$ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_MINGWPATH\libexec\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION;$_ROSBE_ORIGINALPATH"
+$_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe"
+if ($_ROSBE_MODE = "MinGW") {
+    $ENV:C_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"
+    $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"
+} else {
+    $ENV:HOST_CFLAGS = "-I""$_ROSBE_MINGWPATH\include"" -I""$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"""
+    $ENV:HOST_CPPFLAGS = "-I""$_ROSBE_MINGWPATH\include"" -I""$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"""
+}
+$ENV:LIBRARY_PATH = "$_ROSBE_MINGWPATH\lib;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION"
 
 #
 # Display the current version of GCC, NASM, ld and make.
 #
 gcc -v 2>&1 | find "gcc version"
-echo gcc target^: %_ROSBE_GCCTARGET%
+"gcc target - $_ROSBE_GCCTARGET"
 ld -v
-if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" (
+if (Test-Path "$_ROSBE_MINGWPATH\bin\nasm.exe") {
     nasm -v
-) else (
-    if "%_ROSBE_MODE%" == "RosBE" (
-        echo ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC.
-    )
-)
-if exist "%_ROSBE_MINGWPATH%\bin\bison.exe" (
+} else {
+    if ($_ROSBE_MODE = "RosBE") {
+        "ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC."
+    }
+}
+if (Test-Path "$_ROSBE_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 found in the current MinGW/GCC.
-    )
-)
-if exist "%_ROSBE_MINGWPATH%\bin\flex.exe" (
+} else {
+    if ($_ROSBE_MODE = "RosBE") {
+        "WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC."
+    }
+}
+if (Test-Path "$_ROSBE_MINGWPATH\bin\flex.exe") {
     flex --version
-) else (
-    if "%_ROSBE_MODE%" == "RosBE" (
-        echo WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC.
-    )
-)
+} else {
+    if ($_ROSBE_MODE = "RosBE") {
+        "WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC."
+    }
+}
 mingw32-make -v | find "GNU Make"