From 7d02a178923f79366024eece95295b87a7141ee1 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 12 Feb 2022 22:53:52 +0000 Subject: [PATCH] Update quickjs with now merged PR, update carla Signed-off-by: falkTX --- .gitmodules | 2 +- Makefile | 11 ++++++----- carla | 2 +- deps/QuickJS | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index f514dde..2f25e33 100644 --- a/.gitmodules +++ b/.gitmodules @@ -126,7 +126,7 @@ url = https://github.com/CardinalModules/ihtsyn.git [submodule "deps/QuickJS"] path = deps/QuickJS - url = https://github.com/CardinalModules/QuickJS.git + url = https://github.com/JerrySievert/QuickJS.git [submodule "plugins/Autinn"] path = plugins/Autinn url = https://github.com/NikolaiVChr/Autinn.git diff --git a/Makefile b/Makefile index eab36f4..82e1086 100644 --- a/Makefile +++ b/Makefile @@ -267,9 +267,11 @@ install: # -------------------------------------------------------------- # Tarball step, for releases +# --lzma + tarball: rm -f ../cardinal-$(VERSION).tar - tar -c --lzma \ + tar -c \ --exclude=".appveyor*" \ --exclude=".ci*" \ --exclude=".clang*" \ @@ -286,10 +288,7 @@ tarball: --exclude=bin \ --exclude=build \ --exclude=carla/data \ - --exclude=carla/source/bridges-plugin \ - --exclude=carla/source/discovery \ --exclude=carla/source/frontend \ - --exclude=carla/source/jackbridge \ --exclude=carla/source/interposer \ --exclude=carla/source/libjack \ --exclude=carla/source/native-plugins/resources \ @@ -360,8 +359,10 @@ tarball: --exclude=src/Rack/src/window/Window.cpp \ --exclude=src/Rack/res/Core \ --exclude=src/Rack/res/icon.png \ + --transform='s,^\.\.,-.-.,' \ --transform='s,^\.,cardinal-$(VERSION),' \ - -f ../cardinal-$(VERSION).tar.xz . + --transform='s,^-\.-\.,..,' \ + -f ../cardinal-$(VERSION).tar . # -------------------------------------------------------------- diff --git a/carla b/carla index 74a1ae8..719246e 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit 74a1ae82c90db85f20550ddcdc8a927b8fb7e414 +Subproject commit 719246eb66462986c0702480f2d0cc1bef448eb8 diff --git a/deps/QuickJS b/deps/QuickJS index 9ed1187..3afe57a 160000 --- a/deps/QuickJS +++ b/deps/QuickJS @@ -1 +1 @@ -Subproject commit 9ed118744671f1e257ebb0d731300ba115f6cfce +Subproject commit 3afe57a8345814f89cb48df47a9f10f92da3c994