Skip to content

Commit

Permalink
Merge pull request #431 from flucoma/jby/package-presentation
Browse files Browse the repository at this point in the history
Update FluidCorpusManipulation references
  • Loading branch information
jamesb93 authored Oct 29, 2024
2 parents b11251e + 91ad311 commit fe5b47f
Show file tree
Hide file tree
Showing 18 changed files with 47 additions and 47 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/upload-artifact@v4.3.6
with:
name: winbuild
path: "release-packaging/FluidCorpusManipulation/externals/"
path: "release-packaging/Fluid Corpus Manipulation/externals/"

macbuild:
runs-on: macos-latest
Expand All @@ -48,28 +48,28 @@ jobs:
- uses: actions/upload-artifact@v4.3.6
with:
name: macbuild
path: release-packaging/FluidCorpusManipulation/
path: "release-packaging/Fluid Corpus Manipulation/""
release:
runs-on: ubuntu-latest
needs: [winbuild, macbuild]
steps:
- name: make parent folder
run : mkdir -p "FluidCorpusManipulation"
run : mkdir -p "Fluid Corpus Manipulation"

- uses: actions/download-artifact@v4.1.7
with:
name: macbuild
path: "FluidCorpusManipulation"
path: "Fluid Corpus Manipulation"

- uses: actions/download-artifact@v4.1.7
with:
name: winbuild
path: "FluidCorpusManipulation/externals"
path: "Fluid Corpus Manipulation/externals"

- name: zip
run: zip -r FluCoMa-Max-nightly.zip "FluidCorpusManipulation"
run: zip -r FluCoMa-Max-nightly.zip "Fluid Corpus Manipulation"

- uses: dev-drprasad/delete-tag-and-release@v0.2.1
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/upload-artifact@v4.3.6
with:
name: winbuild
path: "release-packaging/FluidCorpusManipulation/externals/"
path: "release-packaging/Fluid Corpus Manipulation/externals/"

macbuild:
runs-on: macos-latest
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
- uses: actions/upload-artifact@v4.3.6
with:
name: macbuild
path: release-packaging/FluidCorpusManipulation/
path: "release-packaging/Fluid Corpus Manipulation/"

- id: get-version
run: echo "version=$(cat flucoma.version.rc)" >> $GITHUB_OUTPUT
Expand All @@ -55,20 +55,20 @@ jobs:

steps:
- name: make parent folder
run : mkdir -p "FluidCorpusManipulation"
run : mkdir -p "Fluid Corpus Manipulation"

- uses: actions/download-artifact@v4.1.7
with:
name: macbuild
path: "FluidCorpusManipulation"
path: "Fluid Corpus Manipulation"

- uses: actions/download-artifact@v4.1.7
with:
name: winbuild
path: "FluidCorpusManipulation/externals"
path: "Fluid Corpus Manipulation/externals"

- name: zip
run: zip -r FluCoMa-Max-"${{ needs.macbuild.outputs.version }}".zip "FluidCorpusManipulation"
run: zip -r FluCoMa-Max-"${{ needs.macbuild.outputs.version }}".zip "Fluid Corpus Manipulation"

- name: delete pre-existing release
uses: dev-drprasad/delete-tag-and-release@v0.2.1
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)


set(MAX_INSTALL_PREFIX "." CACHE PATH "Prefix for assembling max package")
set(FLUID_PACKAGE_NAME "FluidCorpusManipulation" CACHE STRING "Name for published package")
set(FLUID_PACKAGE_NAME "Fluid Corpus Manipulation" CACHE STRING "Name for published package")
set(MAX_PACKAGE_ROOT ${MAX_INSTALL_PREFIX}/${FLUID_PACKAGE_NAME})
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/source/script")
################################################################################
Expand Down
2 changes: 1 addition & 1 deletion QuickStart.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## How to start:

1) move the full FluidCorpusManipulation folder in your Packages folder (~/Documents/Max/Packages/), and restart Max.
1) move the full Fluid Corpus Manipulation folder in your Packages folder (~/Documents/Max/Packages/), and restart Max.

There is now an 'extras' giving the overview of the toolbox, and a shortcut (shift-f) to create fluid.* objects. Full documentation, and examples, are also available.

Expand Down
8 changes: 4 additions & 4 deletions help/fluid.jit.plotter.maxhelp
Original file line number Diff line number Diff line change
Expand Up @@ -6631,7 +6631,7 @@
}
, {
"name" : "fluid.dataloader.maxpat",
"bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/patchers",
"bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/patchers",
"patcherrelativepath" : "../patchers",
"type" : "JSON",
"implicit" : 1
Expand All @@ -6642,21 +6642,21 @@
}
, {
"name" : "fluid.jit.plotter.labels2colors.js",
"bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript",
"bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript",
"patcherrelativepath" : "../javascript",
"type" : "TEXT",
"implicit" : 1
}
, {
"name" : "fluid.jit.plotter.maxpat",
"bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/patchers",
"bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/patchers",
"patcherrelativepath" : "../patchers",
"type" : "JSON",
"implicit" : 1
}
, {
"name" : "fluid.jit.plotter.resize.pworld.js",
"bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript",
"bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript",
"patcherrelativepath" : "../javascript",
"type" : "TEXT",
"implicit" : 1
Expand Down
24 changes: 12 additions & 12 deletions help/fluid.kdtree~.maxhelp
Original file line number Diff line number Diff line change
Expand Up @@ -4461,36 +4461,36 @@
}
, {
"name" : "fluid.concataudiofiles.maxpat",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/patchers",
"patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/patchers",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/patchers",
"patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/patchers",
"type" : "JSON",
"implicit" : 1
}
, {
"name" : "fluid.dsinterface.maxpat",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/patchers",
"patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/patchers",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/patchers",
"patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/patchers",
"type" : "JSON",
"implicit" : 1
}
, {
"name" : "fluid.dslink.maxpat",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/patchers",
"patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/patchers",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/patchers",
"patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/patchers",
"type" : "JSON",
"implicit" : 1
}
, {
"name" : "fluid.flucomaorg.maxpat",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/patchers",
"patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/patchers",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/patchers",
"patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/patchers",
"type" : "JSON",
"implicit" : 1
}
, {
"name" : "fluid.learn.maxpat",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/patchers",
"patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/patchers",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/patchers",
"patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/patchers",
"type" : "JSON",
"implicit" : 1
}
Expand All @@ -4504,8 +4504,8 @@
}
, {
"name" : "fluid.plotter.js",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/jsui",
"patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/jsui",
"bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/jsui",
"patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/jsui",
"type" : "TEXT",
"implicit" : 1
}
Expand Down
10 changes: 5 additions & 5 deletions help/fluid.plotter.maxhelp
Original file line number Diff line number Diff line change
Expand Up @@ -6828,7 +6828,7 @@
}
, {
"name" : "fluid.dataloader.maxpat",
"bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/patchers",
"bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/patchers",
"patcherrelativepath" : "../patchers",
"type" : "JSON",
"implicit" : 1
Expand All @@ -6839,21 +6839,21 @@
}
, {
"name" : "fluid.jit.plotter.labels2colors.js",
"bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript",
"bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript",
"patcherrelativepath" : "../javascript",
"type" : "TEXT",
"implicit" : 1
}
, {
"name" : "fluid.jit.plotter.maxpat",
"bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/patchers",
"bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/patchers",
"patcherrelativepath" : "../patchers",
"type" : "JSON",
"implicit" : 1
}
, {
"name" : "fluid.jit.plotter.resize.pworld.js",
"bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript",
"bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript",
"patcherrelativepath" : "../javascript",
"type" : "TEXT",
"implicit" : 1
Expand All @@ -6876,7 +6876,7 @@
}
, {
"name" : "fluid.plotter.js",
"bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/jsui",
"bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/jsui",
"patcherrelativepath" : "../jsui",
"type" : "TEXT",
"implicit" : 1
Expand Down
2 changes: 1 addition & 1 deletion local_docs/fluid.audiofilesin.maxref.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC)
under the European Union’s Horizon 2020 research and innovation programme
(grant agreement No 725899).
-->
<c74object name='fluid.audiofilesin' category='FluidCorpusManuipulation'>
<c74object name='fluid.audiofilesin' category='Fluid Corpus Manipulation'>
<digest>Collect audio from a directory</digest>
<description>A convenience abstraction for collecting all audio files in a directory into a list.</description>
<discussion>
Expand Down
2 changes: 1 addition & 1 deletion local_docs/fluid.buf2list.maxref.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC)
under the European Union’s Horizon 2020 research and innovation programme
(grant agreement No 725899).
-->
<c74object name='fluid.buf2list' category='FluidCorpusManuipulation'>
<c74object name='fluid.buf2list' category='Fluid Corpus Manipulation'>
<digest>Copy the contents of a buffer~ to a list</digest>
<description>A simplified workflow for extracting numerical data from buffers as lists of numbers.</description>
<discussion>
Expand Down
2 changes: 1 addition & 1 deletion local_docs/fluid.concataudiofiles.maxref.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC)
under the European Union’s Horizon 2020 research and innovation programme
(grant agreement No 725899).
-->
<c74object name='fluid.concataudiofiles' category='FluidCorpusManuipulation'>
<c74object name='fluid.concataudiofiles' category='Fluid Corpus Manipulation'>
<digest>Concatenate audio files</digest>
<description>Concatenate a list of audio files into a single buffer~.</description>
<discussion>
Expand Down
2 changes: 1 addition & 1 deletion local_docs/fluid.jit.plotter.maxref.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC)
under the European Union’s Horizon 2020 research and innovation programme
(grant agreement No 725899).
-->
<c74object name='fluid.jit.plotter' category='FluidCorpusManuipulation'>
<c74object name='fluid.jit.plotter' category='Fluid Corpus Manipulation'>
<digest>Plot very large 2D datasets fast.</digest>
<description>An abstraction around jit.pworld that plots data in a two-dimensional graph. Similar to fluid.plotter, but more performant on large datasets.</description>
<discussion>
Expand Down
2 changes: 1 addition & 1 deletion local_docs/fluid.list2buf.maxref.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC)
under the European Union’s Horizon 2020 research and innovation programme
(grant agreement No 725899).
-->
<c74object name='fluid.list2buf' category='FluidCorpusManuipulation'>
<c74object name='fluid.list2buf' category='Fluid Corpus Manipulation'>
<digest>Copy a list to a buffer~</digest>
<description>Copies the values of a list to a buffer~.</description>
<discussion>
Expand Down
2 changes: 1 addition & 1 deletion local_docs/fluid.plotter.maxref.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC)
under the European Union’s Horizon 2020 research and innovation programme
(grant agreement No 725899).
-->
<c74object name='fluid.plotter' category='FluidCorpusManuipulation'>
<c74object name='fluid.plotter' category='Fluid Corpus Manipulation'>
<digest>Plot data in a two-dimensional graph.</digest>
<description>A JSUI object that plots data in a two-dimensional graph.</description>
<discussion>
Expand Down
2 changes: 1 addition & 1 deletion local_docs/fluid.waveform~.maxref.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC)
under the European Union’s Horizon 2020 research and innovation programme
(grant agreement No 725899).
-->
<c74object name='fluid.waveform~' category='FluidCorpusManuipulation'>
<c74object name='fluid.waveform~' category='Fluid Corpus Manipulation'>
<digest>Visualise audio waveforms and data.</digest>
<description>A JSUI object for visualising waveforms, feature data, slices and spectrograms.</description>
<discussion>
Expand Down
2 changes: 1 addition & 1 deletion package-info.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description" : "FluCoMa introduces a suite of tools to Max that can help you work with sounds and collections of them in new and flexible ways. Possibilities include slicing, decomposition and hybridisation of sounds, audio-descriptor analysis and machine learning driven musicking. The package links out to a body of educational content, tutorials, and inspirational examples from the world of FluCoMa and Max users.",
"homepatcher" : "Fluid Corpus Manipulation Toolkit.maxpat",
"max_version_min" : "7.0",
"name" : "FluidCorpusManipulation",
"name" : "Fluid Corpus Manipulation",
"os" : {
"macintosh" : {
"platform" : [ "aarch64", "x64" ],
Expand Down
4 changes: 2 additions & 2 deletions patchers/fluid.jit.plotter.maxpat
Original file line number Diff line number Diff line change
Expand Up @@ -12595,14 +12595,14 @@
}
, {
"name" : "fluid.jit.plotter.labels2colors.js",
"bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript",
"bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript",
"patcherrelativepath" : "../javascript",
"type" : "TEXT",
"implicit" : 1
}
, {
"name" : "fluid.jit.plotter.resize.pworld.js",
"bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript",
"bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript",
"patcherrelativepath" : "../javascript",
"type" : "TEXT",
"implicit" : 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<?xml-stylesheet href="_c74_vig.xsl" type="text/xsl"?>
<vignette name="Automatic buffer~ and fluid.dataset~ management" package="FluidCorpusManipulation">
<vignette name="Automatic buffer~ and fluid.dataset~ management" package="Fluid Corpus Manipulation">
<h1>Automatic <o>buffer~</o> and <o>fluid.dataset~</o> management.</h1>

<h2><o>buffer~</o> and <o>fluid.dataset~</o> management.</h2>
Expand Down
2 changes: 1 addition & 1 deletion vignettes/flucoma/bufcompose_macros.maxvig.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<?xml-stylesheet href="_c74_vig.xsl" type="text/xsl"?>
<vignette name="fluid.bufcompose~ macros" package="FluidCorpusManipulation">
<vignette name="fluid.bufcompose~ macros" package="Fluid Corpus Manipulation">
<h1><o>fluid.bufcompose~</o> macros</h1>

<bluebox>
Expand Down

0 comments on commit fe5b47f

Please sign in to comment.