[ros-diffs] [dreimer] 35935: Various small fixes.
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Thu Sep 4 15:16:53 CEST 2008
Author: dreimer
Date: Thu Sep 4 08:16:52 2008
New Revision: 35935
URL: http://svn.reactos.org/svn/reactos?rev=35935&view=rev
Log:
Various small fixes.
Modified:
trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd
trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd
trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd
trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd
trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd
trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd?rev=35935&r1=35934&r2=35935&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Thu Sep 4 08:16:52 2008
@@ -34,7 +34,7 @@
endlocal
::
-:: Check if strip or ccache are being used and set the appropriate options.
+:: Check if strip, no Debug Symbols or ccache are being used and set the appropriate options.
::
if .%_ROSBE_NOSTRIP%. == .1. (
set ROS_BUILDNOSTRIP=yes
@@ -48,6 +48,7 @@
set ROS_LEAN_AND_MEAN=no
)
+:: Small Security Check to prevent useless apps.
if .%ROS_LEAN_AND_MEAN%. == .yes. (
if .%ROS_BUILDNOSTRIP%. == .yes. (
cls
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd?rev=35935&r1=35934&r2=35935&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Thu Sep 4 08:16:52 2008
@@ -44,7 +44,7 @@
) else (
echo ERROR: There are no logs to clean.
)
-goto :EOF
+goto :EOC
:DEL
@@ -70,6 +70,7 @@
) else (
echo ERROR: There is no compiler output to clean.
)
+ goto :ROS
)
if .%ROS_ARCH%. == .i386. (
::
@@ -93,6 +94,7 @@
) else (
echo ERROR: There is no compiler output to clean.
)
+ goto :ROS
)
if .%ROS_ARCH%. == .ppc. (
::
@@ -116,6 +118,7 @@
) else (
echo ERROR: There is no compiler output to clean.
)
+ goto :ROS
)
if .%ROS_ARCH%. == .amd64. (
::
@@ -139,6 +142,7 @@
) else (
echo ERROR: There is no compiler output to clean.
)
+ goto :ROS
)
if .%ROS_ARCH%. == .. (
::
@@ -162,13 +166,13 @@
) else (
echo ERROR: There is no compiler output to clean.
)
+ goto :ROS
)
+:ROS
if exist "reactos\." (
rd /s /q "reactos" 1> NUL 2> NUL
)
-
-goto :EOF
:EOC
if defined _ROSBE_VERSION (
Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd?rev=35935&r1=35934&r2=35935&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] Thu Sep 4 08:16:52 2008
@@ -16,7 +16,7 @@
if not "%1" == "" (
cls
echo Unknown parameter specified. Exiting.
- goto :EOC
+ goto :EOF
)
color 0A
@@ -46,5 +46,3 @@
doskey /macrofile="%_ROSBE_BASEDIR%\MinGW.mac"
if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= )
-
-:EOC
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd?rev=35935&r1=35934&r2=35935&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Thu Sep 4 08:16:52 2008
@@ -31,6 +31,7 @@
set _ROSBE_WRITELOG=1
set _ROSBE_USECCACHE=0
set _ROSBE_STRIP=0
+set _ROSBE_NOSTRIP=0
set _ROSBE_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3
set _ROSBE_LOGDIR=%CD%\RosBE-Logs
set _ROSBE_OBJPATH=
@@ -64,16 +65,19 @@
goto :EndCommandParse
)
if /i "%1" == "arm" (
+ cls
set _ROSBE_ARCH=1
call :RosBE4
goto :EndCommandParse
)
if /i "%1" == "ppc" (
+ cls
set _ROSBE_ARCH=2
call :RosBE4
goto :EndCommandParse
)
if /i "%1" == "amd64" (
+ cls
set _ROSBE_ARCH=3
call :RosBE4
goto :EndCommandParse
@@ -159,5 +163,6 @@
if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= )
if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SSVN= )
if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SVN= )
+ if not exist "%_ROSBE_BASEDIR%\update.cmd" ( doskey UPDATE= )
if not exist "%_ROSBE_BASEDIR%\options.cmd" ( doskey OPTIONS= )
goto :EOF
Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd?rev=35935&r1=35934&r2=35935&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Thu Sep 4 08:16:52 2008
@@ -16,7 +16,8 @@
::
:: Parse the command line arguments.
:: ROS_ARCH: Set to x86, x64, ppc or arm.
-:: ROS_PREFIX: Default is mingw32. ppc could be ppc-pc-mingw32, arm arm-pc-mingw32, x64 x86_64-pc-mingw32.
+:: ROS_PREFIX: Default is mingw32. ppc could be ppc-pc-mingw32,
+:: arm arm-pc-mingw32, x64 x86_64-pc-mingw32.
::
if "%1" == "" (
@@ -59,11 +60,8 @@
echo ERROR: You must enter a Architecture.
goto :EOC
)
-goto :EOF
:EOC
-REM chdefgcc %PATH%
-
if defined _ROSBE_VERSION (
title ReactOS Build Environment %_ROSBE_VERSION%
)
Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd?rev=35935&r1=35934&r2=35935&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] Thu Sep 4 08:16:52 2008
@@ -45,7 +45,6 @@
echo ERROR: You must enter a ReactOS source directory, or 'previous'.
goto :EOC
)
-goto :EOF
:EOC
if defined _ROSBE_VERSION (
Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd?rev=35935&r1=35934&r2=35935&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Thu Sep 4 08:16:52 2008
@@ -48,7 +48,6 @@
echo ERROR: You must enter a MinGW/GCC directory.
goto :EOC
)
-goto :EOF
:EOC
if defined _ROSBE_VERSION (
Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd?rev=35935&r1=35934&r2=35935&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] Thu Sep 4 08:16:52 2008
@@ -69,7 +69,7 @@
if "%_2%" == "" (
set /p _2="Please enter the address you would like to analyze: "
)
-goto :EOF
+goto :EOC
::
:: Check if the user supplied a path, if they didn't look for
@@ -81,7 +81,7 @@
if errorlevel 2 (
for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% 2>NUL | findstr "%_1%""`) do set _1=%%i
)
-goto :EOF
+goto :EOC
:EOC
if defined _ROSBE_VERSION (
Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd?rev=35935&r1=35934&r2=35935&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Thu Sep 4 08:16:52 2008
@@ -75,8 +75,12 @@
if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" (
nasm -v
) else (
- if "%_ROSBE_MODE%" == "RosBE" (
- echo ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC.
+ if exist "%_ROSBE_MINGWPATH%\bin\yasm.exe" (
+ yasm --version | find "yasm 0"
+ ) else (
+ if "%_ROSBE_MODE%" == "RosBE" (
+ echo ERROR: NASM or YASM is required to build ReactOS, none found in the current MinGW/GCC.
+ )
)
)
if exist "%_ROSBE_MINGWPATH%\bin\bison.exe" (
Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd?rev=35935&r1=35934&r2=35935&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] Thu Sep 4 08:16:52 2008
@@ -25,12 +25,12 @@
:: It's a shortcut name, so change the directory
for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\scut.exe" %*"`) do (
- if /i not "%%i" == "Default" (
- if exist "%%i\." (
- cd /d %%i
- set _ROSBE_ROSSOURCEDIR=%%i
- )
- )
+ if /i not "%%i" == "Default" (
+ if exist "%%i\." (
+ cd /d %%i
+ set _ROSBE_ROSSOURCEDIR=%%i
+ )
+ )
)
goto :EOC
More information about the Ros-diffs
mailing list