Update CI references to 0.0.122
[ldk-java] / genbindings.sh
index e2952f7306a49326d100b82dbf0a450915d1ead3..f3dd774cce752312f6d2c7998a713aa472535ab5 100755 (executable)
@@ -20,13 +20,75 @@ function is_gnu_sed(){
   sed --version >/dev/null 2>&1
 }
 
-if [ "$CC" != "" ]; then
-       COMMON_COMPILE="$CC -std=c11 -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-unused-function -Wno-nullability-completeness -Wno-pointer-sign -Wdate-time -ffile-prefix-map=$(pwd)="
-else
+if [ "$CC" = "" ]; then
        CC=clang
-       COMMON_COMPILE="clang -std=c11 -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-unused-function -Wno-nullability-completeness -Wno-pointer-sign -Wdate-time -ffile-prefix-map=$(pwd)="
 fi
 
+TARGET_STRING="$LDK_TARGET"
+if [ "$TARGET_STRING" = "" ]; then
+       # We assume clang-style $CC --version here, but worst-case we just get an empty suffix
+       TARGET_STRING="$($CC --version | grep Target | awk '{ print $2 }')"
+fi
+
+IS_MAC=false
+IS_WIN=false
+
+[ "$($CC --version | grep apple-darwin)" != "" ] && IS_MAC=true
+IS_APPLE_CLANG=false
+[ "$($CC --version | grep "Apple clang version")" != "" ] && IS_APPLE_CLANG=true
+
+STRIP=llvm-strip
+[ "$IS_APPLE_CLANG" = "true" ] && STRIP=echo
+
+case "$TARGET_STRING" in
+       "x86_64-pc-linux"*)
+               LDK_TARGET_SUFFIX="_Linux-amd64"
+               CS_PLATFORM_NAME="linux-x64"
+               LDK_JAR_TARGET=true
+               ;;
+       "x86_64-redhat-linux"*)
+               LDK_TARGET_SUFFIX="_Linux-amd64"
+               CS_PLATFORM_NAME="linux-x64"
+               LDK_JAR_TARGET=true
+               ;;
+       "x86_64-apple-darwin"*)
+               LDK_TARGET_SUFFIX="_MacOSX-x86_64"
+               CS_PLATFORM_NAME="osx-x64"
+               LDK_JAR_TARGET=true
+               IS_MAC=true
+               ;;
+       "aarch64-apple-darwin"*)
+               LDK_TARGET_CPU="apple-a14"
+               LDK_TARGET_SUFFIX="_MacOSX-aarch64"
+               CS_PLATFORM_NAME="osx-arm64"
+               LDK_JAR_TARGET=true
+               IS_MAC=true
+               ;;
+       "x86_64-pc-windows"*)
+               LDK_TARGET_SUFFIX="_Win-amd64"
+               CS_PLATFORM_NAME="win-x64"
+               LDK_JAR_TARGET=true
+               IS_WIN=true
+               # llvm-strip currently corrupts DLLs - https://github.com/llvm/llvm-project/issues/63081
+               STRIP=echo
+               ;;
+       *)
+               LDK_TARGET_SUFFIX="_${TARGET_STRING}"
+esac
+if [ "$LDK_TARGET_CPU" = "" ]; then
+       LDK_TARGET_CPU="sandybridge"
+fi
+
+COMMON_COMPILE="$CC -std=c11 -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-unused-function -Wno-nullability-completeness -Wno-pointer-sign -Wdate-time -ffile-prefix-map=$(pwd)="
+COMMON_CC=""
+if [[ "$TARGET_STRING" != *"android" && "$TARGET_STRING" != *"androideabi" ]]; then
+       [[ "$TARGET_STRING" != "x86"* ]] && COMMON_CC="$COMMON_CC --target=$TARGET_STRING"
+       [[ "$TARGET_STRING" = "x86"* ]] && COMMON_CC="$COMMON_CC --target=$TARGET_STRING"
+fi
+[[ "$TARGET_STRING" != "x86"* ]] && COMMON_CC="$COMMON_CC -mcpu=$LDK_TARGET_CPU"
+[[ "$TARGET_STRING" = "x86"* ]] && COMMON_CC="$COMMON_CC -march=$LDK_TARGET_CPU -mtune=$LDK_TARGET_CPU"
+[ "$IS_MAC" = "true" -a "$MACOS_SDK" != "" ] && COMMON_COMPILE="$COMMON_COMPILE -isysroot $MACOS_SDK"
+
 DEBUG_ARG="$3"
 if [ "$3" = "leaks" ]; then
        DEBUG_ARG="true"
@@ -34,11 +96,14 @@ fi
 
 cp "$1/lightning-c-bindings/include/lightning.h" ./
 if is_gnu_sed; then
-       sed -i "s/TransactionOutputs/C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ/g" ./lightning.h
+       sed -i "s/TransactionOutputs/C2Tuple_ThirtyTwoBytesCVec_C2Tuple_u32TxOutZZZ/g" ./lightning.h
 else
-  # OSX sed is for some reason not compatible with GNU sed
-       sed -i '' "s/TransactionOutputs/C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ/g" ./lightning.h
+       # OSX sed is for some reason not compatible with GNU sed
+       sed -i '' "s/TransactionOutputs/C2Tuple_ThirtyTwoBytesCVec_C2Tuple_u32TxOutZZZ/g" ./lightning.h
 fi
+echo "#define LDKCVec_C2Tuple_ThirtyTwoBytesCVec_C2Tuple_u32TxOutZZZZ LDKCVec_TransactionOutputsZ" > header.c
+echo "#define CVec_C2Tuple_ThirtyTwoBytesCVec_C2Tuple_u32TxOutZZZZ_free CVec_TransactionOutputsZ_free" >> header.c
+
 
 if [ "$LDK_GARBAGECOLLECTED_GIT_OVERRIDE" = "" ]; then
        export LDK_GARBAGECOLLECTED_GIT_OVERRIDE=$(git describe --tag --dirty)
@@ -50,36 +115,13 @@ fi
 
 
 if [ "$2" = "c_sharp" ]; then
-       TARGET_STRING="$LDK_TARGET"
-       if [ "$TARGET_STRING" = "" ]; then
-               # We assume clang-style $CC --version here, but worst-case we just get an empty suffix
-               TARGET_STRING="$($CC --version | grep Target | awk '{ print $2 }')"
-       fi
-       case "$TARGET_STRING" in
-               "x86_64-pc-linux"*)
-                       LDK_TARGET_SUFFIX="_Linux-amd64"
-                       LDK_JAR_TARGET=true
-                       ;;
-               "x86_64-apple-darwin"*)
-                       LDK_TARGET_SUFFIX="_MacOSX-x86_64"
-                       LDK_JAR_TARGET=true
-                       ;;
-               "aarch64-apple-darwin"*)
-                       LDK_TARGET_CPU="apple-a14"
-                       LDK_TARGET_SUFFIX="_MacOSX-aarch64"
-                       LDK_JAR_TARGET=true
-                       ;;
-               *)
-                       LDK_TARGET_SUFFIX="_${TARGET_STRING}"
-       esac
-       if [ "$LDK_TARGET_CPU" = "" ]; then
-               LDK_TARGET_CPU="sandybridge"
-       fi
-
        echo "Creating C# bindings..."
        mkdir -p c_sharp/src/org/ldk/{enums,structs,impl}
        rm -f c_sharp/src/org/ldk/{enums,structs,impl}/*.cs
-       ./genbindings.py "./lightning.h" c_sharp/src/org/ldk/impl c_sharp/src/org/ldk c_sharp/ $DEBUG_ARG c_sharp $4
+       GEN_PLAT="c_sharp-linux"
+       [ "$IS_WIN" = "true" ] && GEN_PLAT="c_sharp-win"
+       [ "$IS_MAC" = "true" ] && GEN_PLAT="c_sharp-darwin"
+       ./genbindings.py "./lightning.h" c_sharp/src/org/ldk/impl c_sharp/src/org/ldk c_sharp/ $DEBUG_ARG $GEN_PLAT $4 $TARGET_STRING
        rm -f c_sharp/bindings.c
        if [ "$3" = "true" ]; then
                echo "#define LDK_DEBUG_BUILD" > c_sharp/bindings.c
@@ -88,73 +130,78 @@ if [ "$2" = "c_sharp" ]; then
                # __unmangle_inner_ptr, but the C code expects to be able to call it.
                echo "#define __unmangle_inner_ptr(a) (a)" > c_sharp/bindings.c
        fi
-       echo "#define LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ LDKCVec_TransactionOutputsZ" >> c_sharp/bindings.c
-       echo "#define CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free CVec_TransactionOutputsZ_free" >> c_sharp/bindings.c
+       cat header.c >> c_sharp/bindings.c
+       cat header.c >> c_sharp/bindings.c
        cat c_sharp/bindings.c.body >> c_sharp/bindings.c
 
-       IS_MAC=false
-       [ "$($CC --version | grep apple-darwin)" != "" ] && IS_MAC=true
-       IS_APPLE_CLANG=false
-       [ "$($CC --version | grep "Apple clang version")" != "" ] && IS_APPLE_CLANG=true
+       if is_gnu_sed; then
+               sed -i "s/<version>.*<\/version>/<version>${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" c_sharp/packaging_artifacts/org.ldk.nuspec
+               sed -i "s/<version>.*<\/version>/<version>${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" c_sharp/packaging_artifacts/package/services/metadata/core-properties/ldk.psmdcp
+       else
+               # OSX sed is for some reason not compatible with GNU sed
+               sed -i '' "s/<version>.*<\/version>/<version>${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" c_sharp/packaging_artifacts/org.ldk.nuspec
+               sed -i '' "s/<version>.*<\/version>/<version>${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" c_sharp/packaging_artifacts/package/services/metadata/core-properties/ldk.psmdcp
+       fi
 
        # Compiling C# bindings with Mono
-       MONO_COMPILE="-out:csharpldk.dll -langversion:3 -t:library c_sharp/src/org/ldk/enums/*.cs c_sharp/src/org/ldk/impl/*.cs c_sharp/src/org/ldk/util/*.cs c_sharp/src/org/ldk/structs/*.cs"
        if [ "$3" = "true" ]; then
-               mono-csc $MONO_COMPILE
+               mono-csc -g -out:csharpldk.dll -langversion:3 -t:library -unsafe c_sharp/src/org/ldk/enums/*.cs c_sharp/src/org/ldk/impl/*.cs c_sharp/src/org/ldk/util/*.cs c_sharp/src/org/ldk/structs/*.cs
        else
-               mono-csc -o $MONO_COMPILE
+               cd c_sharp
+               dotnet build --configuration Release
+               cd ..
        fi
 
-       mv ./-out:csharpldk.dll csharpldk.dll # Mono is braindead, apparently
-
        echo "Building C# bindings..."
-       COMPILE="$COMMON_COMPILE -mcpu=$LDK_TARGET_CPU -Isrc/main/jni -pthread -fPIC"
-       LINK="-ldl -shared"
+       COMPILE="$COMMON_COMPILE $COMMON_CC -pthread -fPIC"
+       LINK="$COMMON_CC -shared"
+       [ "$IS_WIN" = "false" ] && LINK="$LINK -ldl"
        [ "$IS_MAC" = "false" ] && LINK="$LINK -Wl,--no-undefined"
        [ "$IS_MAC" = "true" ] && COMPILE="$COMPILE -mmacosx-version-min=10.9"
        [ "$IS_MAC" = "true" -a "$IS_APPLE_CLANG" = "false" ] && LINK="$LINK -fuse-ld=lld"
        [ "$IS_MAC" = "true" -a "$IS_APPLE_CLANG" = "false" ] && echo "WARNING: Need at least upstream clang 13!"
        [ "$IS_MAC" = "false" -a "$3" != "false" ] && LINK="$LINK -Wl,-wrap,calloc -Wl,-wrap,realloc -Wl,-wrap,malloc -Wl,-wrap,free"
+       [ "$IS_WIN" = "true" ] && LINK="$LINK -lbcrypt -lntdll -static-libgcc"
+       [ "$IS_WIN" = "true" ] && COMPILE="$COMPILE -I/usr/x86_64-w64-mingw32/sys-root/mingw/include/ -I/usr/x86_64-w64-mingw32/include/"
 
-       exit 0 # Sadly compilation doesn't currently work
        if [ "$3" = "true" ]; then
-               $COMPILE $LINK -o liblightningjni_debug$LDK_TARGET_SUFFIX.so -g -fsanitize=address -shared-libasan -rdynamic -I"$1"/lightning-c-bindings/include/ $2 c_sharp/bindings.c "$1"/lightning-c-bindings/target/$LDK_TARGET/debug/libldk.a -lm
+               $COMPILE $LINK -o libldkcsharp_debug$LDK_TARGET_SUFFIX.so -g -fsanitize=address -shared-libasan -rdynamic -I"$1"/lightning-c-bindings/include/ c_sharp/bindings.c "$1"/lightning-c-bindings/target/$LDK_TARGET/debug/libldk.a -lm
        else
-               $COMPILE -o bindings.o -c -flto -O3 -I"$1"/lightning-c-bindings/include/ $2 c_sharp/bindings.c
-               $COMPILE $LINK -o liblightningjni_release$LDK_TARGET_SUFFIX.so -flto -O3 -Wl,--lto-O3 -Wl,-O3 -Wl,--version-script=c_sharp/libcode.version -I"$1"/lightning-c-bindings/include/ $2 bindings.o "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a -lm
-               llvm-strip liblightningjni_release$LDK_TARGET_SUFFIX.so
+               [ "$IS_APPLE_CLANG" = "false" ] && LINK="$LINK -flto -Wl,-O3 -fuse-ld=lld"
+               [ "$IS_APPLE_CLANG" = "false" ] && COMPILE="$COMPILE -flto"
+               [ "$IS_MAC" = "false" ] && LINK="$LINK -Wl,--no-undefined"
+               [ "$IS_WIN" = "false" ] && LINK="$LINK -Wl,--lto-O3"
+               LDK_LIB="$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a
+               if [ "$IS_MAC" = "false" -a "$IS_WIN" = "false" -a "$4" = "false" ]; then
+                       LINK="$LINK -Wl,--version-script=c_sharp/libcode.version -Wl,--build-id=0x0000000000000000"
+               fi
+
+               # When building for Windows, a timestamp is included in the resulting dll,
+               # so we have to build with faketime.
+               faketime -f "2021-01-01 00:00:00" $COMPILE -o bindings.o -c -O3 -I"$1"/lightning-c-bindings/include/ c_sharp/bindings.c
+               faketime -f "2021-01-01 00:00:00" $COMPILE $LINK -o libldkcsharp_release$LDK_TARGET_SUFFIX.so -O3 bindings.o $LDK_LIB -lm
+               $STRIP -R .llvmbc -R .llvmcmd libldkcsharp_release$LDK_TARGET_SUFFIX.so
+
+               if [ "$LDK_JAR_TARGET" = "true" ]; then
+                       # Copy resulting native binary for inclusion in release nuget zip
+                       mkdir -p c_sharp/packaging_artifacts/lib/net6.0/
+                       cp c_sharp/bin/Release/net6.0/csharpldk.dll c_sharp/packaging_artifacts/lib/net6.0/
+
+                       mkdir -p c_sharp/packaging_artifacts/runtimes/"$CS_PLATFORM_NAME"/native/
+                       if [ "$IS_WIN" = "true" ]; then
+                               cp libldkcsharp_release$LDK_TARGET_SUFFIX.so c_sharp/packaging_artifacts/runtimes/"$CS_PLATFORM_NAME"/native/ldkcsharp.dll
+                       elif [ "$IS_MAC" = "true" ]; then
+                               cp libldkcsharp_release$LDK_TARGET_SUFFIX.so c_sharp/packaging_artifacts/runtimes/"$CS_PLATFORM_NAME"/native/libldkcsharp.dylib
+                       else
+                               cp libldkcsharp_release$LDK_TARGET_SUFFIX.so c_sharp/packaging_artifacts/runtimes/"$CS_PLATFORM_NAME"/native/libldkcsharp.so
+                       fi
+               fi
        fi
 elif [ "$2" = "python" ]; then
-       TARGET_STRING="$LDK_TARGET"
-       if [ "$TARGET_STRING" = "" ]; then
-               # We assume clang-style $CC --version here, but worst-case we just get an empty suffix
-               TARGET_STRING="$($CC --version | grep Target | awk '{ print $2 }')"
-       fi
-       case "$TARGET_STRING" in
-               "x86_64-pc-linux"*)
-                       LDK_TARGET_SUFFIX="_Linux-amd64"
-                       LDK_JAR_TARGET=true
-                       ;;
-               "x86_64-apple-darwin"*)
-                       LDK_TARGET_SUFFIX="_MacOSX-x86_64"
-                       LDK_JAR_TARGET=true
-                       ;;
-               "aarch64-apple-darwin"*)
-                       LDK_TARGET_CPU="apple-a14"
-                       LDK_TARGET_SUFFIX="_MacOSX-aarch64"
-                       LDK_JAR_TARGET=true
-                       ;;
-               *)
-                       LDK_TARGET_SUFFIX="_${TARGET_STRING}"
-       esac
-       if [ "$LDK_TARGET_CPU" = "" ]; then
-               LDK_TARGET_CPU="sandybridge"
-       fi
-
        echo "Creating Python bindings..."
        mkdir -p python/src/{enums,structs,impl}
        rm -f python/src/{enums,structs,impl}/*.py
-       ./genbindings.py "./lightning.h" python/src/impl python/src python/ $DEBUG_ARG python $4
+       ./genbindings.py "./lightning.h" python/src/impl python/src python/ $DEBUG_ARG python $4 $TARGET_STRING
        rm -f python/bindings.c
        if [ "$3" = "true" ]; then
                echo "#define LDK_DEBUG_BUILD" > python/bindings.c
@@ -163,8 +210,8 @@ elif [ "$2" = "python" ]; then
                # __unmangle_inner_ptr, but the C code expects to be able to call it.
                echo "#define __unmangle_inner_ptr(a) (a)" > python/bindings.c
        fi
-       echo "#define LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ LDKCVec_TransactionOutputsZ" >> python/bindings.c
-       echo "#define CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free CVec_TransactionOutputsZ_free" >> python/bindings.c
+       echo "#define LDKCVec_C2Tuple_ThirtyTwoBytesCVec_C2Tuple_u32TxOutZZZZ LDKCVec_TransactionOutputsZ" >> python/bindings.c
+       echo "#define CVec_C2Tuple_ThirtyTwoBytesCVec_C2Tuple_u32TxOutZZZZ_free CVec_TransactionOutputsZ_free" >> python/bindings.c
        cat python/bindings.c.body >> python/bindings.c
 
        IS_MAC=false
@@ -173,8 +220,8 @@ elif [ "$2" = "python" ]; then
        [ "$($CC --version | grep "Apple clang version")" != "" ] && IS_APPLE_CLANG=true
 
        echo "Building Python bindings..."
-       COMPILE="$COMMON_COMPILE -mcpu=$LDK_TARGET_CPU -Isrc/main/jni -pthread -fPIC"
-       LINK="-ldl -shared"
+       COMPILE="$COMMON_COMPILE $COMMON_CC -Isrc/main/jni -pthread -fPIC"
+       LINK="$COMMON_CC -ldl -shared"
        [ "$IS_MAC" = "false" ] && LINK="$LINK -Wl,--no-undefined"
        [ "$IS_MAC" = "true" ] && COMPILE="$COMPILE -mmacosx-version-min=10.9"
        [ "$IS_MAC" = "true" -a "$IS_APPLE_CLANG" = "false" ] && LINK="$LINK -fuse-ld=lld"
@@ -187,16 +234,16 @@ elif [ "$2" = "python" ]; then
        else
                $COMPILE -o bindings.o -c -flto -O3 -I"$1"/lightning-c-bindings/include/ $2 c_sharp/bindings.c
                $COMPILE $LINK -o liblightningpython_release$LDK_TARGET_SUFFIX.so -Wl,--version-script=python/libcode.version -flto -O3 -Wl,--lto-O3 -Wl,-O3 -I"$1"/lightning-c-bindings/include/ $2 bindings.o "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a -lm
-               llvm-strip liblightningpython_release$LDK_TARGET_SUFFIX.so
+               $STRIP -R .llvmbc -R .llvmcmd liblightningpython_release$LDK_TARGET_SUFFIX.so
        fi
 elif [ "$2" = "wasm" ]; then
        echo "Creating TS bindings..."
        mkdir -p ts/{enums,structs}
        rm -f ts/{enums,structs,}/*.{mjs,mts,mts.part}
        if [ "$4" = "false" ]; then
-               ./genbindings.py "./lightning.h" ts ts ts $DEBUG_ARG typescript node
+               ./genbindings.py "./lightning.h" ts ts ts $DEBUG_ARG typescript node wasm
        else
-               ./genbindings.py "./lightning.h" ts ts ts $DEBUG_ARG typescript browser
+               ./genbindings.py "./lightning.h" ts ts ts $DEBUG_ARG typescript browser wasm
        fi
        rm -f ts/bindings.c
        sed -i 's/^  "version": .*/  "version": "'${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}'",/g' ts/package.json
@@ -209,12 +256,11 @@ elif [ "$2" = "wasm" ]; then
                # __unmangle_inner_ptr, but the C code expects to be able to call it.
                echo "#define __unmangle_inner_ptr(a) (a)" > ts/bindings.c
        fi
-       echo "#define LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ LDKCVec_TransactionOutputsZ" >> ts/bindings.c
-       echo "#define CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free CVec_TransactionOutputsZ_free" >> ts/bindings.c
+       cat header.c >> ts/bindings.c
        cat ts/bindings.c.body >> ts/bindings.c
 
        echo "Building TS bindings..."
-       COMPILE="$COMMON_COMPILE -flto -Wl,--no-entry -nostdlib --target=wasm32-wasi -Wl,-z -Wl,stack-size=$((8*1024*1024)) -Wl,--initial-memory=$((16*1024*1024)) -Wl,--max-memory=$((1024*1024*1024)) -Wl,--global-base=4096"
+       COMPILE="$COMMON_COMPILE $COMMON_CC -flto -Wl,--no-entry -nostdlib --target=wasm32-wasi -Wl,-z -Wl,stack-size=$((8*1024*1024)) -Wl,--initial-memory=$((16*1024*1024)) -Wl,--max-memory=$((1024*1024*1024)) -Wl,--global-base=4096"
        # We only need malloc and assert/abort, but for now just use WASI for those:
        EXTRA_LINK=/usr/lib/wasm32-wasi/libc.a
        [ "$3" != "false" ] && COMPILE="$COMPILE -Wl,-wrap,calloc -Wl,-wrap,realloc -Wl,-wrap,reallocarray -Wl,-wrap,malloc -Wl,-wrap,aligned_alloc -Wl,-wrap,free"
@@ -250,32 +296,6 @@ elif [ "$2" = "wasm" ]; then
                fi
        fi
 else
-       TARGET_STRING="$LDK_TARGET"
-       if [ "$TARGET_STRING" = "" ]; then
-               # We assume clang-style $CC --version here, but worst-case we just get an empty suffix
-               TARGET_STRING="$($CC --version | grep Target | awk '{ print $2 }')"
-       fi
-       case "$TARGET_STRING" in
-               "x86_64-pc-linux"*)
-                       LDK_TARGET_SUFFIX="_Linux-amd64"
-                       LDK_JAR_TARGET=true
-                       ;;
-               "x86_64-apple-darwin"*)
-                       LDK_TARGET_SUFFIX="_MacOSX-x86_64"
-                       LDK_JAR_TARGET=true
-                       ;;
-               "aarch64-apple-darwin"*)
-                       LDK_TARGET_CPU="apple-a14"
-                       LDK_TARGET_SUFFIX="_MacOSX-aarch64"
-                       LDK_JAR_TARGET=true
-                       ;;
-               *)
-                       LDK_TARGET_SUFFIX="_${TARGET_STRING}"
-       esac
-       if [ "$LDK_TARGET_CPU" = "" ]; then
-               LDK_TARGET_CPU="sandybridge"
-       fi
-
        if is_gnu_sed; then
                sed -i "s/^    <version>.*<\/version>/    <version>${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" pom.xml
        else
@@ -288,9 +308,9 @@ else
        rm -f src/main/java/org/ldk/{enums,structs}/*.java
        rm -f src/main/jni/*.h
        if [ "$4" = "true" ]; then
-               ./genbindings.py "./lightning.h" src/main/java/org/ldk/impl src/main/java/org/ldk src/main/jni/ $DEBUG_ARG android $4
+               ./genbindings.py "./lightning.h" src/main/java/org/ldk/impl src/main/java/org/ldk src/main/jni/ $DEBUG_ARG android $4 $TARGET_STRING
        else
-               ./genbindings.py "./lightning.h" src/main/java/org/ldk/impl src/main/java/org/ldk src/main/jni/ $DEBUG_ARG java $4
+               ./genbindings.py "./lightning.h" src/main/java/org/ldk/impl src/main/java/org/ldk src/main/jni/ $DEBUG_ARG java $4 $TARGET_STRING
        fi
        rm -f src/main/jni/bindings.c
        if [ "$3" = "true" ]; then
@@ -300,20 +320,16 @@ else
                # __unmangle_inner_ptr, but the C code expects to be able to call it.
                echo "#define __unmangle_inner_ptr(a) (a)" > src/main/jni/bindings.c
        fi
-       echo "#define LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ LDKCVec_TransactionOutputsZ" >> src/main/jni/bindings.c
-       echo "#define CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free CVec_TransactionOutputsZ_free" >> src/main/jni/bindings.c
+       cat header.c >> src/main/jni/bindings.c
+       cat header.c >> src/main/jni/bindings.c
        cat src/main/jni/bindings.c.body >> src/main/jni/bindings.c
        javac -h src/main/jni src/main/java/org/ldk/enums/*.java src/main/java/org/ldk/impl/*.java
        rm src/main/java/org/ldk/enums/*.class src/main/java/org/ldk/impl/bindings*.class
 
-       IS_MAC=false
-       [ "$($CC --version | grep apple-darwin)" != "" ] && IS_MAC=true
-       IS_APPLE_CLANG=false
-       [ "$($CC --version | grep "Apple clang version")" != "" ] && IS_APPLE_CLANG=true
-
        echo "Building Java bindings..."
-       COMPILE="$COMMON_COMPILE -mcpu=$LDK_TARGET_CPU -Isrc/main/jni -pthread -fPIC"
-       LINK="-ldl -shared"
+       COMPILE="$COMMON_COMPILE $COMMON_CC -Isrc/main/jni -pthread -fPIC"
+       LINK="$COMMON_CC -shared"
+       [ "$IS_WIN" = "false" ] && LINK="$LINK -ldl"
        [ "$IS_MAC" = "false" ] && LINK="$LINK -Wl,--no-undefined"
        [ "$IS_MAC" = "true" ] && COMPILE="$COMPILE -mmacosx-version-min=10.9"
        [ "$IS_MAC" = "true" -a "$IS_APPLE_CLANG" = "false" ] && LINK="$LINK -fuse-ld=lld"
@@ -322,56 +338,24 @@ else
        if [ "$3" = "true" ]; then
                $COMPILE $LINK -o liblightningjni_debug$LDK_TARGET_SUFFIX.so -g -fsanitize=address -shared-libasan -rdynamic -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c "$1"/lightning-c-bindings/target/$LDK_TARGET/debug/libldk.a -lm
        else
+               [ "$IS_APPLE_CLANG" = "false" ] && LINK="$LINK -flto -Wl,-O3 -fuse-ld=lld"
+               [ "$IS_APPLE_CLANG" = "false" ] && COMPILE="$COMPILE -flto"
+               [ "$IS_MAC" = "false" ] && LINK="$LINK -Wl,--no-undefined"
+               [ "$IS_WIN" = "false" ] && LINK="$LINK -Wl,--lto-O3"
+               [ "$IS_WIN" = "true" ] && LINK="$LINK -L/usr/lib/gcc/x86_64-w64-mingw32/12-win32/ -lbcrypt"
                LDK_LIB="$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a
-               if [ "$IS_MAC" = "false" -a "$4" = "false" ]; then
-                       LINK="$LINK -Wl,--version-script=libcode.version -fuse-ld=lld"
-                       # __cxa_thread_atexit_impl is used to more effeciently cleanup per-thread local storage by rust libstd.
-                       # However, it is not available on glibc versions 2.17 or earlier, and rust libstd has a null-check and
-                       # fallback in case it is missing.
-                       # Because it is weak-linked on the rust side, we should be able to simply define it
-                       # explicitly, forcing rust to use the fallback. However, for some reason involving ancient
-                       # dark magic and haunted code segments, overriding the weak symbol only impacts sites which
-                       # *call* the symbol in question, not sites which *compare with* the symbol in question.
-                       # This means that the NULL check in rust's libstd will always think the function is
-                       # callable while the function which is called ends up being NULL (leading to a jmp to the
-                       # zero page and a quick SEGFAULT).
-                       # This issue persists not only with directly providing a symbol, but also ld.lld's -wrap
-                       # and --defsym arguments.
-                       # In smaller programs, it appears to be possible to work around this with -Bsymbolic and
-                       # -nostdlib, however when applied the full-sized JNI library here it no longer works.
-                       # After exhausting nearly every flag documented in lld, the only reliable method appears
-                       # to be editing the LDK binary. Luckily, LLVM's tooling makes this rather easy as we can
-                       # disassemble it into very readable code, edit it, and then reassemble it.
-                       # Note that if we do so we don't have to bother overriding the actual call, LLVM should
-                       # optimize it away, which also provides a good check that there isn't anything actually
-                       # relying on it elsewhere.
-                       [ ! -f "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a ] && exit 1
-                       if [ "$(ar t "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a | grep -v "\.o$" || echo)" != "" ]; then
-                               echo "Archive contained non-object files!"
-                               exit 1
-                       fi
-                       if [ "$(ar t "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a | grep ldk.*-cgu.*.rcgu.o | wc -l)" != "1" ]; then
-                               echo "Archive contained more than one LDK object file"
-                               exit 1
-                       fi
-                       mkdir -p tmp
-                       rm -f tmp/*
-                       ar x --output=tmp "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a
-                       pushd tmp
-                       llvm-dis ldk*-cgu.*.rcgu.o
-                       sed -i 's/br i1 icmp eq (i8\* @__cxa_thread_atexit_impl, i8\* null)/br i1 icmp eq (i8* null, i8* null)/g' ldk*-cgu.*.rcgu.o.ll
-                       llvm-as ldk*-cgu.*.rcgu.o.ll -o ./libldk.bc
-                       ar q libldk.a *.o
-                       popd
-                       LDK_LIB="tmp/libldk.bc tmp/libldk.a"
+               if [ "$IS_MAC" = "false" -a "$IS_WIN" = "false" -a "$4" = "false" ]; then
+                       LINK="$LINK -Wl,--version-script=libcode.version"
                fi
-               $COMPILE -o bindings.o -c -flto -O3 -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c
-               $COMPILE $LINK -o liblightningjni_release$LDK_TARGET_SUFFIX.so -flto -Wl,--lto-O3 -Wl,-O3 -O3 -I"$1"/lightning-c-bindings/include/ $2 bindings.o $LDK_LIB -lm
-               llvm-strip liblightningjni_release$LDK_TARGET_SUFFIX.so
+
+               $COMPILE -o bindings.o -c -O3 -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c
+               $COMPILE $LINK -o liblightningjni_release$LDK_TARGET_SUFFIX.so -O3 $2 bindings.o $LDK_LIB -lm
+               $STRIP -R .llvmbc -R .llvmcmd liblightningjni_release$LDK_TARGET_SUFFIX.so
+
                if [ "$IS_MAC" = "false" -a "$4" = "false" ]; then
-                       GLIBC_SYMBS="$(objdump -T liblightningjni_release$LDK_TARGET_SUFFIX.so | grep GLIBC_ | grep -v "GLIBC_2\.2\." | grep -v "GLIBC_2\.3\(\.\| \)" | grep -v "GLIBC_2.\(14\|17\) " || echo)"
+                       GLIBC_SYMBS="$(objdump -T liblightningjni_release$LDK_TARGET_SUFFIX.so | grep GLIBC_ | grep -v "GLIBC_2\.\(2\|3\)\(\.\|)\)" | grep -v "GLIBC_2.\(3\.4\|14\|17\|18\|25\|28\|29\|32\|33\|34\|\))" || echo)"
                        if [ "$GLIBC_SYMBS" != "" ]; then
-                               echo "Unexpected glibc version dependency! Some users need glibc 2.17 support, symbols for newer glibcs cannot be included."
+                               echo "Unexpected glibc version dependency! Some users need glibc 2.35 support, symbols for newer glibcs cannot be included."
                                echo "$GLIBC_SYMBS"
                                exit 1
                        fi
@@ -381,6 +365,7 @@ else
                                exit 1
                        fi
                fi
+
                if [ "$LDK_JAR_TARGET" = "true" ]; then
                        # Copy to JNI native directory for inclusion in JARs
                        mkdir -p src/main/resources/