[dreimer] 36119: Add a way to include rosapps and rostests into the build and ssvn script by modifying one var. Add this var to options.exe (Maciej Bialas and slight changes by me)
10 Sep
2008
10 Sep
'08
11:01 a.m.
Author: dreimer
Date: Wed Sep 10 06:01:22 2008
New Revision: 36119
URL: http://svn.reactos.org/svn/reactos?rev=36119&view=rev
Log:
Add a way to include rosapps and rostests into the build and ssvn script by modifying one
var. Add this var to options.exe (Maciej Bialas and slight changes by me)
Added:
trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc (with props)
Modified:
trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc
trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc
trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc
trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc
trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc
trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c
trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h
trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h
trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Wed Sep 10 06:01:22 2008
@@ -12,6 +12,108 @@
if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0
if %_ROSBE_DEBUG% == 1 (
@echo on
+)
+
+:: temporary arch definition
+if "%ROS_ARCH%" == "" (
+ set _TMP_ARCH=i386
+) else (
+ set _TMP_ARCH=%ROS_ARCH%
+)
+
+if %_ROSBE_MODULES% neq 1 (
+ if exist "modules\rosapps" (
+ if exist "modules\rosapps.bak" (
+ call :DELA
+ )
+ echo Renaming rosapps to rosapps.bak...
+ ren "modules\rosapps" "rosapps.bak"
+ )
+ if exist "modules\rostests" (
+ if exist "modules\rostests.bak" (
+ call :DELB
+ )
+ echo Renaming rostests to rostests.bak...
+ ren "modules\rostests" "rostests.bak"
+ )
+::
+:: if there are dirs in obj and output for rosapps and rostests, remove them
+:: to not have them included in iso images
+ if exist "%_ROSBE_OBJPATH%\modules\rostests" (
+ echo Removing rostests obj and output files from %_ROSBE_OBJPATH%
+ rd /s /q "%_ROSBE_OBJPATH%\modules\rostests"
+ rd /s /q "%_ROSBE_OUTPATH%\modules\rostests"
+ if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto (
+ echo removing makefile.auto
+ del %_ROSBE_ROSSOURCEDIR%\makefile.auto
+ )
+ ) else (
+ if exist "%_ROSBE_ROSSOURCEDIR%\obj-%_TMP_ARCH%\modules\rostests" (
+ echo Removing rostests obj and output files from
%_ROSBE_ROSSOURCEDIR%\obj-%_TMP_ARCH%
+ rd /q /s %_ROSBE_ROSSOURCEDIR%\obj-%_TMP_ARCH%\modules\rostests
+ rd /q /s %_ROSBE_ROSSOURCEDIR%\output-%_TMP_ARCH%\modules\rostests
+ if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto (
+ echo Removing makefile.auto
+ del %_ROSBE_ROSSOURCEDIR%\makefile.auto
+ )
+ )
+ )
+ if exist %_ROSBE_OBJPATH%\modules\rosapps (
+ echo Removing rosapps obj and output files
+ rd /q /s %_ROSBE_OBJPATH%\modules\rosapps
+ rd /q /s %_ROSBE_OUTPATH%\modules\rosapps
+ if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto (
+ echo removing makefile.auto
+ del %_ROSBE_ROSSOURCEDIR%\makefile.auto
+ )
+ ) else (
+ if exist %_ROSBE_ROSSOURCEDIR%\obj-%_TMP_ARCH%\modules\rosapps (
+ echo Removing rosapps obj and output files
+ rd /q /s %_ROSBE_ROSSOURCEDIR%\obj-%_TMP_ARCH%\modules\rosapps
+ rd /q /s %_ROSBE_ROSSOURCEDIR%\output-%_TMP_ARCH%\modules\rosapps
+ if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto (
+ echo Removing makefile.auto
+ del %_ROSBE_ROSSOURCEDIR%\makefile.auto
+ )
+ )
+ )
+) else (
+ if exist "modules\rosapps.bak" (
+ if not exist "modules\rosapps" (
+ echo Renaming rosapps.bak to rosapps...
+ ren "modules\rosapps.bak" "rosapps"
+ )
+ ) else (
+ if not exist "modules\rosapps" set _ROSAPP=1
+ )
+ if exist "modules\rostests.bak" (
+ if not exist "modules\rostests" (
+ echo Renaming rostests.bak to rostests...
+ ren "modules\rostests.bak" "rostests"
+ )
+ ) else (
+ if not exist "modules\rosapps" set _ROSTEST=1
+ )
+ if not exist "%_ROSBE_OBJPATH%\modules\rostests" (
+ if not exist "%_ROSBE_ROSSOURCEDIR%\obj-%_TMP_ARCH%\modules\rostests"
(
+ if not defined _ROSTEST (
+ if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto (
+ echo Removing makefile.auto
+ del %_ROSBE_ROSSOURCEDIR%\makefile.auto
+ )
+ )
+ )
+ )
+ if not exist %_ROSBE_OBJPATH%\modules\rosapps (
+ if not exist %_ROSBE_ROSSOURCEDIR%\obj-%_TMP_ARCH%\modules\rosapps (
+ if not defined _ROSAPP (
+ if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto (
+ echo Removing makefile.auto
+ del %_ROSBE_ROSSOURCEDIR%\makefile.auto
+ )
+ )
+ )
+ )
)
::
@@ -193,6 +295,19 @@
)
goto :EOF
+
+:DELA
+set /p ROSA_DEL="rosapps.bak exists! Delete it? [yes/no] "
+ if /i "%ROSA_DEL%"=="no" goto :EOC
+ if /i "%ROSA_DEL%"=="yes" rd /q /s
"modules\rosapps.bak" > rm1.txt
+goto :EOF
+
+:DELB
+set /p ROSB_DEL="rostests.bak exists! Delete it? [yes/no] "
+ if /i "%ROSB_DEL%"=="no" goto :EOC
+ if /i "%ROSB_DEL%"=="yes" rd /q /s
"modules\rostests.bak" > rm2.txt
+goto :EOF
+
:EOC
::
:: Highlight the fact that building has ended.
@@ -217,3 +332,8 @@
set ROS_TEMPORARY=
set CPUCOUNT=
set CCACHE_DIR=
+set ROSA_DEL=
+set ROSB_DEL=
+set _TMP_ARCH=
+set _ROS_TEST=
+set _ROS_APP=
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Wed Sep 10 06:01:22 2008
@@ -32,6 +32,7 @@
set _ROSBE_USECCACHE=0
set _ROSBE_STRIP=0
set _ROSBE_NOSTRIP=0
+set _ROSBE_MODULES=0
set _ROSBE_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3
set _ROSBE_LOGDIR=%CD%\RosBE-Logs
set _ROSBE_OBJPATH=
Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Wed Sep 10 06:01:22 2008
@@ -31,6 +31,43 @@
) else (
"%_ROSBE_BASEDIR%\Tools\svn.exe" update
)
+
+:: check if we should update modules dir (rosapps and rostests)
+if "%_ROSBE_MODULES%" == "1" (
+:: Check if we have .bak dir instead of rosapps - if so, rename it
+ if exist "modules\rostests.bak" (
+ if not exist "modules\rostests" (
+ echo Renaming rostests.bak to rostests...
+ ren "modules\rostests.bak" "rostests"
+ )
+ )
+ if exist "modules\rostests" (
+ cd modules\rostests
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" update
+ cd ..\..
+ ) else (
+ cd modules
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/rostests rostests
+ cd ..
+ )
+:: Check if we have .bak dir instead of rosapps - if so, rename it
+ if exist "modules\rosapps.bak" (
+ if not exist "modules\rosapps" (
+ echo Renaming rosapps.bak to rosapps...
+ ren "modules\rosapps.bak" "rosapps"
+ )
+ )
+ if exist "modules\rosapps" (
+ cd modules\rosapps
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" update
+ cd ..\..
+ ) else (
+ cd modules
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/rosapps rosapps
+ cd ..
+ )
+
+)
goto :EOC
)
if /i "%1" == "cleanup" (
@@ -53,6 +90,15 @@
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
"%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/reactos .
+ :: check if we should download additional modules
+ if "%_ROSBE_MODULES%" == "1" (
+ cd modules
+ echo Adding rostests...
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/rostests rostests
+ echo Adding rosapps...
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/rosapps rosapps
+ )
+
) else (
echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors.
ABORTED
)
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc [iso-8859-1] Wed Sep 10
06:01:22 2008
@@ -1,6 +1,6 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "RosBE Einstellungen"
FONT 8, "MS Shell Dlg"
@@ -14,21 +14,22 @@
CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX
| WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
CONTROL "Nostrip Dateien zum Debuggen erzeugen", ID_NOSTRIP,
"button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12
- LTEXT "Pfad zu MinGW/GCC", -1, 10, 107, 100, 15
- EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
- PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
- CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
- EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
- CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
- EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
- CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
- EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
- CONTROL "Willkommen!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD
| WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+ CONTROL "rosapps und rostests miteinbeziehen", ID_MODULES,
"button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150,
12
+ LTEXT "Pfad zu MinGW/GCC", -1, 10, 122, 100, 15
+ EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP
+ PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP
+ CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12
+ EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 100, 12
+ EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 100, 12
+ EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Speichern", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP
+ CONTROL "Willkommen!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD
| WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15
END
STRINGTABLE
@@ -74,4 +75,5 @@
HLP_QUITBUTTON, "Dieser Button lässt Sie das Programm, ohne die Konfiguration zu
speichern, beenden."
HLP_DEFAULTMSG, "Bewegen Sie sich über eine Fläche um Hilfe zu erhalten."
HLP_NOSTRIP, "Erzeugt Debuginformation für den ReactOS Debugger."
+ HLP_MODULES, "Dieser Button lässt Sie entscheiden, ob ROSBE rosapps and
rostests in den Build- und SVN Ladevorgang einbeziehen soll."
END
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc [iso-8859-1] Wed Sep 10
06:01:22 2008
@@ -1,6 +1,6 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Build Environment Settings"
FONT 8, "MS Shell Dlg"
@@ -14,21 +14,22 @@
CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12
- LTEXT "Path to MinGW/GCC", -1, 10, 107, 100, 15
- EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
- PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
- CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
- EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
- CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
- EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
- CONTROL "Change Folder for OUT", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
- EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Save", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Cancel", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
- CONTROL "Welcome!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD |
WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+ CONTROL "Download and make rosapps and rostests", ID_MODULES,
"button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150,
12
+ LTEXT "Path to MinGW/GCC", -1, 10, 122, 100, 15
+ EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP
+ PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP
+ CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12
+ EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 100, 12
+ EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Change Folder for OUT", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 100, 12
+ EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Save", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Cancel", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP
+ CONTROL "Welcome!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD |
WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15
END
STRINGTABLE
@@ -74,4 +75,5 @@
HLP_QUITBUTTON, "This button lets you quit configuration without saving."
HLP_DEFAULTMSG, "Hover over a control to get help."
HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger."
+ HLP_MODULES, "If checked ROSBE will download rosapps and rostests and add them
to compiled image."
END
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc [iso-8859-1] Wed Sep 10
06:01:22 2008
@@ -14,21 +14,22 @@
CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX
| WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
CONTROL "Optimiser les fichiers", ID_STRIP, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12
- LTEXT "Chemin vers MinGW/GCC", -1, 10, 107, 110, 15
- EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
- PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
- CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
- EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
- CONTROL "Changer de répertoire pour OBJ", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 150, 12
- EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
- CONTROL "Changer de répertoire pour OUT", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 150, 12
- EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Sauvegarder", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Annuler", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
- CONTROL "Bienvenue !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD
| WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+ CONTROL "Download and make rosapps and rostests", ID_MODULES,
"button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150,
12
+ LTEXT "Chemin vers MinGW/GCC", -1, 10, 122, 110, 15
+ EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP
+ PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP
+ CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12
+ EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Changer de répertoire pour OBJ", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 150, 12
+ EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Changer de répertoire pour OUT", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 150, 12
+ EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Sauvegarder", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Annuler", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP
+ CONTROL "Bienvenue !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD
| WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15
END
STRINGTABLE
@@ -74,4 +75,5 @@
HLP_QUITBUTTON, "Ce bouton vous permet de quitter la configuration sans
sauvegarder."
HLP_DEFAULTMSG, "Passez sur un contrôle pour avoir de l'aide."
HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger."
+ HLP_MODULES, "If checked ROSBE will download rosapps and rostests and add them
to compiled image."
END
Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc (added)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc [iso-8859-1] Wed Sep 10
06:01:22 2008
@@ -1,0 +1,79 @@
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305
+STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ustawienia ReactOS Build Environment"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Kolor t³a", -1, 10, 10, 75, 12
+ LTEXT "Kolor czcionki", 0x0, 10, 27, 75, 12
+ COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
CBS_DROPDOWNLIST
+ COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
CBS_DROPDOWNLIST
+ CONTROL "\n\nPrzyk³adowy tekst", ID_EXAMPLE, "static", WS_CHILD |
WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36
+ CONTROL "Poka¿ czas budowania", ID_SHOWBUILDTIME, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12
+ CONTROL "U¿yj CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
+ CONTROL "Usuñ dane debugowania", ID_STRIP, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
+ CONTROL "Utwórz pliki nostrip dla debugowania", ID_NOSTRIP,
"button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12
+ CONTROL "Pobierz i skompiluj rosapps oraz rostests", ID_MODULES,
"button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150,
12
+ LTEXT "cie¿ka do MinGW/GCC", -1, 10, 122, 100, 15
+ EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP
+ PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP
+ CONTROL "Zapisuj logi", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12
+ EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Zmieñ folder plików OBJ", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 100, 12
+ EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Zmieñ folder plików OUT", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 100, 12
+ EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Zapisz", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Anuluj", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP
+ CONTROL "Witamy!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD |
WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15
+END
+
+STRINGTABLE
+BEGIN
+ CLR0, "Czarny"
+ CLR1, "Niebieski"
+ CLR2, "Zielony"
+ CLR3, "Morski"
+ CLR4, "Czerwony"
+ CLR5, "Fioletowy"
+ CLR6, "¯ó³ty"
+ CLR7, "Jasnoszary"
+ CLR8, "Szary"
+ CLR9, "Jasnoniebieski"
+ CLR10, "Jasnozielony"
+ CLR11, "Jasny morski"
+ CLR12, "Jasnoczerwony"
+ CLR13, "Jasnofioletowy"
+ CLR14, "Jasno¿ó³ty"
+ CLR15, "Bia³y"
+ MSG_NOGCCFOUND, "Nie znaleziono MinGW/GCC! Sprawd nazwê folderu."
+ MSG_FILEFAILED, "Nie uda³o siê stworzyæ pliku rosbe-options.cmd!"
+ MSG_DIREFAILED, "Nie powiod³o siê stworzenie folderu!"
+ MSG_SETLOADSUC, "Za³adowano ostatnio zapisane ustawienia."
+ MSG_FINDLOGDIR, "Proszê wybraæ folder, gdzie zostan¹ zapisane dzienniki
budowania:"
+ MSG_FINDMGWDIR, "Proszê wskazaæ folder, w którym znajduje siê MinGW/GCC:"
+ MSG_FINDOBJDIR, "Proszê wybraæ folder, gdzie zostan¹ zapisane pliki OBJ:"
+ MSG_FINDOUTDIR, "Proszê wybraæ folder, gdzie zostan¹ zapisane pliki OUT:"
+ MSG_WARNINGBOX, "Ostrze¿enie"
+ MSG_EXITCHANGE, "Czy chcesz opuciæ program bez zapisania zmian?"
+ MSG_INVALIDDIR, "Podany folder nie istnieje. Czy chcesz go utworzyæ?"
+ /* Help Strings */
+ HLP_BACKCOLORC, "Wybierz kolor t³a dla RosBE DOS windows."
+ HLP_FONTCOLORC, "Wybierz kolor czcionki dla RosBE DOS windows."
+ HLP_SBUILDTIME, "Wywietla ca³kowity czas budowania po jego zakoñczeniu."
+ HLP_CCACHEUSED, "Zaznacz jeli chcesz u¿ywaæ ccache (compiler cache)."
+ HLP_STRIPEDEXE, "Zaznacz jeli chcesz uzyskaæ mniejsze pliki wynikowe."
+ HLP_FINDMGWDIR, "Tutaj mo¿esz okreliæ po³o¿enie MinGW/GCC."
+ HLP_FINDLOGDIR, "Tutaj mo¿esz okreliæ miejsce, gdzie zostan¹ zapisane dzienniki
budowania."
+ HLP_FINDOBJDIR, "Tutaj mo¿esz okreliæ miejsce, gdzie zostan¹ zapisane pliki
OBJ."
+ HLP_FINDOUTDIR, "Tutaj mo¿esz okreliæ miejsce, gdzie zostan¹ zapisane pliki OUT
(wynikowe)."
+ HLP_SAVEBUTTON, "Przycisk aktywowany po zmianie ustawieñ, koñczy dzia³anie
programu i zapisuje nowe ustawienia."
+ HLP_QUITBUTTON, "Przycisk pozwala na wyjcie bez zapisania ustawieñ."
+ HLP_DEFAULTMSG, "Najed na element, aby uzyskaæ pomoc."
+ HLP_NOSTRIP, "Utwórz informacje debugowania dla Debuggera ReactOS."
+ HLP_MODULES, "Zaznacz jeli chcesz, by ROSBE pobra³o i skompilowa³o pliki z
rosapps i rostests."
+END
Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] Wed Sep 10
06:01:22 2008
@@ -16,21 +16,22 @@
CONTROL "Èñïîëüçîâàòü êåøèðîâàíèå", ID_USECCACHE, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
CONTROL "Âûðåçàòü ïóñòîé êîä ïðè êîìïèë.", ID_STRIP, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12
- LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", -1, 10, 107, 100, 15
- EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
- PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
- CONTROL "Âåñòè ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
- EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
- CONTROL "Ïóòü ê êàòàëîãó îáúåêòîâ", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
- EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
- CONTROL "Ïóòü ê êàòàëîãó âûâîäà", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
- EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Îòìåíà", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
- CONTROL "Ââåäåíèå", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD |
WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+ CONTROL "Download and make rosapps and rostests", ID_MODULES,
"button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150,
12
+ LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", -1, 10, 122, 100, 15
+ EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP
+ PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP
+ CONTROL "Âåñòè ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12
+ EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Ïóòü ê êàòàëîãó îáúåêòîâ", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 100, 12
+ EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Ïóòü ê êàòàëîãó âûâîäà", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 100, 12
+ EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Îòìåíà", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP
+ CONTROL "Ââåäåíèå", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD |
WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15
END
STRINGTABLE
@@ -76,4 +77,5 @@
HLP_QUITBUTTON, "Ýòî êëàâèøà ïîçâîëÿåò âûéòè áåç ñîõðàíåíèÿ èçìåíåíèé"
HLP_DEFAULTMSG, "Ïîìîùü ïî èçíà÷àëüíûì ïàðàìåòðàì"
HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger."
+ HLP_MODULES, "If checked ROSBE will download rosapps and rostests and add them
to compiled image."
END
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc [iso-8859-1] Wed Sep 10
06:01:22 2008
@@ -8,7 +8,7 @@
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS"
FONT 8, "MS Shell Dlg"
@@ -22,21 +22,22 @@
CONTROL "Âèêîðèñòîâóâàòè CCache", ID_USECCACHE, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12
- LTEXT "Øëÿõ äî MinGW/GCC", -1, 10, 107, 100, 15
- EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
- PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
- CONTROL "Âåñòè æóðíàë", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
- EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
- CONTROL "Çì³íèòè ïàïêó äëÿ OBJ", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
- EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
- CONTROL "Çì³íèòè ïàïêó äëÿ OUT", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
- EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Çáåðåãòè", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
- PUSHBUTTON "Ñêàñóâàòè", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
- CONTROL "Ëàñêàâî ïðîñèìî!", ID_STATUSBAR, "msctls_statusbar32",
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+ CONTROL "Download and make rosapps and rostests", ID_MODULES,
"button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150,
12
+ LTEXT "Øëÿõ äî MinGW/GCC", -1, 10, 122, 100, 15
+ EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP
+ PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP
+ CONTROL "Âåñòè æóðíàë", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12
+ EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Çì³íèòè ïàïêó äëÿ OBJ", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 100, 12
+ EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED
+ CONTROL "Çì³íèòè ïàïêó äëÿ OUT", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 100, 12
+ EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Çáåðåãòè", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Ñêàñóâàòè", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP
+ CONTROL "Ëàñêàâî ïðîñèìî!", ID_STATUSBAR, "msctls_statusbar32",
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15
END
STRINGTABLE
@@ -82,4 +83,5 @@
HLP_QUITBUTTON, "Öå êíîïêà äîçâîëÿº âèéòè ç êîíô³ãóðóâàííÿ áåç çáåðåæåííÿ
çì³í."
HLP_DEFAULTMSG, "Íàâåä³òü âêàç³âíèê ìèø³ íà åëåìåíò êåðóâàííÿ, ùîá îòðèìàòè
äîâ³äêó."
HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger."
+ HLP_MODULES, "If checked ROSBE will download rosapps and rostests and add them
to compiled image."
END
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] Wed Sep 10
06:01:22 2008
@@ -60,7 +60,7 @@
WriteSettings(POPTIONS_DLG infoPtr)
{
INT foreground, background;
- BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate;
+ BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate,modules;
WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH],
checkmgw[MAX_PATH];
WCHAR msgerror[256];
HANDLE hFile;
@@ -69,6 +69,7 @@
showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0,
0) == BST_CHECKED);
writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0)
== BST_CHECKED);
useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0)
== BST_CHECKED);
+ modules = (SendDlgItemMessage(infoPtr->hwndDlg, ID_MODULES, BM_GETCHECK, 0, 0) ==
BST_CHECKED);
strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) ==
BST_CHECKED);
nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) ==
BST_CHECKED);
objstate = (SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0)
== BST_CHECKED);
@@ -117,6 +118,7 @@
fwprintf(pFile, L"set _ROSBE_STRIP=%d\n", strip);
fwprintf(pFile, L"set _ROSBE_NOSTRIP=%d\n", nostrip);
fwprintf(pFile, L"set _ROSBE_WRITELOG=%d\n", writelog);
+ fwprintf(pFile, L"set _ROSBE_MODULES=%d\n", modules);
if (logdir[0] != 0) fwprintf(pFile, L"set _ROSBE_LOGDIR=%s\n",
logdir);
if (mingwpath[0] != 0) fwprintf(pFile, L"set _ROSBE_MINGWPATH=%s\n",
mingwpath);
if ((objdir[0] != 0) && objstate) fwprintf(pFile, L"set
_ROSBE_OBJPATH=%s\n", objdir);
@@ -164,6 +166,8 @@
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"_ROSBE_MODULES") == 0)
+ LoadedSettings->modules = wcstol(ptr2, NULL, 2);
else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0)
LoadedSettings->writelog = wcstol(ptr2, NULL, 2);
else if (wcscmp(ptr, L"_ROSBE_LOGDIR") == 0)
@@ -194,6 +198,7 @@
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);
+ SendDlgItemMessage(infoPtr->hwndDlg, ID_MODULES, BM_SETCHECK,
LoadedSettings->modules, 0);
SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_SETCHECK,
LoadedSettings->writelog, 0);
if (LoadedSettings->writelog)
{
@@ -226,7 +231,7 @@
VOID SetSaveState(POPTIONS_DLG infoPtr)
{
INT foreground, background;
- BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate;
+ BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate,modules;
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;
@@ -236,6 +241,7 @@
useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0)
== BST_CHECKED);
strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) ==
BST_CHECKED);
nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) ==
BST_CHECKED);
+ modules = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_MODULES, BM_GETCHECK, 0, 0) ==
BST_CHECKED);
objstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0)
== BST_CHECKED);
outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0)
== BST_CHECKED);
foreground = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL,
0, 0);
@@ -257,7 +263,7 @@
State ^= ((foreground == DefaultSettings->foreground) && (background ==
DefaultSettings->background) &&
(showtime == DefaultSettings->showtime) && (writelog ==
DefaultSettings->writelog) &&
- (useccache == DefaultSettings->useccache) && (strip ==
DefaultSettings->strip) &&
+ (useccache == DefaultSettings->useccache) && (strip ==
DefaultSettings->strip) && (modules == DefaultSettings->modules) &&
(objstate == DefaultSettings->objstate) && (outstate ==
DefaultSettings->outstate) &&
(StateLog) && (wcscmp(mingwpath, DefaultSettings->mingwpath) == 0)
&&
(StateObj) && (StateOut) && (nostrip ==
DefaultSettings->nostrip));
@@ -356,6 +362,7 @@
{ID_USECCACHE, HLP_CCACHEUSED},
{ID_STRIP, HLP_STRIPEDEXE},
{ID_NOSTRIP, HLP_NOSTRIP},
+ {ID_MODULES, HLP_MODULES},
{ID_MGWDIR, HLP_FINDMGWDIR},
{ID_BROWSEMGW, HLP_FINDMGWDIR},
{ID_LOGDIR, HLP_FINDLOGDIR},
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h [iso-8859-1] Wed Sep 10
06:01:22 2008
@@ -24,6 +24,7 @@
WCHAR mingwpath[MAX_PATH];
INT foreground;
INT background;
+ BOOL modules;
BOOL showtime;
BOOL useccache;
BOOL strip;
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h [iso-8859-1] Wed Sep 10
06:01:22 2008
@@ -50,6 +50,7 @@
#define IDC_BACK 0x25
#define ID_STATUSBAR 0x26
#define ID_NOSTRIP 0x27
+#define ID_MODULES 0x28
/* Strings */
#define MSG_NOGCCFOUND 0x27
@@ -78,4 +79,5 @@
#define HLP_QUITBUTTON 0x3c
#define HLP_DEFAULTMSG 0x3d
#define HLP_NOSTRIP 0x3e
+#define HLP_MODULES 0x3f
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc [iso-8859-1] Wed Sep 10 06:01:22
2008
@@ -6,3 +6,4 @@
#include "lang/fr-FR.rc"
#include "lang/ru-RU.rc"
#include "lang/uk-UA.rc"
+#include "lang/pl-PL.rc"
5914
days inactive
5914
days old
0 comments
1 participants
participants (1)
-
dreimer＠svn.reactos.org