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
Julian Merlin
bitmask-vpn
Commits
7aa96cb3
Unverified
Commit
7aa96cb3
authored
4 years ago
by
Kali Kaneko
Browse files
Options
Downloads
Patches
Plain Diff
[pkg] rename to make-installer
parent
015faa8f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Makefile
+1
-1
1 addition, 1 deletion
Makefile
README.md
+10
-29
10 additions, 29 deletions
README.md
docs/branding.rst
+3
-3
3 additions, 3 deletions
docs/branding.rst
docs/build.windows.rst
+2
-2
2 additions, 2 deletions
docs/build.windows.rst
docs/i18n-howto.rst
+21
-0
21 additions, 0 deletions
docs/i18n-howto.rst
with
37 additions
and
35 deletions
Makefile
+
1
−
1
View file @
7aa96cb3
...
...
@@ -103,7 +103,7 @@ build_helper:
build_openvpn
:
@
[
-f
$(
OPENVPN_BIN
)
]
&&
echo
"OpenVPN already built at"
$(
OPENVPN_BIN
)
||
./branding/thirdparty/openvpn/build_openvpn.sh
build_
installer
:
check_qtifw build
installer
:
check_qtifw build
@
mkdir
-p
${
INST_DATA
}
@
cp
-r
${
TEMPLATES
}
/qtinstaller/packages
${
INSTALLER
}
@
cp
-r
${
TEMPLATES
}
/qtinstaller/installer.pro
${
INSTALLER
}
...
...
This diff is collapsed.
Click to expand it.
README.md
+
10
−
29
View file @
7aa96cb3
...
...
@@ -24,18 +24,18 @@ For other situations, have a look at https://github.com/golang/go/wiki/Ubuntu or
OSX
----------
Using homebrew:
---
You can install dependencies with homebrew:
```
git clone 0xacab.org/leap/bitmask-vpn && cd bitmask-vpn
make depends
make build
```
Running t
est
s
----
---------
T
est
----
```
sudo apt install qml-module-qttest
...
...
@@ -44,33 +44,14 @@ Running tests
```
i18n
----
TODO: move this to developer docs
The translations are done in transifex. To help us contribute your translations there and/or review the existing
ones:
https://www.transifex.com/otf/bitmask/RiseupVPN/
When a string has being modified you need to regenerate the 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
```
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.
Translations
------------
If you want to add a new language create the folder
`locales/$lang`
before running
`make locales`
.
We use
[
transifex
](
https://www.transifex.com/otf/bitmask/RiseupVPN/
)
to coordinate translations. Any help is welcome!
Report an issue
-----
--------------
Bugs?
-----
When you report an issue include the following information:
...
...
This diff is collapsed.
Click to expand it.
docs/branding.rst
+
3
−
3
View file @
7aa96cb3
...
...
@@ -53,11 +53,11 @@ Then you can build the binaries for some quick manual testing::
Now you can build the installer for your host platform::
make
build_
installer
make installer
Previously we had a cross-compilation setup in place. Cross compilation will be added back in the future.
For debian and snap packages (FIXME -- WORK IN PROGRESS):
make debian
make snap
make
package_
debian
make
package_
snap
This diff is collapsed.
Click to expand it.
docs/build.windows.rst
+
2
−
2
View file @
7aa96cb3
...
...
@@ -13,5 +13,5 @@ For the installer, install QtIFW for windows (tested with version 3.2.2).
Assuming you have the vendor path in place and correctly configured, all you need to do is `make build_installer`::
export PATH="/c/Qt/Qt5/bin/":"/c/Qt/QtIFW-3.2.2/bin":$PATH
VENDOR_PATH=providers
/
make
build_
installer
export
VENDOR_PATH=providers
make
vendor && make
installer
This diff is collapsed.
Click to expand it.
docs/i18n-howto.rst
0 → 100644
+
21
−
0
View file @
7aa96cb3
Howto i18n
----------
The translations are done in transifex. To help us contribute your translations there and/or review the existing
ones:
https://www.transifex.com/otf/bitmask/RiseupVPN/
When a string has being modified you need to regenerate the 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
```
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.
If you want to add a new language create the folder `locales/$lang` before running `make locales`.
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