https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9da45923b33fba22a509c45df7f78f870bd98fb6
commit 9da45923b33fba22a509c45df7f78f870bd98fb6
Author: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
AuthorDate: Sat Mar 8 21:18:37 2025 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
CommitDate: Tue Mar 18 21:20:32 2025 +0100
[CONFIGURE] Adjust some echo'ed strings (#7773)
[CONFIGURE.CMD] Use multi-command syntax instead of AND operator for
successive echo's
And adjust few strings.
[CONFIGURE.SH] Quote the echo'ed strings, and adjust some of them.
---
configure.cmd | 24 +++++++++++-------------
configure.sh | 12 ++++++------
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/configure.cmd b/configure.cmd
index d94501ab4bc..c0c318e8756 100755
--- a/configure.cmd
+++ b/configure.cmd
@@ -24,7 +24,7 @@ set REACTOS_SOURCE_DIR=%~dp0
REM Ensure there's no spaces in the source path
echo %REACTOS_SOURCE_DIR%| find " " > NUL
if %ERRORLEVEL% == 0 (
- echo. && echo Your source path contains at least one space.
+ echo. & echo Your source path contains at least one space.
echo This will cause problems with building.
echo Please rename your folders so there are no spaces in the source
path,
echo or move your source to a different folder.
@@ -97,14 +97,14 @@ set REMAINING=%*
) else if /I "!PARAM!" == "Ninja" (
set CMAKE_GENERATOR="Ninja"
) else if /I "!PARAM!" == "VSSolution" (
- echo. && echo Error: Creation of VS Solution files is not
supported in a MinGW environment.
+ echo. & echo Error: Creation of VS Solution files is not supported
in a MinGW environment.
echo Please run this command in a [Developer] Command Prompt for
Visual Studio.
goto quit
) else if /I "!PARAM:~0,2!" == "-D" (
REM User is passing a switch to CMake
set "CMAKE_PARAMS=%CMAKE_PARAMS% !PARAM!"
) else (
- echo. && echo Warning: Unrecognized switch "!PARAM!" && echo.
+ echo. & echo Warning: Unrecognized switch "!PARAM!" & echo.
)
) else (
if /I "!PARAM!" == "CodeBlocks" (
@@ -145,7 +145,7 @@ set REMAINING=%*
REM User is passing a switch to CMake
set "CMAKE_PARAMS=%CMAKE_PARAMS% !PARAM!"
) else (
- echo. && echo Warning: Unrecognized switch "!PARAM!" && echo.
+ echo. & echo Warning: Unrecognized switch "!PARAM!" & echo.
)
)
@@ -175,17 +175,16 @@ if "%REACTOS_SOURCE_DIR%" == "%CD%\" (
)
if "%VS_SOLUTION%" == "1" (
-
if exist build.ninja (
- echo. && echo Error: This directory has already been configured for
ninja.
+ echo. & echo Error: This directory has already been configured for
ninja.
echo An output folder configured for ninja can't be reconfigured for
VSSolution.
echo Use an empty folder or delete the contents of this folder, then
try again.
goto quit
)
) else if exist REACTOS.sln (
- echo. && echo Error: This directory has already been configured for Visual
Studio.
+ echo. & echo Error: This directory has already been configured for Visual
Studio.
echo An output folder configured for VSSolution can't be reconfigured for
ninja.
- echo Use an empty folder or delete the contents of this folder, then try
again. && echo.
+ echo Use an empty folder or delete the contents of this folder, then try
again. & echo.
goto quit
)
@@ -195,7 +194,6 @@ if EXIST CMakeCache.txt (
del CMakeCache.txt /q
)
-
if "%BUILD_ENVIRONMENT%" == "MinGW" (
cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=%MINGW_TOOCHAIN_FILE% -DARCH:STRING=%ARCH%
%BUILD_TOOLS_FLAG% %CMAKE_PARAMS% "%REACTOS_SOURCE_DIR%"
) else if %USE_CLANG_CL% == 1 (
@@ -213,17 +211,17 @@ if "%CD_SAME_AS_SOURCE%" == "1" (
)
if "%VS_SOLUTION%" == "1" (
- set ENDV= You can now use msbuild or open REACTOS.sln%ENDV%.
+ set ENDV= You can now use msbuild or open REACTOS.sln%ENDV%
) else (
- set ENDV= Execute appropriate build commands ^(ex: ninja, make, nmake,
etc...^)%ENDV%
+ set ENDV= Execute appropriate build commands ^(e.g. ninja, make, nmake,
etc.^)%ENDV%
)
-echo. && echo Configure script complete^^!%ENDV%
+echo. & echo Configure script complete^^!%ENDV%
goto quit
:cmake_notfound
-echo Unable to find cmake, if it is installed, check your PATH variable.
+echo Unable to find cmake. If it is installed, check your PATH variable.
:quit
endlocal
diff --git a/configure.sh b/configure.sh
index f9c4679ad13..7a693949d35 100755
--- a/configure.sh
+++ b/configure.sh
@@ -1,7 +1,7 @@
#!/bin/sh
if [ "x$ROS_ARCH" = "x" ]; then
- echo Could not detect RosBE.
+ echo "Could not detect RosBE."
exit 1
fi
@@ -11,7 +11,7 @@ REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
usage() {
- echo Invalid parameter given.
+ echo "Invalid parameter given."
exit 1
}
@@ -41,18 +41,18 @@ while [ $# -gt 0 ]; do
done
if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then
- echo Creating directories in $REACTOS_OUTPUT_PATH
+ echo "Creating directories in $REACTOS_OUTPUT_PATH"
mkdir -p "$REACTOS_OUTPUT_PATH"
cd "$REACTOS_OUTPUT_PATH"
fi
-echo Preparing reactos...
+echo "Preparing reactos..."
rm -f CMakeCache.txt host-tools/CMakeCache.txt
cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH
$EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
if [ $? -ne 0 ]; then
- echo "An error occured while configuring ReactOS"
+ echo "An error occurred while configuring ReactOS"
exit 1
fi
-echo Configure script complete! Enter directories and execute appropriate
build commands \(ex: ninja, make, makex, etc...\).
+echo "Configure script complete! Execute appropriate build commands (e.g.
ninja, make, makex, etc.) from $REACTOS_OUTPUT_PATH"
