From b933204492665ae20979a6ec968e18b5c79cbefe Mon Sep 17 00:00:00 2001 From: Elliot Glaysher Date: Tue, 3 Apr 2018 11:15:17 -0700 Subject: [PATCH] Rebuild the scripts without PKG_CONFIG_PATH hacks. --- README.md | 8 +++----- scripts/bootstrap | 4 ++++ scripts/build | 5 +++++ 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100755 scripts/bootstrap create mode 100755 scripts/build diff --git a/README.md b/README.md index 228e00336..829db92c3 100644 --- a/README.md +++ b/README.md @@ -48,11 +48,9 @@ are included as git submodules. To build urbit from source, perform the followin (For instructions for legacy meson, also see below) 1. Install all required dependencies. -2. `git submodule init` in the urbit repository -3. `git submodule update` -4. `meson ./build` -5. If the last step was successful, type `ninja -C build` to compile urbit. -6. The executable should appear in `./build` directory. +2. Run `./scripts/bootstrap` +3. Run `./scripts/build` +4. The executable should appear in `./build` directory. ### Using meson & ninja To configure project, enter the build directory and enter diff --git a/scripts/bootstrap b/scripts/bootstrap new file mode 100755 index 000000000..4ac72fa7b --- /dev/null +++ b/scripts/bootstrap @@ -0,0 +1,4 @@ +#!/bin/bash + +git submodule init +git submodule update diff --git a/scripts/build b/scripts/build new file mode 100755 index 000000000..7aa65d1a4 --- /dev/null +++ b/scripts/build @@ -0,0 +1,5 @@ +#!/bin/bash + +mkdir ./build &> /dev/null +meson . ./build +ninja -C build