Merge pull request #109 from amnezia-vpn/Linux_deploy_script

Linux deploy script

.gitignore

@@ -66,6 +66,12 @@ client/3rd/ShadowSocks/build/
 # QtCtreator CMake
 CMakeLists.txt.user*
 
+# Linux files
+*.7z
+deploy/AppDir
+deploy/Tools
+deploy/AmneziaVPN*Installer*
+
 # MACOS files
 .DS_Store
 client/.DS_Store

.travis.yml

@@ -162,6 +162,7 @@ jobs:
         apt:
           packages:
           - p7zip
+          - p7zip-full
           - python3
           - python3-pip
           - libgl-dev

deploy/build_linux.sh

@@ -11,6 +11,15 @@ 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}"
 
@@ -18,26 +27,23 @@ APP_NAME=AmneziaVPN
 APP_FILENAME=$APP_NAME.app
 APP_DOMAIN=org.amneziavpn.package
 
-OUT_APP_DIR=$BUILD_DIR/client
-BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME
-
 DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/linux
-INSTALLER_DATA_DIR=$BUILD_DIR/installer/packages/$APP_DOMAIN/data
-INSTALLER_BUNDLE_DIR=$BUILD_DIR/installer/$APP_FILENAME
+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
 
 # Seacrh Qt
 if [ -z "${QT_VERSION+x}" ]; then
-QT_VERSION=5.15.2;
-QIF_VERSION=4.1
+  QT_VERSION=5.15.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
-QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin
+  fi
 fi
 
 echo "Using Qt in $QT_BIN_DIR"
-echo "Using QIF in $QIF_BIN_DIR"
 
 
 # Checking env
@@ -56,4 +62,22 @@ make
 
 #echo "............Deploy.................."
 
+cp -r $DEPLOY_DATA_DIR/* $APP_DIR
+
+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/*
+
+$CQTDEPLOYER_DIR/binarycreator.sh --offline-only -v -c $PROJECT_DIR/deploy/installer/config/linux.xml -p $PROJECT_DIR/deploy/installer/packages/ -f $PROJECT_DIR/deploy/AmneziaVPN_Linux_Installer
+