From 412b127dbc54ae8bacdcdfc5a969bfcaf97a4150 Mon Sep 17 00:00:00 2001 From: Marek Kubica Date: Mon, 23 Mar 2026 16:46:42 +0100 Subject: [PATCH] Remove REPO_ROOT and depends.sh They seem not to be used anywhere so might as well remove them. Signed-off-by: Marek Kubica --- Makefile | 2 -- scripts/depends.sh | 75 ---------------------------------------------- 2 files changed, 77 deletions(-) delete mode 100755 scripts/depends.sh diff --git a/Makefile b/Makefile index a78a103cf..e1cb0bf39 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -REPO_ROOT=$(shell git rev-parse --show-toplevel) - build: vpnkit.exe vpnkit.exe: diff --git a/scripts/depends.sh b/scripts/depends.sh deleted file mode 100755 index a5a19d0e5..000000000 --- a/scripts/depends.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/env sh -set -ex - -# Set up the exact set of dependant packages - -case "$(uname -s)" in - CYGWIN*) - - ### From ocaml-ci-scripts - - # default setttings - SWITCH="${OPAM_COMP}" - OPAM_URL='https://dl.dropboxusercontent.com/s/b2q2vjau7if1c1b/opam64.tar.xz' - OPAM_ARCH=opam64 - - if [ "$PROCESSOR_ARCHITECTURE" != "AMD64" ] && \ - [ "$PROCESSOR_ARCHITEW6432" != "AMD64" ]; then - OPAM_URL='https://dl.dropboxusercontent.com/s/eo4igttab8ipyle/opam32.tar.xz' - OPAM_ARCH=opam32 - fi - - curl -fsSL -o "${OPAM_ARCH}.tar.xz" "${OPAM_URL}" - tar -xf "${OPAM_ARCH}.tar.xz" - "${OPAM_ARCH}/install.sh" - - PATH="/usr/x86_64-w64-mingw32/sys-root/mingw/bin:${PATH}" - export PATH - - ### Custom - - export REPO_ROOT=$(git rev-parse --show-toplevel) - export OPAM_REPO=$(cygpath.exe -w "${REPO_ROOT}/repo/win32") - export OPAMROOT=$(cygpath.exe -w "${REPO_ROOT}/_build/opam") - ;; -esac - -REPO_ROOT=$(git rev-parse --show-toplevel) - -if [ -z "${OPAMROOT}" ]; then - OPAMROOT=${REPO_ROOT}/_build/opam -fi - -export OPAMROOT -export OPAMYES=1 -export OPAMCOLORS=1 - -# if a compiler is specified, use it; otherwise use the system compiler -if [ -n "${OPAM_COMP}" ]; then - OPAM_COMP_ARG="--comp=${OPAM_COMP}" - OPAM_SWITCH_ARG="--switch=${OPAM_COMP}" -fi - -opam init -v -n "${OPAM_COMP_ARG}" "${OPAM_SWITCH_ARG}" local "${OPAM_REPO}" -echo opam configuration is: -opam config env -eval $(opam config env) - -export PATH="${OPAMROOT}/${OPAM_COMP}/bin:${PATH}" - -opam install depext -y -v -opam install depext-cygwinports -y || true - -OPAMBUILDTEST=1 opam depext -u vpnkit - -# Debug a failure to find stringext's archive -OPAMVERBOSE=1 opam install stringext -y - -# Don't run all the unit tests of all upstream packages in the universe -# for speed. As a special exception we will run the tests for tcpip -OPAMVERBOSE=1 opam install --deps-only tcpip -y -OPAMVERBOSE=1 opam install tcpip -t - -opam install $(ls -1 ${OPAM_REPO}/packages/upstream) -y -OPAMVERBOSE=1 opam install alcotest -y -OPAMVERBOSE=1 opam install --deps-only vpnkit -y