Enable linux and mac build in workflow

.github/workflows/plugins_build.yml

@@ -1,7 +1,7 @@
 name: Csound plugins build
 
 env:
-  VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
+  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
 on:
   push:
@@ -21,15 +21,11 @@ jobs:
 
     strategy:
       matrix:
-        os: [windows-latest]
-        version: ["6.17.0"]
+        os: [windows-latest, ubuntu-latest, "macos-13"]
         include:
           - os: "windows-latest"
-            mono: ""
-          # - os: "ubuntu-latest"
-          #   mono: "mono"
-          # - os: "macos-latest"
-          #   mono: "mono"
+          - os: "ubuntu-latest"
+          - os: "macos-13"
 
     steps:
       - name: Checkout Source Code
@@ -45,55 +41,45 @@ jobs:
         run: |
           Invoke-WebRequest $env:FAUST_URL -OutFile faustInstaller.exe
           ./faustInstaller.exe /S
+          echo "C:/Program Files/Faust;C:/Program Files/Faust/lib" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           echo "C:/Program Files/csound/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           echo "OPCODE6DIR64=C:/Program Files/csound/plugins64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           echo "PYTHONPATH=C:/Program Files/csound/bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           echo "RAWWAVE_PATH=C:/Program Files/csound/samples" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          .\6.x\vcpkg\bootstrap-vcpkg.bat
-          choco install csound --version=6.17.0
-          echo $GITHUB_ENV
-          ls 'C:\Program Files\Faust\'
-          echo "C:\Program Files\Faust\;C:\Program Files\Faust\lib" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          .\vcpkg\bootstrap-vcpkg.bat
 
-        # - name: Setup platform (linux)
-        #   if: startsWith(matrix.os, 'ubuntu')
-        #   run: |
-        #     ./vcpkg/bootstrap-vcpkg.sh
-        #     sudo apt-get update
-        #     sudo apt-get install libcsound64-dev
+      - name: Setup platform (linux)
+        if: startsWith(matrix.os, 'ubuntu')
+        run: ./vcpkg/bootstrap-vcpkg.sh
 
-        # - name: Setup platform (macos)
-        #   if: startsWith(matrix.os, 'macos')
-        #   run: |
-        #     ./vcpkg/bootstrap-vcpkg.sh
-        #     brew install csound
-
-      - name: Setup VCPKG cache
-        shell: bash
+      - name: Setup platform (macos)
+        if: startsWith(matrix.os, 'macos')
         run: |
-          ${{ matrix.mono }} `./6.x/vcpkg/vcpkg fetch nuget | tail -n 1` \
-          sources add \
-          -source "https://nuget.pkg.github.com/csound/index.json" \
-          -storepasswordincleartext \
-          -name "GitHub" \
-          -username "csound" \
-          -password "${{ secrets.GITHUB_TOKEN }}"
-          ${{ matrix.mono }} `./6.x/vcpkg/vcpkg fetch nuget | tail -n 1` \
-            setapikey "${{ secrets.GITHUB_TOKEN }}" \
-            -source "https://nuget.pkg.github.com/csound/index.json"
+          ./vcpkg/bootstrap-vcpkg.sh
+
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Generate CMake build
-        run: cmake 6.x/. -B build -DUSE_VCPKG=1
+        run: cmake -B build -DUSE_VCPKG=1
 
       - name: Build plugins
         run: cmake --build build --config Release
 
-      - name: Build installer
-        run: iscc /o. .\installer\win64\Installer.iss
+      - name: Build installer (windows)
+        if: startsWith(matrix.os, 'windows') && github.ref == 'refs/heads/develop'
+        run: |
+          iscc /o. .\6.x\installer\win64\Installer.iss
+          # iscc /o. .\7.x\installer\win64\Installer.iss
 
-      - name: Upload installer
-        uses: actions/upload-artifact@v2
+      - name: Upload installer (windows)
+        if: startsWith(matrix.os, 'windows') && github.ref == 'refs/heads/develop'
+        uses: actions/upload-artifact@v4
         with:
           name: Csound_win_x64-${{env.CSOUND_VERSION}}.${{github.run_number}}-plugins-installer
-          path: ./csound6-plugins-win_x86_64-*.exe
+          path: ./6.x/csound6-plugins-win_x86_64-*.exe
           if-no-files-found: error

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "vcpkg"]
-	path = 6.x/vcpkg
+	path = vcpkg
 	url = https://github.com/microsoft/vcpkg.git

.vscode/settings.json

@@ -1,5 +1,7 @@
 {
     "files.associations": {
-        "lame.h": "c"
+        "lame.h": "c",
+        "pythonopcodes.h": "c",
+        "csdl.h": "c"
     }
 }

6.x/CMakeLists.txt

@@ -1,48 +1,9 @@
-cmake_minimum_required(VERSION 3.5)
-cmake_policy(SET CMP0077 NEW)
-
-option(USE_VCPKG "Use VCPKG to download and manage dependencies" OFF)
-
-if (USE_VCPKG)
-    # Detect correct triplet based on CMake env
-    if (WIN32)
-        set(VCPKG_HOST_TRIPLET "x64-windows-csound" CACHE STRING "")
-        set(VCPKG_TARGET_TRIPLET "x64-windows-csound")
-        set(CSOUND_INCLUDE_DIR_HINT "C:/Program Files/Csound6_x64")
-    elseif(APPLE)
-        set(VCPKG_HOST_TRIPLET "x64-osx" CACHE STRING "")
-        set(VCPKG_TARGET_TRIPLET "x64-osx")
-    elseif (UNIX)
-        set(VCPKG_HOST_TRIPLET "x64-linux" CACHE STRING "")
-        set(VCPKG_TARGET_TRIPLET "x64-linux")
-    endif()
-
-    set(VCPKG_FEATURE_FLAGS versions)
-    set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON)
-    set(VCPKG_OVERLAY_TRIPLETS ${CMAKE_CURRENT_SOURCE_DIR}/)
-    set(VCPKG_OVERLAY_PORTS ${CMAKE_CURRENT_SOURCE_DIR}/)
-    set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
-        CACHE STRING "Vcpkg toolchain file")
-endif()
-
-project(Csound-plugins)
-
-if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-    set(CMAKE_COMPILER_IS_CLANG 1)
-endif()
-
-set(APIVERSION "6.0")
-
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_MACOSX_RPATH 1)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
-find_package(CSOUND)
-
-if(NOT CSOUND_INCLUDE_DIRS)
-    message(FATAL_ERROR "Csound header files are required")
-endif()
+set(APIVERSION "6.0")
 
 include(TestBigEndian)
 include(CheckFunctionExists)
@@ -52,7 +13,7 @@ include(CheckCXXCompilerFlag)
 ### COMPILER OPTIMIZATION FLAGS
 option(USE_COMPILER_OPTIMIZATIONS "Use the default Csound compiler optimization flags" ON)
 if(USE_COMPILER_OPTIMIZATIONS)
-    include(${CMAKE_SOURCE_DIR}/cmake/CompilerOptimizations.cmake)
+    include("${CMAKE_SOURCE_DIR}/cmake/CompilerOptimizations.cmake")
 endif()
 
 ##/Library/Frameworks/CsoundLib64.framework/Versions/Current/Resources/Opcodes64
@@ -182,70 +143,11 @@ if(APPLE)
 endif()
 message("-- Plugins to be installed at: ${PLUGIN_INSTALL_DIR}")
 
-# Checks if dependencies for an enabled target are fulfilled.
-# If FAIL_MISSING is true and the dependencies are not fulfilled,
-# it will abort the cmake run.
-# If FAIL_MISSING is false, it will set the option to OFF.
-# If the target is not enabled, it will do nothing.
-# example: check_deps(BUILD_NEW_PARSER FLEX_EXECUTABLE BISON_EXECUTABLE)
-function(check_deps option)
-    if(${option})
-        set(i 1)
-        while( ${i} LESS ${ARGC} )
-            set(dep ${ARGV${i}})
-            if(NOT ${dep})
-                if(FAIL_MISSING)
-                    message(FATAL_ERROR
-                        "${option} is enabled, but ${dep}=\"${${dep}}\"")
-                else()
-                    message(STATUS "${dep}=\"${${dep}}\", so disabling ${option}")
-                    set(${option} OFF PARENT_SCOPE)
-                    # Set it in the local scope too
-                    set(${option} OFF)
-                endif()
-            endif()
-            math(EXPR i "${i}+1")
-        endwhile()
-    endif()
-    if(${option})
-        message(STATUS "${option} is enabled.")
-    else()
-        message(STATUS "${option} is disabled.")
-    endif()
-endfunction(check_deps)
-
-# Utility function to make plugins. All plugin targets should use this as it
-# sets up output directory set in top-level CmakeLists.txt
-# and adds the appropriate install target
-#
-# libname - name of library to produce
-# srcs - list of src files (must be quoted if a list)
-# extralibs (OPTIONAL) - extra libraries to link the plugin to
-#
-# NB - this was moved here as it needs some VARS defined above
-# for setting up the framework
-function(make_plugin libname srcs)
-    if(APPLE)
-        add_library(${libname} SHARED ${srcs})
-    else()
-        add_library(${libname} MODULE ${srcs})
-    endif()
-
-    set(i 2)
-    while( ${i} LESS ${ARGC} )
-        target_link_libraries(${libname} PRIVATE ${ARGV${i}})
-        math(EXPR i "${i}+1")
-    endwhile()
+# Include utility functions for making plugins
+include("${CMAKE_SOURCE_DIR}/cmake/utilities.cmake")
 
-    install(TARGETS ${libname}
-        LIBRARY DESTINATION "${PLUGIN_INSTALL_DIR}"
-        ARCHIVE DESTINATION "${PLUGIN_INSTALL_DIR}" )
-endfunction(make_plugin)
-
-#checking pthread functions
+# Checking pthread functions
 if(REQUIRE_PTHREADS AND (PTHREAD_LIBRARY OR HAIKU))
-
-  #list(APPEND libcsound_CFLAGS -DHAVE_PTHREAD)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_PTHREAD")
 
   check_function_exists(pthread_spin_lock PTHREAD_SPIN_LOCK_EXISTS)
@@ -311,4 +213,4 @@ add_subdirectory(./src/mp3)
 add_subdirectory(./src/wiimote)
 add_subdirectory(./src/p5glove)
 add_subdirectory(./src/jackops)
-add_subdirectory(./src/fluidOpcodes)
+add_subdirectory(./src/fluidOpcodes)

6.x/csound/CppSound.hpp

@@ -0,0 +1,92 @@
+/*
+ * C S O U N D
+ *
+ * L I C E N S E
+ *
+ * This software is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#ifndef CSND_CPPSOUND_H
+#define CSND_CPPSOUND_H
+
+#include "float-version.h"
+#ifndef __MYFLT_DEF
+#define __MYFLT_DEF
+#ifdef USE_DOUBLE
+#define MYFLT double
+#else
+#define MYFLT float
+#endif
+#endif
+
+#ifdef SWIG
+%module csnd6
+%include "std_string.i"
+%include "std_vector.i"
+%{
+#include "csound.hpp"
+#include "CsoundFile.hpp"
+#include <string>
+#include <vector>
+  %}
+%template(MyfltVector) std::vector<MYFLT>;
+#else
+#include "csound.hpp"
+#include "CsoundFile.hpp"
+#include <string>
+#include <vector>
+#endif
+
+class PUBLIC CppSound : public Csound, public CsoundFile
+{
+  bool go;
+  bool isCompiled;
+  bool isPerforming;
+  size_t spoutSize;
+  std::string renderedSoundfile;
+public:
+  CppSound() : Csound(),
+                       go(false),
+                       isCompiled(false),
+                       isPerforming(false),
+                       spoutSize(0)
+{
+
+  //SetHostData((CSOUND *)0);
+
+}
+
+  virtual ~CppSound();
+  virtual CSOUND *getCsound();
+  virtual intptr_t getThis();
+  virtual CsoundFile *getCsoundFile();
+  virtual int compile(int argc, const char **argv);
+  virtual int compile();
+  virtual size_t getSpoutSize() const;
+  virtual std::string getOutputSoundfileName() const;
+  virtual int perform(int argc, const char **argv);
+  virtual int perform();
+  virtual int performKsmps();
+  virtual void cleanup();
+  virtual void inputMessage(const char *istatement);
+  virtual void write(const char *text);
+  virtual bool getIsCompiled() const;
+  virtual void setIsPerforming(bool isPerforming);
+  virtual bool getIsPerforming() const;
+  virtual bool getIsGo();
+  virtual void stop();
+};
+
+#endif
+