From 015a16c91a171f742f91a83d694445111b1c99a4 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 17 Jan 2022 04:29:02 +0000 Subject: [PATCH] [TS] Set LDK_GARBAGECOLLECTED_GIT_OVERRIDE so that versions work --- genbindings.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/genbindings.sh b/genbindings.sh index 5576b8db..ce9411e1 100755 --- a/genbindings.sh +++ b/genbindings.sh @@ -35,6 +35,14 @@ else sed -i "s/TransactionOutputs/C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ/g" ./lightning.h fi +if [ "$LDK_GARBAGECOLLECTED_GIT_OVERRIDE" = "" ]; then + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE=$(git describe --tag --dirty) +fi +if [ "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:0:1}" != "v" ]; then + echo "Version tag should start with a v" > /dev/stderr + exit 1 +fi + if [ "$2" != "wasm" ]; then TARGET_STRING="$LDK_TARGET" if [ "$TARGET_STRING" = "" ]; then @@ -61,14 +69,6 @@ if [ "$2" != "wasm" ]; then LDK_TARGET_CPU="sandybridge" fi - if [ "$LDK_GARBAGECOLLECTED_GIT_OVERRIDE" = "" ]; then - export LDK_GARBAGECOLLECTED_GIT_OVERRIDE=$(git describe --tag --dirty) - fi - if [ "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:0:1}" != "v" ]; then - echo "Version tag should start with a v" > /dev/stderr - exit 1 - fi - if [ "$(rustc --version --verbose | grep "host:")" = "host: x86_64-apple-darwin" ]; then # OSX sed is for some reason not compatible with GNU sed sed -i '' "s/^ .*<\/version>/ ${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" pom.xml -- 2.30.2