f6d7552b58
* Add allowed DNS list for killswitch * Windows killswitch strict mode backend part * Killswitch strict mode for Linux and MacOS * Windows fixes * feature: Add Kill Switch settings page with strict mode option * fix windows build after merge * Refresh killswitch mode when it toggled * Use HLM to store strictMode flag * Some Linux updates * feat: Enhance VerticalRadioButton with improved styling and disabled states * Refresh killSwitch state update * Fix build * refactor: Modularize header components * Change kill switch radio button styling * Fix strict kill switch mode handling * Refactor: Replace HeaderType with new Types for headers in QML pages * Remove deprecated HeaderType QML component * Refresh strict mode killswitch after global toggle change * Implement model, controller and UI for killswitch dns exceptions * Connect backend part and UI * Change label text to DNS exceptions * Remove HeaderType from PageSettingsApiDevices * Some pretty fixes * Fix problem with definition sequence of PageSettingsKillSwitchExceptions.pml elements * Add exclusion method for Windows firewall * Change ubuntu version in deploy script * Update ubuntu version in GH actions * Add confirmation popup for strict killswitch mode * Add qt standard path for build script * Add method to killswitch for expanding strickt mode exceptions list and fix allowTrafficTo() for Windows. Also Added cache in KillSwitch class for exceptions * Add insertion of gateway address to strict killswitch exceptions * Review fixes * buildfix and naming --------- Co-authored-by: aiamnezia <ai@amnezia.org>
90 lines
2.5 KiB
Bash
Executable file
90 lines
2.5 KiB
Bash
Executable file
#!/bin/bash
|
|
echo "Build script started ..."
|
|
|
|
set -o errexit -o nounset
|
|
|
|
|
|
# Hold on to current directory
|
|
PROJECT_DIR=$(pwd)
|
|
DEPLOY_DIR=$PROJECT_DIR/deploy
|
|
|
|
mkdir -p $DEPLOY_DIR/build
|
|
BUILD_DIR=$DEPLOY_DIR/build
|
|
|
|
APP_DIR=$DEPLOY_DIR/AppDir
|
|
mkdir -p $APP_DIR
|
|
|
|
TOOLS_DIR=$DEPLOY_DIR/Tools
|
|
mkdir -p $TOOLS_DIR
|
|
|
|
CQTDEPLOYER_DIR=$TOOLS_DIR/cqtdeployer
|
|
mkdir -p $CQTDEPLOYER_DIR
|
|
|
|
echo "Project dir: ${PROJECT_DIR}"
|
|
echo "Build dir: ${BUILD_DIR}"
|
|
|
|
APP_NAME=AmneziaVPN
|
|
APP_FILENAME=$APP_NAME.app
|
|
APP_DOMAIN=org.amneziavpn.package
|
|
|
|
DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/linux
|
|
PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/client/3rd-prebuilt/deploy-prebuilt/linux/client/bin
|
|
INSTALLER_DATA_DIR=$PROJECT_DIR/deploy/installer/packages/$APP_DOMAIN/data
|
|
|
|
PRO_FILE_PATH=$PROJECT_DIR/$APP_NAME.pro
|
|
QMAKE_STASH_FILE=$PROJECT_DIR/.qmake_stash
|
|
|
|
# Search Qt
|
|
if [ -z "${QT_VERSION+x}" ]; then
|
|
QT_VERSION=6.6.2
|
|
if [ -f /opt/Qt/$QT_VERSION/gcc_64/bin/qmake ]; then
|
|
QT_BIN_DIR=/opt/Qt/$QT_VERSION/gcc_64/bin
|
|
elif [ -f $HOME/Qt/$QT_VERSION/gcc_64/bin/qmake ]; then
|
|
QT_BIN_DIR=$HOME/Qt/$QT_VERSION/gcc_64/bin
|
|
elif [ -f /usr/lib/qt6/bin/qmake ]; then
|
|
QT_BIN_DIR=/usr/lib/qt6/bin
|
|
elif [ -f /usr/lib/x86_64-linux-gnu/qt6/bin/qmake ]; then
|
|
QT_BIN_DIR=/usr/lib/x86_64-linux-gnu/qt6/bin
|
|
fi
|
|
fi
|
|
|
|
echo "Using Qt in $QT_BIN_DIR"
|
|
|
|
|
|
# Checking env
|
|
$QT_BIN_DIR/qt-cmake --version
|
|
gcc -v
|
|
|
|
# Build App
|
|
echo "Building App..."
|
|
cd $BUILD_DIR
|
|
|
|
$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR
|
|
cmake --build . -j --config release
|
|
|
|
# Build and run tests here
|
|
|
|
#echo "............Deploy.................."
|
|
|
|
cp -r $DEPLOY_DATA_DIR/* $APP_DIR
|
|
cp -r $PREBUILT_DEPLOY_DATA_DIR $APP_DIR/client
|
|
|
|
if [ ! -f $CQTDEPLOYER_DIR/cqtdeployer.sh ]; then
|
|
wget -O $TOOLS_DIR/CQtDeployer.zip https://github.com/QuasarApp/CQtDeployer/releases/download/v1.5.4.17/CQtDeployer_1.5.4.17_Linux_x86_64.zip
|
|
unzip -o $TOOLS_DIR/CQtDeployer.zip -d $CQTDEPLOYER_DIR/
|
|
chmod +x -R $CQTDEPLOYER_DIR
|
|
fi
|
|
|
|
|
|
$CQTDEPLOYER_DIR/cqtdeployer.sh -bin $BUILD_DIR/client/AmneziaVPN -qmake $QT_BIN_DIR/qmake -qmlDir $PROJECT_DIR/client/ui/qml/ -targetDir $APP_DIR/client/
|
|
$CQTDEPLOYER_DIR/cqtdeployer.sh -bin $BUILD_DIR/service/server/AmneziaVPN-service -qmake $QT_BIN_DIR/qmake -targetDir $APP_DIR/service/
|
|
|
|
rm -f $INSTALLER_DATA_DIR/data.7z
|
|
|
|
7z a $INSTALLER_DATA_DIR/data.7z $APP_DIR/*
|
|
|
|
ldd $CQTDEPLOYER_DIR/bin/binarycreator
|
|
|
|
cp -r $PROJECT_DIR/deploy/installer $BUILD_DIR
|
|
|
|
$CQTDEPLOYER_DIR/binarycreator.sh --offline-only -v -c $BUILD_DIR/installer/config/linux.xml -p $BUILD_DIR/installer/packages -f $PROJECT_DIR/deploy/AmneziaVPN_Linux_Installer.bin
|