[dreimer] 43012: Get rid of the TranslateOptions Hack and set the env vars properly. Thx to arty for help.
Author: dreimer Date: Tue Sep 8 16:07:10 2009 New Revision: 43012
URL: http://svn.reactos.org/svn/reactos?rev=43012&view=rev Log: Get rid of the TranslateOptions Hack and set the env vars properly. Thx to arty for help.
Removed: trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -18,34 +18,6 @@ "" exit } -} - -# Check if strip, no Debug Symbols or ccache are being used and set the appropriate options. -if ($_ROSBE_NOSTRIP -eq 1) { - $ENV:ROS_BUILDNOSTRIP = "yes" -} else { - $ENV:ROS_BUILDNOSTRIP = "no" -} -if ($_ROSBE_STRIP -eq 1) { - $ENV:ROS_LEAN_AND_MEAN = "yes" -} else { - $ENV:ROS_LEAN_AND_MEAN = "no" -} - -# Check if the user has chosen to use a different object or output path and set -# it accordingly. -if ("$_ROSBE_OBJPATH" -ne "") { - if (Test-Path "$_ROSBE_OBJPATH") { - "WARNING: The Object-Path specified doesn't seem to exist. Creating..." - } - $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH" - $ENV:ROS_TEMPORARY = "$_ROSBE_OBJPATH" -} -if ("$_ROSBE_OUTPATH" -ne "") { - if (Test-Path "$_ROSBE_OUTPATH") { - "WARNING: The Output-Path specified doesn't seem to exist. Creating..." - } - $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH" }
if ($_ROSBE_USECCACHE -eq 1) {
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -41,8 +41,6 @@ $global:_ROSBE_SHOWTIME = 1 $global:_ROSBE_WRITELOG = 1 $global:_ROSBE_USECCACHE = 0 -$global:_ROSBE_STRIP = 0 -$global:_ROSBE_NOSTRIP = 0 $global:_ROSBE_SHOWVERSION = 0 $global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs" $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386"
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Buil... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -27,8 +27,6 @@ goto :EOC ) ) - -call "%_ROSBE_BASEDIR%\TranslateOptions.cmd"
if "%_ROSBE_USECCACHE%" == "1" ( set _ROSBE_CCACHE=ccache
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosB... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -35,11 +35,7 @@ set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 set _ROSBE_USECCACHE=0 -set _ROSBE_STRIP=0 -set _ROSBE_NOSTRIP=0 set _ROSBE_LOGDIR=%CD%\RosBE-Logs -set _ROSBE_OBJPATH= -set _ROSBE_OUTPATH= set _ROSBE_SHOWVERSION=0 set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%%ROS_ARCH% @@ -91,7 +87,7 @@ cls echo ******************************************************************************* echo * * -echo * ReactOS Build Environment %_ROSBE_VERSION% * +echo * ReactOS Build Environment %_ROSBE_VERSION% * echo * * echo ******************************************************************************* echo.
Removed: trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tran... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd (removed) @@ -1,30 +1,0 @@ -:: This file is entirely a HACK!!! -:: The ROS_* variables set here should later be set by the Options utility, so we can drop the translations from _ROSBE_* variables here - -if "%_ROSBE_NOSTRIP%" == "1" ( - set ROS_BUILDNOSTRIP=yes -) else ( - set ROS_BUILDNOSTRIP=no -) - -if "%_ROSBE_STRIP%" == "1" ( - set ROS_LEAN_AND_MEAN=yes -) else ( - set ROS_LEAN_AND_MEAN=no -) - -:: Check if the user has chosen to use a different object or output path -:: and set it accordingly. -if defined _ROSBE_OBJPATH ( - if not exist "%_ROSBE_OBJPATH%." ( - echo WARNING: The Object-Path specified doesn't seem to exist. Creating... - ) - set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% - set ROS_TEMPORARY=%_ROSBE_OBJPATH% -) -if defined _ROSBE_OUTPATH ( - if not exist "%_ROSBE_OUTPATH%." ( - echo WARNING: The Output-Path specified doesn't seem to exist. Creating... - ) - set ROS_OUTPUT=%_ROSBE_OUTPATH% -)
Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opti... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -12,7 +12,6 @@ @echo on )
-setlocal enabledelayedexpansion title Options
if "%ROS_ARCH%" == "amd64" ( @@ -37,4 +36,3 @@ )
title ReactOS Build Environment %_ROSBE_VERSION% -endlocal
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.nsi... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -140,7 +140,6 @@ File /r Root\RosBE.mac File /r Root\rosbe-gcc-env.cmd File /r Root\TimeDate.cmd - File /r Root\TranslateOptions.cmd File /r Root\version.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try @@ -307,7 +306,6 @@ File /r Root\RosBE.mac File /r Root\rosbe-gcc-env.cmd File /r Root\TimeDate.cmd - File /r Root\TranslateOptions.cmd File /r Root\version.cmd File /r Root\charch.cmd File /r Root\chdefdir.cmd @@ -480,7 +478,6 @@ Delete /REBOOTOK "$INSTDIR\sSVN.cmd" Delete /REBOOTOK "$INSTDIR\sSVN.ps1" Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" - Delete /REBOOTOK "$INSTDIR\TranslateOptions.cmd" Delete /REBOOTOK "$INSTDIR\update.cmd" Delete /REBOOTOK "$INSTDIR\update.ps1" Delete /REBOOTOK "$INSTDIR\README.pdf"
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -134,14 +134,25 @@ fwprintf(pFilecmd, L"color %X%X\n", background, foreground); fwprintf(pFilecmd, L"set _ROSBE_SHOWTIME=%d\n", showtime); fwprintf(pFilecmd, L"set _ROSBE_USECCACHE=%d\n", useccache); - fwprintf(pFilecmd, L"set _ROSBE_STRIP=%d\n", strip); - fwprintf(pFilecmd, L"set _ROSBE_NOSTRIP=%d\n", nostrip); + if (strip == 1) { + fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=yes\n"); + } else { + fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=no\n"); + } + if (nostrip == 1) { + fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=yes\n"); + } else { + fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=no\n"); + } fwprintf(pFilecmd, L"set _ROSBE_WRITELOG=%d\n", writelog); fwprintf(pFilecmd, L"set _ROSBE_SHOWVERSION=%d\n", showversion); if (logdir[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir); if (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFilecmd, L"set _ROSBE_OBJPATH=%s\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set _ROSBE_OUTPATH=%s\n", outdir); + if ((objdir[0] != 0) && objstate) { + fwprintf(pFilecmd, L"set ROS_INTERMEDIATE=%s\n", objdir); + fwprintf(pFilecmd, L"set ROS_TEMPORARY=%s\n", objdir); + } + if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set ROS_OUTPUT=%s\n", outdir); }
if (pFileps1) @@ -155,14 +166,25 @@ fwprintf(pFileps1, L"clear-host\n"); fwprintf(pFileps1, L"$global:_ROSBE_SHOWTIME = %d\n", showtime); fwprintf(pFileps1, L"$global:_ROSBE_USECCACHE = %d\n", useccache); - fwprintf(pFileps1, L"$global:_ROSBE_STRIP = %d\n", strip); - fwprintf(pFileps1, L"$global:_ROSBE_NOSTRIP = %d\n", nostrip); + if (strip == 1) { + fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = "yes"\n"); + } else { + fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = "no"\n"); + } + if (nostrip == 1) { + fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = "yes"\n"); + } else { + fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = "no"\n"); + } fwprintf(pFileps1, L"$global:_ROSBE_WRITELOG = %d\n", writelog); fwprintf(pFileps1, L"$global:_ROSBE_SHOWVERSION = %d\n", showversion); if (logdir[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_LOGDIR = "%s"\n", logdir); - if (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = "%s"\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$global:_ROSBE_OBJPATH = "%s"\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$global:_ROSBE_OUTPATH = "%s"\n", outdir); + if (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = "%s"\n", mingwpath); + if ((objdir[0] != 0) && objstate) { + fwprintf(pFileps1, L"$ENV:ROS_INTERMEDIATE = "%s"\n", objdir); + fwprintf(pFileps1, L"$ENV:ROS_TEMPORARY = "%s"\n", objdir); + } + if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$ENV:ROS_OUTPUT = "%s"\n", outdir); }
if (pFilecmd && pFileps1) @@ -221,10 +243,10 @@ LoadedSettings->showtime = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_USECCACHE") == 0) LoadedSettings->useccache = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_STRIP") == 0) - LoadedSettings->strip = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_NOSTRIP") == 0) - LoadedSettings->nostrip = wcstol(ptr2, NULL, 2); + else if (wcscmp(ptr, L"ROS_LEAN_AND_MEAN") == 0) + wcsncpy(LoadedSettings->lstrip, ptr2, wcslen(ptr2)-1); + else if (wcscmp(ptr, L"ROS_BUILDNOSTRIP") == 0) + wcsncpy(LoadedSettings->lnostrip, ptr2, wcslen(ptr2)-1); else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) LoadedSettings->writelog = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_SHOWVERSION") == 0) @@ -233,9 +255,9 @@ wcsncpy(LoadedSettings->logdir, ptr2, wcslen(ptr2)-1); else if (wcscmp(ptr, L"_ROSBE_TARGET_MINGWPATH") == 0) wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1); - else if (wcscmp(ptr, L"_ROSBE_OBJPATH") == 0) + else if (wcscmp(ptr, L"ROS_INTERMEDIATE") == 0) wcsncpy(LoadedSettings->objdir, ptr2, wcslen(ptr2)-1); - else if (wcscmp(ptr, L"_ROSBE_OUTPATH") == 0) + else if (wcscmp(ptr, L"ROS_OUTPUT") == 0) wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); } } @@ -257,6 +279,17 @@ LoadString(hInstance, HLP_DEFAULTMSG, SBTitle, 256); SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); } + + if (!wcscmp(LoadedSettings->lstrip, L"yes")) { + LoadedSettings->strip = 1; + } else { + LoadedSettings->strip = 0; + } + if (!wcscmp(LoadedSettings->lnostrip, L"yes")) { + LoadedSettings->nostrip = 1; + } else { + LoadedSettings->nostrip = 0; + } SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); @@ -297,6 +330,17 @@ WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; PSETTINGS DefaultSettings = &infoPtr->Settings; + + if (!wcscmp(DefaultSettings->lstrip, L"yes")) { + DefaultSettings->strip = 1; + } else { + DefaultSettings->strip = 0; + } + if (!wcscmp(DefaultSettings->lnostrip, L"yes")) { + DefaultSettings->nostrip = 1; + } else { + DefaultSettings->nostrip = 0; + }
showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED);
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -26,6 +26,8 @@ INT background; BOOL showtime; BOOL useccache; + WCHAR lstrip[MAX_PATH]; + WCHAR lnostrip[MAX_PATH]; BOOL strip; BOOL nostrip; BOOL writelog;
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 Sep 8 16:07:10 2009 @@ -134,14 +134,25 @@ fwprintf(pFilecmd, L"color %X%X\n", background, foreground); fwprintf(pFilecmd, L"set _ROSBE_SHOWTIME=%d\n", showtime); fwprintf(pFilecmd, L"set _ROSBE_USECCACHE=%d\n", useccache); - fwprintf(pFilecmd, L"set _ROSBE_STRIP=%d\n", strip); - fwprintf(pFilecmd, L"set _ROSBE_NOSTRIP=%d\n", nostrip); + if (strip == 1) { + fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=yes\n"); + } else { + fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=no\n"); + } + if (nostrip == 1) { + fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=yes\n"); + } else { + fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=no\n"); + } fwprintf(pFilecmd, L"set _ROSBE_WRITELOG=%d\n", writelog); fwprintf(pFilecmd, L"set _ROSBE_SHOWVERSION=%d\n", showversion); if (logdir[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir); if (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_HOST_MINGWPATH=%s\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFilecmd, L"set _ROSBE_OBJPATH=%s\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set _ROSBE_OUTPATH=%s\n", outdir); + if ((objdir[0] != 0) && objstate) { + fwprintf(pFilecmd, L"set ROS_INTERMEDIATE=%s\n", objdir); + fwprintf(pFilecmd, L"set ROS_TEMPORARY=%s\n", objdir); + } + if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set ROS_OUTPUT=%s\n", outdir); }
if (pFileps1) @@ -155,14 +166,25 @@ fwprintf(pFileps1, L"clear-host\n"); fwprintf(pFileps1, L"$global:_ROSBE_SHOWTIME = %d\n", showtime); fwprintf(pFileps1, L"$global:_ROSBE_USECCACHE = %d\n", useccache); - fwprintf(pFileps1, L"$global:_ROSBE_STRIP = %d\n", strip); - fwprintf(pFileps1, L"$global:_ROSBE_NOSTRIP = %d\n", nostrip); + if (strip == 1) { + fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = "yes"\n"); + } else { + fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = "no"\n"); + } + if (nostrip == 1) { + fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = "yes"\n"); + } else { + fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = "no"\n"); + } fwprintf(pFileps1, L"$global:_ROSBE_WRITELOG = %d\n", writelog); fwprintf(pFileps1, L"$global:_ROSBE_SHOWVERSION = %d\n", showversion); if (logdir[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_LOGDIR = "%s"\n", logdir); if (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = "%s"\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$global:_ROSBE_OBJPATH = "%s"\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$global:_ROSBE_OUTPATH = "%s"\n", outdir); + if ((objdir[0] != 0) && objstate) { + fwprintf(pFileps1, L"$ENV:ROS_INTERMEDIATE = "%s"\n", objdir); + fwprintf(pFileps1, L"$ENV:ROS_TEMPORARY = "%s"\n", objdir); + } + if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$ENV:ROS_OUTPUT = "%s"\n", outdir); }
if (pFilecmd && pFileps1) @@ -221,10 +243,10 @@ LoadedSettings->showtime = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_USECCACHE") == 0) LoadedSettings->useccache = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_STRIP") == 0) - LoadedSettings->strip = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_NOSTRIP") == 0) - LoadedSettings->nostrip = wcstol(ptr2, NULL, 2); + else if (wcscmp(ptr, L"ROS_LEAN_AND_MEAN") == 0) + wcsncpy(LoadedSettings->lstrip, ptr2, wcslen(ptr2)-1); + else if (wcscmp(ptr, L"ROS_BUILDNOSTRIP") == 0) + wcsncpy(LoadedSettings->lnostrip, ptr2, wcslen(ptr2)-1); else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) LoadedSettings->writelog = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_SHOWVERSION") == 0) @@ -233,9 +255,9 @@ wcsncpy(LoadedSettings->logdir, ptr2, wcslen(ptr2)-1); else if (wcscmp(ptr, L"_ROSBE_HOST_MINGWPATH") == 0) wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1); - else if (wcscmp(ptr, L"_ROSBE_OBJPATH") == 0) + else if (wcscmp(ptr, L"ROS_INTERMEDIATE") == 0) wcsncpy(LoadedSettings->objdir, ptr2, wcslen(ptr2)-1); - else if (wcscmp(ptr, L"_ROSBE_OUTPATH") == 0) + else if (wcscmp(ptr, L"ROS_OUTPUT") == 0) wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); } } @@ -257,6 +279,17 @@ LoadString(hInstance, HLP_DEFAULTMSG, SBTitle, 256); SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); } + + if (!wcscmp(LoadedSettings->lstrip, L"yes")) { + LoadedSettings->strip = 1; + } else { + LoadedSettings->strip = 0; + } + if (!wcscmp(LoadedSettings->lnostrip, L"yes")) { + LoadedSettings->nostrip = 1; + } else { + LoadedSettings->nostrip = 0; + } SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); @@ -297,6 +330,17 @@ WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; PSETTINGS DefaultSettings = &infoPtr->Settings; + + if (!wcscmp(DefaultSettings->lstrip, L"yes")) { + DefaultSettings->strip = 1; + } else { + DefaultSettings->strip = 0; + } + if (!wcscmp(DefaultSettings->lnostrip, L"yes")) { + DefaultSettings->nostrip = 1; + } else { + DefaultSettings->nostrip = 0; + }
showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED);
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -26,6 +26,8 @@ INT background; BOOL showtime; BOOL useccache; + WCHAR lstrip[MAX_PATH]; + WCHAR lnostrip[MAX_PATH]; BOOL strip; BOOL nostrip; BOOL writelog;
-
dreimer＠svn.reactos.org