From dc86a87016dcb6fd64912ee861eaa8c5d9fa591a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 10 Nov 2009 00:40:02 +0000 Subject: renaming this to 'vanilla' since that's the most common name used for the core of Pd svn path=/trunk/; revision=12733 --- externals/corelibs/generate.sh | 25 ------------------------- externals/vanilla/Makefile | 15 +++++++++++++++ externals/vanilla/README | 24 ++++++++++++++++++++++++ externals/vanilla/bng.c | 5 +++++ externals/vanilla/cnv.c | 5 +++++ externals/vanilla/generate.sh | 25 +++++++++++++++++++++++++ externals/vanilla/hradio.c | 5 +++++ externals/vanilla/hsl.c | 5 +++++ externals/vanilla/lib_d_arithmetic.c | 5 +++++ externals/vanilla/lib_d_array.c | 5 +++++ externals/vanilla/lib_d_ctl.c | 5 +++++ externals/vanilla/lib_d_dac.c | 5 +++++ externals/vanilla/lib_d_delay.c | 5 +++++ externals/vanilla/lib_d_fft.c | 7 +++++++ externals/vanilla/lib_d_filter.c | 5 +++++ externals/vanilla/lib_d_global.c | 5 +++++ externals/vanilla/lib_d_math.c | 5 +++++ externals/vanilla/lib_d_misc.c | 5 +++++ externals/vanilla/lib_d_osc.c | 5 +++++ externals/vanilla/lib_d_soundfile.c | 5 +++++ externals/vanilla/lib_d_ugen.c | 5 +++++ externals/vanilla/lib_x_acoustics.c | 5 +++++ externals/vanilla/lib_x_arithmetic.c | 5 +++++ externals/vanilla/lib_x_connective.c | 5 +++++ externals/vanilla/lib_x_gui.c | 5 +++++ externals/vanilla/lib_x_interface.c | 5 +++++ externals/vanilla/lib_x_list.c | 5 +++++ externals/vanilla/lib_x_midi.c | 5 +++++ externals/vanilla/lib_x_misc.c | 5 +++++ externals/vanilla/lib_x_net.c | 5 +++++ externals/vanilla/lib_x_qlist.c | 5 +++++ externals/vanilla/lib_x_time.c | 5 +++++ externals/vanilla/nbx.c | 5 +++++ externals/vanilla/print.c | 1 + externals/vanilla/tgl.c | 5 +++++ externals/vanilla/vradio.c | 5 +++++ externals/vanilla/vslider.c | 5 +++++ externals/vanilla/vu.c | 5 +++++ 38 files changed, 232 insertions(+), 25 deletions(-) delete mode 100755 externals/corelibs/generate.sh create mode 100644 externals/vanilla/Makefile create mode 100644 externals/vanilla/README create mode 100644 externals/vanilla/bng.c create mode 100644 externals/vanilla/cnv.c create mode 100755 externals/vanilla/generate.sh create mode 100644 externals/vanilla/hradio.c create mode 100644 externals/vanilla/hsl.c create mode 100644 externals/vanilla/lib_d_arithmetic.c create mode 100644 externals/vanilla/lib_d_array.c create mode 100644 externals/vanilla/lib_d_ctl.c create mode 100644 externals/vanilla/lib_d_dac.c create mode 100644 externals/vanilla/lib_d_delay.c create mode 100644 externals/vanilla/lib_d_fft.c create mode 100644 externals/vanilla/lib_d_filter.c create mode 100644 externals/vanilla/lib_d_global.c create mode 100644 externals/vanilla/lib_d_math.c create mode 100644 externals/vanilla/lib_d_misc.c create mode 100644 externals/vanilla/lib_d_osc.c create mode 100644 externals/vanilla/lib_d_soundfile.c create mode 100644 externals/vanilla/lib_d_ugen.c create mode 100644 externals/vanilla/lib_x_acoustics.c create mode 100644 externals/vanilla/lib_x_arithmetic.c create mode 100644 externals/vanilla/lib_x_connective.c create mode 100644 externals/vanilla/lib_x_gui.c create mode 100644 externals/vanilla/lib_x_interface.c create mode 100644 externals/vanilla/lib_x_list.c create mode 100644 externals/vanilla/lib_x_midi.c create mode 100644 externals/vanilla/lib_x_misc.c create mode 100644 externals/vanilla/lib_x_net.c create mode 100644 externals/vanilla/lib_x_qlist.c create mode 100644 externals/vanilla/lib_x_time.c create mode 100644 externals/vanilla/nbx.c create mode 100644 externals/vanilla/print.c create mode 100644 externals/vanilla/tgl.c create mode 100644 externals/vanilla/vradio.c create mode 100644 externals/vanilla/vslider.c create mode 100644 externals/vanilla/vu.c (limited to 'externals') diff --git a/externals/corelibs/generate.sh b/externals/corelibs/generate.sh deleted file mode 100755 index 0e37eefd..00000000 --- a/externals/corelibs/generate.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -echo this script appends, so first delete all files you want to update! - -# put these at the top of the file -touch lib_d_fft.c -echo '#include "../../pd/src/d_fftroutine.c"' >> lib_d_fft.c -echo '#include "../../pd/src/d_fft_mayer.c"' >> lib_d_fft.c - -for file in ../../pd/src/[dx]_*.c; do - newfile=`echo $file | sed 's|.*/src/\([dx]_\)|lib_\1|'` - touch $newfile - /bin/echo -n '#include "' >> $newfile - /bin/echo -n $file >> $newfile - /bin/echo '"' >> $newfile - /bin/echo "void "`echo $newfile|sed 's|\(.*\)\.c|\1|'`"_setup(void)" >> $newfile - /bin/echo "{" >> $newfile - /bin/echo $file | sed 's|.*src/\(.*\)\.c| \1_setup();|' >> $newfile - /bin/echo "}" >> $newfile -done - -# these files hold code for other classes, but no classes -rm lib_d_fftroutine.c lib_d_fft_mayer.c lib_d_resample.c -rm lib_d_fft_fftw.c lib_d_fft_fftsg.c lib_d_fftsg_h.c - diff --git a/externals/vanilla/Makefile b/externals/vanilla/Makefile new file mode 100644 index 00000000..a13265fb --- /dev/null +++ b/externals/vanilla/Makefile @@ -0,0 +1,15 @@ +TARGET := $(shell pwd | sed 's|.*/\(.*\)$$|\1|') +EXTERNALS_ROOT := $(shell pwd | sed 's|^\(/.*externals\).*|\1|') + +default: + make -C $(EXTERNALS_ROOT) $(TARGET) + +install: + make -C $(EXTERNALS_ROOT) $(TARGET)_install + +clean: + make -C $(EXTERNALS_ROOT) $(TARGET)_clean + +test_locations: + make -C $(EXTERNALS_ROOT) test_locations + diff --git a/externals/vanilla/README b/externals/vanilla/README new file mode 100644 index 00000000..adf78da0 --- /dev/null +++ b/externals/vanilla/README @@ -0,0 +1,24 @@ + +These are just the objects included in Miller's Pd compiled as stand-alone +libraries based on their source files. Its a quick and dirty hack to strip Pd +down to the bare essentials so that the namespace will be fully functional. + +The lib_x_* files are generated using the included script, generate.sh. They +should not be modified directly. Ideally, these would be compiled as +individual objects. + +The files named after the classes are GUI objects that originally had g_ +prefixes on the file names. + +This stuff is currently here as a proof of concept for turning Pd core into a +micro-language. If you want to start modifying these, then we should discuss +how these should be maintained along with Miller's changes. + +test version +------------ + +Once 0.40.x is done, then I plan on making the full test of this concept in +the branch-v0-40-x-extended, splitting out each class into its own file in +"extra", and compiling each as its own lib. + + diff --git a/externals/vanilla/bng.c b/externals/vanilla/bng.c new file mode 100644 index 00000000..e4fc5f28 --- /dev/null +++ b/externals/vanilla/bng.c @@ -0,0 +1,5 @@ +#include "../../pd/src/g_bang.c" +void bng_setup(void) +{ + g_bang_setup(); +} diff --git a/externals/vanilla/cnv.c b/externals/vanilla/cnv.c new file mode 100644 index 00000000..af815721 --- /dev/null +++ b/externals/vanilla/cnv.c @@ -0,0 +1,5 @@ +#include "../../pd/src/g_mycanvas.c" +void cnv_setup(void) +{ + g_mycanvas_setup(); +} diff --git a/externals/vanilla/generate.sh b/externals/vanilla/generate.sh new file mode 100755 index 00000000..0e37eefd --- /dev/null +++ b/externals/vanilla/generate.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +echo this script appends, so first delete all files you want to update! + +# put these at the top of the file +touch lib_d_fft.c +echo '#include "../../pd/src/d_fftroutine.c"' >> lib_d_fft.c +echo '#include "../../pd/src/d_fft_mayer.c"' >> lib_d_fft.c + +for file in ../../pd/src/[dx]_*.c; do + newfile=`echo $file | sed 's|.*/src/\([dx]_\)|lib_\1|'` + touch $newfile + /bin/echo -n '#include "' >> $newfile + /bin/echo -n $file >> $newfile + /bin/echo '"' >> $newfile + /bin/echo "void "`echo $newfile|sed 's|\(.*\)\.c|\1|'`"_setup(void)" >> $newfile + /bin/echo "{" >> $newfile + /bin/echo $file | sed 's|.*src/\(.*\)\.c| \1_setup();|' >> $newfile + /bin/echo "}" >> $newfile +done + +# these files hold code for other classes, but no classes +rm lib_d_fftroutine.c lib_d_fft_mayer.c lib_d_resample.c +rm lib_d_fft_fftw.c lib_d_fft_fftsg.c lib_d_fftsg_h.c + diff --git a/externals/vanilla/hradio.c b/externals/vanilla/hradio.c new file mode 100644 index 00000000..f1b99d07 --- /dev/null +++ b/externals/vanilla/hradio.c @@ -0,0 +1,5 @@ +#include "../../pd/src/g_hdial.c" +void hradio_setup(void) +{ + g_hradio_setup(); +} diff --git a/externals/vanilla/hsl.c b/externals/vanilla/hsl.c new file mode 100644 index 00000000..3a1f7b81 --- /dev/null +++ b/externals/vanilla/hsl.c @@ -0,0 +1,5 @@ +#include "../../pd/src/g_hslider.c" +void hsl_setup(void) +{ + g_hslider_setup(); +} diff --git a/externals/vanilla/lib_d_arithmetic.c b/externals/vanilla/lib_d_arithmetic.c new file mode 100644 index 00000000..3f0a1cf9 --- /dev/null +++ b/externals/vanilla/lib_d_arithmetic.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_arithmetic.c" +void lib_d_arithmetic_setup(void) +{ + d_arithmetic_setup(); +} diff --git a/externals/vanilla/lib_d_array.c b/externals/vanilla/lib_d_array.c new file mode 100644 index 00000000..e548120f --- /dev/null +++ b/externals/vanilla/lib_d_array.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_array.c" +void lib_d_array_setup(void) +{ + d_array_setup(); +} diff --git a/externals/vanilla/lib_d_ctl.c b/externals/vanilla/lib_d_ctl.c new file mode 100644 index 00000000..356315a8 --- /dev/null +++ b/externals/vanilla/lib_d_ctl.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_ctl.c" +void lib_d_ctl_setup(void) +{ + d_ctl_setup(); +} diff --git a/externals/vanilla/lib_d_dac.c b/externals/vanilla/lib_d_dac.c new file mode 100644 index 00000000..a77ddf0c --- /dev/null +++ b/externals/vanilla/lib_d_dac.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_dac.c" +void lib_d_dac_setup(void) +{ + d_dac_setup(); +} diff --git a/externals/vanilla/lib_d_delay.c b/externals/vanilla/lib_d_delay.c new file mode 100644 index 00000000..67fab609 --- /dev/null +++ b/externals/vanilla/lib_d_delay.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_delay.c" +void lib_d_delay_setup(void) +{ + d_delay_setup(); +} diff --git a/externals/vanilla/lib_d_fft.c b/externals/vanilla/lib_d_fft.c new file mode 100644 index 00000000..6cc6085b --- /dev/null +++ b/externals/vanilla/lib_d_fft.c @@ -0,0 +1,7 @@ +#include "../../pd/src/d_fftroutine.c" +#include "../../pd/src/d_fft_mayer.c" +#include "../../pd/src/d_fft.c" +void lib_d_fft_setup(void) +{ + d_fft_setup(); +} diff --git a/externals/vanilla/lib_d_filter.c b/externals/vanilla/lib_d_filter.c new file mode 100644 index 00000000..80134665 --- /dev/null +++ b/externals/vanilla/lib_d_filter.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_filter.c" +void lib_d_filter_setup(void) +{ + d_filter_setup(); +} diff --git a/externals/vanilla/lib_d_global.c b/externals/vanilla/lib_d_global.c new file mode 100644 index 00000000..3c7c4487 --- /dev/null +++ b/externals/vanilla/lib_d_global.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_global.c" +void lib_d_global_setup(void) +{ + d_global_setup(); +} diff --git a/externals/vanilla/lib_d_math.c b/externals/vanilla/lib_d_math.c new file mode 100644 index 00000000..d9605431 --- /dev/null +++ b/externals/vanilla/lib_d_math.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_math.c" +void lib_d_math_setup(void) +{ + d_math_setup(); +} diff --git a/externals/vanilla/lib_d_misc.c b/externals/vanilla/lib_d_misc.c new file mode 100644 index 00000000..fb70d525 --- /dev/null +++ b/externals/vanilla/lib_d_misc.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_misc.c" +void lib_d_misc_setup(void) +{ + d_misc_setup(); +} diff --git a/externals/vanilla/lib_d_osc.c b/externals/vanilla/lib_d_osc.c new file mode 100644 index 00000000..acd8fdd5 --- /dev/null +++ b/externals/vanilla/lib_d_osc.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_osc.c" +void lib_d_osc_setup(void) +{ + d_osc_setup(); +} diff --git a/externals/vanilla/lib_d_soundfile.c b/externals/vanilla/lib_d_soundfile.c new file mode 100644 index 00000000..8305559e --- /dev/null +++ b/externals/vanilla/lib_d_soundfile.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_soundfile.c" +void lib_d_soundfile_setup(void) +{ + d_soundfile_setup(); +} diff --git a/externals/vanilla/lib_d_ugen.c b/externals/vanilla/lib_d_ugen.c new file mode 100644 index 00000000..30a9ec05 --- /dev/null +++ b/externals/vanilla/lib_d_ugen.c @@ -0,0 +1,5 @@ +#include "../../pd/src/d_ugen.c" +void lib_d_ugen_setup(void) +{ + d_ugen_setup(); +} diff --git a/externals/vanilla/lib_x_acoustics.c b/externals/vanilla/lib_x_acoustics.c new file mode 100644 index 00000000..67a17cac --- /dev/null +++ b/externals/vanilla/lib_x_acoustics.c @@ -0,0 +1,5 @@ +#include "../../pd/src/x_acoustics.c" +void lib_x_acoustics_setup(void) +{ + x_acoustics_setup(); +} diff --git a/externals/vanilla/lib_x_arithmetic.c b/externals/vanilla/lib_x_arithmetic.c new file mode 100644 index 00000000..f09dd36e --- /dev/null +++ b/externals/vanilla/lib_x_arithmetic.c @@ -0,0 +1,5 @@ +#include "../../pd/src/x_arithmetic.c" +void lib_x_arithmetic_setup(void) +{ + x_arithmetic_setup(); +} diff --git a/externals/vanilla/lib_x_connective.c b/externals/vanilla/lib_x_connective.c new file mode 100644 index 00000000..1f56ebae --- /dev/null +++ b/externals/vanilla/lib_x_connective.c @@ -0,0 +1,5 @@ +#include "../../pd/src/x_connective.c" +void lib_x_connective_setup(void) +{ + x_connective_setup(); +} diff --git a/externals/vanilla/lib_x_gui.c b/externals/vanilla/lib_x_gui.c new file mode 100644 index 00000000..d1f20bd8 --- /dev/null +++ b/externals/vanilla/lib_x_gui.c @@ -0,0 +1,5 @@ +#include "../../pd/src/x_gui.c" +void lib_x_gui_setup(void) +{ + x_gui_setup(); +} diff --git a/externals/vanilla/lib_x_interface.c b/externals/vanilla/lib_x_interface.c new file mode 100644 index 00000000..6875374f --- /dev/null +++ b/externals/vanilla/lib_x_interface.c @@ -0,0 +1,5 @@ +#include "../../pd/src/x_interface.c" +void lib_x_interface_setup(void) +{ + x_interface_setup(); +} diff --git a/externals/vanilla/lib_x_list.c b/externals/vanilla/lib_x_list.c new file mode 100644 index 00000000..66147687 --- /dev/null +++ b/externals/vanilla/lib_x_list.c @@ -0,0 +1,5 @@ +#include "../../pd/src/x_list.c" +void lib_x_list_setup(void) +{ + x_list_setup(); +} diff --git a/externals/vanilla/lib_x_midi.c b/externals/vanilla/lib_x_midi.c new file mode 100644 index 00000000..24148b59 --- /dev/null +++ b/externals/vanilla/lib_x_midi.c @@ -0,0 +1,5 @@ +#include "../../pd/src/x_midi.c" +void lib_x_midi_setup(void) +{ + x_midi_setup(); +} diff --git a/externals/vanilla/lib_x_misc.c b/externals/vanilla/lib_x_misc.c new file mode 100644 index 00000000..6db34248 --- /dev/null +++ b/externals/vanilla/lib_x_misc.c @@ -0,0 +1,5 @@ +#include "../../pd/src/x_misc.c" +void lib_x_misc_setup(void) +{ + x_misc_setup(); +} diff --git a/externals/vanilla/lib_x_net.c b/externals/vanilla/lib_x_net.c new file mode 100644 index 00000000..c2a109aa --- /dev/null +++ b/externals/vanilla/lib_x_net.c @@ -0,0 +1,5 @@ +#include "../../pd/src/x_net.c" +void lib_x_net_setup(void) +{ + x_net_setup(); +} diff --git a/externals/vanilla/lib_x_qlist.c b/externals/vanilla/lib_x_qlist.c new file mode 100644 index 00000000..452f34a2 --- /dev/null +++ b/externals/vanilla/lib_x_qlist.c @@ -0,0 +1,5 @@ +#include "../../pd/src/x_qlist.c" +void lib_x_qlist_setup(void) +{ + x_qlist_setup(); +} diff --git a/externals/vanilla/lib_x_time.c b/externals/vanilla/lib_x_time.c new file mode 100644 index 00000000..8714eb1a --- /dev/null +++ b/externals/vanilla/lib_x_time.c @@ -0,0 +1,5 @@ +#include "../../pd/src/x_time.c" +void lib_x_time_setup(void) +{ + x_time_setup(); +} diff --git a/externals/vanilla/nbx.c b/externals/vanilla/nbx.c new file mode 100644 index 00000000..e79b5573 --- /dev/null +++ b/externals/vanilla/nbx.c @@ -0,0 +1,5 @@ +#include "../../pd/src/g_numbox.c" +void nbx_setup(void) +{ + g_numbox_setup(); +} diff --git a/externals/vanilla/print.c b/externals/vanilla/print.c new file mode 100644 index 00000000..d74d8fe8 --- /dev/null +++ b/externals/vanilla/print.c @@ -0,0 +1 @@ +#include "../../pd/src/x_interface.c" diff --git a/externals/vanilla/tgl.c b/externals/vanilla/tgl.c new file mode 100644 index 00000000..08cf7bdf --- /dev/null +++ b/externals/vanilla/tgl.c @@ -0,0 +1,5 @@ +#include "../../pd/src/g_toggle.c" +void tgl_setup(void) +{ + g_toggle_setup(); +} diff --git a/externals/vanilla/vradio.c b/externals/vanilla/vradio.c new file mode 100644 index 00000000..9fea1c02 --- /dev/null +++ b/externals/vanilla/vradio.c @@ -0,0 +1,5 @@ +#include "../../pd/src/g_vdial.c" +void vradio_setup(void) +{ + g_vradio_setup(); +} diff --git a/externals/vanilla/vslider.c b/externals/vanilla/vslider.c new file mode 100644 index 00000000..e4486c4b --- /dev/null +++ b/externals/vanilla/vslider.c @@ -0,0 +1,5 @@ +#include "../../pd/src/g_vslider.c" +void vslider_setup(void) +{ + g_vslider_setup(); +} diff --git a/externals/vanilla/vu.c b/externals/vanilla/vu.c new file mode 100644 index 00000000..e0c31da7 --- /dev/null +++ b/externals/vanilla/vu.c @@ -0,0 +1,5 @@ +#include "../../pd/src/g_vumeter.c" +void vu_setup(void) +{ + g_vumeter_setup(); +} -- cgit v1.2.1