From e2588638c1914d6907709bf99be4823622d5be63 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 1 Sep 2016 08:53:30 +0200 Subject: Add BUILD2_REPO envvar to build scripts --- build-mingw.bat | 10 ++++++++-- build-msvc.bat | 10 ++++++++-- build.sh | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/build-mingw.bat b/build-mingw.bat index 36572b4..3a6df43 100644 --- a/build-mingw.bat +++ b/build-mingw.bat @@ -29,6 +29,13 @@ set "owd=%CD%" if "_%1_" == "_/?_" goto usage +rem Package repository URL (or path). +rem +if "_%BUILD2_REPO%_" == "__" ( +set "BUILD2_REPO=https://stage.build2.org/1" +rem set "BUILD2_REPO=https://pkg.cppget.org/1/alpha" +) + rem Compiler. rem if "_%1_" == "__" ( @@ -133,8 +140,7 @@ bpkg-stage create^ config.install.root=%idir% @if errorlevel 1 goto error -@rem @@ TMP: queue -bpkg-stage add https://pkg.cppget.org/1/queue +bpkg-stage add %BUILD2_REPO% @if errorlevel 1 goto error bpkg-stage fetch diff --git a/build-msvc.bat b/build-msvc.bat index 88eebe7..b56be54 100644 --- a/build-msvc.bat +++ b/build-msvc.bat @@ -29,6 +29,13 @@ set "owd=%CD%" if "_%1_" == "_/?_" goto usage +rem Package repository URL (or path). +rem +if "_%BUILD2_REPO%_" == "__" ( +set "BUILD2_REPO=https://stage.build2.org/1" +rem set "BUILD2_REPO=https://pkg.cppget.org/1/alpha" +) + rem Installation directory. rem if "_%1_" == "__" ( @@ -124,8 +131,7 @@ bpkg-stage create^ config.install.root=%idir% @if errorlevel 1 goto error -@rem @@ TMP: queue -bpkg-stage add https://pkg.cppget.org/1/queue +bpkg-stage add %BUILD2_REPO% @if errorlevel 1 goto error bpkg-stage fetch diff --git a/build.sh b/build.sh index df5b1e5..7b267c9 100755 --- a/build.sh +++ b/build.sh @@ -11,6 +11,13 @@ usage="Usage: $0 [-h] [--install-dir ] [--sudo ] " +# Package repository URL (or path). +# +if test -z "$BUILD2_REPO"; then + BUILD2_REPO="https://stage.build2.org/1" +# BUILD2_REPO="https://pkg.cppget.org/1/alpha" +fi + diag () { echo "$*" 1>&2 @@ -146,8 +153,7 @@ config.bin.rpath="$idir/lib" \ config.install.root="$idir" \ config.install.sudo="$sudo" -#@@ TMP: queue -run bpkg-stage add https://pkg.cppget.org/1/queue +run bpkg-stage add "$BUILD2_REPO" run bpkg-stage fetch run bpkg-stage build --yes build2 bpkg run bpkg-stage install build2 bpkg -- cgit v1.1