From 1da87d1d19d0abc16701a8c1a41267b23a22c9ef Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Sun, 29 Jan 2017 20:58:09 +0100 Subject: [PATCH] Only create bin-release dir on Linux --- release-tool | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release-tool b/release-tool index 0784a4458..de5c723c9 100755 --- a/release-tool +++ b/release-tool @@ -494,7 +494,6 @@ build() { logInfo "Creating build directory..." mkdir -p "${OUTPUT_DIR}/build-release" - mkdir -p "${OUTPUT_DIR}/bin-release" cd "${OUTPUT_DIR}/build-release" logInfo "Configuring sources..." @@ -537,9 +536,10 @@ build() { logInfo "Compiling and packaging sources..." make $MAKE_OPTIONS package - rmdir ../bin-release mv "./${APP_NAME}-${RELEASE_NAME}-"*.{exe,zip} ../ else + mkdir -p "${OUTPUT_DIR}/bin-release" + # Building on Linux without Docker container logInfo "Configuring build..." cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \ @@ -555,6 +555,8 @@ build() { ${SRC_DIR}/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME" fi else + mkdir -p "${OUTPUT_DIR}/bin-release" + logInfo "Launching Docker container to compile sources..." docker run --name "$DOCKER_CONTAINER_NAME" --rm \