From b1b18b2ac5745e2b54a73dc3e53f8d7b5b230ba1 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 26 Feb 2019 21:34:02 +0100 Subject: [PATCH] build-package: mv termux_setup_ninja to scripts/build/setup --- build-package.sh | 15 +-------------- scripts/build/setup/termux_setup_ninja.sh | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 scripts/build/setup/termux_setup_ninja.sh diff --git a/build-package.sh b/build-package.sh index bd7f76b9f..de537b408 100755 --- a/build-package.sh +++ b/build-package.sh @@ -16,20 +16,7 @@ source scripts/build/setup/termux_setup_golang.sh source scripts/build/setup/termux_setup_rust.sh # Utility function to setup a current ninja build system. -termux_setup_ninja() { - local NINJA_VERSION=1.9.0 - local NINJA_FOLDER=$TERMUX_COMMON_CACHEDIR/ninja-$NINJA_VERSION - if [ ! -x "$NINJA_FOLDER/ninja" ]; then - mkdir -p "$NINJA_FOLDER" - local NINJA_ZIP_FILE=$TERMUX_PKG_TMPDIR/ninja-$NINJA_VERSION.zip - termux_download https://github.com/ninja-build/ninja/releases/download/v$NINJA_VERSION/ninja-linux.zip \ - "$NINJA_ZIP_FILE" \ - 609cc10d0f226a4d9050e4d4a57be9ea706858cce64b9132102c3789c868da92 - unzip "$NINJA_ZIP_FILE" -d "$NINJA_FOLDER" - chmod 755 $NINJA_FOLDER/ninja - fi - export PATH=$NINJA_FOLDER:$PATH -} +source scripts/build/setup/termux_setup_ninja.sh # Utility function to setup a current meson build system. termux_setup_meson() { diff --git a/scripts/build/setup/termux_setup_ninja.sh b/scripts/build/setup/termux_setup_ninja.sh new file mode 100644 index 000000000..850ab426a --- /dev/null +++ b/scripts/build/setup/termux_setup_ninja.sh @@ -0,0 +1,14 @@ +termux_setup_ninja() { + local NINJA_VERSION=1.9.0 + local NINJA_FOLDER=$TERMUX_COMMON_CACHEDIR/ninja-$NINJA_VERSION + if [ ! -x "$NINJA_FOLDER/ninja" ]; then + mkdir -p "$NINJA_FOLDER" + local NINJA_ZIP_FILE=$TERMUX_PKG_TMPDIR/ninja-$NINJA_VERSION.zip + termux_download https://github.com/ninja-build/ninja/releases/download/v$NINJA_VERSION/ninja-linux.zip \ + "$NINJA_ZIP_FILE" \ + 609cc10d0f226a4d9050e4d4a57be9ea706858cce64b9132102c3789c868da92 + unzip "$NINJA_ZIP_FILE" -d "$NINJA_FOLDER" + chmod 755 $NINJA_FOLDER/ninja + fi + export PATH=$NINJA_FOLDER:$PATH +}