Skip to content
Snippets Groups Projects
Unverified Commit 8c0ced09 authored by Kali Kaneko's avatar Kali Kaneko
Browse files

[test] include missing qrc

parent 1501c031
No related branches found
No related tags found
No related merge requests found
...@@ -44,7 +44,8 @@ depends: ...@@ -44,7 +44,8 @@ depends:
-@make depends$(UNAME) -@make depends$(UNAME)
dependsLinux: 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 @make -C docker deps
@# debian needs also: snap install snapcraft --classic; snap install multipass --beta --classic @# debian needs also: snap install snapcraft --classic; snap install multipass --beta --classic
......
Install it Build
---------- -----
Install dependencies: 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 git clone 0xacab.org/leap/bitmask-vpn && cd bitmask-vpn
$ make build make build
``` ```
You need at least go 1.11. If you have something older and are using ubuntu, you can do: You need at least go 1.11. If you have something older and are using ubuntu, you can do:
...@@ -29,19 +28,11 @@ OSX ...@@ -29,19 +28,11 @@ OSX
Using homebrew: Using homebrew:
``` ```
$ git clone 0xacab.org/leap/bitmask-vpn && cd bitmask-vpn git clone 0xacab.org/leap/bitmask-vpn && cd bitmask-vpn
$ make depends make depends
$ make build
```
Linux
----------
```
make build make build
```
```
Running tests Running tests
------------- -------------
...@@ -64,13 +55,13 @@ https://www.transifex.com/otf/bitmask/RiseupVPN/ ...@@ -64,13 +55,13 @@ https://www.transifex.com/otf/bitmask/RiseupVPN/
When a string has being modified you need to regenerate the locales: 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): 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 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. cmd/bitmask-vpn/catalog.go and to have a `package main` at the beginning of the file.
......
{
"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"
}
]
}
<RCC>
<qresource>
<file alias="providers.json">providers.json</file>
</qresource>
</RCC>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment