Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only create bin-release dir on Linux

Browse Source
This commit is contained in:
Janek Bevendorff 2017-01-29 20:58:09 +01:00
parent 0c54276fe2
commit 1da87d1d19
No known key found for this signature in database
GPG Key ID: CFEC2F6850BFFA53
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release-tool
View File

@ -494,7 +494,6 @@ build() {
logInfo "Creating build directory..." logInfo "Creating build directory..."
mkdir -p "${OUTPUT_DIR}/build-release" mkdir -p "${OUTPUT_DIR}/build-release"
mkdir -p "${OUTPUT_DIR}/bin-release"
cd "${OUTPUT_DIR}/build-release" cd "${OUTPUT_DIR}/build-release"
logInfo "Configuring sources..." logInfo "Configuring sources..."
@ -537,9 +536,10 @@ build() {
logInfo "Compiling and packaging sources..." logInfo "Compiling and packaging sources..."
make $MAKE_OPTIONS package make $MAKE_OPTIONS package
rmdir ../bin-release
mv "./${APP_NAME}-${RELEASE_NAME}-"*.{exe,zip} ../ mv "./${APP_NAME}-${RELEASE_NAME}-"*.{exe,zip} ../
else else
mkdir -p "${OUTPUT_DIR}/bin-release"
# Building on Linux without Docker container # Building on Linux without Docker container
logInfo "Configuring build..." logInfo "Configuring build..."
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \ cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
@ -555,6 +555,8 @@ build() {
${SRC_DIR}/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME" ${SRC_DIR}/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME"
fi fi
else else
mkdir -p "${OUTPUT_DIR}/bin-release"
logInfo "Launching Docker container to compile sources..." logInfo "Launching Docker container to compile sources..."
docker run --name "$DOCKER_CONTAINER_NAME" --rm \ docker run --name "$DOCKER_CONTAINER_NAME" --rm \