Author: spetreolle Date: Sun Apr 24 22:40:53 2016 New Revision: 71204
URL: http://svn.reactos.org/svn/reactos?rev=71204&view=rev Log: [CONFIGURE] Addendum to r69601: host-tools are "no longer required" but actually still exist. Add the CMakeCache cleanup for them.
Modified: trunk/reactos/configure.cmd trunk/reactos/configure.sh
Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=71204&... ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Apr 24 22:40:53 2016 @@ -214,6 +214,7 @@
if EXIST CMakeCache.txt ( del CMakeCache.txt /q + del host-tools\CMakeCache.txt /q )
if "%NEW_STYLE_BUILD%"=="0" (
Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=71204&... ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Sun Apr 24 22:40:53 2016 @@ -52,7 +52,7 @@
mkdir -p reactos
-EXTRA_ARGS="" +#EXTRA_ARGS="" if [ $USE_NEW_STYLE -eq 0 ]; then mkdir -p host-tools echo Preparing host tools... @@ -62,14 +62,14 @@ REACTOS_BUILD_TOOLS_DIR="$PWD" cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS -DNEW_STYLE_BUILD:BOOL=0 "$REACTOS_SOURCE_DIR"
- EXTRA_ARGS="-DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR" + EXTRA_ARGS="$EXTRA_ARGS -DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR"
cd .. fi
echo Preparing reactos... cd reactos -rm -f 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 -DNEW_STYLE_BUILD:BOOL=$USE_NEW_STYLE $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"