From 1127b60439f830b4c363c4b086d5306ae2c230cb Mon Sep 17 00:00:00 2001 From: guillot Date: Sat, 8 Sep 2018 09:26:55 +0200 Subject: [PATCH 01/16] update faust --- faust | 2 +- src/faust_tilde_ui.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/faust b/faust index 341bd3c..5c45bff 160000 --- a/faust +++ b/faust @@ -1 +1 @@ -Subproject commit 341bd3c562b4dcb9271a82bc939313613bc59244 +Subproject commit 5c45bff8f7e83969426e7036b186b7715c3ecda0 diff --git a/src/faust_tilde_ui.c b/src/faust_tilde_ui.c index 2dbc219..e878ad1 100644 --- a/src/faust_tilde_ui.c +++ b/src/faust_tilde_ui.c @@ -309,7 +309,7 @@ t_faust_ui_manager* faust_ui_manager_new(t_object* owner) ui_manager->f_glue.addHorizontalBargraph = (addHorizontalBargraphFun)faust_ui_manager_ui_add_bargraph; ui_manager->f_glue.addVerticalBargraph = (addVerticalBargraphFun)faust_ui_manager_ui_add_bargraph; - ui_manager->f_glue.addSoundFile = (addSoundFileFun)faust_ui_manager_ui_add_sound_file; + ui_manager->f_glue.addSoundfile = (addSoundfileFun)faust_ui_manager_ui_add_sound_file; ui_manager->f_glue.declare = (declareFun)faust_ui_manager_ui_declare; ui_manager->f_owner = owner; From 210a1a977224580f4dbc89fa99245693599098fd Mon Sep 17 00:00:00 2001 From: guillot Date: Sat, 8 Sep 2018 09:34:22 +0200 Subject: [PATCH 02/16] use MSVC_STATIC support --- CMakeLists.txt | 14 -------------- FaustLib.cmake | 20 ++++++-------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 590c866..2767981 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,20 +13,6 @@ if(UNIX AND NOT APPLE) set(FAUST_LIBS "stdc++" CACHE STRING "FAUST LIBRARIES" FORCE) endif() -## For Windows use static runtime instead of default dynamic runtime -if(MSVC) - set(CMAKE_CXX_FLAGS_RELEASE "/MT" CACHE STRING "FORCE CXX FLAGS" FORCE) - set(CMAKE_C_FLAGS_RELEASE "/MT" CACHE STRING "FORCE C FLAGS" FORCE) - set(CMAKE_CXX_FLAGS_DEBUG "/MTd" CACHE STRING "FORCE CXX FLAGS" FORCE) - set(CMAKE_C_FLAGS_DEBUG "/MTd" CACHE STRING "FORCE C FLAGS" FORCE) - set(CompilerFlags - CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE - CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE) - foreach(CompilerFlag ${CompilerFlags}) - string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}") - endforeach() -endif() - include(FaustLib.cmake) ## Create Faust~ message(STATUS "faustgen~ external") diff --git a/FaustLib.cmake b/FaustLib.cmake index b59f20e..047e334 100644 --- a/FaustLib.cmake +++ b/FaustLib.cmake @@ -1,15 +1,6 @@ ## Create Faust Lib message(STATUS "Faust Library") -## For Windows use static runtime instead of default dynamic runtime -if(MSVC) - set(CompilerFlags - CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE - CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE) - foreach(CompilerFlag ${CompilerFlags}) - string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}") - endforeach() -endif() ## Save the llvm directory and change it for subdirectory if(DEFINED LLVM_DIR) @@ -18,11 +9,12 @@ if(DEFINED LLVM_DIR) endif() ## Hardcoded targets for faust -set(INCLUDE_STATIC ON CACHE STRING "Include static library" FORCE) -set(INCLUDE_EXECUTABLE OFF CACHE STRING "Include runtime executable" FORCE) -set(INCLUDE_DYNAMIC OFF CACHE STRING "Include dynamic library" FORCE) -set(INCLUDE_OSC OFF CACHE STRING "Include Faust OSC library" FORCE) -set(INCLUDE_HTTP OFF CACHE STRING "Include Faust HTTPD library" FORCE) +set(MSVC_STATIC ON CACHE STRING "Use static runtimes with MSVC" FORCE) +set(INCLUDE_STATIC ON CACHE STRING "Include static library" FORCE) +set(INCLUDE_EXECUTABLE OFF CACHE STRING "Include runtime executable" FORCE) +set(INCLUDE_DYNAMIC OFF CACHE STRING "Include dynamic library" FORCE) +set(INCLUDE_OSC OFF CACHE STRING "Include Faust OSC library" FORCE) +set(INCLUDE_HTTP OFF CACHE STRING "Include Faust HTTPD library" FORCE) ## Hardcoded backends for faust set(ASMJS_BACKEND OFF CACHE STRING "Include ASMJS backend" FORCE) From e05a10c61ec0500802c03f9efd345c471af34472 Mon Sep 17 00:00:00 2001 From: guillot Date: Sat, 8 Sep 2018 10:34:50 +0200 Subject: [PATCH 03/16] update print options --- src/faust_tilde_options.c | 9 --------- src/faust_tilde_options.h | 2 -- src/faustgen_tilde.c | 23 ++++++++++++++++++++++- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/faust_tilde_options.c b/src/faust_tilde_options.c index a8be766..c2d923c 100644 --- a/src/faust_tilde_options.c +++ b/src/faust_tilde_options.c @@ -236,12 +236,3 @@ char const* faust_opt_manager_get_full_path(t_faust_opt_manager *x, char const* pd_error(x->f_owner, "faustgen~: invalid path or name"); return NULL; } - -void faust_opt_manager_print(t_faust_opt_manager const *x, char const log) -{ - size_t i; - for(i = 0; i < x->f_noptions; ++i) - { - logpost(x->f_owner, 2+log, " option %i: %s", (int)i, x->f_options[i]); - } -} diff --git a/src/faust_tilde_options.h b/src/faust_tilde_options.h index 9c657f6..da441e5 100644 --- a/src/faust_tilde_options.h +++ b/src/faust_tilde_options.h @@ -24,8 +24,6 @@ char const** faust_opt_manager_get_options(t_faust_opt_manager* x); char const* faust_opt_manager_get_full_path(t_faust_opt_manager* x, char const* name); -void faust_opt_manager_print(t_faust_opt_manager const *x, char const log); - char faust_opt_has_double_precision(t_faust_opt_manager const *x); #endif diff --git a/src/faustgen_tilde.c b/src/faustgen_tilde.c index 007025d..8cc5538 100644 --- a/src/faustgen_tilde.c +++ b/src/faustgen_tilde.c @@ -205,7 +205,28 @@ static void faustgen_tilde_print(t_faustgen_tilde *x) { post("faustgen~: %s", faust_opt_manager_get_full_path(x->f_opt_manager, x->f_dsp_name->s_name)); faust_io_manager_print(x->f_io_manager, 0); - faust_opt_manager_print(x->f_opt_manager, 0); + if(x->f_dsp_factory) + { + char* text = NULL; + text = getCTarget(x->f_dsp_factory); + if(text) + { + if(strnlen(text, 1) > 0) + { + post(" target: %s", text); + } + free(text); + } + text = getCDSPFactoryCompileOptions(x->f_dsp_factory); + if(text) + { + if(strnlen(text, 1) > 0) + { + post(" options: %s", text); + } + free(text); + } + } faust_ui_manager_print(x->f_ui_manager, 0); } else From a6f2c74a8e287f1955b253948ab79d4df540a54b Mon Sep 17 00:00:00 2001 From: Pierre Guillot Date: Wed, 18 Sep 2019 11:40:29 +0200 Subject: [PATCH 04/16] travis update gcc to 4.9 for std reg_exp --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index c3de132..f5911bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,14 @@ matrix: - cmake --build . --config Release --target faustgen_tilde_project - os: linux compiler: gcc + addons: + apt: + sources: ubuntu-toolchain-r-test + packages: g++-4.9 env: release_arch=Linux-amd64-32 install: + - export CXX=g++-4.9 + - export CC=gcc-4.9 - git submodule update --init --recursive - sudo apt-get install -y pkg-config libedit-dev - curl -o ./llvm.tar.gz http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz From ba91e327dfede92792c73aa6d33aa5c3046f7179 Mon Sep 17 00:00:00 2001 From: Pierre Guillot Date: Wed, 18 Sep 2019 12:09:15 +0200 Subject: [PATCH 05/16] hide the command console on Windows used to open the file #6 --- src/faustgen_tilde.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/faustgen_tilde.c b/src/faustgen_tilde.c index 8cc5538..69638e0 100644 --- a/src/faustgen_tilde.c +++ b/src/faustgen_tilde.c @@ -133,6 +133,10 @@ static void faustgen_tilde_compile_options(t_faustgen_tilde *x, t_symbol* s, int faustgen_tilde_compile(x); } +#ifdef _WIN32 +#include +#endif + static void faustgen_tilde_open_texteditor(t_faustgen_tilde *x) { if(x->f_dsp_instance) @@ -142,13 +146,23 @@ static void faustgen_tilde_open_texteditor(t_faustgen_tilde *x) char temp[MAXPDSTRING]; sys_bashfilename(faust_opt_manager_get_full_path(x->f_opt_manager, x->f_dsp_name->s_name), temp); sprintf(message, "\"%s\"", temp); + WinExec(message, SW_HIDE); + return; #elif __APPLE__ sprintf(message, "open -t %s", faust_opt_manager_get_full_path(x->f_opt_manager, x->f_dsp_name->s_name)); + if(system(message)) + { + + } + return; #else sprintf(message, "xdg-open %s", faust_opt_manager_get_full_path(x->f_opt_manager, x->f_dsp_name->s_name)); -#endif - system(message); + if(system(message)) + { + + } return; +#endif } pd_error(x, "faustgen~: no FAUST DSP file defined"); } From 7a55509a5bac24e51d74761375a3dfc48ac30b43 Mon Sep 17 00:00:00 2001 From: Pierre Guillot Date: Wed, 29 Jul 2020 17:07:27 +0200 Subject: [PATCH 06/16] update pd.build --- pd.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pd.build b/pd.build index ed7591e..d1062a5 160000 --- a/pd.build +++ b/pd.build @@ -1 +1 @@ -Subproject commit ed7591eecb239970158bd2fa2550b63280a16e2d +Subproject commit d1062a5a4bbcc374c5e7570c9e5a99faa9c8dffa From f7308b8358786c2d1c085e61c478ac1a752f7ac7 Mon Sep 17 00:00:00 2001 From: guillot Date: Sat, 8 Sep 2018 09:55:41 +0200 Subject: [PATCH 07/16] update faustgen~ version (0.1.2) --- src/faustgen_tilde.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/faustgen_tilde.c b/src/faustgen_tilde.c index 69638e0..52fdc82 100644 --- a/src/faustgen_tilde.c +++ b/src/faustgen_tilde.c @@ -18,7 +18,7 @@ #include "faust_tilde_io.h" #include "faust_tilde_options.h" -#define FAUSTGEN_VERSION_STR "0.1.0" +#define FAUSTGEN_VERSION_STR "0.1.2" #define MAXFAUSTSTRING 4096 typedef struct _faustgen_tilde From 6e4e9a2c000f48b64f18b20fa9c1429d98201f2f Mon Sep 17 00:00:00 2001 From: Pierre Guillot Date: Mon, 3 Aug 2020 11:26:09 +0200 Subject: [PATCH 08/16] use LLVM-9.0.0 on Travis --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f5911bb..5e2149d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ matrix: env: release_arch=Darwin-amd64-32 install: - git submodule update --init --recursive - - curl -o ./llvm.zip -L https://github.com/CICM/pd-faustgen/releases/download/v0.0.0/llvm-macos-x64.zip - - tar xzf ./llvm.zip && mv llvm-macos-x64 llvm + - curl -o ./llvm.tar.xz -L https://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-darwin-apple.tar.xz + - tar xzf ./llvm.tar.xz && mv clang+llvm-9.0.0-x86_64-darwin-apple llvm script: - mkdir build && cd build - cmake .. -GXcode -DUSE_LLVM_CONFIG=off -DLLVM_DIR=./llvm/lib/cmake/llvm -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 @@ -31,8 +31,8 @@ matrix: - export CC=gcc-4.9 - git submodule update --init --recursive - sudo apt-get install -y pkg-config libedit-dev - - curl -o ./llvm.tar.gz http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz - - tar xvf ./llvm.tar.gz && mv clang+llvm-5.0.0-linux-x86_64-ubuntu14.04 llvm + - curl -o ./llvm.tar.gz https://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz + - tar xvf ./llvm.tar.gz && mv clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04 llvm script: - mkdir build && cd build - cmake .. -DCMAKE_C_FLAGS=-m64 -DUSE_LLVM_CONFIG=off -DLLVM_DIR=./llvm/lib/cmake/llvm From 490a4f8bc9b0a0eeb05fde1db85c724011b9b114 Mon Sep 17 00:00:00 2001 From: Pierre Guillot Date: Mon, 3 Aug 2020 12:00:39 +0200 Subject: [PATCH 09/16] remove unused todo list [skip ci] --- ToDoList.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 ToDoList.md diff --git a/ToDoList.md b/ToDoList.md deleted file mode 100644 index fa17b59..0000000 --- a/ToDoList.md +++ /dev/null @@ -1,2 +0,0 @@ -- Mesure DSP time of the code -- Use automatic optimizations with compile options From ea6273c5d1179bfdd6c9accbdee5b99b58afdffc Mon Sep 17 00:00:00 2001 From: Pierre Guillot Date: Mon, 3 Aug 2020 12:14:22 +0200 Subject: [PATCH 10/16] update Readme [skip ci] --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 97dd411..652e82b 100644 --- a/README.md +++ b/README.md @@ -32,27 +32,27 @@ The **faustgen~** object is an external with the [FAUST](http://faust.grame.fr/a ## Compilation -The FAUST compiler requires LLVM 5.0.0 backend (or higher - 6.0.0). Once LLVM is installed on your machine, you can use CMake to generate a project that will compile both the FAUST library and the Pure Data external. Then you can use Deken to release the external. +The FAUST compiler requires LLVM 9.0.0 backend (or higher). Once LLVM is installed on your machine, you can use CMake to generate a project that will compile both the FAUST library and the Pure Data external. Then you can use Deken to release the external. #### Installing LLVM The fastest solution to install LLVM is to download the precompiled binaries from the [LLVM website](http://releases.llvm.org). For example, on the Travis CI for MacOS, we assume that the binaries are installed in the llvm folder at the root of the project: ``` -curl -o ./llvm.tar.gz http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-x86_64-apple-darwin.tar.xz -tar zxvf ./llvm.tar.gz && mv clang+llvm-5.0.0-x86_64-apple-darwin llvm +curl -o ./llvm.tar.xz -L https://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-darwin-apple.tar.xz +tar xzf ./llvm.tar.xz && mv clang+llvm-9.0.0-x86_64-darwin-apple llvm ``` or a for a linux system ``` -curl -o ./llvm.tar.gz http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz -tar xvf ./llvm.tar.gz && mv clang+llvm-5.0.0-linux-x86_64-ubuntu14.04 llvm +curl -o ./llvm.tar.gz https://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz +tar xvf ./llvm.tar.gz && mv clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04 llvm ``` You can also use HomeBrew or MacPorts on macOS or APT on Linux the compilation of the sources last around 50 minutes and in this case, you change the LLVM_DIR with the proper location. On Windows, you must compile from sources using the static runtime library. Compiling LLVM with the Microsoft Visual Compiler requires to use the static runtime library, for example: ``` -cd llvm-6.0.0.src && mkdir build && cd build -cmake .. -G "Visual Studio 14 2015 Win64" -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_BUILD_TESTS=Off -DCMAKE_INSTALL_PREFIX="./llvm" -Thost=x64 +cd llvm-9.0.0.src && mkdir build && cd build +cmake .. -G "Visual Studio 16 2019" -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_BUILD_TESTS=Off -DCMAKE_INSTALL_PREFIX="./llvm" -Thost=x64 cmake --build . --target ALL_BUILD (--config Debug/Release) cmake --build . --target INSTALL (optional) ``` From 3509889b6e2cedc5f3ebec627e5d37d2754c1d4c Mon Sep 17 00:00:00 2001 From: Pierre Guillot Date: Mon, 3 Aug 2020 14:01:08 +0200 Subject: [PATCH 11/16] appveyor: use visual studio 2019 & LLVM-9.0.0 --- appveyor.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f4313ce..b378dc6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -os: Visual Studio 2015 +os: Visual Studio 2019 environment: matrix: @@ -6,19 +6,18 @@ environment: # compiler: "Visual Studio 14 2015" # configuration: Debug - platform: x64 - compiler: "Visual Studio 14 2015 Win64" + compiler: "Visual Studio 16 2019" configuration: Release release_arch: "Windows-amd64-32" install: - git submodule update --init --recursive - - curl -L https://github.com/CICM/pd-faustgen/releases/download/v0.0.0/llvm-windows-x64-mt.zip -o llvm.zip + - curl -L https://github.com/CICM/pd-faustgen/releases/download/v0.0.0/llvm-9.0.0-windows-x64-mt.zip -o llvm.zip - 7z x llvm.zip - - rename llvm-windows-x64-mt llvm - curl http://faust.grame.fr/images/faust-quick-reference.pdf -o ./external/faust-quick-reference.pdf build_script: - mkdir build && cd build - - cmake .. -G "%compiler%" -DUSE_LLVM_CONFIG=off -DLLVM_DIR=./llvm/lib/cmake/llvm + - cmake .. -G "%compiler%" -A x64 -DUSE_LLVM_CONFIG=off -DLLVM_DIR=./llvm/lib/cmake/llvm - msbuild faustgen~.sln /nologo /p:config=%configuration% /p:plateform=%platform% after_build: - cd %APPVEYOR_BUILD_FOLDER% From dab8b849192246a4ab4b882b1d5addbe0b6a3439 Mon Sep 17 00:00:00 2001 From: Pierre Guillot Date: Mon, 3 Aug 2020 16:03:06 +0200 Subject: [PATCH 12/16] fix travis deploy key --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5e2149d..6c4203b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ deploy: name: ${TRAVIS_TAG} tag_name: ${TRAVIS_TAG} api_key: - secure: dT+n95s+gMM1iZ2G91S6zRKb/bQLxeOANy3AIh2PO/7cOCJ/MoFGjNv69qhn0B17RbPwrpbHjw+aXNS3BSuQ6uWzK6YT8Xr+vS45mIYxq/QTnyn+zWuAnzMFdu37WgGnuCau7X2tl99ia82acqt/sMKbFBWlufgudQVUtj34i8t2SuIteWT+wJ0N2V4evtvr1FnLazcbxCJFQFyw0lUrc3tMlm0rgB61lV7oESTfuEK9WCLFJyrXR9ar9Nvo22l/LVl6XsIQhpEH+/+WRTx/pa8aeM9iZzs7pYsRp5VZeezTfcPcBIL+S5Z2sKZNXf6SeWDXooR84T4WyONbNz7Io2+860VjUzSmYjr0Z9pveShApOjk3iwauwLU4bpJEuVKk4TTiDJ7eTX4JwcNvSS+kWxXUROTO6QZkkVTD/xCxAjr9BQVuts30xOXQ4D0EUaVAMLU9KNFNfqcZxqhtIihVKZgGOPzR2CqO/KgdL5aT4Ov6j1usSj32xhnzDhLEb1GVpW7TF2mzSq4Qqdesr8lhskrkPaim3SBwiqra9oqUK3qJcGysdZQX/dXgmZYBZnukvtxzV4MgE9QVSqAcUUDqxuxirg6ozHZe+OjaLuKhP+5vxr1BSUc+8o3jZbAaN17rCuPl1EDcv5QHQphwZSCPFhPzrv7kjbJMAhIQnPmSRE= + secure: K5Fu30/Jahwit18UpJBti48aLE7Z1U3VmiZCgdnYBQHnNAyZ9g5IsILRegU9p7m1yY2AMQbl/eIybYDtfVldTSCdxEaeGta5Q+emV5TUzj/na9kNduZlXSaVgIzZ6rWtdRJQsaaBL7Q7F++o3AlDl6jvi8N41EbIpMy5Enkux4ZkGKvOftviBip5OTnkmM3MFZWGVOgnFV//DvMXBSLtHgSylSnq8jE++7DvyMlN6C9yZIGcBy7ZRpMGD7aqccCy2u41gQq286IQBPPfqmzcZOgC1s1jbM8+oD0Hl9e5LaA/D8tnrt2lZbfh5R+ULGgXd7BAGp/I/+ketCWEnMqg3bV1jTXglweIGmC+uTSAiu9hAfGW5DCzVYc4G15rnniy/HlXS7qCyTuow377HfqtRdqGe4lulSxvmIWGsCAgjXuXnaTSDR70Mer0g6bsNijDa5f28c68KCv9Kq6Oy8CMmGOAmUoO7Yp5y3jVUHlHpwxMukH35ScJaauEzzPqu0CbR/bx5+nGNIllkT7yzeOI+YMq6deLnakG/4iBqmWfgtTnTUDq1Q+hm+RtYjS0JQ5LKMKjMui+/UFSGZ1ZTer+NWhmL2sWXtYyYOPwLWY+AdDAHGOq386CsohMQ36seAiU3X5bC1icBK3tG93nrJEIucgVmDeAvsrHHX41FHW8dL4= file: "faustgen_tilde-$release_arch-sources.zip" on: repo: CICM/pd-faustgen From 22237ed1fa5f904ae23ddd98310f3aa822bbd7a5 Mon Sep 17 00:00:00 2001 From: Pierre Guillot Date: Mon, 3 Aug 2020 16:06:25 +0200 Subject: [PATCH 13/16] fix appveyor deploy key --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b378dc6..9e0525e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ deploy: overwrite: true draft: true auth_token: - secure: 0Vv/0e24P2Oa/R/obFQBd824WDpAolXToTc1B0xOjM8TdXXkFdRkfRkPHDgCtoCR + secure: n/wNzOYdawEQPTt9OaxXu59bO9PKjKjzeZulk0yrmQduH6SLI7c0CduPQXBwjI1B artifact: /.*\.zip/ on: appveyor_repo_tag: true From 3fac5c854dafe8e54ae36cffab1990fdd624ccf0 Mon Sep 17 00:00:00 2001 From: Albert Graef Date: Mon, 3 Aug 2020 21:21:14 +0200 Subject: [PATCH 14/16] Add a script to create a self-contained distribution tarball. --- make-dist.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100755 make-dist.sh diff --git a/make-dist.sh b/make-dist.sh new file mode 100755 index 0000000..67ebe38 --- /dev/null +++ b/make-dist.sh @@ -0,0 +1,42 @@ +#! /bin/bash + +# Copyright (c) 2020 Albert Gräf . Distributed under the +# MIT license, please check the toplevel LICENSE file for details. + +# Create a self-contained distribution tarball from the source, including all +# the submodules. + +# Invoke this in the toplevel directory as `./make-dist.sh`. It will leave the +# tarball as pd-faustgen-.tar.gz in the toplevel directory. Temporary +# data is written to the pd-faustgen- directory, which is +# automatically deleted afterwards. The version number is extracted from +# src/faustgen_tilde.c, so make sure to keep that up-to-date. + +# NOTE: git and tar need to be installed to make this work. As a side-effect, +# all submodules will be checked out recursively, using `git submodule update +# --init --recursive`. + +# This may need adjusting if the file is edited and the macro name changes. +version=$(grep "#define FAUSTGEN_VERSION_STR" src/faustgen_tilde.c | sed 's|^#define *FAUSTGEN_VERSION_STR *"\(.*\)".*|\1|') + +# Distribution basename and name of the source tarball. +dist=pd-faustgen-$version +src=$dist.tar.gz + +# Make sure that the submodules are initialized. +git submodule update --init --recursive + +# List of submodules to include in the package. This requires git version +# 1.7.8 or later to work. +submodules=$(find . -mindepth 2 -name '.git' -type f -print | xargs grep -l "gitdir" | sed -e 's/^\.\///' -e 's/\.git$//') + +# Remove any left-over temp directory and previous tarball. +rm -rf $dist $src +# Grab the main source. +git archive --format=tar.gz --prefix=$dist/ HEAD | tar xfz - +# Grab the submodules. +for x in $submodules; do (cd $dist && git -C ../$x archive --format=tar.gz --prefix=$x HEAD | tar xfz -); done + +# Create the source tarball. +tar cfz $src $dist +rm -rf $dist From 663929e0d03c0961f0cc20729b30ad0032f482cc Mon Sep 17 00:00:00 2001 From: Pierre Guillot Date: Tue, 4 Aug 2020 11:15:04 +0200 Subject: [PATCH 15/16] update changelog --- ChangeLog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index e140a98..e258af4 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,7 @@ +### v0.1.2 +- Update Faust (2.72.2) +- Update LLVM (>= 9.0.0) + ### v0.1.1 - Fix the method to open the FAUST file on Windows when the path contains a space From 20c1b59c22b74f427e60265278de747c58f301ca Mon Sep 17 00:00:00 2001 From: Pierre Guillot Date: Tue, 4 Aug 2020 10:11:28 +0200 Subject: [PATCH 16/16] upload distribution tarball --- .travis.yml | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c4203b..b19b054 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,16 @@ matrix: - mkdir build && cd build - cmake .. -GXcode -DUSE_LLVM_CONFIG=off -DLLVM_DIR=./llvm/lib/cmake/llvm -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 - cmake --build . --config Release --target faustgen_tilde_project + before_deploy: + - cd $TRAVIS_BUILD_DIR + - cp -r faust/libraries external/libs + - cp -r src/ external/sources + - cp README.md external/README.txt + - cp LICENSE external/LICENSE.txt + - chmod 0444 external/.default.dsp + - curl -o ./external/faust-quick-reference.pdf http://faust.grame.fr/images/faust-quick-reference.pdf + - mv external faustgen~ + - zip -r "faustgen_tilde-$release_arch-sources.zip" faustgen~ - os: linux compiler: gcc addons: @@ -31,23 +41,24 @@ matrix: - export CC=gcc-4.9 - git submodule update --init --recursive - sudo apt-get install -y pkg-config libedit-dev - - curl -o ./llvm.tar.gz https://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz - - tar xvf ./llvm.tar.gz && mv clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04 llvm + - curl -o ./llvm.tar.xz https://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz + - tar xvf ./llvm.tar.xz && mv clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04 llvm script: - mkdir build && cd build - cmake .. -DCMAKE_C_FLAGS=-m64 -DUSE_LLVM_CONFIG=off -DLLVM_DIR=./llvm/lib/cmake/llvm -DCMAKE_BUILD_TYPE=Release - cmake --build . --config Release --target faustgen_tilde_project -before_deploy: -- cd $TRAVIS_BUILD_DIR -- cp -r faust/libraries external/libs -- cp -r src/ external/sources -- cp README.md external/README.txt -- cp LICENSE external/LICENSE.txt -- chmod 0444 external/.default.dsp -- curl -o ./external/faust-quick-reference.pdf http://faust.grame.fr/images/faust-quick-reference.pdf -- mv external faustgen~ -- zip -r "faustgen_tilde-$release_arch-sources.zip" faustgen~ + before_deploy: + - cd $TRAVIS_BUILD_DIR + - cp -r faust/libraries external/libs + - cp -r src/ external/sources + - cp README.md external/README.txt + - cp LICENSE external/LICENSE.txt + - chmod 0444 external/.default.dsp + - curl -o ./external/faust-quick-reference.pdf http://faust.grame.fr/images/faust-quick-reference.pdf + - mv external faustgen~ + - zip -r "faustgen_tilde-$release_arch-sources.zip" faustgen~ + - ./make-dist.sh deploy: provider: releases skip_cleanup: true @@ -58,7 +69,10 @@ deploy: tag_name: ${TRAVIS_TAG} api_key: secure: K5Fu30/Jahwit18UpJBti48aLE7Z1U3VmiZCgdnYBQHnNAyZ9g5IsILRegU9p7m1yY2AMQbl/eIybYDtfVldTSCdxEaeGta5Q+emV5TUzj/na9kNduZlXSaVgIzZ6rWtdRJQsaaBL7Q7F++o3AlDl6jvi8N41EbIpMy5Enkux4ZkGKvOftviBip5OTnkmM3MFZWGVOgnFV//DvMXBSLtHgSylSnq8jE++7DvyMlN6C9yZIGcBy7ZRpMGD7aqccCy2u41gQq286IQBPPfqmzcZOgC1s1jbM8+oD0Hl9e5LaA/D8tnrt2lZbfh5R+ULGgXd7BAGp/I/+ketCWEnMqg3bV1jTXglweIGmC+uTSAiu9hAfGW5DCzVYc4G15rnniy/HlXS7qCyTuow377HfqtRdqGe4lulSxvmIWGsCAgjXuXnaTSDR70Mer0g6bsNijDa5f28c68KCv9Kq6Oy8CMmGOAmUoO7Yp5y3jVUHlHpwxMukH35ScJaauEzzPqu0CbR/bx5+nGNIllkT7yzeOI+YMq6deLnakG/4iBqmWfgtTnTUDq1Q+hm+RtYjS0JQ5LKMKjMui+/UFSGZ1ZTer+NWhmL2sWXtYyYOPwLWY+AdDAHGOq386CsohMQ36seAiU3X5bC1icBK3tG93nrJEIucgVmDeAvsrHHX41FHW8dL4= - file: "faustgen_tilde-$release_arch-sources.zip" + file_glob: true + file: + - "faustgen_tilde-$release_arch-sources.zip" + - '*.tar.gz' on: repo: CICM/pd-faustgen tags: true