Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 98e2960
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Thu May 26 08:45:58 2022 -0600

    minor update

commit 7e5fb64
Author: David Braun <email@example.com>
Date:   Fri May 6 08:47:52 2022 -0700

    fix typo

commit 7b15d92
Author: David Braun <email@example.com>
Date:   Fri May 6 08:41:13 2022 -0700

    use 7z instead of tar on Windows

commit b9441ef
Author: David Braun <email@example.com>
Date:   Wed May 4 13:58:45 2022 -0700

    fix windows build and change index of a switch CHOP.

commit 3d074d8
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Wed May 4 13:39:05 2022 -0700

    minor fixes

commit 80427c1
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Wed May 4 13:38:44 2022 -0700

    change reset/recompile execution order to fix crash on macOS

    The crash was from adding a shred and then resetting it. Strangely it only crashed if there was a chop (such as Null CHOP) downstream of the chuck audio chop.

commit 286fe13
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Tue May 3 15:53:21 2022 -0700

    refactor

commit 9324c19
Author: David Braun <email@example.com>
Date:   Fri Feb 4 10:05:29 2022 -0800

    add drum sequencer example with multilevel from Palette to control velocity

commit 8ae41bc
Author: David Braun <email@example.com>
Date:   Thu Feb 3 21:24:13 2022 -0800

    fix bug where python callback for getFloat was casting values to integers

commit 1e65bef
Author: David Braun <email@example.com>
Date:   Thu Feb 3 10:17:23 2022 -0800

    add VST chop to midi generator example

commit eb23c10
Author: David Braun <email@example.com>
Date:   Tue Feb 1 19:30:20 2022 -0800

    add basic_array_melody.ck

commit 36ee115
Author: David Braun <email@example.com>
Date:   Tue Feb 1 13:43:30 2022 -0800

    python version

commit ea6fcce
Author: David Braun <email@example.com>
Date:   Tue Feb 1 13:38:11 2022 -0800

    fix python version

commit afc709d
Author: David Braun <email@example.com>
Date:   Tue Feb 1 13:26:24 2022 -0800

    python version

commit a0ed74d
Author: David Braun <email@example.com>
Date:   Tue Feb 1 13:21:37 2022 -0800

    python location

commit cdd05d9
Author: David Braun <email@example.com>
Date:   Tue Feb 1 13:10:35 2022 -0800

    python version

commit 67c4d6c
Author: David Braun <email@example.com>
Date:   Tue Feb 1 13:01:16 2022 -0800

    python version

commit 29a4af5
Author: David Braun <email@example.com>
Date:   Tue Feb 1 12:52:07 2022 -0800

    python version

commit f6fdd9f
Author: David Braun <email@example.com>
Date:   Tue Feb 1 12:46:53 2022 -0800

    python version

commit 0fef1ad
Author: David Braun <email@example.com>
Date:   Tue Feb 1 12:41:25 2022 -0800

    python version

commit 4c4cd41
Author: David Braun <email@example.com>
Date:   Mon Jan 31 20:43:30 2022 -0800

    .

commit eed40b7
Author: David Braun <email@example.com>
Date:   Mon Jan 31 20:38:28 2022 -0800

    fix previous

commit c7fce9b
Author: David Braun <email@example.com>
Date:   Mon Jan 31 20:34:29 2022 -0800

    change how cmake finds python

commit a39a84b
Author: David Braun <email@example.com>
Date:   Mon Jan 31 20:23:15 2022 -0800

    try to fix workflow finding right python version

commit 2cee542
Author: David Braun <email@example.com>
Date:   Mon Jan 31 18:11:01 2022 -0800

    externalize chuck code files and undo mistake in working directory

commit 6f383a5
Author: David Braun <email@example.com>
Date:   Sat Jan 29 16:19:55 2022 -0800

    update README.md

commit 4367017
Author: David Braun <email@example.com>
Date:   Sat Jan 29 15:33:02 2022 -0800

    add control rate smoothing example

commit d6f71ac
Merge: 16fc2b7 6e46bbd
Author: David Braun <email@example.com>
Date:   Thu Jan 27 17:32:08 2022 -0800

    Merge branch 'feature/python-api' of github.com:DBraun/ChucKDesigner into feature/python-api

commit 16fc2b7
Author: David Braun <email@example.com>
Date:   Thu Jan 27 17:31:07 2022 -0800

    add chugin instructions

commit 6e46bbd
Merge: 1fbc91f 046c14d
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Mon Jan 17 16:35:57 2022 -0800

    Merge branch 'feature/python-api' of https://github.com/DBraun/ChucKDesigner into feature/python-api

commit 1fbc91f
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Mon Jan 17 16:35:55 2022 -0800

    Update build_macos.sh

commit 046c14d
Author: David Braun <email@example.com>
Date:   Sun Jan 16 17:37:42 2022 -0800

    update README.md

commit c8ef438
Author: David Braun <email@example.com>
Date:   Sun Jan 16 17:21:50 2022 -0800

    update sequencer.ck

commit 52a582c
Author: David Braun <email@example.com>
Date:   Sun Jan 16 16:04:44 2022 -0800

    update doc image

commit a867eee
Author: David Braun <email@example.com>
Date:   Sun Jan 16 15:50:48 2022 -0800

    change syntax to avoid typing global so many times

commit e8b189e
Author: David Braun <email@example.com>
Date:   Sun Jan 16 15:29:32 2022 -0800

    update sequencer.ck

commit c546f3b
Author: David Braun <email@example.com>
Date:   Sun Jan 16 15:25:47 2022 -0800

    add sequencer example

commit eca9c0e
Author: David Braun <email@example.com>
Date:   Sun Jan 16 15:23:41 2022 -0800

    fix typo

commit cd6e678
Author: David Braun <email@example.com>
Date:   Sun Jan 16 13:35:12 2022 -0800

    .

commit 749cecd
Author: David Braun <email@example.com>
Date:   Sat Jan 15 21:55:53 2022 -0800

    update README.md

commit 84a4bb8
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Sat Jan 15 21:11:34 2022 -0800

    Update README.md

commit e869809
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Sat Jan 15 21:10:06 2022 -0800

    Update README.md

commit fff4240
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Sat Jan 15 21:07:39 2022 -0800

    Update README.md

commit bb72d60
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Sat Jan 15 20:57:42 2022 -0800

    Update all.yml

commit ccb4a49
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Sat Jan 15 20:54:28 2022 -0800

    fix python linking issue on macos

commit 3115c69
Author: David Braun <email@example.com>
Date:   Sat Jan 15 17:41:31 2022 -0800

    .

commit 1ec001e
Author: David Braun <email@example.com>
Date:   Sat Jan 15 17:28:11 2022 -0800

    .

commit 179ffcc
Author: David Braun <email@example.com>
Date:   Sat Jan 15 17:06:00 2022 -0800

    .

commit 2eec501
Author: David Braun <email@example.com>
Date:   Sat Jan 15 17:04:10 2022 -0800

    .

commit 7f93b1f
Author: David Braun <email@example.com>
Date:   Sat Jan 15 16:40:05 2022 -0800

    .

commit 350bca7
Author: David Braun <email@example.com>
Date:   Sat Jan 15 16:34:16 2022 -0800

    .

commit 6097ad0
Author: David Braun <email@example.com>
Date:   Sat Jan 15 16:17:31 2022 -0800

    .

commit ad973b0
Author: David Braun <email@example.com>
Date:   Sat Jan 15 16:07:15 2022 -0800

    .

commit 353022c
Author: David Braun <email@example.com>
Date:   Sat Jan 15 16:05:31 2022 -0800

    .

commit f8ef2d6
Author: David Braun <email@example.com>
Date:   Sat Jan 15 16:01:16 2022 -0800

    .

commit 7fade89
Author: David Braun <email@example.com>
Date:   Sat Jan 15 15:52:57 2022 -0800

    .

commit d30ab24
Author: David Braun <email@example.com>
Date:   Sat Jan 15 15:50:31 2022 -0800

    try to install universal python

commit fd671d9
Author: David Braun <email@example.com>
Date:   Sat Jan 15 12:41:05 2022 -0800

    architecture

commit d7659a8
Author: David Braun <email@example.com>
Date:   Sat Jan 15 12:35:14 2022 -0800

    architecture

commit a520c04
Author: David Braun <email@example.com>
Date:   Sat Jan 15 12:24:59 2022 -0800

    architecture

commit 7881296
Author: David Braun <email@example.com>
Date:   Sat Jan 15 12:23:12 2022 -0800

    specify python architecture for macos

commit b854b69
Author: David Braun <email@example.com>
Date:   Sat Jan 15 12:14:27 2022 -0800

    skip arm64 macos build

commit c473ccb
Author: David Braun <email@example.com>
Date:   Sat Jan 15 12:07:20 2022 -0800

    update python instructions

commit 4193a4c
Author: David Braun <email@example.com>
Date:   Sat Jan 15 12:01:45 2022 -0800

    update README.md

commit d4fe09c
Author: David Braun <email@example.com>
Date:   Sat Jan 15 11:59:04 2022 -0800

    update README.md

commit 3cb2a0c
Author: David Braun <email@example.com>
Date:   Sat Jan 15 11:53:22 2022 -0800

    update docs

commit 4d29248
Author: David Braun <email@example.com>
Date:   Sat Jan 15 11:34:45 2022 -0800

    update README.md

commit 67dc944
Author: David Braun <email@example.com>
Date:   Sat Jan 15 11:31:04 2022 -0800

    updates

commit 43eec25
Author: David Braun <email@example.com>
Date:   Sat Jan 15 10:31:13 2022 -0800

    fix wrong type

commit 7dfc9a3
Author: David Braun <email@example.com>
Date:   Fri Jan 14 18:55:30 2022 -0800

    fix typo

commit fcd406b
Author: David Braun <email@example.com>
Date:   Fri Jan 14 17:20:53 2022 -0800

    event callbacks work

commit c3739dc
Author: David Braun <email@example.com>
Date:   Fri Jan 14 15:32:00 2022 -0800

    wip

commit baa1420
Author: David Braun <email@example.com>
Date:   Fri Jan 14 13:18:54 2022 -0800

    cleanup

commit 90e00f1
Author: David Braun <email@example.com>
Date:   Fri Jan 14 10:40:33 2022 -0800

    update workflow

commit c36c1d5
Author: David Braun <email@example.com>
Date:   Thu Jan 13 22:36:58 2022 -0800

    WIP with event listener

commit 4dc7c9b
Author: David Braun <email@example.com>
Date:   Thu Jan 13 21:41:01 2022 -0800

    add broadcasting events to chuck

commit 41ae46c
Author: David Braun <email@example.com>
Date:   Thu Jan 13 12:05:40 2022 -0800

    some fixes and testing

commit 3087987
Author: David Braun <email@example.com>
Date:   Wed Jan 12 22:16:42 2022 -0800

    lots of boilerplate

commit e87f538
Author: David Braun <email@example.com>
Date:   Mon Jan 10 13:07:31 2022 -0800

    set_global_float_array works on Windows

commit c9ce6ba
Author: David Braun <email@example.com>
Date:   Mon Jan 10 12:32:17 2022 -0800

    set_global_float works on Windows

commit 7ce25af
Author: David Braun <email@example.com>
Date:   Mon Jan 10 12:02:33 2022 -0800

    float array callback works on Windows

commit 69b965c
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Mon Jan 10 08:28:10 2022 -0800

    WIP

commit e1a3d1d
Author: David Braun <2096055+DBraun@users.noreply.github.com>
Date:   Sat Jan 8 21:53:10 2022 -0800

    old features of chuckdesigner still work on macOS 2021.38470
  • Loading branch information
@DBraun
DBraun committed May 26, 2022
1 parent e0c2920 commit 7fb2fe5
Show file tree
Hide file tree
Showing 46 changed files with 3,322 additions and 363 deletions.
47 changes: 36 additions & 11 deletions .github/workflows/all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ jobs:
with:
submodules: true

- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: "3.9"

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.3

Expand All @@ -25,15 +30,15 @@ jobs:
- name: Build Windows (Release)
run: |
mkdir build
cmake . -DCMAKE_BUILD_TYPE=Release -Bbuild
cmake . -DCMAKE_BUILD_TYPE=Release -Bbuild -DPython_ROOT_DIR=$pythonLocation
cd build
msbuild ChucKDesignerCHOP.sln /property:Configuration=Release
- name: Make distribution
run: |
mkdir chuckdesigner_dist
move ${{ github.workspace }}/Plugins/ChucK*.dll chuckdesigner_dist
tar.exe -c -f ChucKDesigner-${{ matrix.os }}.zip chuckdesigner_dist
7z a ChucKDesigner-${{ matrix.os }}.zip ./chuckdesigner_dist/* -r
- name: Upload artifact
uses: actions/upload-artifact@v2
Expand All @@ -45,12 +50,25 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-10.15, macos-11]
os: [macos-latest]
steps:
- uses: actions/checkout@v2
with:
submodules: true

- name: Setup Python 3.8
uses: actions/setup-python@v2
with:
python-version: '3.8'

- name: Setup Python 3.9
run: |
which python
python --version
pip install --upgrade certifi
cd install_script
python macos_install_python.py
- name: Get CMake
uses: lukka/get-cmake@latest

Expand All @@ -62,11 +80,17 @@ jobs:
- name: Build MacOS (Release)
run: |
mkdir build
cd build
cmake .. -G "Xcode" -DCMAKE_OSX_ARCHITECTURES=x86_64
export PATH=/Library/Frameworks/Python.framework/Versions/3.9:/Library/Frameworks/Python.framework/Versions/3.9/bin:/Library/Frameworks/Python.framework/Versions/3.9/lib:$PATH
which python3
python3 --version
which python3
python3 --version
mkdir build && cd build
cmake .. -G "Xcode" -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0
xcodebuild -configuration Release -project ChucKDesignerCHOP.xcodeproj
ls -r *
install_name_tool -change @rpath/libChucKDesignerShared.dylib @loader_path/../../../libChucKDesignerShared.dylib Release/ChucKDesignerCHOP.plugin/Contents/MacOS/ChucKDesignerCHOP
install_name_tool -change @rpath/libChucKDesignerShared.dylib @loader_path/../../../libChucKDesignerShared.dylib Release/ChucKListenerCHOP.plugin/Contents/MacOS/ChucKListenerCHOP
- name: Make distribution
run: |
Expand All @@ -76,11 +100,12 @@ jobs:
mv ${{ github.workspace }}/build/Release/ChucKListenerCHOP.plugin chuckdesigner_dist
zip -r ChucKDesigner-${{ matrix.os }}.zip chuckdesigner_dist
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: my-artifact-${{ matrix.os }}
path: ChucKDesigner-${{ matrix.os }}.zip
# Don't upload until we figure out codesigning.
# - name: Upload artifact
# uses: actions/upload-artifact@v2
# with:
# name: my-artifact-${{ matrix.os }}
# path: ChucKDesigner-${{ matrix.os }}.zip

create-release:
if: startsWith(github.ref, 'refs/tags/v')
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
build
Backup
CrashAutoSave*
*.dmp
ChucKDesigner.[0-9]*.toe
.DS_STORE
28 changes: 21 additions & 7 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ file(GLOB CK_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/chuck/src/core/lo/*.c
)

list(FILTER CK_SOURCES EXCLUDE REGEX ".*lex.yy.c")

if(WIN32)
list(FILTER CK_SOURCES EXCLUDE REGEX ".*server_thread.c")
list(FILTER CK_SOURCES EXCLUDE REGEX ".*lo/config.h")
Expand All @@ -40,8 +42,6 @@ else()
list(APPEND CK_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/chuck/src/core/chuck.yy.c")
endif()

message("CK_SOURCES: " ${CK_SOURCES})

file(GLOB TOUCHDESIGNER_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/TouchDesigner/*)

add_library(ChucKDesignerShared SHARED
Expand Down Expand Up @@ -134,13 +134,15 @@ set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
set_target_properties(${PROJECT_NAME} PROPERTIES
BUNDLE true
BUNDLE_EXTENSION "plugin"
MACOSX_BUNDLE_GUI_IDENTIFIER design.dirt.cpp.${PROJECT_NAME}
# PRODUCT_BUNDLE_IDENTIFIER design.dirt.cpp.${PROJECT_NAME}
# MACOSX_BUNDLE_GUI_IDENTIFIER design.dirt.cpp.${PROJECT_NAME}
MACOSX_BUNDLE_INFO_STRING ${PROJECT_NAME}
MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}
MACOSX_BUNDLE_BUNDLE_VERSION "0.1"
MACOSX_BUNDLE_SHORT_VERSION_STRING "0.1"
MACOSX_BUNDLE_COPYRIGHT "David Braun"
# MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/src/Info.plist
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/src/Info.plist
XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS "/System/Library/PrivateFrameworks /Library/Frameworks"
)

# Include header directories
Expand All @@ -152,6 +154,11 @@ target_include_directories(ChucKListenerCHOP PUBLIC
$<INSTALL_INTERFACE:ChucKListenerCHOP>
)

set(Python_FIND_REGISTRY "LAST")
set(Python_FIND_STRATEGY "LOCATION")
find_package(Python 3.9 EXACT REQUIRED COMPONENTS Interpreter Development)
target_link_libraries(${PROJECT_NAME} PUBLIC Python::Python)

target_link_libraries(${PROJECT_NAME} PUBLIC ChucKDesignerShared)

target_compile_definitions(${PROJECT_NAME} PRIVATE
Expand Down Expand Up @@ -205,21 +212,23 @@ endif()
project(ChucKDesignerCHOP VERSION 0.0.1)

add_library(ChucKDesignerCHOP MODULE
${CMAKE_CURRENT_SOURCE_DIR}/src/ChuckDesignerCHOP.h
${CMAKE_CURRENT_SOURCE_DIR}/src/ChucKDesignerCHOP.h
${CMAKE_CURRENT_SOURCE_DIR}/src/ChucKDesignerCHOP.cpp
${TOUCHDESIGNER_SOURCES}
)
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
set_target_properties(${PROJECT_NAME} PROPERTIES
BUNDLE true
BUNDLE_EXTENSION "plugin"
MACOSX_BUNDLE_GUI_IDENTIFIER design.dirt.cpp.${PROJECT_NAME}
# PRODUCT_BUNDLE_IDENTIFIER design.dirt.cpp.${PROJECT_NAME}
# MACOSX_BUNDLE_GUI_IDENTIFIER design.dirt.cpp.${PROJECT_NAME}
MACOSX_BUNDLE_INFO_STRING ${PROJECT_NAME}
MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}
MACOSX_BUNDLE_BUNDLE_VERSION "0.1"
MACOSX_BUNDLE_SHORT_VERSION_STRING "0.1"
MACOSX_BUNDLE_COPYRIGHT "David Braun"
# MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/src/Info.plist
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/src/Info.plist
XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS "/System/Library/PrivateFrameworks /Library/Frameworks"
)

# Include header directories
Expand All @@ -231,6 +240,11 @@ target_include_directories(ChucKDesignerCHOP PUBLIC
$<INSTALL_INTERFACE:ChucKDesignerCHOP>
)

set(Python_FIND_REGISTRY "LAST")
set(Python_FIND_STRATEGY "LOCATION")
find_package(Python 3.9 EXACT REQUIRED COMPONENTS Interpreter Development)
target_link_libraries(${PROJECT_NAME} PUBLIC Python::Python)

target_link_libraries(${PROJECT_NAME} PUBLIC ChucKDesignerShared)

target_compile_definitions(${PROJECT_NAME} PRIVATE
Expand Down
Binary file modified ChucKDesigner.toe
View file
Binary file not shown.
Loading

0 comments on commit 7fb2fe5

Please sign in to comment.