Archives/ncdns-repro
2
0
Fork 0
mirror of https://github.com/namecoin/ncdns-repro synced 2024-11-10 07:10:29 +00:00
Code Issues Projects Releases Wiki Activity

Use parent tor-browser-build instead of submodule if available

Browse Source
This commit is contained in:
JeremyRand 2019-10-31 00:59:14 +00:00
parent 0ed95b0fa7
commit 254be6172f
No known key found for this signature in database
GPG Key ID: B3F2D165786D6570
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -59,8 +59,7 @@ release-osx-x86_64: submodule-update
$(rbm) build ncprop279 --target release --target ncdns-osx-x86_64 $(rbm) build ncprop279 --target release --target ncdns-osx-x86_64
submodule-update: submodule-update:
git submodule update --init ./setup-submodule-symlinks
$(MAKE) -C tor-browser-build submodule-update
fetch: submodule-update fetch: submodule-update
$(rbm) fetch $(rbm) fetch

22
setup-submodule-symlinks Executable file
View File

@ -0,0 +1,22 @@
#!/usr/bin/env bash
# This script inits tor-browser-build as a Git submodule of ncdns-repro, unless
# ncdns-repro is inside a tor-browser-build tree (e.g. as a Git submodule of
# tor-browser-build), in which case it uses the parent tor-browser-build.
set -euo pipefail
shopt -s nullglob globstar
ncdnsdir=$(pwd)
parentdir=$(dirname "${ncdnsdir}")
parentbase=$(basename "${parentdir}")
if [ "${parentbase}" == "tor-browser-build" ]; then
if [ -e tor-browser-build ]; then
rm tor-browser-build || rmdir tor-browser-build || mv tor-browser-build tor-browser-build-backup
fi
ln -s -T .. tor-browser-build
else
git submodule update --init
make -C tor-browser-build submodule-update
fi