From c57fc768aa19937866f823a1ad2b70e62fc2b870 Mon Sep 17 00:00:00 2001 From: LAGonauta Date: Sat, 19 Jun 2021 11:43:12 -0300 Subject: [PATCH] Do not generate WinRT headers, just download them on build --- .gitmodules | 3 --- .../windows-notification/prepare-yolort.sh | 19 +++++++------------ plugins/windows-notification/yolort-builder | 1 - 3 files changed, 7 insertions(+), 16 deletions(-) delete mode 160000 plugins/windows-notification/yolort-builder diff --git a/.gitmodules b/.gitmodules index b0826ebf..b5480660 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,3 @@ path = plugins/signal-protocol/libsignal-protocol-c url = https://github.com/WhisperSystems/libsignal-protocol-c.git branch = v2.3.3 -[submodule "plugins/windows-notification/yolort-builder"] - path = plugins/windows-notification/yolort-builder - url = https://github.com/Yuubi-san/YoloRT.git diff --git a/plugins/windows-notification/prepare-yolort.sh b/plugins/windows-notification/prepare-yolort.sh index 5b63259a..8d6e95c8 100644 --- a/plugins/windows-notification/prepare-yolort.sh +++ b/plugins/windows-notification/prepare-yolort.sh @@ -1,15 +1,10 @@ #!/bin/bash - +export FILE_NAME=cppwinrt-2.0.210122.3+windows-10.0.19041+yolort-835cd4e.zip export ORIGINAL_FOLDER=${PWD} -cd ${PWD}/yolort-builder -if [ ! -f bin/cppwinrt.exe ]; then - make CPPWINRT_VERSION=2.0.210122.3 bin/cppwinrt.exe -fi - -make originals -make --jobs=$(nproc) - -mkdir -p ../yolort -cp -r include ../yolort -cd ${ORIGINAL_FOLDER} \ No newline at end of file +mkdir -p yolort && \ + cd yolort && \ + curl -L -O https://github.com/LAGonauta/YoloRT/releases/download/v1.0.0/${FILE_NAME} && \ + unzip -o ${FILE_NAME} && \ + rm ${FILE_NAME} && \ + cd ${ORIGINAL_FOLDER} diff --git a/plugins/windows-notification/yolort-builder b/plugins/windows-notification/yolort-builder deleted file mode 160000 index 835cd4ee..00000000 --- a/plugins/windows-notification/yolort-builder +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 835cd4eefd456df0a9d017310beba772f1c48460