diff options
| author | Andrii Yurchuk <ay@mntw.re> | 2021-02-26 11:35:11 +0100 |
|---|---|---|
| committer | Andrii Yurchuk <ay@mntw.re> | 2021-02-26 19:03:01 +0100 |
| commit | ec488538ac3f3ecdfd67eddd40df623580225a11 (patch) | |
| tree | c8125ae9c48f604103625060bc04ec937ac4c641 /README.md | |
| parent | 7f8939e5f44346c1b38bea3a6531c12ff5f8b972 (diff) | |
| download | mullvadvpn-ec488538ac3f3ecdfd67eddd40df623580225a11.tar.xz mullvadvpn-ec488538ac3f3ecdfd67eddd40df623580225a11.zip | |
Remove build_mi_proto.sh. Update readme
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 19 |
1 files changed, 11 insertions, 8 deletions
@@ -303,29 +303,32 @@ Due to inability to build the management interface proto files on ARM64 (see [this](https://github.com/grpc/grpc-node/issues/1497) issue) the Apple ARM64 build must be done in 2 stages: 1. Build management interface proto files on a non-ARM64 platform -2. Use the built proto files during the main build by setting the `MI_PROTO_BUILD_DIR` environment variable - to the path the proto files +2. Use the built proto files during the main build by setting the `MANAGEMENT_INTERFACE_PROTO_BUILD_DIR` + environment variable to the path the proto files 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 +npm ci +./build-proto.sh ``` -After that transfer the resulting build directory to your Apple ARM64 platform, and set the value of -`MI_PROTO_BUILD_DIR` to the transfer destination while running the main build. +After that copy the files from `gui/src/main/management_interface/` and `gui/build/src/main/management_interface/` +directories into a single directory on your Apple Silicon Mac, and set the value of +`MANAGEMENT_INTERFACE_PROTO_BUILD_DIR` to that directory while running the main build. -Another prerequisite is `protobuf`, which can be installed by running: +On your Apple Silicon Mac install `protobuf` by running: ```bash brew install protobuf ``` -When all is done run the main build: +When all is done run the main build. Assuming that you copied the proto files into `/tmp/management_interface_proto` +directory, the build command will look as follows: ```bash -MI_PROTO_BUILD_DIR=/Users/doe/mullvadvpn-app/gui/scripts/mi_proto ./build.sh --dev-build +MANAGEMENT_INTERFACE_PROTO_BUILD_DIR=/tmp/management_interface_proto ./build.sh --dev-build ``` If you want to build each component individually, or run in development mode, read the following |
