[Release] 1.0.0-beta7

.github/workflows/nightly.yaml → .github/workflows/nightly.yml

@@ -5,26 +5,15 @@ on:
   push:
     branches: [ dev, ci/** ]
 
-jobs:
-  docs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: flucoma/actions/env@v4      
-      - uses: flucoma/actions/docs@v4
-        with:
-          target: MAKE_MAX_REF
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: docsbuild
-          path: build/max_ref
-
+jobs: 
   winbuild:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: flucoma/actions/env@v4
-      - uses: flucoma/actions/max@v4
+      - uses: flucoma/actions/env@v5
+      - uses: flucoma/actions/max@v5
+        with:
+          branch: origin/dev
 
       - uses: actions/upload-artifact@v2
         with:
@@ -35,8 +24,10 @@ jobs:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
-      - uses: flucoma/actions/env@v4
-      - uses: flucoma/actions/max@v4
+      - uses: flucoma/actions/env@v5
+      - uses: flucoma/actions/max@v5
+        with:
+          branch: origin/dev
 
       - uses: actions/upload-artifact@v2
         with:
@@ -45,7 +36,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: [winbuild, macbuild, docs]
+    needs: [winbuild, macbuild]
 
     steps:
       - name: make parent folder
@@ -60,18 +51,10 @@ jobs:
         with:
           name: winbuild
           path: "FluidCorpusManipulation/externals"
-
-      - uses: actions/download-artifact@v2
-        with:
-          name: docsbuild
-          path: "FluidCorpusManipulation/docs"
 
       - name: zip
         run: zip -r FluCoMa-Max-nightly.zip "FluidCorpusManipulation"
 
-      - name: see
-        run: ls
-
       - uses: dev-drprasad/[email protected]
         with:
           delete_release: true # default: false

.github/workflows/release.yml

@@ -1,37 +1,16 @@
 name: Release
 on:
   workflow_dispatch:
-    inputs:
-      base:
-        description: 'Base branch to deploy core from'
-        required: false
-        default: 'main'
 
-jobs:
-  docs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: flucoma/actions/env@v4
-        with:
-          branch: ${{ github.event.inputs.base }} 
-      - uses: flucoma/actions/docs@v4
-        with:
-          target: MAKE_MAX_REF
-          branch: ${{ github.event.inputs.base }} 
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: docsbuild
-          path: build/max_ref
-
+jobs:          
   winbuild:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: flucoma/actions/env@v4
+      - uses: flucoma/actions/env@v5
+      - uses: flucoma/actions/max@v5
         with:
-          branch: ${{ github.event.inputs.base }} 
-      - uses: flucoma/actions/max@v4
+          branch: origin/main
 
       - uses: actions/upload-artifact@v2
         with:
@@ -44,10 +23,10 @@ jobs:
       version: ${{ steps.get-version.outputs.version }}
     steps:
       - uses: actions/checkout@v2
-      - uses: flucoma/actions/env@v4
+      - uses: flucoma/actions/env@v5
+      - uses: flucoma/actions/max@v5
         with:
-          branch: ${{ github.event.inputs.base }} 
-      - uses: flucoma/actions/max@v4
+          branch: origin/main
 
       - uses: actions/upload-artifact@v2
         with:
@@ -56,11 +35,11 @@ jobs:
 
       - id: get-version
         run: echo "::set-output name=version::$(cat flucoma.version.rc)"
-        working-directory: core
+        working-directory: build/_deps/flucoma-core-src
 
   release:
     runs-on: ubuntu-latest
-    needs: [winbuild, macbuild, docs]
+    needs: [winbuild, macbuild]
 
     steps:
       - name: make parent folder
@@ -75,11 +54,6 @@ jobs:
         with:
           name: winbuild
           path: "FluidCorpusManipulation/externals"
-
-      - uses: actions/download-artifact@v2
-        with:
-          name: docsbuild
-          path: "FluidCorpusManipulation/docs"
 
       - name: zip
         run: zip -r FluCoMa-Max-"${{ needs.macbuild.outputs.version }}".zip "FluidCorpusManipulation"

CMakeLists.txt

@@ -6,7 +6,13 @@
 # under the European Union’s Horizon 2020 research and innovation programme
 # (grant agreement No 725899).
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.18)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging" CACHE PATH "")
 ################################################################################
 # Paths
 set(MAX_TARGET_NAMESPACE "" CACHE STRING "Optional namesapce to prepend to targets to prevent collision in superbuilds")
@@ -17,6 +23,8 @@ endif()
 
 set(FLUID_PATH "" CACHE PATH "Optional path to the Fluid Decomposition repo")
 
+set(FLUID_BRANCH "origin/main" CACHE STRING "Branch to pull flucoma dependencies from")
+
 option(DOCS "Generate Max XML documentation" OFF)
 set(FLUID_DOCS_PATH "" CACHE PATH "Optional path to flucoma-docs (needed for docs)")
 
@@ -30,31 +38,35 @@ endif()
 
 ################################################################################
 # Main Action
-project (flucoma-max LANGUAGES CXX)
+project (flucoma-max LANGUAGES C CXX)
 
 set(CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY ON)
 set(AUTHOR_DOMAIN "org.flucoma")
 string(TIMESTAMP "%Y" THISYEAR)
 set(COPYRIGHT_STRING "Copyright (c) 2017-${THISYEAR} University of Huddersfield")
 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(MAX_PACKAGE_ROOT ${MAX_INSTALL_PREFIX}/${FLUID_PACKAGE_NAME})
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/source/script")
 ################################################################################
 # Fetch / link to dependencies
 include(FetchContent)
 
-set(FETCHCONTENT_QUIET FALSE)
-
 FetchContent_Declare(
   flucoma-core
   GIT_REPOSITORY https://github.com/flucoma/flucoma-core.git
   GIT_PROGRESS TRUE
-  GIT_TAG origin/main
+  GIT_TAG ${FLUID_BRANCH}
 )
 
 FetchContent_Declare(
   flucoma-docs
   GIT_REPOSITORY https://github.com/flucoma/flucoma-docs.git
   GIT_PROGRESS TRUE  
-  GIT_TAG origin/main
+  GIT_TAG ${FLUID_BRANCH}
 )
 
 if(FLUID_PATH)
@@ -63,42 +75,36 @@ if(FLUID_PATH)
   )
 endif()
 
-FetchContent_GetProperties(flucoma-core)
+FetchContent_MakeAvailable(flucoma-core)
+
+file(GLOB FLUCOMA_CORE_RESOURCES "${flucoma-core_SOURCE_DIR}/Resources/Data/*.*")
+file(COPY ${FLUCOMA_CORE_RESOURCES} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/misc")
+include(flucoma_version)
+include(flucoma-buildtools)
+include(flucoma-buildtype)
+
+get_property(FLUCOMA_VERSION_TAG GLOBAL PROPERTY FLUCOMA_VERSION_SHA)
+configure_file(package-info.json.in "${CMAKE_CURRENT_SOURCE_DIR}/package-info.json")
 
-if(NOT flucoma-core_POPULATED)
-  FetchContent_Populate(flucoma-core)
-  add_subdirectory(${flucoma-core_SOURCE_DIR} ${flucoma-core_BINARY_DIR})  
-  file(GLOB FLUCOMA_CORE_RESOURCES ${flucoma-core_SOURCE_DIR}/Resources/Data/*.*)
-  file(COPY ${FLUCOMA_CORE_RESOURCES} DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/misc)
-  include(flucoma_version)
-  include(flucoma-buildtools)
-  include(flucoma-buildtype)
-endif()
 
 set_if_toplevel(VAR CMAKE_LIBRARY_OUTPUT_DIRECTORY
                 TOPLEVEL "${CMAKE_CURRENT_SOURCE_DIR}/externals"
                 SUPERBUILD "${CMAKE_SOURCE_DIR}/max_externals")
 
-if(DOCS)
-
+if(DOCS)  
   set(MAX_DOC_OUT "${CMAKE_SOURCE_DIR}/docs" CACHE PATH "")
 
   if(FLUID_DOCS_PATH)
     get_filename_component(
       FETCHCONTENT_SOURCE_DIR_FLUCOMA-DOCS ${FLUID_DOCS_PATH} ABSOLUTE
     )
   endif()
-
-  FetchContent_GetProperties(flucoma-docs)
-  if(NOT flucoma-docs_POPULATED)
-    FetchContent_Populate(flucoma-docs)
-    file(GLOB_RECURSE DOC_SOURCE RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${flucoma-docs_SOURCE_DIR}/**/*.cpp" )
-    source_group("\\XML Doc Gen" FILES ${DOC_SOURCE})
-    add_subdirectory(${flucoma-docs_SOURCE_DIR} ${flucoma-docs_BINARY_DIR})
-  endif()
-
-
 
+  FetchContent_MakeAvailable(flucoma-docs)
+  include(FlucomaDocs)
+  set(MAX_DOC_OUT "${CMAKE_BINARY_DIR}/max_ref")
+  add_ref_target(max "Making Max ref")
+  # endif()
   add_custom_target(MAX_MAKE_DOCS ALL DEPENDS MAKE_MAX_REF)
 endif()
 
@@ -108,13 +114,8 @@ FetchContent_Declare(
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
 )
+FetchContent_MakeAvailable(fluid_waveform)
 
-if(NOT fluid_waveform_POPULATED)
-  FetchContent_Populate(fluid_waveform)
-endif() 
-
-# Misc setup and subroutines
-include("${CMAKE_CURRENT_SOURCE_DIR}/source/script/max-package.cmake")
 
 ################################################################################
 # Max Wrapper
@@ -125,41 +126,63 @@ target_sources(
 	"${CMAKE_CURRENT_SOURCE_DIR}/source/include/MaxBufferAdaptor.hpp"
 )
 
-################################################################################
-# Generate a project for every folder in the "source/projects" folder
-SUBDIRLIST(PROJECT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/source/projects")
-foreach (project_dir ${PROJECT_DIRS})
-	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/source/projects/${project_dir}/CMakeLists.txt")
-		message("Generating: ${MAX_TARGET_NAMESPACE}${project_dir}")
-		add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/source/projects/${project_dir}")
-    source_group("" FILES "${project_dir}.cpp")
-	endif ()
-endforeach ()
+target_include_directories(FLUID_MAX INTERFACE 
+  "${CMAKE_CURRENT_SOURCE_DIR}/source/include"
+)
+
+include(MakeMaxSources)
+include(SetupMaxSDK)
+
+# generate targets for standalone clients
+get_client_group(NONE client_list)
+foreach(client ${client_list}) 
+  get_core_client_header(${client} header)   
+  get_core_client_class(${client} class)   
+  generate_max_source(
+    CLIENTS ${client} 
+    HEADERS ${header} 
+    CLASSES ${class} 
+  )
+endforeach()
+
+#generate target for MANIPULATION group 
+get_client_group(MANIPULATION client_list)
+foreach(client ${client_list})  
+  get_core_client_header(${client} header)  
+  get_core_client_class(${client} class)  
+  list(APPEND MANIPULATION_CLIENTS ${client})
+  list(APPEND MANIPULATION_HEADERS ${header})
+  list(APPEND MANIPULATION_CLASSES ${class})
+endforeach()
+
+generate_max_source(
+  CLIENTS ${MANIPULATION_CLIENTS}
+  HEADERS ${MANIPULATION_HEADERS}
+  CLASSES ${MANIPULATION_CLASSES}
+  FILENAME fluid.libmanipulation 
+)
+
+add_max_external(fluid.list2buf "${CMAKE_CURRENT_SOURCE_DIR}/source/projects/fluid.list2buf/fluid.list2buf.cpp")
+add_max_external(fluid.buf2list "${CMAKE_CURRENT_SOURCE_DIR}/source/projects/fluid.buf2list/fluid.buf2list.cpp")
 
-################################################################################
 #install bits. Max packages bundle Windows and Mac builds together
-set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging")
-set(MAX_INSTALL_PREFIX "." CACHE PATH "Prefix for assembling max package")
-set(FLUID_PACKAGE_NAME "FluidCorpusManipulation" CACHE STRING "Name for published package")
-set(MAX_PACKAGE_ROOT ${MAX_INSTALL_PREFIX}/${FLUID_PACKAGE_NAME})
 
 foreach(PACKAGE_DIRECTORY examples;extras;help;init;patchers;interfaces;javascript;jsui;misc)
   install(DIRECTORY ${PACKAGE_DIRECTORY} DESTINATION ${MAX_PACKAGE_ROOT})
 endforeach(PACKAGE_DIRECTORY)
 
-install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ 
-        DESTINATION ${MAX_PACKAGE_ROOT}/externals 
-        FILES_MATCHING REGEX "\\.(mxo|mxe|mxe64)")
-
 install(DIRECTORY "${flucoma-core_SOURCE_DIR}/Resources/AudioFiles/" 
-        DESTINATION ${MAX_PACKAGE_ROOT}/media)
+        DESTINATION "${MAX_PACKAGE_ROOT}/media")
 install(DIRECTORY "${flucoma-core_SOURCE_DIR}/Resources/Data/"
-        DESTINATION ${MAX_PACKAGE_ROOT}/misc)
+        DESTINATION "${MAX_PACKAGE_ROOT}/misc")
 install(FILES icon.png package-info.json QuickStart.md 
         DESTINATION ${MAX_PACKAGE_ROOT})
 install(FILES ${flucoma-core_SOURCE_DIR}/distribution.lic 
         DESTINATION ${MAX_PACKAGE_ROOT} 
         RENAME LICENSE.md)
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/local_docs/"
+        DESTINATION "${MAX_PACKAGE_ROOT}/docs")
+
 if(DOCS)
   install(DIRECTORY "${MAX_DOC_OUT}/" 
           DESTINATION "${MAX_PACKAGE_ROOT}/docs"