fixes

DBraun · Apr 5, 2024 · 8173016 · 8173016
1 parent 53a935c
commit 8173016
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 188 deletions.
diff --git a/build_tdfaust.py b/build_tdfaust.py
@@ -2,6 +2,7 @@
 import os
 import platform
 import subprocess
+import shlex
 
 
 def run_command(command, shell=False):
@@ -66,7 +67,8 @@ def build_macos(pythonver: str, touchdesigner_app: str, arch: str=None):
     run_command(["cmake", "--build", "build", "--config", "Release"])
     os.system('mv build/Release/TD-Faust.plugin Plugins')
     if 'CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM' in os.environ:
-        os.system(f'codesign --force --verify --verbose=2 --timestamp --options=runtime --deep --sign "Developer ID Application: David Braun ($CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM)" build/Release/TD-Faust.plugin')
+        CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM = os.environ['CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM']
+        subprocess.call(shlex.split(f'codesign --force --verify --verbose=2 --timestamp --options=runtime --deep --sign "Developer ID Application: David Braun ({CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM})" build/Release/TD-Faust.plugin'))
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Build TD-Faust plugin for Windows or macOS.")

diff --git a/faust2td.py b/faust2td.py
@@ -299,7 +299,7 @@ def add_toggle(item) -> str:
         assert isdir(libfaust_dir), "Have you run `sh download_libfaust.sh`?"
 
     # execute CMake and build
-    build_dir = 'build_faust2touchdesigner'
+    build_dir = f'build_{op_type}'
     generator = " -G Xcode " if platform.system() == 'Darwin' else ''
     subprocess.call(shlex.split(f'cmake faust2touchdesigner -B{build_dir} {generator} -DOP_TYPE={op_type} -DAUTHOR_NAME="{author_name}" -DLIBFAUST_DIR="{libfaust_dir}" {cmake_osx_deployment_target} {cmake_build_arch}'))
     subprocess.call(shlex.split(f'cmake --build {build_dir} --config Release'))
@@ -308,7 +308,8 @@ def add_toggle(item) -> str:
         file_dest = f'"{build_dir}/Release/{op_type}.plugin"'
         subprocess.call(shlex.split(f'cp -r {file_dest} Plugins'))
         if 'CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM' in os.environ:
-            os.system(f'codesign --force --verify --verbose=2 --timestamp --options=runtime --deep --sign "Developer ID Application: David Braun ($CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM)" {file_dest}')
+            CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM = os.environ['CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM']
+            subprocess.call(shlex.split(f'codesign --force --verify --verbose=2 --timestamp --options=runtime --deep --sign "Developer ID Application: David Braun ({CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM})" {file_dest}'))
 
 
     print('All done!')
diff --git a/install_script/install_certifi.py b/install_script/install_certifi.py
diff --git a/install_script/macos_install_python.py b/install_script/macos_install_python.py