Commit graph

2416 commits

Author SHA1 Message Date
vladimir.kuznetsov
a8fc42a17e added copying OpenSSL libraries, for windows and macos, to the folder with binaries, because we have the wrong folder structure with the OpenSSL library 2022-12-08 21:40:51 +03:00
Shahzain Ali
005008814a icon added in cmake. 2022-12-08 21:34:55 +05:00
Shahzain Ali
ad3bbaedb3 getting openvpn.sh script message. 2022-12-08 18:22:07 +05:00
Dmitriy Karpushin
cad0dabe42 Export/import of configuration filed on Android 2022-12-08 11:51:28 +03:00
Shahzain Ali
48fa3c8aec Update CMakeLists.txt 2022-12-07 20:36:22 +05:00
Shahzain Ali
fb585cbac0 OpenVPN integrated successfully 2022-12-07 20:35:43 +05:00
Shahzain Ali
dd1adda1a6 postbuild command fix. 2022-12-07 00:19:02 +05:00
vladimir.kuznetsov
3742583508 added zlib to submodules. Added build and link zlib, libssh in CMakeLists.txt 2022-12-06 18:17:10 +03:00
Shahzain Ali
3c6cd623af version issues fixed 2022-12-06 19:18:38 +05:00
Shahzain Ali
70c6e69b36 updatinf info.plist for .vpn type. 2022-12-06 03:09:45 +05:00
Shahzain Ali
943e58d32a Wireguard working. 2022-12-06 02:47:46 +05:00
Shahzain Ali
5237058016 Added launcher 2022-12-06 02:18:45 +05:00
Shahzain Ali
b87c5f8a51 iOS building successfully
Need to remove postbuild commands most probably from osxtools.cmake
2022-12-06 00:42:48 +05:00
Shahzain Ali
43e7a03af4 Some fixes.
Now team is preselected in signing.
2022-12-05 20:47:12 +05:00
pokamest
19fce4975d Merge branch 'dev' into feature/ovpn-config-import 2022-12-04 22:04:51 +01:00
pokamest
a9217810e7 Remove travis builds and tiny refactoring 2022-12-04 21:54:22 +01:00
Mykola Baibuz
a87610c856 Use libssh for server setup script
That gives some advantages in supported key types.
2022-12-04 01:43:53 +03:00
vladimir.kuznetsov
0ec0cb1b19 feature: added libssh submodule 2022-12-04 01:43:34 +03:00
vladimir.kuznetsov
9b1678a06c Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into bugfix/config-without-containers-import 2022-12-03 15:26:32 +03:00
vladimir.kuznetsov
0da63062d7 bugfix: fixed transition to the "Installed services" page when importing a config that does not have installed containers 2022-12-03 15:23:52 +03:00
Shahzain Ali
c8dd12eb20 Some more progress in cmake
Still have errors, currently not using apple-compile.sh building completely using cmake.
2022-12-02 22:26:10 +05:00
Shahzain Ali
008592f13b Architecture change not needed for ios build
CMAKE_OSX_ARCHITECTURES not needed for ios, it is setting x86_64 for all targets in ios.
2022-12-02 15:07:05 +05:00
vladimir.kuznetsov
56b9972053 build script for macos now uses cmake 2022-12-01 20:26:00 +03:00
vladimir.kuznetsov
1335c94bbc added include directory for botan ios 2022-12-01 20:24:04 +03:00
vladimir.kuznetsov
21a6ab369e Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into qmake-to-cmake-migration 2022-12-01 20:11:56 +03:00
vladimir.kuznetsov
2a80117d42 Merge remote-tracking branch 'remotes/origin/qt6-github-actions' into qmake-to-cmake-migration 2022-12-01 20:05:36 +03:00
Shahzain Ali
e65d312503 Merge branch 'qmake-to-cmake-migration' of https://github.com/amnezia-vpn/desktop-client into qmake-to-cmake-migration 2022-12-01 20:40:00 +05:00
Shahzain Ali
5fc34e643c Adding network extenstionn, fixing cmake.
Botan cmake changes, cmake APPLE/IOS fixes, wireguard added, Currently removed openvpn implementation, once wireguard is stable then will add openVPN framework.
Current progress is it is generating xcode project using
mkdir build-ios
/Users/shahzainali/Qt/6.4.1/ios/bin/qt-cmake . -B build-ios -GXcode
Need to select team only for Network extension only. select AmneizaVPN to run.
current issue is related to Botan.
2022-12-01 20:26:45 +05:00
pokamest
3463a84903 Merge branch 'qt_migration' into qmake-to-cmake-migration 2022-11-30 15:02:55 +01:00
pokamest
48dc532de6 Merge branch 'dev' into qt_migration 2022-11-30 14:26:44 +01:00
Shahzain Ali
20cb62483f Moved all libraries to LIBS variable 2022-11-30 15:36:25 +05:00
pokamest
dcb5828313
GitHub actions (#133)
GitHub actions
2022-11-30 01:51:18 +01:00
pokamest
74860256b9
Merge pull request #136 from amnezia-vpn/bugfix/notarize-app-macos
fixed options parsing for enable macos NOTARIZE_APP
2022-11-30 01:21:19 +01:00
vladimir.kuznetsov
97457f17c1 fixed options parsing for enable macos NOTARIZE_APP 2022-11-29 22:11:02 +03:00
Shahzain Ali
de9167cae6 Frameworks, libcrypto, libssl and some properties added for iOS. 2022-11-29 18:00:59 +05:00
vladimir.kuznetsov
2e5171c205 added matrix for all android arch 2022-11-29 00:55:32 +03:00
Shahzain Ali
a0b5491178 Merge branch 'qt_migration' into qmake-to-cmake-migration 2022-11-28 19:23:28 +05:00
vladimir.kuznetsov
fc8ef8678b Merge remote-tracking branch 'remotes/origin/qt_migration' into qmake-to-cmake-migration 2022-11-28 14:50:20 +03:00
Shahzain Ali
2dc1f2ea5b Setting minimum version to 13
QT 6.4 required minimum ios 13
https://doc.qt.io/qt-6/supported-platforms.html
2022-11-28 15:56:48 +05:00
Shahzain Ali
7999527582 Update README.md 2022-11-28 15:44:55 +05:00
Shahzain Ali
14be6506ee Qt5 to QT6 fixes. 2022-11-28 15:36:33 +05:00
vladimir.kuznetsov
c85ad470ba qt version in github actions changed to 6.4.1 2022-11-27 12:08:48 +03:00
vladimir.kuznetsov
8b6afcc5ec removed unused qzxing folder 2022-11-27 01:35:13 +03:00
vladimir.kuznetsov
813dced6df added qt6 modules installation to github actions 2022-11-27 01:30:36 +03:00
vladimir.kuznetsov
0a39866045 for github actions added step to build android application 2022-11-27 01:21:42 +03:00
vladimir.kuznetsov
48734689d8 for github actions added step to build macos and linux application 2022-11-27 01:21:41 +03:00
vladimir.kuznetsov
dfe927dcbd for github actions added step to build ios application 2022-11-27 01:21:41 +03:00
vladimir.kuznetsov
ca158def31 temporarily turned off the deployment of artifacts 2022-11-27 01:21:41 +03:00
vladimir.kuznetsov
409386336d for github actions added steps to build x32/x64 windows application 2022-11-27 01:21:41 +03:00
vladimir.kuznetsov
eeed6c3474 chore/revert link to dev qtkeychain submodule 2022-11-27 01:21:40 +03:00