Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
bitmask-vpn
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
anna petry
bitmask-vpn
Commits
8c0ced09
Unverified
Commit
8c0ced09
authored
4 years ago
by
Kali Kaneko
Browse files
Options
Downloads
Patches
Plain Diff
[test] include missing qrc
parent
1501c031
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile
+2
-1
2 additions, 1 deletion
Makefile
README.md
+12
-21
12 additions, 21 deletions
README.md
tests/providers.json
+21
-0
21 additions, 0 deletions
tests/providers.json
tests/tests.qrc
+6
-0
6 additions, 0 deletions
tests/tests.qrc
with
41 additions
and
22 deletions
Makefile
+
2
−
1
View file @
8c0ced09
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
README.md
+
12
−
21
View file @
8c0ced09
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.
...
...
This diff is collapsed.
Click to expand it.
tests/providers.json
0 → 100644
+
21
−
0
View file @
8c0ced09
{
"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-----
\n
MIIBQzCB6aADAgECAgEBMAoGCCqGSM49BAMCMBcxFTATBgNVBAMTDExFQVAgUm9v
\n
dCBDQTAeFw0yMDA4MDYxOTA3NDRaFw0yNTA4MDYxOTEyNDRaMBcxFTATBgNVBAMT
\n
DExFQVAgUm9vdCBDQTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIG5POr4cAdK
\n
kTavKpSJr8nW1V7HLpr27qKaShpk1TUy5ipaAlusmavGLxKsPE+i3AMlvf/f6ch3
\n
1MjAtIf5rYujJjAkMA4GA1UdDwEB/wQEAwICpDASBgNVHRMBAf8ECDAGAQH/AgEB
\n
MAoGCCqGSM49BAMCA0kAMEYCIQDXj280LNZbSbi0Y2WvtQrJBUw4wdm8qAeOeuH7
\n
6XiLEwIhAPBRsmst/ujcChsG2t6LpG+p8s4rfIfh8YLo/4qrcc5p
\n
-----END CERTIFICATE-----"
,
"timeStamp"
:
"2020-09-25 13:05:47"
}
]
}
This diff is collapsed.
Click to expand it.
tests/tests.qrc
0 → 100644
+
6
−
0
View file @
8c0ced09
<RCC>
<qresource>
<file alias="providers.json">providers.json</file>
</qresource>
</RCC>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment