[ros-diffs] [dreimer] 27581: Sometimes I really think, I am too tupid for that... - Fix all cmds to support Foldernaes with Spaces properly. - Hopefuly final fix for NonAdmin Usage.
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Wed Jul 11 00:05:52 CEST 2007
Author: dreimer
Date: Wed Jul 11 02:05:51 2007
New Revision: 27581
URL: http://svn.reactos.org/svn/reactos?rev=27581&view=rev
Log:
Sometimes I really think,I am too tupid for that...
- Fix all cmds to support Foldernaes with Spaces properly.
- Hopefuly final fix for NonAdmin Usage.
Modified:
trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
trunk/tools/RosBE-Windows/Root/Config.cmd
trunk/tools/RosBE-Windows/Root/RAddr.cmd
trunk/tools/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE-Windows/Root/chdefdir.cmd
trunk/tools/RosBE-Windows/Root/sSVN.cmd
trunk/tools/RosBE-Windows/RosBE.nsi
Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Shared.cmd?rev=27581&r1=27580&r2=27581&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Wed Jul 11 02:05:51 2007
@@ -60,7 +60,7 @@
::
:: Now use mingw32-make to build ReactOS, passing along options, if any.
::
-call buildtime %MAKE_COMMAND% 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
+call buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
::
:: Highlight the fact that building has ended.
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cmd?rev=27581&r1=27580&r2=27581&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Wed Jul 11 02:05:51 2007
@@ -12,13 +12,13 @@
if "%1" == "delete" (
if exist "%_ROSSOURCEDIR%\config.rbuild" (
- del %_ROSSOURCEDIR%\config.rbuild
+ del "%_ROSSOURCEDIR%\config.rbuild"
echo Main Configuration File was found and deleted.
) else (
echo Main Configuration File was not found in ReactOS Source Tree.
)
if exist "%ROSBEBASEDIR%\config.rbuild" (
- del %ROSBEBASEDIR%\config.rbuild
+ del "%ROSBEBASEDIR%\config.rbuild"
echo Working Configuration File was found and deleted.
) else (
echo Working Configuration File was not found in ReactOS Source Tree.
@@ -50,16 +50,16 @@
echo Architecture to build for. Not Editable.
echo.
echo Right now
-call grep \"ARCH\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4
+call grep \"ARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
echo.
echo Sub-architecture to build for.
echo Default is: none
echo.
echo Right now
-call grep \"SARCH\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4
+call grep \"SARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P X= (), (xbox)
-call sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" %ROSBEBASEDIR%\config.rbuild > %ROSBEBASEDIR%\config2.rbuild
+call sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%ROSBEBASEDIR%\config.rbuild" > "%ROSBEBASEDIR%\config2.rbuild"
cls
echo Which CPU ReactOS should be optimized for.
@@ -70,9 +70,9 @@
echo Default is: pentium
echo.
echo Right now
-call grep \"OARCH\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4
+call grep \"OARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P XX=
-call sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" %ROSBEBASEDIR%\config2.rbuild > %ROSBEBASEDIR%\config21.rbuild
+call sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" "%ROSBEBASEDIR%\config2.rbuild" > "%ROSBEBASEDIR%\config21.rbuild"
cls
echo What level do you want ReactOS to be optimized at.
@@ -83,27 +83,27 @@
echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk.
echo.
echo Right now
-call grep \"OPTIMIZE\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4
+call grep \"OPTIMIZE\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P Y= (0), (1), (2), (3), (4), (5)
-call sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" %ROSBEBASEDIR%\config21.rbuild > %ROSBEBASEDIR%\config3.rbuild
+call sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" "%ROSBEBASEDIR%\config21.rbuild" > "%ROSBEBASEDIR%\config3.rbuild"
cls
echo Whether to compile for an uniprocessor or multiprocessor machine.
echo Default is: 0
echo.
echo Right now
-call grep \"MP\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4
+call grep \"MP\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P Z= (0), (1)
-call sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" %ROSBEBASEDIR%\config3.rbuild > %ROSBEBASEDIR%\config4.rbuild
+call sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" "%ROSBEBASEDIR%\config3.rbuild" > "%ROSBEBASEDIR%\config4.rbuild"
cls
echo Whether to compile in the integrated kernel debugger.
echo Default is: 0
echo.
echo Right now
-call grep \"KDBG\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4
+call grep \"KDBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P A= (0), (1)
-call sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" %ROSBEBASEDIR%\config4.rbuild > %ROSBEBASEDIR%\config5.rbuild
+call sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" "%ROSBEBASEDIR%\config4.rbuild" > "%ROSBEBASEDIR%\config5.rbuild"
cls
echo Whether to compile for debugging. No compiler optimizations will be
@@ -111,9 +111,9 @@
echo Default is: 1
echo.
echo Right now
-call grep \"DBG\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4
+call grep \"DBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P B= (0), (1)
-call sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" %ROSBEBASEDIR%\config5.rbuild > %ROSBEBASEDIR%\config6.rbuild
+call sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" "%ROSBEBASEDIR%\config5.rbuild" > "%ROSBEBASEDIR%\config6.rbuild"
cls
echo Whether to compile for debugging with GDB. If you don't use GDB,
@@ -121,9 +121,9 @@
echo Default is: 0
echo.
echo Right now
-call grep \"GDB\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4
+call grep \"GDB\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P C= (0), (1)
-call sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" %ROSBEBASEDIR%\config6.rbuild > %ROSBEBASEDIR%\config7.rbuild
+call sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" "%ROSBEBASEDIR%\config6.rbuild" > "%ROSBEBASEDIR%\config7.rbuild"
cls
echo Whether to compile apps/libs with features covered software patents
@@ -133,18 +133,18 @@
echo Default is: 0
echo.
echo Right now
-call grep \"NSWPAT\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4
+call grep \"NSWPAT\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P D= (0), (1)
-call sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" %ROSBEBASEDIR%\config7.rbuild > %ROSBEBASEDIR%\config8.rbuild
+call sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%ROSBEBASEDIR%\config7.rbuild" > "%ROSBEBASEDIR%\config8.rbuild"
cls
echo Whether to compile with NT-compatible LPC Semantics. This should
echo always be 1.
echo.
echo Right now
-call grep \"NTLPC\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4
+call grep \"NTLPC\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P E= (0), (1)
-call sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" %ROSBEBASEDIR%\config8.rbuild > %ROSBEBASEDIR%\config9.rbuild
+call sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" "%ROSBEBASEDIR%\config8.rbuild" > "%ROSBEBASEDIR%\config9.rbuild"
cls
echo Whether to compile with the KD protocol. This will disable support for
@@ -156,15 +156,15 @@
echo Default is: 0
echo.
echo Right now
-call grep \"_WINKD_\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4
+call grep \"_WINKD_\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4
SET /P F= (0), (1)
-call sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" %ROSBEBASEDIR%\config9.rbuild > %ROSBEBASEDIR%\config10.rbuild
+call sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%ROSBEBASEDIR%\config9.rbuild" > "%ROSBEBASEDIR%\config10.rbuild"
-copy %ROSBEBASEDIR%\config10.rbuild %ROSBEBASEDIR%\config.tmp
-del %ROSBEBASEDIR%\*.rbuild
-copy %ROSBEBASEDIR%\config.tmp %ROSBEBASEDIR%\config.rbuild
-del %ROSBEBASEDIR%\*.tmp
-copy %ROSBEBASEDIR%\config.rbuild %_ROSSOURCEDIR%\config.rbuild
+copy "%ROSBEBASEDIR%\config10.rbuild" "%ROSBEBASEDIR%\config.tmp"
+del "%ROSBEBASEDIR%\*.rbuild"
+copy "%ROSBEBASEDIR%\config.tmp" "%ROSBEBASEDIR%\config.rbuild"
+del "%ROSBEBASEDIR%\*.tmp"
+copy "%ROSBEBASEDIR%\config.rbuild" "%_ROSSOURCEDIR%\config.rbuild"
goto :NOK
Modified: trunk/tools/RosBE-Windows/Root/RAddr.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RAddr.cmd?rev=27581&r1=27580&r2=27581&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RAddr.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RAddr.cmd Wed Jul 11 02:05:51 2007
@@ -35,17 +35,17 @@
SET /P ADDR=
echo.
echo.
-raddr2line %EXE% %ADDR%
+raddr2line "%EXE%" "%ADDR%"
goto :EOC
:AUTO1
echo Set the Address you wanna analyze inside the Executable.
SET /P ADDR=
-raddr2line %1 %ADDR%
+raddr2line "%1" "%ADDR%"
goto :EOC
:AUTO2
-raddr2line %1 %2
+raddr2line "%1" "%2"
goto :EOC
:EOC
Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd?rev=27581&r1=27580&r2=27581&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Wed Jul 11 02:05:51 2007
@@ -60,7 +60,7 @@
::
:: Look if the Source Folder is empty. If so, ask for using "svn create".
::
-dir /b %_ROSSOURCEDIR% 2>nul|grep -e ".*" >nul
+dir /b "%_ROSSOURCEDIR%" 2>nul|grep -e ".*" >nul
if errorlevel 1 (
echo No ReactOS Source detected. Please use "svn create" to download it.
goto :ExitRosBE
Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.cmd?rev=27581&r1=27580&r2=27581&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Wed Jul 11 02:05:51 2007
@@ -14,9 +14,9 @@
goto :DEF
)
if /I "%1"=="default" (
- set "%_ROSSOURCEDIR%" == "%_ROSSRCDIRBCK%"
+ set _ROSSOURCEDIR=%_ROSSRCDIRBCK%
) else (
- set "%_ROSSOURCEDIR%" == "%1"
+ set _ROSSOURCEDIR=%1
)
goto :END
@@ -29,11 +29,12 @@
goto :END
)
if /I "%XY%"=="default" (
- set "%_ROSSOURCEDIR%" == "%_ROSSRCDIRBCK%"
+ set _ROSSOURCEDIR=%_ROSSRCDIRBCK%
) else (
- set "%_ROSSOURCEDIR%" == "%XY%"
+ set _ROSSOURCEDIR=%XY%
)
goto :END
:END
title ReactOS Build Environment %_VER%
+cd "%_ROSSOURCEDIR%"
Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?rev=27581&r1=27580&r2=27581&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Wed Jul 11 02:05:51 2007
@@ -18,15 +18,15 @@
if "%1" == "update" (
title Updating...
if not "%2" == "" (
- svn update %_ROSSOURCEDIR% -r %2
+ svn update "%_ROSSOURCEDIR%" -r %2
) else (
- svn update %_ROSSOURCEDIR%
+ svn update "%_ROSSOURCEDIR%"
)
goto :ExitSVN
)
if "%1" == "cleanup" (
title Cleaning...
- svn cleanup %_ROSSOURCEDIR%
+ svn cleanup "%_ROSSOURCEDIR%"
goto :ExitSVN
)
::
@@ -39,9 +39,9 @@
echo Folder already cotains a Reposority. Exiting
goto :ExitSVN
)
- dir /b %_ROSSOURCEDIR% 2>nul|grep -e ".*" >nul
+ dir /b "%_ROSSOURCEDIR%" 2>nul|grep -e ".*" >nul
if errorlevel 1 (
- svn checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR%
+ svn checkout svn://svn.reactos.org/reactos/trunk/reactos "%_ROSSOURCEDIR%"
) else (
echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED
)
@@ -49,14 +49,14 @@
)
if "%1" == "status" (
title Status
- call svn info %_ROSSOURCEDIR% > "%ROSBEBASEDIR%\x.tmp"
+ call svn info "%_ROSSOURCEDIR%" > "%ROSBEBASEDIR%\x.tmp"
echo Recent Offline Revision:
- call grep Revision: %ROSBEBASEDIR%\x.tmp|cut -d " " -f 2
+ call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cut -d " " -f 2
del "%ROSBEBASEDIR%\x.tmp"
call svn info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp"
echo Online HEAD Revision:
- call grep Revision: %ROSBEBASEDIR%\x.tmp|cut -d " " -f 2
+ call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cut -d " " -f 2
del "%ROSBEBASEDIR%\x.tmp"
goto :ExitSVN
)
Modified: trunk/tools/RosBE-Windows/RosBE.nsi
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=27581&r1=27580&r2=27581&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/RosBE.nsi (original)
+++ trunk/tools/RosBE-Windows/RosBE.nsi Wed Jul 11 02:05:51 2007
@@ -104,7 +104,7 @@
!include "RosBE.Files-Miscellaneous.nsh"
Section -StartMenuShortcuts SEC03
- SetShellVarContext all
+ SetShellVarContext current
;;
;; Add our start menu shortcuts.
@@ -122,7 +122,7 @@
SectionEnd
Section /o "Desktop Shortcuts" SEC04
- SetShellVarContext all
+ SetShellVarContext current
;;
;; Add our desktop shortcuts.
@@ -132,7 +132,7 @@
SectionEnd
Section /o "Quick Launch Shortcuts" SEC05
- SetShellVarContext all
+ SetShellVarContext current
;;
;; Add our quick launch shortcuts.
@@ -171,7 +171,7 @@
Section Uninstall
!insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
- SetShellVarContext all
+ SetShellVarContext current
;;
;; Clean up installed files.
More information about the Ros-diffs
mailing list