From 7080db8c01d44f0e691873c340520b4a1aa5856b Mon Sep 17 00:00:00 2001 From: david-c14 <10398567+david-c14@users.noreply.github.com> Date: Tue, 16 Nov 2021 08:21:29 +0000 Subject: [PATCH] Bring up to date with latest RC 588342d7 --- .github/actions/build_linux/entrypoint.sh | 2 +- .github/actions/build_osx/Dockerfile | 18 ----------------- .github/actions/build_osx/entrypoint.sh | 19 ------------------ .github/actions/build_win/entrypoint.sh | 2 +- .github/actions/upload_zip/script.sh | 24 ----------------------- .github/workflows/buildRelease.yml | 11 ++++------- .github/workflows/buildV2.yml | 22 ++++++++------------- src/LT1.cpp | 5 ++++- src/WM1.cpp | 6 ++---- src/shared/EventWidgets.cpp | 1 - src/shared/SizeableModuleWidget.cpp | 1 - src/shared/SubTooltip.cpp | 2 -- 12 files changed, 20 insertions(+), 93 deletions(-) delete mode 100644 .github/actions/build_osx/Dockerfile delete mode 100644 .github/actions/build_osx/entrypoint.sh delete mode 100644 .github/actions/upload_zip/script.sh diff --git a/.github/actions/build_linux/entrypoint.sh b/.github/actions/build_linux/entrypoint.sh index 09bad89c..29ac645c 100644 --- a/.github/actions/build_linux/entrypoint.sh +++ b/.github/actions/build_linux/entrypoint.sh @@ -7,7 +7,7 @@ export RACK_USER_DIR=${GITHUB_WORKSPACE} git submodule update --init --recursive -curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip +curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-lin.zip -o rack-sdk.zip unzip -o rack-sdk.zip rm rack-sdk.zip diff --git a/.github/actions/build_osx/Dockerfile b/.github/actions/build_osx/Dockerfile deleted file mode 100644 index e4e1a0f3..00000000 --- a/.github/actions/build_osx/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ - -FROM debian - -LABEL "com.github.actions.name"="VCVRackPluginBuilder-OSX" -LABEL "com.github.actions.description"="Builds a VCV Rack plugin for OS X" -LABEL "com.github.actions.icon"="headphones" -LABEL "com.github.actions.color"="purple" - -LABEL "repository"="TBD" -LABEL "homepage"="TBD" -LABEL "maintainer"="dewb" - -RUN brew install git wget cmake autoconf automake libtool jq python zstd - -ADD entrypoint.sh /entrypoint.sh -RUN chmod a+x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/build_osx/entrypoint.sh b/.github/actions/build_osx/entrypoint.sh deleted file mode 100644 index 2d867bdd..00000000 --- a/.github/actions/build_osx/entrypoint.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -set -eu - -export RACK_DIR=${GITHUB_WORKSPACE}/Rack-SDK -export RACK_USER_DIR=${GITHUB_WORKSPACE} - -export CC=x86_64-apple-darwin15-clang -export CXX=x86_64-apple-darwin15-clang++ -export STRIP=x86_64-apple-darwin15-strip - -git submodule update --init --recursive - -curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip -unzip -o rack-sdk.zip -rm rack-sdk.zip - -make clean -make dist diff --git a/.github/actions/build_win/entrypoint.sh b/.github/actions/build_win/entrypoint.sh index 59b900fe..f434d8ac 100644 --- a/.github/actions/build_win/entrypoint.sh +++ b/.github/actions/build_win/entrypoint.sh @@ -11,7 +11,7 @@ export STRIP=x86_64-w64-mingw32-strip git submodule update --init --recursive -curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip +curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-win.zip -o rack-sdk.zip unzip -o rack-sdk.zip rm rack-sdk.zip diff --git a/.github/actions/upload_zip/script.sh b/.github/actions/upload_zip/script.sh deleted file mode 100644 index aa184761..00000000 --- a/.github/actions/upload_zip/script.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -eu - -GITHUB_API_URL=https://api.github.com - -GITHUB_TOKEN=$1 - -# Get release url -curl -o release.json \ - --header "Authorization: token ${GITHUB_TOKEN}" \ - --request GET \ - ${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/${GITHUB_REF#"refs/"} - -UPLOAD_URL=$(jq -r .upload_url release.json) - -ASSET_PATH=$(ls dist/*.vcvplugin) - -curl -i \ - --header "Authorization: token ${GITHUB_TOKEN}" \ - --header "Content-Type: application/zstd" \ - --request POST \ - --data-binary @"${ASSET_PATH}" \ - ${UPLOAD_URL%"{?name,label\}"}?name=${ASSET_PATH#"dist/"} diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml index 3e8a7acf..e447b1a6 100644 --- a/.github/workflows/buildRelease.yml +++ b/.github/workflows/buildRelease.yml @@ -5,12 +5,11 @@ name: Release env: RACK_DIR: ${GITHUB_WORKSPACE}/Rack-SDK RACK_USER_DIR: ${GITHUB_WORKSPACE} + RACK_SDK_VERSION: 2.git.588342d7 jobs: buildLinux: name: Build Linux runs-on: ubuntu-latest - env: - RACK_SDK_VERSION: 2.git.219bbaf1-lin steps: - uses: actions/checkout@master - name: Build Linux @@ -20,8 +19,6 @@ jobs: buildWindows: name: Build Windows runs-on: ubuntu-latest - env: - RACK_SDK_VERSION: 2.git.219bbaf1-win steps: - uses: actions/checkout@master - name: Build Windows @@ -31,18 +28,18 @@ jobs: buildOsx: name: Build OSX runs-on: macos-10.15 - env: - RACK_SDK_VERSION: 2.git.219bbaf1-mac steps: - uses: actions/checkout@master - name: install tools run: brew install automake - name: get Rack-SDK - run: curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip + run: curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-mac.zip -o rack-sdk.zip - name: unzip SDK run: unzip -o rack-sdk.zip - name: clean up SDK run: rm rack-sdk.zip + - name: update submodules + run: git submodules update --init --recursive - name: make run: make dist - name: upload zip diff --git a/.github/workflows/buildV2.yml b/.github/workflows/buildV2.yml index 02fa286d..c22f02f6 100644 --- a/.github/workflows/buildV2.yml +++ b/.github/workflows/buildV2.yml @@ -4,22 +4,16 @@ on: - v2q name: V2 env: - RACK_SDK_VERSION: 2.git.219bbaf1-mac + RACK_SDK_VERSION: 2.git.588342d7 RACK_DIR: ${GITHUB_WORKSPACE}/Rack-SDK RACK_USER_DIR: ${GITHUB_WORKSPACE} jobs: - buildOSX: - name: Build OSX - runs-on: macos-10.15 + buildLinux: + name: Build Linux + runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: install tools - run: brew install automake - - name: get Rack-SDK - run: curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip - - name: unzip SDK - run: unzip -o rack-sdk.zip - - name: clean up SDK - run: rm rack-sdk.zip - - name: make - run: make dist + - name: Build Linux + uses: ./.github/actions/build_linux + - name: upload zip + run: sh ./.github/actions/upload_plugin_lin/script.sh ${{ secrets.GITHUB_TOKEN }} diff --git a/src/LT1.cpp b/src/LT1.cpp index f1201726..085ac096 100644 --- a/src/LT1.cpp +++ b/src/LT1.cpp @@ -767,7 +767,10 @@ struct LT116 : SchemeModuleWidget { } void normaliseAll() { bulkChangeWithHistory("LT116 normalise all columns", [=](float *params) { - __m128 a1, a2, a3, a4 = _mm_setzero_ps(); + __m128 a1 = _mm_setzero_ps(); + __m128 a2 = _mm_setzero_ps(); + __m128 a3 = _mm_setzero_ps(); + __m128 a4 = _mm_setzero_ps(); for (int i = 0; i < 256; i += 16) { __m128 s = _mm_load_ps(params + i); a1 = _mm_add_ps(a1, s); diff --git a/src/WM1.cpp b/src/WM1.cpp index 18c1f559..e69de228 100644 --- a/src/WM1.cpp +++ b/src/WM1.cpp @@ -1,6 +1,4 @@ //SubTag W10 WP AM -#include -#include #include #include "SubmarineFree.hpp" @@ -1184,8 +1182,8 @@ struct WM101 : SizeableModuleWidget, WM_Base { lastCable = NULL; highlightIsDirty = true; } - if (wirePanel->visible && APP->scene->rack->incompleteCable) { - colorCable(APP->scene->rack->incompleteCable,NULL); + if (wirePanel->visible && APP->scene->rack->getIncompleteCable()) { + colorCable(APP->scene->rack->getIncompleteCable(),NULL); } highlightWires(); SizeableModuleWidget::step(); diff --git a/src/shared/EventWidgets.cpp b/src/shared/EventWidgets.cpp index a68e43c9..e0a7373d 100755 --- a/src/shared/EventWidgets.cpp +++ b/src/shared/EventWidgets.cpp @@ -1,4 +1,3 @@ -#include #include "../SubmarineFree.hpp" void EventWidgetAction::undo() { diff --git a/src/shared/SizeableModuleWidget.cpp b/src/shared/SizeableModuleWidget.cpp index 7bc8acd3..9829f6e0 100755 --- a/src/shared/SizeableModuleWidget.cpp +++ b/src/shared/SizeableModuleWidget.cpp @@ -1,4 +1,3 @@ -#include #include "../SubmarineFree.hpp" json_t *SizeableModule::dataToJson() { diff --git a/src/shared/SubTooltip.cpp b/src/shared/SubTooltip.cpp index 94fbcb3d..7bc5b62b 100755 --- a/src/shared/SubTooltip.cpp +++ b/src/shared/SubTooltip.cpp @@ -1,8 +1,6 @@ -#include #include "../SubmarineFree.hpp" void SubTooltip::step() { if (stepLambda != NULL) stepLambda(); - //Tooltip::step(); }