https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53ce7d4370d2dbcce0217b12d8a93d556a36a55b
commit 53ce7d4370d2dbcce0217b12d8a93d556a36a55b Author: Victor Perevertkin <[email protected]> AuthorDate: Sun Sep 16 15:07:46 2018 +0300 Commit: Pierre Schweitzer <[email protected]> CommitDate: Mon Feb 11 09:55:17 2019 +0100 [CONFIGURE] Do not create another "reactos" directory in build directory. This makes configure.sh consistent with configure.cmd --- .travis.yml | 2 +- configure.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 447a77b553..a91c8c95fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ git: before_script: - wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz -O RosBE.tar.gz - tar -xzf RosBE.tar.gz - - echo 'mkdir ../Build && cd ../Build && $TRAVIS_BUILD_DIR/configure.sh -DENABLE_ROSTESTS=1 && cd reactos && ninja -k 0 && ninja bootcd' > tmp_file + - echo 'mkdir ../Build && cd ../Build && $TRAVIS_BUILD_DIR/configure.sh -DENABLE_ROSTESTS=1 && ninja -k 0 && ninja bootcd' > tmp_file script: - ./RosBEBinFull/RosBE.sh < tmp_file diff --git a/configure.sh b/configure.sh index 64a18db4c8..52417c06e5 100755 --- a/configure.sh +++ b/configure.sh @@ -50,11 +50,10 @@ if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then cd "$REACTOS_OUTPUT_PATH" fi -mkdir -p reactos - #EXTRA_ARGS="" if [ $USE_NEW_STYLE -eq 0 ]; then mkdir -p host-tools + mkdir -p reactos echo Preparing host tools... cd host-tools rm -f CMakeCache.txt @@ -68,7 +67,11 @@ if [ $USE_NEW_STYLE -eq 0 ]; then fi echo Preparing reactos... -cd reactos + +if [ $USE_NEW_STYLE -eq 0 ]; then + cd reactos +fi + 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"
