Commit graph

143 commits

Author SHA1 Message Date
vladimir.kuznetsov
e9b92b216a added a check for port availability when installing up a container
- added wireguard service copying to debug build folder
2023-02-14 18:02:51 +03:00
Dmitriy Karpushin
b68c6b6807 Little refactoring 2023-02-13 10:42:47 +03:00
vladimir.kuznetsov
0fa0d72300 increased required version of cmake for LINUX variable to work properly 2023-02-07 19:45:42 +03:00
Dmitriy Karpushin
3943314142 Fix of android build 2023-02-03 19:07:09 +03:00
vladimir.kuznetsov
74fbce8b96 Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support 2023-01-29 09:43:03 +03:00
pokamest
18d89e9cad
Merge pull request #152 from amnezia-vpn/feature/android_qt6_moving
Moving to Qt 6 and cmake on Android client
2023-01-19 12:51:02 +00:00
Dmitriy Karpushin
6bebfb861c Little cleanup 2023-01-18 15:54:19 +03:00
pokamest
9d01a52a4a
Merge pull request #145 from amnezia-vpn/feature/qt6-server-busy-notification
feature/qt6-server-busy-notification
2023-01-18 00:43:13 +00:00
vladimir.kuznetsov
b9717e9894 removed unused code 2023-01-17 17:11:45 +03:00
Dmitry Karpushin
21779395ef
Merge branch 'qt_migration' into feature/android_qt6_moving 2023-01-16 14:58:01 +03:00
vladimir.kuznetsov
221ea5ebb0 Merge branch 'qt_migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-server-busy-notification 2023-01-13 16:59:03 +03:00
pokamest
85020270d5 MacOS deploy fix 2023-01-08 17:21:51 -08:00
vladimir.kuznetsov
08a8eadb49 added display of a notification that the server is busy installing third-party software
- refactoring doInstallAction functions
2023-01-01 22:08:39 +03:00
Dmitriy Karpushin
42038cd6e7 Fixed filenames 2022-12-28 14:26:44 +03:00
Dmitriy Karpushin
a30e478cbd Fix of cmake build 2022-12-27 17:14:44 +03:00
Dmitriy Karpushin
ad4b3dfad1 [WIP] cmake build for android 2022-12-27 15:37:58 +03:00
Dmitriy Karpushin
ad7fc937a9 Added missing files 2022-12-27 11:10:01 +03:00
vladimir.kuznetsov
64317ffef5 fixed deploy service additional data for debug target 2022-12-26 17:15:45 +03:00
vladimir.kuznetsov
4a75f2ebca Moved ssh lib wrapper from SshSession to SshClient 2022-12-26 12:43:51 +03:00
vladimir.kuznetsov
d04566a6c4 fix for macos build 2022-12-24 18:21:08 +03:00
vladimir.kuznetsov
c8085a368f added class to open ssh connection using libssh and write data to ssh channel 2022-12-20 13:43:46 +03:00
vladimir.kuznetsov
b0489aa61b Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support 2022-12-18 09:17:35 +03:00
vladimir.kuznetsov
376bc29e95 set OPENSSL_SSL_LIBRARY for ios 2022-12-17 22:18:14 +03:00
vladimir.kuznetsov
bd22e330a7 set OPENSSL_CRYPTO_LIBRARY for ios
- removed linking with brew openssl for ios
2022-12-17 22:02:38 +03:00
vladimir.kuznetsov
9ce7114f8c added variables for OpenSSL 2022-12-17 21:48:45 +03:00
vladimir.kuznetsov
1303da1c20 openedsl linking method changed 2022-12-17 21:34:59 +03:00
Shahzain Ali
914700712e OpenSSL finding issue fixed. 2022-12-16 15:27:06 +05:00
Shahzain Ali
73eb9259e2 Update CMakeLists.txt 2022-12-15 14:26:45 +05:00
vladimir.kuznetsov
14c25480ce changed working directory to call openvpn.sh 2022-12-14 22:26:06 +03:00
vladimir.kuznetsov
77d87f8c50 set working directory to call openvpn.sh 2022-12-14 21:55:51 +03:00
vladimir.kuznetsov
ed2f5af204 Removed "cd client" for ios, also changed CMAKE_SOURCE_DIR to CMAKE_CURRENT_LIST_DIR.
Removed duplicate deployment files for macos
2022-12-14 20:58:49 +03:00
vladimir.kuznetsov
5b2f1f8969 processing of 3rdparty libraries moved to a separate cmake file 2022-12-14 20:32:13 +03:00
vladimir.kuznetsov
a2122cb7d7 moved changes from .pro file 2022-12-14 19:55:14 +03:00
vladimir.kuznetsov
d680702b15 change path to cmake folder 2022-12-14 19:17:58 +03:00
vladimir.kuznetsov
d15de499dc Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into qmake-to-cmake-migration 2022-12-14 19:16:38 +03:00
vladimir.kuznetsov
bd382e3cc7 moved the cmake folder to client root folder 2022-12-14 19:16:12 +03:00
Shahzain Ali
ca9cb997b5 Fixed openVPN issue.
Now OpenVPN moved to main target and fixed search path issue, becuase I face below error while archiving. Invalid Bundle. The bundle at 'AmneziaVPN.app/PlugIns/AmneziaVPNNetworkExtension.appex' contains disallowed nested bundles.
2022-12-14 17:28:16 +05:00
Shahzain Ali
ebd920f3b2 Setting target membership on Media.xcassets 2022-12-14 16:56:20 +05:00
vladimir.kuznetsov
a611ddea2d removed environment OPENSSL_ROOT_DIR variable 2022-12-13 23:52:43 +03:00
vladimir.kuznetsov
75614e0bbb set environment OPENSSL_ROOT_DIR variable 2022-12-13 23:39:58 +03:00
vladimir.kuznetsov
dafef6463a added:
- set PKG_CONFIG_PATH for openssl
- use find_package for precompiled openssl

removed:
- set CMAKE_PREFIX_PATH for openssl
- renaming ios openssl libs after copying to bin dir
2022-12-13 21:39:02 +03:00
vladimir.kuznetsov
61d502eea4 removed find_package for openssl 2022-12-13 20:49:46 +03:00
vladimir.kuznetsov
71aa525dfd set CMAKE_PREFIX_PATH for openssl 2022-12-13 20:36:12 +03:00
vladimir.kuznetsov
c0e3875dfd renaming ios openssl libs after copying to bin dir 2022-12-13 20:23:17 +03:00
vladimir.kuznetsov
7e37b6c151 removed CMAKE_PREFIX_PATH for openssl 2022-12-12 22:22:08 +03:00
vladimir.kuznetsov
0fa84a8b84 set CMAKE_PREFIX_PATH for openssl 2022-12-12 21:39:27 +03:00
vladimir.kuznetsov
236ae57d01 use find_package for precompiled openssl 2022-12-12 20:50:23 +03:00
vladimir.kuznetsov
00ad2e7a80 added path to openssl libs for ios 2022-12-11 18:25:44 +03:00
vladimir.kuznetsov
8f7e5e491f fixed macos openssl lib types 2022-12-11 17:59:18 +03:00
vladimir.kuznetsov
19101176a7 added link_libraries() for zlib 2022-12-11 17:22:59 +03:00