Skip to content

Commit 49b9574

Browse files
pierreguillotpierreguillot
authored
Merge pull request #3 from pierreguillot/dev/v0.0.3
Dev/v0.0.3
2 parents 698a02a + 39139b5 commit 49b9574

29 files changed

+1865
-1080
lines changed

‎.travis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ matrix:
1717
script:
1818
- mkdir build && cd build
1919
- cmake .. -GXcode -DUSE_LLVM_CONFIG=off -DLLVM_DIR=./llvm/lib/cmake/llvm
20-
- cmake --build . --config Release --target faust_tilde_project
20+
- cmake --build . --config Release --target faustgen_tilde_project
2121
- os: linux
2222
compiler: gcc
2323
env: release_arch=Linux-amd64-32
@@ -29,16 +29,16 @@ matrix:
2929
script:
3030
- mkdir build && cd build
3131
- cmake .. -DCMAKE_C_FLAGS=-m64 -DUSE_LLVM_CONFIG=off -DLLVM_DIR=./llvm/lib/cmake/llvm -DCMAKE_BUILD_TYPE=Release
32-
- cmake --build . --config Release --target faust_tilde_project
32+
- cmake --build . --config Release --target faustgen_tilde_project
3333
before_deploy:
3434
- cd $TRAVIS_BUILD_DIR
3535
- cp -r faust/libraries external/libs
36-
- cp src/faust_tilde.c external/faust_tilde.c
36+
- cp src/faustgen_tilde.c external/faustgen_tilde.c
3737
- cp README.md external/README.txt
3838
- cp LICENSE external/LICENSE.txt
3939
- curl -o ./external/faust-quick-reference.pdf http://faust.grame.fr/images/faust-quick-reference.pdf
40-
- mv external faust~
41-
- zip -r "faust_tilde-$release_arch-sources.zip" faust~
40+
- mv external faustgen~
41+
- zip -r "faustgen_tilde-$release_arch-sources.zip" faustgen~
4242

4343
deploy:
4444
provider: releases

‎CMakeLists.txt‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
66

77
include(pd.build/pd.cmake)
88

9-
project(faust~ C)
9+
project(faustgen~ C)
1010

1111
## On Linux "force" the link with stdc++
1212
if(UNIX AND NOT APPLE)
@@ -29,17 +29,25 @@ endif()
2929

3030
include(FaustLib.cmake)
3131
## Create Faust~
32-
message(STATUS "Faust External")
32+
message(STATUS "faustgen~ external")
3333

3434
## Create the Pure Data external
3535
set_pd_sources(${PROJECT_SOURCE_DIR}/pure-data/src/)
3636
set_pd_external_path("${PROJECT_SOURCE_DIR}/external/")
37-
add_pd_external(faust_tilde_project faust~ ${PROJECT_SOURCE_DIR}/src/faust_tilde.c)
37+
file(GLOB faustgen_tilde_sources
38+
${PROJECT_SOURCE_DIR}/src/faustgen_tilde.c
39+
${PROJECT_SOURCE_DIR}/src/faust_tilde_ui.h
40+
${PROJECT_SOURCE_DIR}/src/faust_tilde_ui.c
41+
${PROJECT_SOURCE_DIR}/src/faust_tilde_io.h
42+
${PROJECT_SOURCE_DIR}/src/faust_tilde_io.c
43+
${PROJECT_SOURCE_DIR}/src/faust_tilde_options.h
44+
${PROJECT_SOURCE_DIR}/src/faust_tilde_options.c)
45+
add_pd_external(faustgen_tilde_project faustgen~ "${faustgen_tilde_sources}")
3846

3947
## Link the Pure Data external with faustlib
4048
include_directories(${PROJECT_SOURCE_DIR}/faust/architecture)
41-
add_dependencies(faust_tilde_project staticlib)
42-
target_link_libraries(faust_tilde_project staticlib)
49+
add_dependencies(faustgen_tilde_project staticlib)
50+
target_link_libraries(faustgen_tilde_project staticlib)
4351

4452
## Link the Pure Data external with llvm
4553
find_package(LLVM REQUIRED CONFIG)
@@ -50,11 +58,11 @@ add_definitions(${LLVM_DEFINITIONS})
5058
include_directories(${LLVM_INCLUDE_DIRS})
5159
llvm_map_components_to_libnames(llvm_libs all)
5260
list(REMOVE_ITEM llvm_libs LTO)
53-
target_link_libraries(faust_tilde_project ${llvm_libs})
61+
target_link_libraries(faustgen_tilde_project ${llvm_libs})
5462
if(WIN32)
55-
target_link_libraries(faust_tilde_project ws2_32)
63+
target_link_libraries(faustgen_tilde_project ws2_32)
5664
endif()
5765

5866
if(MSVC)
59-
set_property(TARGET faust_tilde_project APPEND_STRING PROPERTY LINK_FLAGS " /ignore:4099 ")
67+
set_property(TARGET faustgen_tilde_project APPEND_STRING PROPERTY LINK_FLAGS " /ignore:4099 ")
6068
endif()

‎ChangeLog.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
v0.0.3
2+
- Change name from faust~ to faustgen~
3+
- Remove abstraction faust.watcher
4+
- Add support for autocompile method
5+
- Add support for passive parameter
6+
- Add support for list of active parameters
7+
- Add support for ui glue long names
8+
- Add support for dynamic compile options
9+
- Improve print method
10+
11+
v0.0.2
12+
- Fix Linux dependencies
13+
- Add abstraction faust.watcher
14+
15+
v0.0.1
16+
- Integration of FAUST lib inside the faust~ external (Linux/MacOS/Windows)

‎FaustDeken.bat‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
@echo off
2-
title Deken manager for Faust~ for Pure Data
2+
title Deken manager for faustgen~ for Pure Data
33
set release_version=%1
44

5-
rmdir /S /Q faust~
5+
rmdir /S /Q faustgen~
66
del /F /S /Q /A *.dek
77
del /F /S /Q /A *.dek.sha256
88
del /F /S /Q /A *.dek.txt
99

10-
del /F /Q faust_tilde_darwin.zip
11-
curl -L https://github.com/pierreguillot/faust-pd/releases/download/v%release_version%/faust_tilde-Darwin-amd64-32-sources.zip -o faust_tilde_darwin.zip
12-
7z x faust_tilde_darwin.zip
13-
deken package -v%release_version% faust~
14-
rmdir /S /Q faust~
15-
del /F /Q faust_tilde_darwin.zip
10+
del /F /Q faustgen_tilde_darwin.zip
11+
curl -L https://github.com/pierreguillot/faust-pd/releases/download/v%release_version%/faustgen_tilde-Darwin-amd64-32-sources.zip -o faustgen_tilde_darwin.zip
12+
7z x faustgen_tilde_darwin.zip
13+
deken package -v%release_version% faustgen~
14+
rmdir /S /Q faustgen~
15+
del /F /Q faustgen_tilde_darwin.zip
1616

17-
del /F /Q faust_tilde_linux.zip
18-
curl -L https://github.com/pierreguillot/faust-pd/releases/download/v%release_version%/faust_tilde-Linux-amd64-32-sources.zip -o faust_tilde_linux.zip
19-
7z x faust_tilde_linux.zip
20-
deken package -v%release_version% faust~
21-
rmdir /S /Q faust~
22-
del /F /Q faust_tilde_linux.zip
17+
del /F /Q faustgen_tilde_linux.zip
18+
curl -L https://github.com/pierreguillot/faust-pd/releases/download/v%release_version%/faustgen_tilde-Linux-amd64-32-sources.zip -o faustgen_tilde_linux.zip
19+
7z x faustgen_tilde_linux.zip
20+
deken package -v%release_version% faustgen~
21+
rmdir /S /Q faustgen~
22+
del /F /Q faustgen_tilde_linux.zip
2323

24-
del /F /Q faust_tilde_windows.zip
25-
curl -L https://github.com/pierreguillot/faust-pd/releases/download/v%release_version%/faust_tilde-Windows-amd64-32-sources.zip -o faust_tilde_windows.zip
26-
7z x faust_tilde_windows.zip
27-
deken package -v%release_version% faust~
28-
rmdir /S /Q faust~
29-
del /F /Q faust_tilde_windows.zip
24+
del /F /Q faustgen_tilde_windows.zip
25+
curl -L https://github.com/pierreguillot/faust-pd/releases/download/v%release_version%/faustgen_tilde-Windows-amd64-32-sources.zip -o faustgen_tilde_windows.zip
26+
7z x faustgen_tilde_windows.zip
27+
deken package -v%release_version% faustgen~
28+
rmdir /S /Q faustgen~
29+
del /F /Q faustgen_tilde_windows.zip
3030

31-
del /F /Q faust_tilde_archive.zip
32-
curl -L https://github.com/pierreguillot/faust-pd/archive/v%release_version%.zip -o faust_tilde_archive.zip
33-
7z x faust_tilde_archive.zip
34-
rename faust-pd-%release_version% faust~
35-
deken package -v%release_version% faust~
36-
rmdir /S /Q faust~
37-
del /F /Q faust_tilde_archive.zip
31+
del /F /Q faustgen_tilde_archive.zip
32+
curl -L https://github.com/pierreguillot/faust-pd/archive/v%release_version%.zip -o faustgen_tilde_archive.zip
33+
7z x faustgen_tilde_archive.zip
34+
rename faust-pd-%release_version% faustgen~
35+
deken package -v%release_version% faustgen~
36+
rmdir /S /Q faustgen~
37+
del /F /Q faustgen_tilde_archive.zip
3838

39-
rem deken upload faust~[v%release_version%](Darwin-amd64-32)(Sources).dek faust~[v%release_version%](Linux-amd64-32)(Sources).dek faust~[v%release_version%](Windows-amd64-32)(Sources).dek faust~[v%release_version%](Sources).dek
39+
rem deken upload faustgen~[v%release_version%](Darwin-amd64-32)(Sources).dek faustgen~[v%release_version%](Linux-amd64-32)(Sources).dek faustgen~[v%release_version%](Windows-amd64-32)(Sources).dek faustgen~[v%release_version%](Sources).dek
4040
pause

‎FaustDeken.sh‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
#!/bin/bash
22

3-
echo -e "title Deken manager for Faust~ for Pure Data"
3+
echo -e "title Deken manager for faustgen~ for Pure Data"
44

5-
rm -rf faust~
5+
rm -rf faustgen~
66
rm -f *.dek
77
rm -f *.dek.sha256
88
rm -f *.dek.txt
99

10-
rm -f faust_tilde_darwin.zip
11-
curl -L "https://github.com/pierreguillot/faust-pd/releases/download/v$1/faust_tilde-Darwin-amd64-32-sources.zip" -o faust_tilde_darwin.zip
12-
tar zxvf faust_tilde_darwin.zip
13-
deken package -v$1 faust~
14-
rm -rf faust~
15-
rm -f faust_tilde_darwin.zip
10+
rm -f faustgen_tilde_darwin.zip
11+
curl -L "https://github.com/pierreguillot/faust-pd/releases/download/v$1/faustgen_tilde-Darwin-amd64-32-sources.zip" -o faustgen_tilde_darwin.zip
12+
tar zxvf faustgen_tilde_darwin.zip
13+
deken package -v$1 faustgen~
14+
rm -rf faustgen~
15+
rm -f faustgen_tilde_darwin.zip
1616

17-
rm -f faust_tilde_linux.zip
18-
curl -L "https://github.com/pierreguillot/faust-pd/releases/download/v$1/faust_tilde-Linux-amd64-32-sources.zip" -o faust_tilde_linux.zip
19-
tar zxvf faust_tilde_linux.zip
20-
deken package -v$1 faust~
21-
rm -rf faust~
22-
rm -f faust_tilde_linux.zip
17+
rm -f faustgen_tilde_linux.zip
18+
curl -L "https://github.com/pierreguillot/faust-pd/releases/download/v$1/faustgen_tilde-Linux-amd64-32-sources.zip" -o faustgen_tilde_linux.zip
19+
tar zxvf faustgen_tilde_linux.zip
20+
deken package -v$1 faustgen~
21+
rm -rf faustgen~
22+
rm -f faustgen_tilde_linux.zip
2323

24-
rm -f faust_tilde_windows.zip
25-
curl -L "https://github.com/pierreguillot/faust-pd/releases/download/v$1/faust_tilde-Windows-amd64-32-sources.zip" -o faust_tilde_windows.zip
26-
tar zxvf faust_tilde_windows.zip
27-
deken package -v$1 faust~
28-
rm -rf faust~
29-
rm -f faust_tilde_windows.zip
24+
rm -f faustgen_tilde_windows.zip
25+
curl -L "https://github.com/pierreguillot/faust-pd/releases/download/v$1/faustgen_tilde-Windows-amd64-32-sources.zip" -o faustgen_tilde_windows.zip
26+
tar zxvf faustgen_tilde_windows.zip
27+
deken package -v$1 faustgen~
28+
rm -rf faustgen~
29+
rm -f faustgen_tilde_windows.zip
3030

31-
rm -f faust_tilde_archive.zip
32-
curl -L "https://github.com/pierreguillot/faust-pd/archive/v$1.zip" -o faust_tilde_archive.zip
33-
tar zxvf faust_tilde_archive.zip
34-
mv faust-pd-$1 faust~
35-
deken package -v$1 faust~
36-
rm -rf faust~
37-
rm -f faust_tilde_archive.zip
31+
rm -f faustgen_tilde_archive.zip
32+
curl -L "https://github.com/pierreguillot/faust-pd/archive/v$1.zip" -o faustgen_tilde_archive.zip
33+
tar zxvf faustgen_tilde_archive.zip
34+
mv faust-pd-$1 faustgen~
35+
deken package -v$1 faustgen~
36+
rm -rf faustgen~
37+
rm -f faustgen_tilde_archive.zip
3838

39-
# deken upload faust~[v%release_version%](Darwin-amd64-32)(Sources).dek faust~[v%release_version%](Linux-amd64-32)(Sources).dek faust~[v%release_version%](Windows-amd64-32)(Sources).dek faust~[v%release_version%](Sources).dek
39+
# deken upload faustgen~[v%release_version%](Darwin-amd64-32)(Sources).dek faustgen~[v%release_version%](Linux-amd64-32)(Sources).dek faustgen~[v%release_version%](Windows-amd64-32)(Sources).dek faustgen~[v%release_version%](Sources).dek

‎FaustLib.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ set(WASM_BACKEND OFF CACHE STRING "Include WASM ba
4141
add_subdirectory(./faust/build EXCLUDE_FROM_ALL)
4242

4343
if(MSVC)
44-
set_property(TARGET staticlib APPEND_STRING PROPERTY COMPILE_FLAGS " /EHsc /D WIN32 -D_SCL_SECURE_NO_WARNINGS ")
44+
set_property(TARGET staticlib APPEND_STRING PROPERTY COMPILE_FLAGS " /EHsc /D WIN32 -D_SCL_SECURE_NO_WARNINGS")
4545
set_property(TARGET staticlib APPEND_STRING PROPERTY LINK_FLAGS " /ignore:4099 ")
4646
endif()
4747

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<p align="center">
33
<h1 align="center">
4-
faust~
4+
faustgen~
55
</h1>
66
<p align="center">
77
The FAUST compiler embedded in a Pd external
@@ -15,7 +15,7 @@
1515

1616
## Presentation
1717

18-
The **faust~** object is an external with the [FAUST](http://faust.grame.fr/about/) just-in-time (JIT) compiler embedded that allows to load, compile and play FAUST files within the audio programming environment [Pure Data](http://msp.ucsd.edu/software.html). FAUST (Functional Audio Stream) is a functional programming language specifically designed for real-time signal processing and synthesis developed by the [GRAME](http://www.grame.fr/). The FAUST JIT compiler - built with [LLVM](https://llvm.org/) - brings together the convenience of a standalone interpreted language with the efficiency of a compiled language. The **faust~** object is a very first version with elementary features, any help and any contribution are welcome.
18+
The **faustgen~** object is an external with the [FAUST](http://faust.grame.fr/about/) just-in-time (JIT) compiler embedded that allows to load, compile and play FAUST files within the audio programming environment [Pure Data](http://msp.ucsd.edu/software.html). FAUST (Functional Audio Stream) is a functional programming language specifically designed for real-time signal processing and synthesis developed by the [GRAME](http://www.grame.fr/). The FAUST JIT compiler - built with [LLVM](https://llvm.org/) - brings together the convenience of a standalone interpreted language with the efficiency of a compiled language. The **faustgen~** object is a very first version with elementary features, any help and any contribution are welcome.
1919

2020
**Dependencies:**
2121

@@ -77,12 +77,12 @@ Once the binaries are compiled or uploaded with Travis and Appveyor to the relea
7777
**FAUST website**: faust.grame.fr
7878
**FAUST developers**: Yann Orlarey, Stéphane Letz, Dominique Fober and others
7979

80-
**faust~ institutions**: CICM - ANR MUSICOLL
81-
**fauts~ website**: github.com/grame-cncm/faust-pd
82-
**faust~ developer**: Pierre Guillot
80+
**faustgen~ institutions**: CICM - ANR MUSICOLL
81+
**faustgen~ website**: github.com/grame-cncm/faust-pd
82+
**faustgen~ developer**: Pierre Guillot
8383

8484
## Legacy
8585

86-
This **faust~** object for Pd is inspired by the **faustgen~** object for Max developed by Martin Di Rollo and Stéphane Letz.
86+
This **faustgen~** object for Pd is inspired by the **faustgen~** object for Max developed by Martin Di Rollo and Stéphane Letz.
8787

8888
Another **faust~** object has been developed by Albert Graef using the programming language [Pure](https://github.com/agraef/pure-lang).

‎ToDoList.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
- Mesure DSP time of the code
2+
- Use automatic optimizations with compile options
3+
- Check if the DSP process is in-place
4+
- Check why -double option crashes

‎appveyor.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ install:
2323
build_script:
2424
- mkdir build%llvmplateform% && cd build%llvmplateform%
2525
- cmake .. -G "%compiler%" -DUSE_LLVM_CONFIG=off -DLLVM_DIR=./llvm-windows-%llvmplateform%-%llvmpconfig%/lib/cmake/llvm
26-
- msbuild faust~.sln /nologo /p:config=%configuration% /p:plateform=%platform%
26+
- msbuild faustgen~.sln /nologo /p:config=%configuration% /p:plateform=%platform%
2727
after_build:
2828
- cd %APPVEYOR_BUILD_FOLDER%
2929
- del /F /Q llvm.zip
3030
- del /F /S /Q /A external\*.pdb
3131
- del /F /S /Q /A external\*.ilk
3232
- del /F /S /Q /A external\*.lib
3333
- del /F /S /Q /A external\*.exp
34-
- copy src\faust_tilde.c external\faust_tilde.c
34+
- copy src\faustgen_tilde.c external\faustgen_tilde.c
3535
- copy README.md external\README.md
3636
- copy LICENSE external\LICENSE.txt
3737
- xcopy /S /E /Y /I .\faust\libraries .\external\libs
38-
- rename external faust~
39-
- 7z a "faust_tilde-%release_arch%-sources.zip" faust~
38+
- rename external faustgen~
39+
- 7z a "faustgen_tilde-%release_arch%-sources.zip" faustgen~
4040

4141
artifacts:
4242
- path: '*.zip'

‎external/examples/dummy.dsp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
declare name "Dummy";
2+
declare version "1.0";
3+
declare author "Heu... me...";
4+
5+
6+
process = _, _, _, _ :> _, _;

0 commit comments

Comments
 (0)