[dreimer] 36967: Removed the disabling feature which caused more problems than help. Hope we are friends again guys.
25 Oct
2008
25 Oct
'08
8:53 p.m.
Author: dreimer
Date: Sat Oct 25 15:53:14 2008
New Revision: 36967
URL: http://svn.reactos.org/svn/reactos?rev=36967&view=rev
Log:
Removed the disabling feature which caused more problems than help.
Hope we are friends again guys.
Modified:
trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
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/pl-PL.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
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Sat Oct 25 15:53:14
2008
@@ -6,68 +6,6 @@
# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de>
#
#
-
-function DELA {
-! set /p ROSA_DEL="rosapps.bak exists! Delete it? [yes/no] "
- if ($ROSA_DEL -eq "no") exit
-! if ($ROSA_DEL -eq "yes") rd /q /s ".\modules\rosapps.bak"
-}
-
-function DELB {
-! set /p ROSB_DEL="rostests.bak exists! Delete it? [yes/no] "
- if ($ROSB_DEL -eq "no") exit
-! if ($ROSB_DEL -eq "yes") rd /q /s ".\modules\rostests.bak"
-}
-
-if ($_ROSBE_MODULES -ne 1) {
- if (Test-Path ".\modules\rosapps") {
- if (Test-Path ".\modules\rosapps.bak") {
- DELA
- }
- "Renaming rosapps to rosapps.bak..."
-! ren ".\modules\rosapps" "rosapps.bak"
-! if ($ENV:ROS_ARCH -eq $null) {
-! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F
$_ROSBE_ROSSOURCEDIR\makefile.auto
- } else {
-! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F
$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto
- }
- }
- if (Test-Path ".\modules\rostests") {
- if (Test-Path ".\modules\rostests.bak") {
- DELB
- }
- "Renaming rostests to rostests.bak..."
-! ren ".\modules\rostests" "rostests.bak"
-! if ($ENV:ROS_ARCH -eq $null) {
-! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F
$_ROSBE_ROSSOURCEDIR\makefile.auto
- } else {
-! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F
$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto
- }
- }
-} else {
- if (Test-Path ".\modules\rosapps.bak") {
- if !(Test-Path ".\modules\rosapps") {
- "Renaming rosapps.bak to rosapps..."
-! ren ".\modules\rosapps.bak" "rosapps"
-! if ($ENV:ROS_ARCH -eq $null) {
-! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F
$_ROSBE_ROSSOURCEDIR\makefile.auto
- } else {
-! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F
$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto
- }
- }
- }
- if (Test-Path ".\modules\rostests.bak") {
- if !(Test-Path ".\modules\rostests") {
- "Renaming rostests.bak to rostests..."
-! ren ".\modules\rostests.bak" "rostests"
-! if ($ENV:ROS_ARCH -eq $null) {
-! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F
$_ROSBE_ROSSOURCEDIR\makefile.auto
- } else {
-! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F
$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto
- }
- }
- }
-}
#
# Check if config.template.rbuild is newer than config.rbuild, if it is then
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sat Oct 25 15:53:14
2008
@@ -30,7 +30,6 @@
$global:_ROSBE_USECCACHE = 0
$global:_ROSBE_STRIP = 0
$global:_ROSBE_NOSTRIP = 0
-$global:_ROSBE_MODULES = 1
$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3"
$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3"
$global:_ROSBE_LOGDIR = "$_ROSBE_ROSSOURCEDIR\RosBE-Logs"
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] Sat Oct 25 15:53:14 2008
@@ -12,56 +12,6 @@
if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0
if %_ROSBE_DEBUG% == 1 (
@echo on
-)
-
-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 "%ROS_ARCH%" == "" (
- if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto del /F
%_ROSBE_ROSSOURCEDIR%\makefile.auto
- ) else (
- if exist %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto del /F
%_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto
- )
- )
- if exist "modules\rostests" (
- if exist "modules\rostests.bak" (
- call :DELB
- )
- echo Renaming rostests to rostests.bak...
- ren "modules\rostests" "rostests.bak"
- if "%ROS_ARCH%" == "" (
- if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto del /F
%_ROSBE_ROSSOURCEDIR%\makefile.auto
- ) else (
- if exist %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto del /F
%_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto
- )
- )
-) else (
- if exist "modules\rosapps.bak" (
- if not exist "modules\rosapps" (
- echo Renaming rosapps.bak to rosapps...
- ren "modules\rosapps.bak" "rosapps"
- if "%ROS_ARCH%" == "" (
- if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto del /F
%_ROSBE_ROSSOURCEDIR%\makefile.auto
- ) else (
- if exist %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto del /F
%_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto
- )
- )
- )
- if exist "modules\rostests.bak" (
- if not exist "modules\rostests" (
- echo Renaming rostests.bak to rostests...
- ren "modules\rostests.bak" "rostests"
- if "%ROS_ARCH%" == "" (
- if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto del /F
%_ROSBE_ROSSOURCEDIR%\makefile.auto
- ) else (
- if exist %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto del /F
%_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto
- )
- )
- )
)
::
@@ -251,19 +201,6 @@
"%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9
)
)
-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
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] Sat Oct 25 15:53:14 2008
@@ -32,7 +32,6 @@
set _ROSBE_USECCACHE=0
set _ROSBE_STRIP=0
set _ROSBE_NOSTRIP=0
-set _ROSBE_MODULES=1
set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3
set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3
set _ROSBE_LOGDIR=%CD%\RosBE-Logs
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] Sat Oct 25 15:53:14 2008
@@ -31,42 +31,6 @@
) 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
)
@@ -90,15 +54,6 @@
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] Sat Oct 25
15:53:14 2008
@@ -1,6 +1,6 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "RosBE Einstellungen"
FONT 8, "MS Shell Dlg"
@@ -14,22 +14,21 @@
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
- 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
+ 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
END
STRINGTABLE
@@ -75,5 +74,4 @@
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] Sat Oct 25
15:53:14 2008
@@ -1,6 +1,6 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Build Environment Settings"
FONT 8, "MS Shell Dlg"
@@ -14,22 +14,21 @@
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
- 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
+ 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
END
STRINGTABLE
@@ -75,5 +74,4 @@
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] Sat Oct 25
15:53:14 2008
@@ -14,22 +14,21 @@
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
- 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
+ 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
END
STRINGTABLE
@@ -75,5 +74,4 @@
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
Modified: 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 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc [iso-8859-1] Sat Oct 25
15:53:14 2008
@@ -1,6 +1,6 @@
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Ustawienia ReactOS Build Environment"
FONT 8, "MS Shell Dlg"
@@ -14,22 +14,21 @@
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
+ LTEXT "cie¿ka do 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 "Zapisuj logi", 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 "Zmieñ folder plików 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 "Zmieñ folder plików 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 "Zapisz", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
+ PUSHBUTTON "Anuluj", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+ CONTROL "Witamy!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD |
WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
END
STRINGTABLE
@@ -75,5 +74,4 @@
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
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] Sat Oct 25
15:53:14 2008
@@ -16,22 +16,21 @@
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
- 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
+ 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
END
STRINGTABLE
@@ -77,5 +76,4 @@
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] Sat Oct 25
15:53:14 2008
@@ -8,7 +8,7 @@
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS"
FONT 8, "MS Shell Dlg"
@@ -22,22 +22,21 @@
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
- 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
+ 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
END
STRINGTABLE
@@ -83,5 +82,4 @@
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] Sat Oct 25
15:53:14 2008
@@ -60,7 +60,7 @@
WriteSettings(POPTIONS_DLG infoPtr)
{
INT foreground, background;
- BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate,modules;
+ BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate;
WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH],
checkmgw[MAX_PATH];
WCHAR msgerror[256];
HANDLE hFile;
@@ -69,7 +69,6 @@
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);
@@ -118,7 +117,6 @@
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);
@@ -166,8 +164,6 @@
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)
@@ -198,7 +194,6 @@
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)
{
@@ -231,7 +226,7 @@
VOID SetSaveState(POPTIONS_DLG infoPtr)
{
INT foreground, background;
- BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate,modules;
+ BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate;
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;
@@ -241,7 +236,6 @@
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);
@@ -263,7 +257,7 @@
State ^= ((foreground == DefaultSettings->foreground) && (background ==
DefaultSettings->background) &&
(showtime == DefaultSettings->showtime) && (writelog ==
DefaultSettings->writelog) &&
- (useccache == DefaultSettings->useccache) && (strip ==
DefaultSettings->strip) && (modules == DefaultSettings->modules) &&
+ (useccache == DefaultSettings->useccache) && (strip ==
DefaultSettings->strip) &&
(objstate == DefaultSettings->objstate) && (outstate ==
DefaultSettings->outstate) &&
(StateLog) && (wcscmp(mingwpath, DefaultSettings->mingwpath) == 0)
&&
(StateObj) && (StateOut) && (nostrip ==
DefaultSettings->nostrip));
@@ -362,7 +356,6 @@
{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] Sat Oct 25
15:53:14 2008
@@ -24,7 +24,6 @@
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] Sat Oct 25
15:53:14 2008
@@ -50,7 +50,6 @@
#define IDC_BACK 0x25
#define ID_STATUSBAR 0x26
#define ID_NOSTRIP 0x27
-#define ID_MODULES 0x28
/* Strings */
#define MSG_NOGCCFOUND 0x27
@@ -79,5 +78,4 @@
#define HLP_QUITBUTTON 0x3c
#define HLP_DEFAULTMSG 0x3d
#define HLP_NOSTRIP 0x3e
-#define HLP_MODULES 0x3f
5907
days inactive
5907
days old
0 comments
1 participants
participants (1)
-
dreimer＠svn.reactos.org