Merge pull request #68 from flucoma/dev

[Release] 1.0.2

Author: James Bradbury

.github/workflows/nightly.yml

@@ -1,34 +1,47 @@
-name: Nightly Releases
+name: nightly
 
 on:
   workflow_dispatch:
   push:
     branches: [ dev, ci/** ]
 
+concurrency:
+  group: environment-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   macbuild:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: flucoma/actions/env@v5 
+      - uses: actions/checkout@v3
+      - uses: flucoma/actions/env@main 
       - uses: flucoma/actions/pd@v5
         with:
           branch: origin/dev
 
-      - name: compress archive
-        run: zip -r FluCoMa-PD-Mac-nightly.zip FluidCorpusManipulation
-        working-directory: release-packaging
-
-      - uses: actions/upload-artifact@v2
+      - name: sign binaries
+        uses: flucoma/actions/distribution@main
+        with:
+          glob: '-e pd_darwin'
+          package: 'release-packaging'
+          output_type: 'dmg'
+          output: FluCoMa-PD-Mac-nightly
+          cert: ${{ secrets.CERT }}
+          certpwd: ${{ secrets.CERTPWD }}
+          teamid: ${{ secrets.WWDRTEAMID }}
+          apppwd: ${{ secrets.APPSTORECONNECTPWD }}
+          appusr: ${{ secrets.APPSTORECONNECTUSERNAME }}
+
+      - uses: actions/upload-artifact@v3
         with:
           name: macbuild
-          path: release-packaging/FluCoMa-PD-Mac-nightly.zip
+          path: release-packaging/FluCoMa-PD-Mac-nightly.dmg
 
   winbuild:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: flucoma/actions/env@v5         
+      - uses: actions/checkout@v3
+      - uses: flucoma/actions/env@main         
       - uses: flucoma/actions/pd@v5
         with:
           branch: origin/dev
@@ -37,16 +50,16 @@ jobs:
         run: 7z a FluCoMa-PD-Windows-nightly.zip FluidCorpusManipulation
         working-directory: release-packaging
 
-      - uses: actions/upload-artifact@v2 
+      - uses: actions/upload-artifact@v3 
         with:
           name: winbuild
           path: release-packaging/FluCoMa-PD-Windows-nightly.zip
 
   linuxbuild:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: flucoma/actions/env@v5 
+      - uses: actions/checkout@v3
+      - uses: flucoma/actions/env@main 
       - uses: flucoma/actions/pd@v5
         with:
           branch: origin/dev
@@ -55,7 +68,7 @@ jobs:
         run: tar -zcvf FluCoMa-PD-Linux-nightly.tar.gz FluidCorpusManipulation
         working-directory: release-packaging
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: linuxbuild 
           path: release-packaging/FluCoMa-PD-Linux-nightly.tar.gz
@@ -94,7 +107,7 @@ jobs:
         with:
           name: FluCoMa PureData Nightly Release
           body: "This is a nightly build of the FluCoMa PureData package. As such, be warned there may be bugs or other unexpected behaviour. The build hash is ${{ github.sha }}"
-          files: FluCoMa-PD-*
+          files: FluCoMa*
           prerelease: true
           tag_name: nightly
           draft: false

.github/workflows/release.yml

@@ -1,31 +1,40 @@
-name: Release
+name: release
 on:
   workflow_dispatch:
 
 jobs:
   macbuild:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: flucoma/actions/env@v5 
+      - uses: actions/checkout@v3
+      - uses: flucoma/actions/env@main 
       - uses: flucoma/actions/pd@v5
         with:
           branch: origin/main
 
-      - name: compress archive
-        run: zip -r FluCoMa-PD-Mac.zip FluidCorpusManipulation
-        working-directory: release-packaging
+      - name: sign binaries
+        uses: flucoma/actions/distribution@main
+        with:
+          glob: '-e pd_darwin'
+          package: 'release-packaging'
+          output_type: 'dmg'
+          output: FluCoMa-PD-Mac
+          cert: ${{ secrets.CERT }}
+          certpwd: ${{ secrets.CERTPWD }}
+          teamid: ${{ secrets.WWDRTEAMID }}
+          apppwd: ${{ secrets.APPSTORECONNECTPWD }}
+          appusr: ${{ secrets.APPSTORECONNECTUSERNAME }}
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: macbuild
-          path: release-packaging/FluCoMa-PD-Mac.zip
+          path: release-packaging/FluCoMa-PD-Mac.dmg
 
   winbuild:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: flucoma/actions/env@v5         
+      - uses: actions/checkout@v3
+      - uses: flucoma/actions/env@main         
       - uses: flucoma/actions/pd@v5
         with:
           branch: origin/main
@@ -34,18 +43,18 @@ jobs:
         run: 7z a FluCoMa-PD-Windows.zip FluidCorpusManipulation
         working-directory: release-packaging
 
-      - uses: actions/upload-artifact@v2 
+      - uses: actions/upload-artifact@v3 
         with:
           name: winbuild
           path: release-packaging/FluCoMa-PD-Windows.zip
 
   linuxbuild:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.get-version.outputs.version }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: flucoma/actions/env@v5
+      - uses: actions/checkout@v3
+      - uses: flucoma/actions/env@main
       - uses: flucoma/actions/pd@v5
         with:
           branch: origin/main 
@@ -54,7 +63,7 @@ jobs:
         run: tar -zcvf FluCoMa-PD-Linux.tar.gz FluidCorpusManipulation
         working-directory: release-packaging
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: linuxbuild 
           path: release-packaging/FluCoMa-PD-Linux.tar.gz

CMakeLists.txt

@@ -42,7 +42,7 @@ if (APPLE)
   string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++")
 endif()
 
-project (flucoma-pd LANGUAGES CXX)
+project (flucoma-pd LANGUAGES CXX C)
 
 set(CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY ON)
 
@@ -153,6 +153,7 @@ generate_pd_source(
 )
 
 add_pd_external(fluid.bufinfo "${CMAKE_CURRENT_SOURCE_DIR}/src/fluid.bufinfo/fluid.bufinfo.cpp")
+add_pd_external(fluid.waveform "${CMAKE_CURRENT_SOURCE_DIR}/src/fluid.waveform/fluid.waveform.c")
 
 target_include_directories(fluid.bufinfo PRIVATE 
   "${CMAKE_CURRENT_SOURCE_DIR}/include"
@@ -186,6 +187,8 @@ install(FILES ${flucoma-core_SOURCE_DIR}/distribution.lic
         RENAME LICENSE.md)
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/FluidCorpusManipulationOverview.pd 
         DESTINATION ${PD_PACKAGE_ROOT})
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/local_docs/"
+        DESTINATION "${PD_PACKAGE_ROOT}/docs")
 if(DOCS)
   install(DIRECTORY "${PD_DOC_OUT}/" 
           DESTINATION "${PD_PACKAGE_ROOT}/docs" 

FluidCorpusManipulationOverview.pd

@@ -1,7 +1,7 @@
-#N struct 1055-draw-item float x float y float c float a float b;
-#N struct 1028-rectangle float x float c;
-#N struct 1028-pixel float x0 float y0 float x1 float y1;
-#N canvas 0 23 705 747 12;
+#N struct 1110-draw-item float x float y float c float a float b;
+#N struct 1014-rectangle float x float c;
+#N struct 1014-pixel float x0 float y0 float x1 float y1;
+#N canvas 0 23 705 811 12;
 #X obj 285 237 fluid.ampslice~;
 #X obj 285 147 fluid.onsetslice~;
 #X obj 285 207 fluid.noveltyslice~;
@@ -126,7 +126,15 @@
 #X obj 496 1671 fluid.bufflatten;
 #X obj 286 1701 fluid.bufselect;
 #X obj 496 1701 fluid.bufselectevery;
-#X text 146 1730 Data-Viewing GUI;
-#X obj 286 1731 fluid.plotter;
 #X obj 494 1494 fluid.grid;
 #X obj 494 1464 fluid.skmeans;
+#X text 146 1879 Data-Viewing GUI;
+#X obj 286 1876 fluid.plotter;
+#X obj 286 1731 fluid.bufinfo;
+#X obj 286 1819 fluid.waveform 100 40 0 empty empty 0;
+#X text 118 1820 Waveform-Viewing GUI;
+#X obj 286 1790 fluid.s2f;
+#X obj 286 1762 fluid.ds2text;
+#X obj 496 1762 fluid.ls2text;
+#X text 77 1763 Dataset/Labelset Utilities;
+#X obj 496 1732 fluid.multiarray;

abstractions/fluid.ds2text.pd

@@ -5,8 +5,8 @@
 #X msg 84 39 0;
 #X msg 120 400 getlabel \$1;
 #X obj 120 377 makefilename %s;
-#X obj 85 9 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
+#X obj 85 9 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000
+#000000;
 #X obj 156 473 route getlabel;
 #X obj 156 497 list;
 #X obj 286 636 route getpoint;
@@ -34,6 +34,8 @@
 #X obj 158 223 t b;
 #X obj 289 668 t b;
 #X obj 264 26 inlet;
+#X obj 154 35 text delete \$2;
+#X msg 122 38 -1;
 #X connect 0 0 1 0;
 #X connect 1 0 11 0;
 #X connect 2 0 1 1;
@@ -57,6 +59,7 @@
 #X connect 18 0 14 0;
 #X connect 19 0 20 0;
 #X connect 19 1 3 0;
+#X connect 19 1 35 0;
 #X connect 20 0 21 0;
 #X connect 21 0 26 0;
 #X connect 22 0 24 1;
@@ -74,3 +77,4 @@
 #X connect 32 0 16 0;
 #X connect 33 0 26 0;
 #X connect 33 0 28 0;
+#X connect 35 0 34 0;

abstractions/fluid.ls2text.pd

@@ -1,4 +1,4 @@
-#N canvas 832 -1001 462 762 12;
+#N canvas 832 23 462 762 12;
 #X obj 185 267 until;
 #X obj 48 311 f;
 #X obj 91 356 + 1;
@@ -29,6 +29,9 @@
 #X obj 113 263 outlet;
 #X obj 149 191 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc
 #000000 #000000;
+#X obj 154 35 text delete \$2;
+#X msg 122 38 -1;
+#X obj 332 42 inlet;
 #X connect 0 0 1 0;
 #X connect 1 0 10 0;
 #X connect 2 0 1 1;
@@ -46,6 +49,7 @@
 #X connect 13 0 14 0;
 #X connect 14 0 15 0;
 #X connect 14 1 3 0;
+#X connect 14 1 29 0;
 #X connect 15 0 20 0;
 #X connect 16 0 9 0;
 #X connect 16 1 17 0;
@@ -61,3 +65,6 @@
 #X connect 25 0 26 0;
 #X connect 25 1 0 0;
 #X connect 27 0 11 0;
+#X connect 29 0 28 0;
+#X connect 30 0 19 0;
+#X connect 30 0 23 0;