From 503721070e709324adc7ba4037de33ed5079458f Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Tue, 6 Aug 2019 17:57:18 +0200
Subject: [pkg] squash targets

---
 branding/README.rst | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 branding/README.txt | 52 ----------------------------------------------------
 2 files changed, 51 insertions(+), 52 deletions(-)
 create mode 100644 branding/README.rst
 delete mode 100644 branding/README.txt

(limited to 'branding')

diff --git a/branding/README.rst b/branding/README.rst
new file mode 100644
index 0000000..86423cc
--- /dev/null
+++ b/branding/README.rst
@@ -0,0 +1,51 @@
+Branding for BitmaskVPN
+================================================================================
+
+This folder contains everything that is needed to generate a customized built of
+BitmaskVPN for your provider.
+
+
+Configure
+--------------------------------------------------------------------------------
+
+* Copy or edit the file at 'branding/config/vendor.conf'. Add all the needed variables.
+* Copy your provider CA certificate to the same folder: 'branding/config/<provider>-ca.crt'
+* Make sure that the folder 'branding/assets/<provider>' exists. Copy there all the needed assets.
+
+Checkout
+--------------------------------------------------------------------------------
+
+ git clone https://0xacab.org/leap/bitmask-vpn
+ cd bitmask-vpn
+ git pull --tags
+
+
+Package
+--------------------------------------------------------------------------------
+
+NOTE: Some of the following scripts need network access, since they will check
+whether the configuration published by your provider matches what is configured
+before the build.
+
+Run::
+
+ PROVIDER=example make prepare
+
+You can also specify a custom config file::
+
+ PROVIDER=example PROVIDER_CONFIG=/path/to/vendor.conf make prepare
+
+Then you need to build the package::
+
+ make build
+
+Then you can build all the packages::
+
+ make pkg
+
+Alternatively, you can build only for an specific os::
+
+ make pkg_win
+ make pkg_osx
+ make pkg_snap
+ make pkg_deb
diff --git a/branding/README.txt b/branding/README.txt
deleted file mode 100644
index c3d9482..0000000
--- a/branding/README.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Branding for BitmaskVPN
-================================================================================
-
-This folder contains everything that is needed to generate a customized built of
-BitmaskVPN for your provider.
-
-
-Configure
---------------------------------------------------------------------------------
-
-- Copy or edit the file at 'branding/config/vendor.conf'. Add all the needed variables.
-- Copy your provider CA certificate to the same folder: 'branding/config/<provider>-ca.crt'
-- Make sure that the folder 'branding/assets/<provider>' exists. Copy there all the needed assets.
-
-Checkout
---------------------------------------------------------------------------------
-
-git clone https://0xacab.org/leap/bitmask-vpn
-cd bitmask-vpn
-git pull --tags
-
-Build
---------------------------------------------------------------------------------
-
-make build
-
-
-Package
---------------------------------------------------------------------------------
-
-NOTE: Some of the following scripts need network access, since they will check
-whether the configuration published by your provider matches what is configured
-before the build.
-
-Run:
-
-PROVIDER=example make prepare_all
-
-You can also specify a cusom config file:
-
-PROVIDER=example PROVIDER_CONFIG=/path/to/vendor.conf make prepare_all
-make build
-
-After this, you will find the build scripts ready in the following folder:
-
-cd build/example
-
-make package_win
-make package_osx
-make package_snap
-make package_deb
-
-- 
cgit v1.2.3