mirror of
https://github.com/reactos/reactos.git
synced 2025-04-25 08:00:24 +00:00
[CONFIGURE] Display the operating system on which the build config takes place (#7774)
This commit is contained in:
parent
9da45923b3
commit
7c61e5769f
2 changed files with 9 additions and 4 deletions
|
@ -70,7 +70,7 @@ if defined ROS_ARCH (
|
||||||
|
|
||||||
REM Checkpoint
|
REM Checkpoint
|
||||||
if not defined ARCH (
|
if not defined ARCH (
|
||||||
echo Unknown build architecture
|
echo Unknown build architecture.
|
||||||
goto quit
|
goto quit
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -157,6 +157,10 @@ if "!CMAKE_GENERATOR!" == "Ninja" (
|
||||||
echo This script defaults to Ninja. Type "configure help" for alternative options.
|
echo This script defaults to Ninja. Type "configure help" for alternative options.
|
||||||
)
|
)
|
||||||
|
|
||||||
|
REM Display information
|
||||||
|
echo Configuring a new ReactOS build on:
|
||||||
|
(for /f "delims=" %%x in ('ver') do @echo %%x) & echo.
|
||||||
|
|
||||||
REM Create directories
|
REM Create directories
|
||||||
set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH%
|
set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH%
|
||||||
|
|
||||||
|
@ -188,10 +192,9 @@ if "%VS_SOLUTION%" == "1" (
|
||||||
goto quit
|
goto quit
|
||||||
)
|
)
|
||||||
|
|
||||||
echo Preparing reactos...
|
|
||||||
|
|
||||||
if EXIST CMakeCache.txt (
|
if EXIST CMakeCache.txt (
|
||||||
del CMakeCache.txt /q
|
del /q CMakeCache.txt
|
||||||
)
|
)
|
||||||
|
|
||||||
if "%BUILD_ENVIRONMENT%" == "MinGW" (
|
if "%BUILD_ENVIRONMENT%" == "MinGW" (
|
||||||
|
|
|
@ -40,13 +40,15 @@ while [ $# -gt 0 ]; do
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
|
echo "Configuring a new ReactOS build on:"
|
||||||
|
echo $(uname -srvpio); echo
|
||||||
|
|
||||||
if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then
|
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"
|
mkdir -p "$REACTOS_OUTPUT_PATH"
|
||||||
cd "$REACTOS_OUTPUT_PATH"
|
cd "$REACTOS_OUTPUT_PATH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Preparing reactos..."
|
|
||||||
rm -f CMakeCache.txt host-tools/CMakeCache.txt
|
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"
|
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"
|
||||||
|
|
Loading…
Reference in a new issue