Author: dreimer Date: Tue Dec 15 11:23:45 2009 New Revision: 44600
URL: http://svn.reactos.org/svn/reactos?rev=44600&view=rev Log: Fix more remaining Bugs. - PS1 options script now sets the settings immediately after closing the options tool, too. - Add missing Target Compiler C++ Paths. - Cleanup the RosBE64 NSIS Script. - Fix last remaining bug in the options tool. ARM Port still does not build. HAAAALLP!
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Tue Dec 15 11:23:45 2009 @@ -22,7 +22,7 @@
if (Test-Path "$options") { Push-Location "$_ROSBE_BASEDIR" - &{IEX "& '$options' $param"} | out-null + &{IEX "& 'options' $param"} | out-null Pop-Location if (Test-Path "$cfgfile") { & "$cfgfile"
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- 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 Dec 15 11:23:45 2009 @@ -35,4 +35,4 @@ $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\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"" -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++""" +$ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH$_ROSBE_TARGET_GCCTARGET\include"" -I""$_ROSBE_TARGET_MINGWPATH\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"""
Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rosb... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Dec 15 11:23:45 2009 @@ -39,4 +39,4 @@ set ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%%_ROSBE_HOST_GCCTARGET%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc%_ROSBE_HOST_GCCTARGET%%_ROSBE_HOST_GCCVERSION%\include" set 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" set ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc%_ROSBE_TARGET_GCCTARGET%%_ROSBE_TARGET_GCCVERSION%\include" -set ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\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++" +set ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\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%"
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.n... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Tue Dec 15 11:23:45 2009 @@ -129,7 +129,7 @@ CreateDirectory "$SMPROGRAMS$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\Tools\options.exe" 0 +2 @@ -148,7 +148,7 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SectionEnd @@ -161,7 +161,7 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SectionEnd
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] Tue Dec 15 11:23:45 2009 @@ -454,11 +454,18 @@ LoadedSettings->writelog = 1; LoadedSettings->showversion = 0; GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); - if (amd64 || arm) + if (amd64) { if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION64)) < MAX_PATH) { wcscat(LoadedSettings->mingwpath, MINGWVERSION64); + } + } + else if (arm) + { + if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSIONARM)) < MAX_PATH) + { + wcscat(LoadedSettings->mingwpath, MINGWVERSIONARM); } } else