Author: peterw
Date: Tue Oct 23 04:56:07 2007
New Revision: 29806
URL: http://svn.reactos.org/svn/reactos?rev=29806&view=rev
Log:
- Remove the doskey macro for a component if it is not actually present.
Modified:
trunk/tools/RosBE-Windows/Root/RosBE.cmd
Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Tue Oct 23 04:56:07 2007
@@ -83,7 +83,7 @@
::
:: Load the doskey macros that serve as our commands.
::
-doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac"
+call :LOADDOSKEYMACROS
::
:: Look if the Source Folder is empty. If so, ask for using "ssvn create".
@@ -122,4 +122,19 @@
echo.
goto :EOF
+::
+:: Load the doskey macros and delete any macros for components
+:: that are not actually present.
+::
+:LOADDOSKEYMACROS
+ doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac"
+
+ if not exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( doskey CHDEFDIR= )
+ if not exist "%_ROSBE_BASEDIR%\Config.cmd" ( doskey CONFIG= )
+ if not exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( doskey RADDR2LINE= )
+ if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= )
+ if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SSVN= )
+ if not exist "%_ROSBE_BASEDIR%\options.cmd" ( doskey OPTIONS= )
+goto :EOF
+
:ExitRosBE
Author: peterw
Date: Tue Oct 23 04:27:32 2007
New Revision: 29805
URL: http://svn.reactos.org/svn/reactos?rev=29805&view=rev
Log:
- Remove the need for cutz.cmd and delete it.
Removed:
trunk/tools/RosBE-Windows/Tools/cutz.cmd
Modified:
trunk/tools/RosBE-Windows/Root/sSVN.cmd
Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Tue Oct 23 04:27:32 2007
@@ -57,7 +57,7 @@
if "%1" == "status" (
title Status
for /f "usebackq" %%i in (`svnversion .`) do set OFFSVN=%%i
- for /f "usebackq" %%j in (`"svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn"`) do set ONSVN=%%j
+ for /f "usebackq" %%j in (`"svn info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:" | cut -d " " -f 2"`) do set ONSVN=%%j
call :UP
goto :ExitSVN
)
Removed: trunk/tools/RosBE-Windows/Tools/cutz.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cutz.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/cutz.cmd (original)
+++ trunk/tools/RosBE-Windows/Tools/cutz.cmd (removed)
@@ -1,12 +1,0 @@
-::
-:: PROJECT: RosBE - ReactOS Build Environment for Windows
-:: LICENSE: GPL - See COPYING in the top level directory
-:: FILE: Tools/cutz.cmd
-:: PURPOSE: Bypass a stupid bug in cut.
-:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de>
-::
-::
-@echo off
-if "%1" == "svn" (
- cut -d " " -f 2
-)
Author: dreimer
Date: Tue Oct 23 01:59:49 2007
New Revision: 29801
URL: http://svn.reactos.org/svn/reactos?rev=29801&view=rev
Log:
Added more Error Messages to prevent confusion and stupid mistakes.
Edited some Errors.
Modified:
trunk/tools/RosBE-Windows/Root/chdefdir.cmd
trunk/tools/RosBE-Windows/Root/reladdr2line.cmd
trunk/tools/RosBE-Windows/Root/scut.cmd
Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Tue Oct 23 01:59:49 2007
@@ -25,7 +25,7 @@
set _ROSBE_ROSSOURCEDIR=%_ROSBE_PREVIOUSSOURCEDIR%
) else (
if not exist "%1\." (
- echo The path specified doesn't seem to exist.
+ echo ERROR: The path specified doesn't seem to exist.
goto :EOC
)
set _ROSBE_ROSSOURCEDIR=%1
@@ -36,14 +36,14 @@
set /p XY="Please enter a ReactOS source directory, or 'previous': "
if /i "%XY%" == "" (
- echo You must either enter a directory or "previous".
+ echo ERROR: You must either enter a valid directory or "previous".
goto :EOC
)
if /i "%XY%"=="previous" (
set _ROSBE_ROSSOURCEDIR=%_ROSBE_PREVIOUSSOURCEDIR%
) else (
if not exist "%XY%\." (
- echo The path specified doesn't seem to exist.
+ echo ERROR: The path specified doesn't seem to exist.
goto :EOC
)
set _ROSBE_ROSSOURCEDIR=%XY%
Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Tue Oct 23 01:59:49 2007
@@ -37,6 +37,18 @@
set /p _2="Please enter the address you would like to analyze: "
:EOC
+if not exist "%_1%\." (
+ echo ERROR: The path specified doesn't seem to exist.
+ goto :END
+)
+if /i "%_1%" == "" (
+ echo ERROR: You must enter a valid directory.
+ goto :END
+)
+if /i "%_2%" == "" (
+ echo ERROR: You must enter a address to analyze.
+ goto :END
+)
::
:: First get the ImageBase of the File. If its smaller than the given
:: Parameter, everything is ok, because it was already added onto the
@@ -52,4 +64,5 @@
raddr2line "%_1%" "%relbase%" 2>NUL
)
+:END
title ReactOS Build Environment %_ROSBE_VERSION%
Modified: trunk/tools/RosBE-Windows/Root/scut.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/scut.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/scut.cmd Tue Oct 23 01:59:49 2007
@@ -53,6 +53,14 @@
::
:DEF
set /p XY="Choose your Source Folder: "
+if not exist "%XY%\." (
+ echo ERROR: The path specified doesn't seem to exist.
+ goto :END
+)
+if /i "%XY%" == "" (
+ echo ERROR: You must enter a valid directory.
+ goto :END
+)
:RUN
for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do (
if %%i == %XY% (
@@ -82,8 +90,20 @@
:ADD1
set /p CUT="Choose your Shortcut: "
+if /i "%CUT%" == "" (
+ echo ERROR: You must enter a valid Shortcut.
+ goto :END
+)
:ADD2
set /p DIR="Choose your Source Folder: "
+if not exist "%DIR%\." (
+ echo ERROR: The path specified doesn't seem to exist.
+ goto :END
+)
+if /i "%DIR%" == "" (
+ echo ERROR: You must enter a valid directory.
+ goto :END
+)
:ADD23
for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do (
if %%i == %CUT% (
@@ -105,6 +125,10 @@
goto :REM1
)
set /p CUTREM="Choose your Shortcut: "
+if /i "%CUTREM%" == "" (
+ echo ERROR: You must enter a valid Shortcut.
+ goto :END
+)
:REM1
set _ROSBE_REM=0
for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do (
@@ -133,6 +157,10 @@
goto :DEF1
)
set /p DIR="Choose your new Default Shortcut: "
+if /i "%DIR%" == "" (
+ echo ERROR: You must enter a valid Shortcut.
+ goto :END
+)
:DEF1
call "%_ROSBE_BASEDIR%\scut.cmd" edit Base %DIR%
@@ -155,8 +183,20 @@
:EDIT1
set /p CUT="Choose your Shortcut: "
+if /i "%CUT%" == "" (
+ echo ERROR: You must enter a valid Shortcut.
+ goto :END
+)
:EDIT2
set /p DIR="Choose your Source Folder: "
+if not exist "%DIR%\." (
+ echo ERROR: The path specified doesn't seem to exist.
+ goto :END
+)
+if /i "%DIR%" == "" (
+ echo ERROR: You must enter a valid directory.
+ goto :END
+)
:EDIT23
set _ROSBE_EDIT=0
for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do (
Author: peterw
Date: Tue Oct 23 01:41:23 2007
New Revision: 29800
URL: http://svn.reactos.org/svn/reactos?rev=29800&view=rev
Log:
- Make some error messages a bit more consistent.
Modified:
trunk/tools/RosBE-Windows/Root/Build.cmd
trunk/tools/RosBE-Windows/Root/Config.cmd
Modified: trunk/tools/RosBE-Windows/Root/Build.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build.cmd Tue Oct 23 01:41:23 2007
@@ -66,9 +66,11 @@
if not exist "%_ROSBE_LOGDIR%\." (
mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL
if errorlevel 1 (
- echo *** Error - Writing logs requested, but log directory doesn't ***
- echo *** exist and can't be created. Logs will be created in the ***
- echo *** current directory as a fallback. ***
+ echo.
+ echo *** Writing logs requested, but log directory doesn't ***
+ echo *** exist and can't be created. Logs will be created ***
+ echo *** in the current directory as a fallback. ***
+ echo.
set _ROSBE_LOGDIR=%CD%
)
)
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Tue Oct 23 01:41:23 2007
@@ -63,13 +63,14 @@
)
::
-:: N00b Blocker :-P
-::
-echo WARNING:
-echo Non-Default-Configurations are not useable for pasteing Bugs to
-echo Bugzilla or asking quesions about in Forum/Chat!
-echo.
-echo DID YOU UNDERSTAND?
+:: Help prevent non-useful bug reports/questions.
+::
+echo.
+echo *** Configurations other than release/debug are not useful for ***
+echo *** posting bug reports, and generally not very useful for ***
+echo *** IRC/Forum discussion. Please refrain from doing so unless ***
+echo *** you are sure about what you are doing. ***
+echo.
set /p XY="(yes), (no)"
Author: dreimer
Date: Tue Oct 23 01:24:42 2007
New Revision: 29799
URL: http://svn.reactos.org/svn/reactos?rev=29799&view=rev
Log:
Translate xcopy into German and fix the SUBLANGs of the rest.
Update German Shell32 Translation
Added:
trunk/reactos/base/applications/cmdutils/xcopy/De.rc (with props)
Modified:
trunk/reactos/base/applications/cmdutils/xcopy/En.rc
trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc
trunk/reactos/dll/win32/shell32/lang/de-DE.rc
Added: trunk/reactos/base/applications/cmdutils/xcopy/De.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/De.rc (added)
+++ trunk/reactos/base/applications/cmdutils/xcopy/De.rc Tue Oct 23 01:24:42 2007
@@ -1,0 +1,79 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * German language support
+ *
+ * Copyright (C) 2007 Daniel Reimer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+ STRING_INVPARMS, "Ungültige Anzahl an Parametern - Nutze xcopy /? für Hilfe\n"
+ STRING_INVPARM, "Ungültiger Parameter '%s' - Nutze xcopy /? für Hilfe\n"
+ STRING_PAUSE, "Drücke <Enter> um den Kopiervorgang zu starten\n"
+ STRING_SIMCOPY, "%d Datei(en) würden kopiert werden\n"
+ STRING_COPY, "%d Datei(en) kopiert\n"
+ STRING_QISDIR, "Ist '%s' eine Datei oder ein Ordner\n" \
+ "im Zielordner?\n" \
+ "(D - Datei, O - Ordner)\n"
+ STRING_SRCPROMPT,"%s? (Ja|Nein)\n"
+ STRING_OVERWRITE,"Überschreibe %s? (Ja|Nein|Alle)\n"
+ STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen mit r/c %d\n"
+ STRING_OPENFAIL, "Öffnen von '%s' fehlgeschlagen\n"
+ STRING_READFAIL, "Lesen von '%s' fehlgeschlagen\n"
+ STRING_YES_CHAR, "J"
+ STRING_NO_CHAR, "N"
+ STRING_ALL_CHAR, "A"
+ STRING_FILE_CHAR,"D"
+ STRING_DIR_CHAR, "O"
+
+ STRING_HELP,
+"XCOPY - Kopiert Quelldaten oder Verzeichnisbäume and einen Ort\n\
+\n\
+Syntax:\n\
+XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+Wo:\n\
+\n\
+[/I] Falls Ziel nicht vorhanden ist und mehrere Dateien kopiert \n\
+\twerden, nimmt XCOPY an, dass das Ziel ein Verzeichnis ist\n\
+[/S] Kopiert Verzeichnisse und Unterverzeichnisse, die nicht leer sind\n\
+[/E] Kopiert alle Unterverzeichnisse, eingeschlossen leere\n\
+[/Q] Zeigt beim Kopieren keine Dateinamen an\n\
+[/F] Zeigt die Namen der Quell- und Zieldateien beim Kopieren an\n\
+[/L] Listet lediglich die Dateien auf, die kopiert werden würden\n\
+[/W] Fordert vor dem Beginn des Kopiervorgangs eine Bestätigung\n\
+[/T] Erstellt die Verzeichnisstruktur, kopiert aber keine Dateien\n\
+[/Y] Unterdrücke eine Bestätigung vor dem überschreiben einer Datei\n\
+[/-Y] Fordert vor dem überschreiben einer Datei eine Bestätigung\n\
+[/P] Fordert vor jedem Kopiervorgang eine Bestätigung\n\
+[/N] Kurznamen beim kopieren verwenden\n\
+[/U] Kopiert nur Dateien, die im Zielverzeichnis vorhanden sind\n\
+[/R] Schreibgeschützte Dateien überschreiben\n\
+[/H] Verstecke und Systemdateien in den Kopiervorgang miteinbeziehen\n\
+[/C] Kopiervorgang selbst nach Fehlern fortsetzen\n\
+[/A] Nur Dateien mit gestztem Archiv Attribut kopieren\n\
+[/M] Nur Dateien mit gestztem Archiv Attribut kopieren und \n\
+\tdieses entfernen\n\
+[/D | /D:m-d-y] Kopiert nur die an oder nach dem Datum geänderten Dateien.\n\
+\t\tIst kein Datum angegeben, werden nur Dateien kopiert,\n\
+\t\tdie neuer als die bestehenden Zieldateien sind.\n\n"
+
+}
Propchange: trunk/reactos/base/applications/cmdutils/xcopy/De.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/En.rc (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc Tue Oct 23 01:24:42 2007
@@ -20,7 +20,7 @@
*/
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
STRINGTABLE
{
Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc Tue Oct 23 01:24:42 2007
@@ -22,6 +22,7 @@
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#include "De.rc"
#include "En.rc"
#include "Ko.rc"
#include "Pl.rc"
Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original)
+++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Tue Oct 23 01:24:42 2007
@@ -317,16 +317,16 @@
BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Recycle Bin Properties"
+CAPTION "Papierkorb Einstellungen"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
- GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70
- RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10
- EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP | ES_NUMBER
- LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10
- RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP
- RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP
+ GROUPBOX "Einstellungen für gewählten Ort", -1, 10, 80, 220, 70
+ RADIOBUTTON "&Benutzerdefinierte Größe:", 14001, 20, 90, 100, 10
+ EDITTEXT 14002, 120, 90, 50, 10, WS_TABSTOP | ES_NUMBER
+ LTEXT "M&aximale Größe (MB):", -1, 32, 100, 70, 10
+ RADIOBUTTON "Dateien nicht in den Papie&rkorb verschieben, sondern sofort löschen.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP
+ RADIOBUTTON "Bestätigungs&dialog nach erfolgreichem Löschvorgang anzeigen", 14004, 10, 155, 220, 10, WS_TABSTOP
END
STRINGTABLE DISCARDABLE