DBraun
diff --git a/‎.github/workflows/all.yml
+36-11 b/‎.github/workflows/all.yml
+36-11
diff --git a/‎.gitignore
+2 b/‎.gitignore
+2
diff --git a/‎CMakeLists.txt
+21-7 b/‎CMakeLists.txt
+21-7
diff --git a/‎ChucKDesigner.toe
8.54 KB b/‎ChucKDesigner.toe
8.54 KB
@@ -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/[email protected]
 
@@ -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
@@ -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
 
@@ -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: |
@@ -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')
 
@@ -1,4 +1,6 @@
 build
 Backup
+CrashAutoSave*
+*.dmp
 ChucKDesigner.[0-9]*.toe
 .DS_STORE
@@ -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")
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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