diff options
| author | Andrii Yurchuk <ay@mntw.re> | 2021-02-25 11:04:53 +0100 |
|---|---|---|
| committer | Andrii Yurchuk <ay@mntw.re> | 2021-02-26 19:03:01 +0100 |
| commit | 7f8939e5f44346c1b38bea3a6531c12ff5f8b972 (patch) | |
| tree | 3fcaa30b320952f8fbdbfbae8d57cbc8a3b400f3 | |
| parent | c35855ae08b1856014836a122b634b0fe0bd9011 (diff) | |
| download | mullvadvpn-7f8939e5f44346c1b38bea3a6531c12ff5f8b972.tar.xz mullvadvpn-7f8939e5f44346c1b38bea3a6531c12ff5f8b972.zip | |
Move build_mi_proto script and its artefacts to gui/scripts
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | README.md | 3 | ||||
| -rwxr-xr-x | gui/scripts/build_mi_proto.sh (renamed from build_mi_proto.sh) | 8 |
3 files changed, 6 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index b8eb7c92ad..cad0409ccd 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,7 @@ /dist-assets/sslocal /dist-assets/sslocal.exe /dist-assets/shell-completions/ -/dist-assets/mi_proto/ +/gui/scripts/mi_proto/ /windows/**/bin/ /windows/**/*.user /android/keystore.properties @@ -309,6 +309,7 @@ Due to inability to build the management interface proto files on ARM64 (see To build the management interface proto files there is a script (execute it on a non-ARM64 platform): ```bash +cd gui/scripts ./build_mi_proto.sh ``` @@ -324,7 +325,7 @@ brew install protobuf When all is done run the main build: ```bash -MI_PROTO_BUILD_DIR=/Users/doe/mullvadvpn-app/dist-assets/mi_proto ./build.sh --dev-build +MI_PROTO_BUILD_DIR=/Users/doe/mullvadvpn-app/gui/scripts/mi_proto ./build.sh --dev-build ``` If you want to build each component individually, or run in development mode, read the following diff --git a/build_mi_proto.sh b/gui/scripts/build_mi_proto.sh index 178ddf31a4..abfae36cbc 100755 --- a/build_mi_proto.sh +++ b/gui/scripts/build_mi_proto.sh @@ -6,16 +6,14 @@ set -eu SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -PROTO_BUILD_DIR="$SCRIPT_DIR/dist-assets/mi_proto" +PROTO_BUILD_DIR="$SCRIPT_DIR/mi_proto" -pushd "$SCRIPT_DIR/gui" npm ci npm run build-proto -popd mkdir -p "$PROTO_BUILD_DIR" -cp gui/src/main/management_interface/* $PROTO_BUILD_DIR -cp gui/build/src/main/management_interface/* $PROTO_BUILD_DIR +cp $SCRIPT_DIR/../../gui/src/main/management_interface/* $PROTO_BUILD_DIR +cp $SCRIPT_DIR/../../gui/build/src/main/management_interface/* $PROTO_BUILD_DIR echo "" echo "Management interface proto files built successfully." |