diff --git a/.gitignore b/.gitignore index e71dcb4..b1b8f9a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ testbed/log *.deb .vscode/ - +venv/ +__init__.py __pycache__/ -*.py[cod] \ No newline at end of file +*.py[cod] +ev-tools.sh \ No newline at end of file diff --git a/README.md b/README.md index 2512172..c207f48 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,41 @@ Run the command to view all options: evt -h ``` ``` +usage: evt-tools.py [-h] [--sync] [--clean] [--deps] [--src] [--debpak] [--testbed] [--venv] [--xmpp] [--build_docker] [--build_webrtc] [--build_webrtc_release] + [--build_webrtc_raspberry_debug] [--build_webrtc_raspberry_release] [--build_tincan] [--build_tincan_release] [--build_tincan_raspberry_debug] + [--build_tincan_raspberry_release] [--all] + +A collection of all the tools which can be used to deploy EdgeVPN + +optional arguments: + -h, --help show this help message and exit + --sync Syncs the tools repo with the correct version of the tools script.You need to clone the evio repository a directory above for this to work. + --clean Cleans the code from all the locations to prepare for a fresh installation. + --deps Installs system-wide the necessary build tools. + --src Clones EVIO repo. + --debpak Generates the Debian package. + --testbed Installs required dependencies for a testbed. + --venv Setup the virtual environment. + --xmpp Install openfire server. + --build_docker Builds the docker image if you have already built the debian package. + --build_webrtc Clones and builds the webrtc libraries for ubuntu and returns a debug build. + --build_webrtc_release + Clones and builds the webrtc libraries for ubuntu and returns a release build. + --build_webrtc_raspberry_debug + Clones and builds the webrtc libraries for raspberry and returns a debug build. + --build_webrtc_raspberry_release + Clones and builds the webrtc libraries for raspberry and returns a release build. + --build_tincan Builds the tincan debug executable for ubuntu. It assumes you have the webrtc libraries already cloned or built + --build_tincan_release + Builds the tincan release executable for ubuntu. It assumes you have the webrtc libraries already cloned or built + --build_tincan_raspberry_debug + Builds the tincan debug executable for raspberry. It assumes you have the webrtc libraries already cloned or built + --build_tincan_raspberry_release + Builds the tincan release executable for raspberry. It assumes you have the webrtc libraries already cloned or built + --all Setup the whole environment. +``` +``` evt --sync ``` - ## TO DO Move to one output folder. Run sync before any command. diff --git a/evt-tools.py b/evt-tools.py index 1dbfc74..15d1d6d 100644 --- a/evt-tools.py +++ b/evt-tools.py @@ -15,7 +15,7 @@ class EvtTools: parser.add_argument("--clean", action="store_true", default=False, dest="clean", help="Cleans the code from all the locations to prepare for a fresh installation.") parser.add_argument("--deps", action="store_true", default=False, dest="deps", - help="Installs the required build tools.") + help="Installs system-wide the necessary build tools.") parser.add_argument("--src", action="store_true", default=False, dest="src", help="Clones EVIO repo.") parser.add_argument("--debpak", action="store_true", default=False, dest="debpak", diff --git a/setup-evt.sh b/setup-evt.sh index 652d031..8affb0d 100755 --- a/setup-evt.sh +++ b/setup-evt.sh @@ -1,7 +1,7 @@ #!/bin/bash deactivate 2>/dev/null -python -m venv myenv && \ -source myenv/bin/activate && \ +python -m venv venv && \ +source venv/bin/activate && \ export PATH="$PATH:." && \ chmod 775 ./evt && \ pip3 install gitpython simplejson