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

[pkg] rename to make-installer

parent 015faa8f
No related branches found
No related tags found
No related merge requests found
...@@ -103,7 +103,7 @@ build_helper: ...@@ -103,7 +103,7 @@ build_helper:
build_openvpn: build_openvpn:
@[ -f $(OPENVPN_BIN) ] && echo "OpenVPN already built at" $(OPENVPN_BIN) || ./branding/thirdparty/openvpn/build_openvpn.sh @[ -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} @mkdir -p ${INST_DATA}
@cp -r ${TEMPLATES}/qtinstaller/packages ${INSTALLER} @cp -r ${TEMPLATES}/qtinstaller/packages ${INSTALLER}
@cp -r ${TEMPLATES}/qtinstaller/installer.pro ${INSTALLER} @cp -r ${TEMPLATES}/qtinstaller/installer.pro ${INSTALLER}
......
...@@ -24,18 +24,18 @@ For other situations, have a look at https://github.com/golang/go/wiki/Ubuntu or ...@@ -24,18 +24,18 @@ For other situations, have a look at https://github.com/golang/go/wiki/Ubuntu or
OSX OSX
---------- ---
Using homebrew:
You can install dependencies with 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 make build
``` ```
Running tests Test
------------- ----
``` ```
sudo apt install qml-module-qttest sudo apt install qml-module-qttest
...@@ -44,33 +44,14 @@ Running tests ...@@ -44,33 +44,14 @@ Running tests
``` ```
i18n Translations
---- ------------
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.
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: When you report an issue include the following information:
......
...@@ -53,11 +53,11 @@ Then you can build the binaries for some quick manual testing:: ...@@ -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:: 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. 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): For debian and snap packages (FIXME -- WORK IN PROGRESS):
make debian make package_debian
make snap make package_snap
...@@ -13,5 +13,5 @@ For the installer, install QtIFW for windows (tested with version 3.2.2). ...@@ -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`:: 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 export PATH="/c/Qt/Qt5/bin/":"/c/Qt/QtIFW-3.2.2/bin":$PATH
VENDOR_PATH=providers/ export VENDOR_PATH=providers
make build_installer make vendor && make installer
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`.
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