Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-23 10:26:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1675: Pass app name and vendor from topmost Makefile.

Browse Source
This commit is contained in:
Jakub
2022-08-19 10:58:46 +02:00
parent 264c2b2f90
commit 35d2cc9be7
12 changed files with 84 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
internal/frontend/bridge-gui/bridge-gui/build.sh
View File

@ -25,22 +25,23 @@ fi
BRIDGE_REPO_ROOT="../../../.."
BRIDGE_INSTALL_PATH=${BRIDGE_INSTALL_PATH:-deploy}
BRIDGE_APP_VERSION=${BRIDGE_APP_VERSION:-$("${BRIDGE_REPO_ROOT}/utils/bridge_app_version.sh")}
BRIDGE_VENDOR=${BRIDGE_VENDOR:-"Proton AG"}
BUILD_CONFIG=${BRIDGE_GUI_BUILD_CONFIG:-Debug}
BUILD_DIR=$(echo "./cmake-build-${BUILD_CONFIG}" | tr '[:upper:]' '[:lower:]')
realpath() {
START_DIR=$PWD
BASENAME="$(basename "$1")"
cd "$(dirname "$1")" || exit
LNK="$(readlink "$BASENAME")"
while [ "$LNK" ]; do
BASENAME="$(basename "$LNK")"
cd "$(dirname "$LNK")" || exit
LNK="$(readlink "$BASENAME")"
done
REALPATH="$PWD/$BASENAME"
cd "$START_DIR" || exit
echo "$REALPATH"
START_DIR=$PWD
BASENAME="$(basename "$1")"
cd "$(dirname "$1")" || exit
LNK="$(readlink "$BASENAME")"
while [ "$LNK" ]; do
BASENAME="$(basename "$LNK")"
cd "$(dirname "$LNK")" || exit
LNK="$(readlink "$BASENAME")"
done
REALPATH="$PWD/$BASENAME"
cd "$START_DIR" || exit
echo "$REALPATH"
}
check_exit() {
@ -86,6 +87,8 @@ ${VCPKG_EXE} upgrade --no-dry-run
cmake \
-DCMAKE_BUILD_TYPE="${BUILD_CONFIG}" \
-DBRIDGE_APP_FULL_NAME="${BRIDGE_APP_FULL_NAME}" \
-DBRIDGE_VENDOR="${BRIDGE_VENDOR}" \
-DBRIDGE_APP_VERSION="${BRIDGE_APP_VERSION}" \
-G Ninja \
-S . \