[ros-diffs] [dreimer] 29687: Modify options.exe to enable and disable strpping and ccache. Add this to cmds too.
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Fri Oct 19 23:47:07 CEST 2007
Author: dreimer
Date: Sat Oct 20 01:47:06 2007
New Revision: 29687
URL: http://svn.reactos.org/svn/reactos?rev=29687&view=rev
Log:
Modify options.exe to enable and disable strpping and ccache.
Add this to cmds too.
Modified:
trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
trunk/tools/RosBE-Windows/Root/Help.cmd
trunk/tools/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc
trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc
trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc
trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc
trunk/tools/RosBE-Windows/Tools/config/options.c
trunk/tools/RosBE-Windows/Tools/config/resources.h
Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Shared.cmd?rev=29687&r1=29686&r2=29687&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Sat Oct 20 01:47:06 2007
@@ -11,36 +11,14 @@
@echo off
::
-:: Take over the 2nd parameter of Build.cmd, which enables/disables stripping.
+:: Check the parameters.
::
-if "%1" == "strip" (
- set ROS_LEAN_AND_MEAN=yes
+if "%1" == "" (
goto :Build
-)
-if "%1" == "ccache" (
- set ROS_LEAN_AND_MEAN=no
- set HOST_CC=ccache gcc
- set HOST_CPP=ccache g++
- set TARGET_CC=ccache gcc
- set TARGET_CPP=ccache g++
- goto :Build
-)
-if "%2" == "strip" (
- set ROS_LEAN_AND_MEAN=yes
- goto :Build
-)
-if "%2" == "ccache" (
- set HOST_CC=ccache gcc
- set HOST_CPP=ccache g++
- set TARGET_CC=ccache gcc
- set TARGET_CPP=ccache g++
- goto :Build
-)
-if "%1" == "" (
- set ROS_LEAN_AND_MEAN=no
- goto :Build
-)
+) else (
+ echo Unknown parameter specified.
+ goto :EOF
:Build
@@ -87,6 +65,17 @@
)
)
+if %ROSBE_STRIP% == 1 (
+ set ROS_LEAN_AND_MEAN=yes
+)
+if %ROSBE_USECCACHE% == 1 (
+ set ROS_LEAN_AND_MEAN=no
+ set HOST_CC=ccache gcc
+ set HOST_CPP=ccache g++
+ set TARGET_CC=ccache gcc
+ set TARGET_CPP=ccache g++
+)
+
::
:: Get the current date and time for use in in our build log's file name.
::
Modified: trunk/tools/RosBE-Windows/Root/Help.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?rev=29687&r1=29686&r2=29687&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Help.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Help.cmd Sat Oct 20 01:47:06 2007
@@ -19,10 +19,7 @@
echo Available Commands:
echo make [OPTIONS] - Without options it does a standard build of
echo ReactOS. OPTIONS1 are the standard ReactOS build
- echo options ie. "bootcd" and "strip" as optional
- echo second parameter sets stripping to enabled.
- echo "ccache" as third enables Caching and a speedup
- echo in build time.
+ echo options ie. "bootcd"
echo makex [OPTIONS] - Same as 'make' but automatically determines the
echo number of CPU Cores in the system and uses -j
echo with the appropriate number.
@@ -48,8 +45,7 @@
if "%1" == "make" (
echo Usage: make [OPTIONS1] [OPTIONS2]
echo Without options it does a standard build of ReactOS. OPTIONS1 are the
- echo standard ReactOS build options ie. "bootcd", "livecd", etc. "strip" as
- echo optional second parameter sets stripping to enabled.
+ echo standard ReactOS build options ie. "bootcd", "livecd", etc.
goto :EOF
)
if "%1" == "makex" (
Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd?rev=29687&r1=29686&r2=29687&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sat Oct 20 01:47:06 2007
@@ -21,6 +21,8 @@
set _ROSSOURCEDIRBASE=%CD%
set ROSBE_SHOWTIME=1
set ROSBE_WRITELOG=1
+set ROSBE_USECCACHE=0
+set ROSBE_STRIP=0
set ROSBE_MINGWPATH=%ROSBEBASEDIR%\4.1.3
set _LOGDIR=%CD%\RosBE-Logs
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc?rev=29687&r1=29686&r2=29687&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Sat Oct 20 01:47:06 2007
@@ -1,6 +1,6 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 207
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 242
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "RosBE Einstellungen"
FONT 8, "MS Shell Dlg"
@@ -13,12 +13,14 @@
CONTROL "Beispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 10, 85, 235, 15
CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 100, 90, 21
CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 100, 60, 21
- EDITTEXT ID_LOGDIR, 10, 125, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSE, 215, 125, 30, 13, WS_TABSTOP | WS_DISABLED
- EDITTEXT ID_MGWDIR, 10, 142, 200, 13, WS_TABSTOP
- PUSHBUTTON "...", ID_BROWSEMGW, 215, 142, 30, 13, WS_TABSTOP
- PUSHBUTTON "Speichern", ID_OK, 63, 170, 59, 26, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 170, 59, 26, WS_TABSTOP
+ CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21
+ CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 120, 60, 21
+ EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED
+ EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP
+ PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP
+ PUSHBUTTON "Speichern", ID_OK, 63, 205, 59, 26, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 205, 59, 26, WS_TABSTOP
END
STRINGTABLE
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc?rev=29687&r1=29686&r2=29687&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Sat Oct 20 01:47:06 2007
@@ -1,6 +1,6 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 207
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 242
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "RosBE Settings"
FONT 8, "MS Shell Dlg"
@@ -13,12 +13,14 @@
CONTROL "Sample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 10, 85, 235, 15
CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 100, 90, 21
CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 100, 60, 21
- EDITTEXT ID_LOGDIR, 10, 125, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSE, 215, 125, 30, 13, WS_TABSTOP | WS_DISABLED
- EDITTEXT ID_MGWDIR, 10, 142, 200, 13, WS_TABSTOP
- PUSHBUTTON "...", ID_BROWSEMGW, 215, 142, 30, 13, WS_TABSTOP
- PUSHBUTTON "Save", ID_OK, 63, 170, 59, 26, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Cancel", ID_CANCEL, 133, 170, 59, 26, WS_TABSTOP
+ CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21
+ CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 120, 60, 21
+ EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED
+ EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP
+ PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP
+ PUSHBUTTON "Save", ID_OK, 63, 205, 59, 26, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Cancel", ID_CANCEL, 133, 205, 59, 26, WS_TABSTOP
END
STRINGTABLE
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc?rev=29687&r1=29686&r2=29687&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Sat Oct 20 01:47:06 2007
@@ -1,6 +1,6 @@
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 207
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 242
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Paramètre du RosBE"
FONT 8, "MS Shell Dlg"
@@ -13,12 +13,14 @@
CONTROL "Texte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 10, 85, 235, 15
CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 100, 110, 21
CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 135, 100, 85, 21
- EDITTEXT ID_LOGDIR, 10, 125, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSE, 215, 125, 30, 13, WS_TABSTOP | WS_DISABLED
- EDITTEXT ID_MGWDIR, 10, 142, 200, 13, WS_TABSTOP
- PUSHBUTTON "...", ID_BROWSEMGW, 215, 142, 30, 13, WS_TABSTOP
- PUSHBUTTON "Sauvegarder", ID_OK, 63, 170, 59, 26, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Annuler", ID_CANCEL, 133, 170, 59, 26, WS_TABSTOP
+ CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21
+ CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 135, 120, 60, 21
+ EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED
+ EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP
+ PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP
+ PUSHBUTTON "Sauvegarder", ID_OK, 63, 205, 59, 26, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Annuler", ID_CANCEL, 133, 205, 59, 26, WS_TABSTOP
END
STRINGTABLE
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc?rev=29687&r1=29686&r2=29687&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Sat Oct 20 01:47:06 2007
@@ -2,7 +2,7 @@
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 207
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 242
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Óñòàíîâêè RosBE"
FONT 8,"MS Sans Serif",0,0
@@ -15,12 +15,14 @@
CONTROL "Sample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 10, 85, 235, 15
CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 100, 90, 21
CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 100, 60, 21
- EDITTEXT ID_LOGDIR, 10, 125, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSE, 215, 125, 30, 13, WS_TABSTOP | WS_DISABLED
- EDITTEXT ID_MGWDIR, 10, 142, 200, 13, WS_TABSTOP
- PUSHBUTTON "...", ID_BROWSEMGW, 215, 142, 30, 13, WS_TABSTOP
- PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 170, 59, 26, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 170, 59, 26, WS_TABSTOP
+ CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21
+ CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 120, 60, 21
+ EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED
+ EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP
+ PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP
+ PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 205, 59, 26, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 205, 59, 26, WS_TABSTOP
END
STRINGTABLE
Modified: trunk/tools/RosBE-Windows/Tools/config/options.c
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/options.c?rev=29687&r1=29686&r2=29687&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/options.c (original)
+++ trunk/tools/RosBE-Windows/Tools/config/options.c Sat Oct 20 01:47:06 2007
@@ -47,7 +47,7 @@
WriteSettings(HWND hwnd)
{
int foreground, background;
- BOOL showtime, writelog;
+ BOOL showtime, writelog, useccache, strip;
WCHAR logpath[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], checklog[MAX_PATH];
WCHAR msgerror[256];
HANDLE hFile;
@@ -55,6 +55,8 @@
showtime = SendMessage(GetDlgItem(hwnd, ID_SHOWBUILDTIME), BM_GETCHECK, 0, 0) == BST_CHECKED;
writelog = SendMessage(GetDlgItem(hwnd, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED;
+ useccache = SendMessage(GetDlgItem(hwnd, ID_USECCACHE), BM_GETCHECK, 0, 0);
+ strip = SendMessage(GetDlgItem(hwnd, ID_STRIP), BM_GETCHECK, 0, 0);
foreground = SendMessage(GetDlgItem(hwnd, IDC_FONT), CB_GETCURSEL, 0, 0);
background = SendMessage(GetDlgItem(hwnd, IDC_BACK), CB_GETCURSEL, 0, 0);
GetDlgItemText(hwnd, ID_LOGDIR, logpath, MAX_PATH);
@@ -98,6 +100,8 @@
fprintf(pFile, "REM This file has been automatically created by RosBE Options Dialog\n\n");
fprintf(pFile, "color %X%X\n", background, foreground);
fprintf(pFile, "set ROSBE_SHOWTIME=%d\n", showtime);
+ fprintf(pFile, "set ROSBE_USECCACHE=%d\n", useccache);
+ fprintf(pFile, "set ROSBE_STRIP=%d\n", strip);
fprintf(pFile, "set ROSBE_WRITELOG=%d\n", writelog);
fprintf(pFile, "set ROSBE_LOGPATH=%S\n", logpath);
fprintf(pFile, "set ROSBE_MINGWPATH=%S\n", mingwpath);
@@ -204,6 +208,14 @@
EnableWindow(GetDlgItem(Dlg, ID_BROWSE), WriteLogSet);
EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet);
}
+ else if (wParam == ID_STRIP)
+ {
+ EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE);
+ }
+ else if (wParam == ID_USECCACHE)
+ {
+ EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE);
+ }
else if ((wParam == ID_SHOWBUILDTIME) || ((LOWORD(wParam) == IDC_FONT) && (HIWORD(wParam) == CBN_SELCHANGE)) || ((LOWORD(wParam) == IDC_BACK) && (HIWORD(wParam) == CBN_SELCHANGE)))
{
RECT rcWnd;
Modified: trunk/tools/RosBE-Windows/Tools/config/resources.h
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/resources.h?rev=29687&r1=29686&r2=29687&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/resources.h (original)
+++ trunk/tools/RosBE-Windows/Tools/config/resources.h Sat Oct 20 01:47:06 2007
@@ -12,6 +12,8 @@
#define ID_EXAMPLE 0xb
#define IDC_FONT 0xc
#define IDC_BACK 0xd
+#define ID_USECCACHE 0xe
+#define ID_STRIP 0xf
/* Strings */
#define MSG_NOGCCFOUND 0x50
More information about the Ros-diffs
mailing list