From 8c0ced091ce1122dec5f1d414e094f7129c9b846 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Fri, 2 Oct 2020 20:28:46 +0200
Subject: [PATCH] [test] include missing qrc
---
Makefile | 3 ++-
README.md | 33 ++++++++++++---------------------
tests/providers.json | 21 +++++++++++++++++++++
tests/tests.qrc | 6 ++++++
4 files changed, 41 insertions(+), 22 deletions(-)
create mode 100644 tests/providers.json
create mode 100644 tests/tests.qrc
diff --git a/Makefile b/Makefile
index 000b7556..9ae723e5 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,8 @@ depends:
-@make depends$(UNAME)
dependsLinux:
- @sudo apt install golang pkg-config dh-golang golang-golang-x-text-dev cmake devscripts fakeroot debhelper curl
+ @sudo apt install golang pkg-config dh-golang golang-golang-x-text-dev cmake devscripts fakeroot debhelper curl g++ qt5-qmake qttools5-dev-tools qtdeclarative5-dev qml-module-qtquick-controls libqt5qml5 qtdeclarative5-dev qml-module-qt-labs-platform qml-module-qt-labs-qmlmodels qml-module-qtquick-extras qml-module-qtquick-dialogs
+
@make -C docker deps
@# debian needs also: snap install snapcraft --classic; snap install multipass --beta --classic
diff --git a/README.md b/README.md
index f4f16e9b..bcb6f285 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,17 @@
-Install it
-----------
+Build
+-----
Install dependencies:
-TODO: add qt5 deps here
-
```
- # make depends
+ sudo make depends
```
-Build the systray:
+Build the application:
+
```
- $ git clone 0xacab.org/leap/bitmask-vpn && cd bitmask-vpn
- $ make build
+ git clone 0xacab.org/leap/bitmask-vpn && cd bitmask-vpn
+ make build
```
You need at least go 1.11. If you have something older and are using ubuntu, you can do:
@@ -29,19 +28,11 @@ OSX
Using homebrew:
```
- $ git clone 0xacab.org/leap/bitmask-vpn && cd bitmask-vpn
- $ make depends
- $ make build
-
-```
-
-Linux
-----------
-
-```
+ git clone 0xacab.org/leap/bitmask-vpn && cd bitmask-vpn
+ make depends
make build
-```
+```
Running tests
-------------
@@ -64,13 +55,13 @@ https://www.transifex.com/otf/bitmask/RiseupVPN/
When a string has being modified you need to regenerate the locales:
```
- $ make generate_locales
+ make generate_locales
```
To fetch the translations from transifex and rebuild the catalog.go (API\_TOKEN is the transifex API token):
```
- $ API_TOKEN='xxxxxxxxxxx' make locales
+ API_TOKEN='xxxxxxxxxxx' make locales
```
There is some bug on gotext and the catalog.go generated doesn't have a package, you will need to edit
cmd/bitmask-vpn/catalog.go and to have a `package main` at the beginning of the file.
diff --git a/tests/providers.json b/tests/providers.json
new file mode 100644
index 00000000..3951bdd1
--- /dev/null
+++ b/tests/providers.json
@@ -0,0 +1,21 @@
+{
+ "default": "demolib",
+ "providers": [
+ {
+ "name": "demolib",
+ "applicationName": "DemoLibVPN",
+ "binaryName": "demolib-vpn",
+ "auth": "sip",
+ "authEmptyPass": true,
+ "providerURL": "vpnlib.bitmask.net",
+ "tosURL": "https://libraryvpn.org/",
+ "helpURL": "https://libraryvpn.org/",
+ "askForDonations": false,
+ "donateURL": "",
+ "apiURL": "https://api.vpnlib.bitmask.net:4430/",
+ "geolocationAPI": "https://getmyip.vpnlib.bitmask.net/json",
+ "caCertString": "-----BEGIN CERTIFICATE-----\nMIIBQzCB6aADAgECAgEBMAoGCCqGSM49BAMCMBcxFTATBgNVBAMTDExFQVAgUm9v\ndCBDQTAeFw0yMDA4MDYxOTA3NDRaFw0yNTA4MDYxOTEyNDRaMBcxFTATBgNVBAMT\nDExFQVAgUm9vdCBDQTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIG5POr4cAdK\nkTavKpSJr8nW1V7HLpr27qKaShpk1TUy5ipaAlusmavGLxKsPE+i3AMlvf/f6ch3\n1MjAtIf5rYujJjAkMA4GA1UdDwEB/wQEAwICpDASBgNVHRMBAf8ECDAGAQH/AgEB\nMAoGCCqGSM49BAMCA0kAMEYCIQDXj280LNZbSbi0Y2WvtQrJBUw4wdm8qAeOeuH7\n6XiLEwIhAPBRsmst/ujcChsG2t6LpG+p8s4rfIfh8YLo/4qrcc5p\n-----END CERTIFICATE-----",
+ "timeStamp": "2020-09-25 13:05:47"
+ }
+ ]
+}
diff --git a/tests/tests.qrc b/tests/tests.qrc
new file mode 100644
index 00000000..e8a7cb80
--- /dev/null
+++ b/tests/tests.qrc
@@ -0,0 +1,6 @@
+<RCC>
+ <qresource>
+ <file alias="providers.json">providers.json</file>
+ </qresource>
+</RCC>
+
--
GitLab