From 023f5bdefc86f5277c3462e7e26475a083646ef1 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 13 Sep 2010 17:00:22 +0000 Subject: created first sketch of import for 'puredata' svn path=/trunk/externals/import/; revision=14117 --- LICENSE.txt | 32 ++++++ Makefile | 303 +++++++++++++++++++++++++++++++++++++++++++++++++++ README.txt | 12 ++ debian/changelog | 5 + debian/compat | 1 + debian/control | 17 +++ debian/copyright | 23 ++++ debian/gbp.conf | 7 ++ debian/links | 3 + debian/rules | 17 +++ debian/source/format | 1 + debian/watch | 2 + import-help.pd | 21 ++++ import-meta.pd | 7 ++ import.c | 188 ++++++++++++++++++++++++++++++++ 15 files changed, 639 insertions(+) create mode 100644 LICENSE.txt create mode 100644 Makefile create mode 100644 README.txt create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gbp.conf create mode 100644 debian/links create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch create mode 100644 import-help.pd create mode 100644 import-meta.pd create mode 100644 import.c diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..3b2c097 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,32 @@ +Copyright 2004-2010, Hans-Christoph Steiner + +This software is copyrighted by Hans-Christoph Steiner. The following +terms (the "Standard Improved BSD License") apply to all files associated with +the software unless explicitly disclaimed in individual files: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. +3. The name of the author may not be used to endorse or promote + products derived from this software without specific prior + written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..006a12e --- /dev/null +++ b/Makefile @@ -0,0 +1,303 @@ +## Pd library template version 1.0.4 +# For instructions on how to use this template, see: +# http://puredata.info/docs/developer/MakefileTemplate +LIBRARY_NAME = import + +# add your .c source files, one object per file, to the SOURCES +# variable, help files will be included automatically +SOURCES = import.c + +# list all pd objects (i.e. myobject.pd) files here, and their helpfiles will +# be included automatically +PDOBJECTS = + +# example patches and related files, in the 'examples' subfolder +EXAMPLES = + +# manuals and related files, in the 'manual' subfolder +MANUAL = + +# if you want to include any other files in the source and binary tarballs, +# list them here. This can be anything from header files, test patches, +# documentation, etc. README.txt and LICENSE.txt are required and therefore +# automatically included +EXTRA_DIST = + + + +#------------------------------------------------------------------------------# +# +# things you might need to edit if you are using other C libraries +# +#------------------------------------------------------------------------------# + +CFLAGS = -DPD -I"$(PD_INCLUDE)" -Wall -W -g +LDFLAGS = +LIBS = + +#------------------------------------------------------------------------------# +# +# you shouldn't need to edit anything below here, if we did it right :) +# +#------------------------------------------------------------------------------# + +# get library version from meta file +LIBRARY_VERSION = $(shell sed -n 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' $(LIBRARY_NAME)-meta.pd) + +CFLAGS += -DVERSION='"$(LIBRARY_VERSION)"' + +PD_INCLUDE = $(PD_PATH)/include +# where to install the library, overridden below depending on platform +prefix = /usr/local +libdir = $(prefix)/lib +pkglibdir = $(libdir)/pd-externals +objectsdir = $(pkglibdir) + +INSTALL = install +INSTALL_PROGRAM = $(INSTALL) -p -m 644 +INSTALL_DATA = $(INSTALL) -p -m 644 +INSTALL_DIR = $(INSTALL) -p -m 755 -d + +ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx) \ + $(SOURCES_iphoneos) $(SOURCES_linux) $(SOURCES_windows) + +DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION) +ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION) + +UNAME := $(shell uname -s) +ifeq ($(UNAME),Darwin) + CPU := $(shell uname -p) + ifeq ($(CPU),arm) # iPhone/iPod Touch + SOURCES += $(SOURCES_iphoneos) + EXTENSION = pd_darwin + OS = iphoneos + PD_PATH = /Applications/Pd-extended.app/Contents/Resources + IPHONE_BASE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin + CC=$(IPHONE_BASE)/gcc + CPP=$(IPHONE_BASE)/cpp + CXX=$(IPHONE_BASE)/g++ + ISYSROOT = -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk + IPHONE_CFLAGS = -miphoneos-version-min=3.0 $(ISYSROOT) -arch armv6 + OPT_CFLAGS = -fast -funroll-loops -fomit-frame-pointer + CFLAGS := $(IPHONE_CFLAGS) $(OPT_CFLAGS) $(CFLAGS) + LDFLAGS += -arch armv6 -bundle -undefined dynamic_lookup $(ISYSROOT) + LIBS += -lc + STRIP = strip -x + DISTBINDIR=$(DISTDIR)-$(OS) + else # Mac OS X + SOURCES += $(SOURCES_macosx) + EXTENSION = pd_darwin + OS = macosx + PD_PATH = /Applications/Pd-extended.app/Contents/Resources + OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast +# build universal 32-bit on 10.4 and 32/64 on newer + ifeq ($(shell uname -r | sed 's|\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*|\1|'), 8) + FAT_FLAGS = -arch ppc -arch i386 -mmacosx-version-min=10.4 + else + FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4 + SOURCES += $(SOURCES_iphoneos) + endif + CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include + LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib + # if the 'pd' binary exists, check the linking against it to aid with stripping + LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd) + LIBS += -lc + STRIP = strip -x + DISTBINDIR=$(DISTDIR)-$(OS) +# install into ~/Library/Pd on Mac OS X since /usr/local isn't used much + pkglibdir=$(HOME)/Library/Pd + endif +endif +ifeq ($(UNAME),Linux) + CPU := $(shell uname -m) + SOURCES += $(SOURCES_linux) + EXTENSION = pd_linux + OS = linux + PD_PATH = /usr + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer + CFLAGS += -fPIC + LDFLAGS += -Wl,--export-dynamic -shared -fPIC + LIBS += -lc + STRIP = strip --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m) +endif +ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) + CPU := $(shell uname -m) + SOURCES += $(SOURCES_cygwin) + EXTENSION = dll + OS = cygwin + PD_PATH = $(cygpath $(PROGRAMFILES))/pd + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer + CFLAGS += + LDFLAGS += -Wl,--export-dynamic -shared -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" + LIBS += -lc -lpd + STRIP = strip --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS) +endif +ifeq (MINGW,$(findstring MINGW,$(UNAME))) + CPU := $(shell uname -m) + SOURCES += $(SOURCES_windows) + EXTENSION = dll + OS = windows + PD_PATH = $(shell cd "$(PROGRAMFILES)"/pd && pwd) + OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -march=i686 -mtune=pentium4 + CFLAGS += -mms-bitfields + LDFLAGS += -s -shared -Wl,--enable-auto-import + LIBS += -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" -L"$(PD_PATH)/obj" -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 + STRIP = strip --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS) +endif + +# in case somebody manually set the HELPPATCHES above +HELPPATCHES ?= $(SOURCES:.c=-help.pd) $(PDOBJECTS:.c=-help.pd) + +CFLAGS += $(OPT_CFLAGS) + + +.PHONY = install libdir_install single_install install-doc install-exec install-examples install-manual clean dist etags $(LIBRARY_NAME) + +all: $(SOURCES:.c=.$(EXTENSION)) + +%.o: %.c + $(CC) $(CFLAGS) -o "$*.o" -c "$*.c" + +%.$(EXTENSION): %.o + $(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" $(LIBS) + chmod a-x "$*.$(EXTENSION)" + +# this links everything into a single binary file +$(LIBRARY_NAME): $(SOURCES:.c=.o) $(LIBRARY_NAME).o + $(CC) $(LDFLAGS) -o $(LIBRARY_NAME).$(EXTENSION) $(SOURCES:.c=.o) $(LIBRARY_NAME).o $(LIBS) + chmod a-x $(LIBRARY_NAME).$(EXTENSION) + +install: libdir_install + +# The meta and help files are explicitly installed to make sure they are +# actually there. Those files are not optional, then need to be there. +libdir_install: $(SOURCES:.c=.$(EXTENSION)) install-doc install-examples install-manual + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(INSTALL_DATA) $(LIBRARY_NAME)-meta.pd \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + test -z "$(strip $(SOURCES))" || (\ + $(INSTALL_PROGRAM) $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) && \ + $(STRIP) $(addprefix $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/,$(SOURCES:.c=.$(EXTENSION)))) + test -z "$(strip $(PDOBJECTS))" || \ + $(INSTALL_DATA) $(PDOBJECTS) \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + +# install library linked as single binary +single_install: $(LIBRARY_NAME) install-doc install-exec + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(INSTALL_PROGRAM) $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION) + +install-doc: + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + test -z "$(strip $(SOURCES) $(PDOBJECTS))" || \ + $(INSTALL_DATA) $(HELPPATCHES) \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(INSTALL_DATA) README.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt + $(INSTALL_DATA) LICENSE.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/LICENSE.txt + +install-examples: + test -z "$(strip $(EXAMPLES))" || \ + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples && \ + for file in $(EXAMPLES); do \ + $(INSTALL_DATA) examples/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples; \ + done + +install-manual: + test -z "$(strip $(MANUAL))" || \ + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual && \ + for file in $(MANUAL); do \ + $(INSTALL_DATA) manual/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual; \ + done + + +clean: + -rm -f -- $(SOURCES:.c=.o) $(SOURCES_LIB:.c=.o) + -rm -f -- $(SOURCES:.c=.$(EXTENSION)) + -rm -f -- $(LIBRARY_NAME).o + -rm -f -- $(LIBRARY_NAME).$(EXTENSION) + +distclean: clean + -rm -f -- $(DISTBINDIR).tar.gz + -rm -rf -- $(DISTBINDIR) + -rm -f -- $(DISTDIR).tar.gz + -rm -rf -- $(DISTDIR) + -rm -f -- $(ORIGDIR).tar.gz + -rm -rf -- $(ORIGDIR) + + +$(DISTBINDIR): + $(INSTALL_DIR) $(DISTBINDIR) + +libdir: all $(DISTBINDIR) + $(INSTALL_DATA) $(LIBRARY_NAME)-meta.pd $(DISTBINDIR) + $(INSTALL_DATA) $(SOURCES) $(DISTBINDIR) + $(INSTALL_DATA) $(HELPPATCHES) $(DISTBINDIR) + test -z "$(strip $(EXTRA_DIST))" || \ + $(INSTALL_DATA) $(EXTRA_DIST) $(DISTBINDIR) +# tar --exclude-vcs -czpf $(DISTBINDIR).tar.gz $(DISTBINDIR) + +$(DISTDIR): + $(INSTALL_DIR) $(DISTDIR) + +$(ORIGDIR): + $(INSTALL_DIR) $(ORIGDIR) + +dist: $(DISTDIR) + $(INSTALL_DATA) Makefile $(DISTDIR) + $(INSTALL_DATA) README.txt $(DISTDIR) + $(INSTALL_DATA) LICENSE.txt $(DISTDIR) + $(INSTALL_DATA) $(LIBRARY_NAME)-meta.pd $(DISTDIR) + test -z "$(strip $(ALLSOURCES))" || \ + $(INSTALL_DATA) $(ALLSOURCES) $(DISTDIR) + test -z "$(strip $(PDOBJECTS))" || \ + $(INSTALL_DATA) $(PDOBJECTS) $(DISTDIR) + test -z "$(strip $(HELPPATCHES))" || \ + $(INSTALL_DATA) $(HELPPATCHES) $(DISTDIR) + test -z "$(strip $(EXTRA_DIST))" || \ + $(INSTALL_DATA) $(EXTRA_DIST) $(DISTDIR) + test -z "$(strip $(EXAMPLES))" || \ + $(INSTALL_DIR) $(DISTDIR)/examples && \ + for file in $(EXAMPLES); do \ + $(INSTALL_DATA) examples/$$file $(DISTDIR)/examples; \ + done + test -z "$(strip $(MANUAL))" || \ + $(INSTALL_DIR) $(DISTDIR)/manual && \ + for file in $(MANUAL); do \ + $(INSTALL_DATA) manual/$$file $(DISTDIR)/manual; \ + done + tar --exclude-vcs -czpf $(DISTDIR).tar.gz $(DISTDIR) + +# make a Debian source package +dpkg-source: + debclean + make distclean dist + mv $(DISTDIR) $(ORIGDIR) + tar --exclude-vcs -czpf ../$(ORIGDIR).orig.tar.gz $(ORIGDIR) + rm -f -- $(DISTDIR).tar.gz + rm -rf -- $(DISTDIR) $(ORIGDIR) + cd .. && dpkg-source -b $(LIBRARY_NAME) + +etags: + etags *.h $(SOURCES) ../../pd/src/*.[ch] /usr/include/*.h /usr/include/*/*.h + +showsetup: + @echo "CFLAGS: $(CFLAGS)" + @echo "LDFLAGS: $(LDFLAGS)" + @echo "LIBS: $(LIBS)" + @echo "PD_INCLUDE: $(PD_INCLUDE)" + @echo "PD_PATH: $(PD_PATH)" + @echo "objectsdir: $(objectsdir)" + @echo "LIBRARY_NAME: $(LIBRARY_NAME)" + @echo "LIBRARY_VERSION: $(LIBRARY_VERSION)" + @echo "SOURCES: $(SOURCES)" + @echo "PDOBJECTS: $(PDOBJECTS)" + @echo "ALLSOURCES: $(ALLSOURCES)" + @echo "UNAME: $(UNAME)" + @echo "CPU: $(CPU)" + @echo "pkglibdir: $(pkglibdir)" + @echo "DISTDIR: $(DISTDIR)" + @echo "ORIGDIR: $(ORIGDIR)" diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..1c1950d --- /dev/null +++ b/README.txt @@ -0,0 +1,12 @@ + +[import] allows you to manipulate load library into the patch-local +path from within a Pd patch itself. This is a very simple version +that does not need any modifications to the core of Pd. Therefore, +you should make [import] the first object you create in your patch. + +To install, copy the "import" folder into your user Pd folder. You +can find out more here: +http://puredata.info/docs/faq/how-do-i-install-externals-and-help-files-with-pd-extended + +For more info on the structure of libdirs, see this webpage: +http://puredata.org/docs/developer/Libdir diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..9d53a4c --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +pd-template (0.0-1) unstable; urgency=low + + * Initial release (Closes: #nnnn) + + -- Hans-Christoph Steiner Thu, 21 Jan 2010 23:27:04 -0500 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..74fe188 --- /dev/null +++ b/debian/control @@ -0,0 +1,17 @@ +Source: pd-template +Section: sound +Priority: optional +Maintainer: Debian Multimedia Maintainers +Uploaders: Hans-Christoph Steiner +Build-Depends: debhelper (>= 7.0.50~), + puredata +Standards-Version: 3.9.1 +Homepage: http://puredata.info + +Package: pd-template +Architecture: any +Depends: ${shlibs:Depends}, + pd, + ${misc:Depends} +Recommends: pd-libdir +Description: diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..bf20b3b --- /dev/null +++ b/debian/copyright @@ -0,0 +1,23 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135 +Name: template +Maintainer: +Source: http://sourceforge.net/projects/pure-data/files/libraries/template/ + +Files: * +Copyright: 2001-2003, Free Software Foundation +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +X-Comment: On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..ae1dc36 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,7 @@ +[DEFAULT] +upstream-branch = upstream +debian-branch = master +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s +pristine-tar = True +sign-tags = True diff --git a/debian/links b/debian/links new file mode 100644 index 0000000..e21d901 --- /dev/null +++ b/debian/links @@ -0,0 +1,3 @@ +usr/lib/pd/extra/template/README.txt usr/share/doc/pd-template/README +usr/lib/pd/extra/template/examples usr/share/doc/pd-template/examples +usr/share/common-licenses/GPL-2 usr/lib/pd/extra/template/LICENSE.txt diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..df5d06a --- /dev/null +++ b/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +LIBRARY_NAME = template +PACKAGE = pd-$(LIBRARY_NAME) +pkglibdir = /usr/lib/pd/extra + +%: + dh $@ --buildsystem=makefile + +override_dh_auto_install: + dh_auto_install -- prefix=/usr pkglibdir=$(pkglibdir) +# replace license file with link to the Debian license file + rm -f -- $(CURDIR)/debian/$(PACKAGE)/$(pkglibdir)/$(LIBRARY_NAME)/LICENSE.txt + +override_dh_shlibdeps: + dpkg-shlibdeps $(CURDIR)/debian/$(PACKAGE)$(pkglibdir)/$(LIBRARY_NAME)/*.pd_linux \ + -T$(CURDIR)/debian/$(PACKAGE).substvars diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..71e70c7 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/pure-data/import-(.*)\.tar\.gz diff --git a/import-help.pd b/import-help.pd new file mode 100644 index 0000000..8764c7b --- /dev/null +++ b/import-help.pd @@ -0,0 +1,21 @@ +#N canvas 476 83 473 364 10; +#X msg 21 102 bang; +#X obj 21 150 import ext13 memento rradical; +#X text 247 315 released under the GNU GPL; +#X msg 33 126 reset; +#X symbolatom 32 176 0 0 0 0 - - -; +#X obj 21 202 print; +#X text 68 101 get next item in list of loaded libs; +#X text 80 125 start at the top of the list again; +#X text 18 22 [import] loads libraries from the patch. On Pd 0.4 or +greater \, it loads the library into the patch's local namespace. On +older versions \, it loads the libraries into the global namespace. +; +#X text 29 239 Sending bangs to [import] makes it output the loaded +libraries one at a time.; +#X text 18 301 (C) Copyright 2004-6 Hans-Christoph Steiner +; +#X connect 0 0 1 0; +#X connect 1 0 4 0; +#X connect 1 0 5 0; +#X connect 3 0 1 0; diff --git a/import-meta.pd b/import-meta.pd new file mode 100644 index 0000000..1081aa4 --- /dev/null +++ b/import-meta.pd @@ -0,0 +1,7 @@ +#N canvas 15 49 200 200 10; +#N canvas 25 49 420 300 META 1; +#X text 10 10 NAME import; +#X text 10 30 AUTHOR Hans-Christoph Steiner; +#X text 10 50 VERSION 1.9; +#X text 10 70 LICENSE BSD; +#X restore 10 10 pd META; diff --git a/import.c b/import.c new file mode 100644 index 0000000..f61c278 --- /dev/null +++ b/import.c @@ -0,0 +1,188 @@ +/* + * This object loads libraries and libdirs from within a patch. It is the + * first small step towards a patch-specific namespace. Currently, it just + * adds things to the global path. It is a reimplementation of a similar/same + * idea from Guenter Geiger's [using] object. + * + * This object currently depends on the packages/patches/libdir-0.38-4.patch + * for sys_load_lib_dir(). + */ + +#include "m_pd.h" +#include + +/* this includes things from g_canvas.h and s_stuff.h so it can build on + * Debian, Ubuntu, etc. Currently, the pd packages only include m_pd.h */ + +/* this is taken from g_canvas.h 0.43test2 */ +#define t_canvasenvironment struct _canvasenvironment +EXTERN t_canvasenvironment *canvas_getenv(t_canvas *x); + +/* this is taken from s_stuff.h 0.43test2 */ +EXTERN int sys_load_lib(t_canvas *canvas, char *filename); +extern t_symbol *sys_libdir; /* library directory for auxilliary files */ +typedef struct _namelist /* element in a linked list of stored strings */ +{ + struct _namelist *nl_next; /* next in list */ + char *nl_string; /* the string */ +} t_namelist; + +/* WARNING: KLUDGE! */ +/* + * this struct is not publically defined (its in g_canvas.c) so I need to + * include this here. Its from Pd 0.41-test03 2006-11-19. */ +struct _canvasenvironment +{ + t_symbol *ce_dir; /* directory patch lives in */ + int ce_argc; /* number of "$" arguments */ + t_atom *ce_argv; /* array of "$" arguments */ + int ce_dollarzero; /* value of "$0" */ + t_namelist *ce_path; /* search path */ +}; + + +static char *version = "$Revision: 1.2 $"; + +t_int import_instance_count; + +#define DEBUG(x) +//#define DEBUG(x) x + +/*------------------------------------------------------------------------------ + * CLASS DEF + */ +static t_class *import_class; + +typedef struct _import +{ + t_object x_obj; + t_canvas *x_canvas; + t_namelist *x_top; + t_namelist *x_current; + char x_classpath_root[MAXPDSTRING]; + t_outlet *x_data_outlet; + t_outlet *x_status_outlet; +} t_import; + +static int load_library(t_import *x, char *library_name) +{ + DEBUG(post("load_library");); + if (!sys_load_lib(x->x_canvas, library_name)) return 0; + return 1; +} + +static void load_arguments(t_import *x, int argc, t_atom *argv) +{ + t_symbol *library_name; + + while (argc--) { + switch (argv->a_type) { + case A_FLOAT: + post("[import] ERROR: floats not supported: %f", + atom_getfloat(argv)); + break; + case A_SYMBOL: + library_name = atom_getsymbol(argv); + if (!load_library(x,library_name->s_name)) + post("[import]: ERROR: can't load library in %s", + library_name->s_name); + else + post("[import] loaded library: %s",library_name->s_name); + break; + default: + post("[import] ERROR: Unsupported atom type"); + } + argv++; + } +} + + +static void import_output(t_import* x) +{ + DEBUG(post("import_output");); + char buffer[MAXPDSTRING]; + +/* TODO: think about using x->x_current->nl_next so that if [import] is at + * the end of its list, and another element gets added to the local + * namespace, [import] will output the new element on the next bang. */ + if(x->x_current) + { + post("current string: %s", x->x_current->nl_string); + strncpy(buffer, x->x_current->nl_string, MAXPDSTRING); + post("current string buffer: %s", buffer); + outlet_symbol( x->x_data_outlet, gensym(buffer) ); + x->x_current = x->x_current->nl_next; + } + else + outlet_bang(x->x_status_outlet); +} + + +static void import_reset(t_import* x) +{ +/* on >= 0.40, this class uses the patch-local paths, on older versions + * before that existed, this class uses the global classpath */ +#if (PD_MINOR_VERSION >= 40) + x->x_top = canvas_getenv(x->x_canvas)->ce_path; +#else + x->x_top = sys_searchpath; +#endif /* (PD_MINOR_VERSION >= 40) */ + x->x_current = x->x_top; +} + + +static void *import_new(t_symbol *s, int argc, t_atom *argv) +{ + t_import *x = (t_import *)pd_new(import_class); + t_symbol *currentdir; + + if(import_instance_count == 0) + { + post("[import] %s",version); + post("\twritten by Hans-Christoph Steiner "); + post("\tcompiled on "__DATE__" at "__TIME__ " "); + post("\tcompiled against Pd version %d.%d.%d", PD_MAJOR_VERSION, + PD_MINOR_VERSION, PD_BUGFIX_VERSION); + } + import_instance_count++; + + strncpy(x->x_classpath_root, sys_libdir->s_name, MAXPDSTRING - 7); + strcat(x->x_classpath_root, "/extra"); + + x->x_data_outlet = outlet_new(&x->x_obj, &s_symbol); + x->x_status_outlet = outlet_new(&x->x_obj, 0); + + x->x_canvas = canvas_getcurrent(); + load_arguments(x,argc,argv); + import_reset(x); + + return (x); +} + + +static void import_free(t_import *x) +{ + /* TODO: look into freeing the namelist. It probably does not need to + * happen, since this class is just copying the pointer of an existing + * namelist that is handled elsewhere. */ + +/* TODO: perhaps this should remove any libs that this instance had added to + * the namespace */ +} + + +void import_setup(void) +{ + import_class = class_new(gensym("import"), (t_newmethod)import_new, + (t_method)import_free, + sizeof(t_import), + CLASS_DEFAULT, + A_GIMME, + 0); + /* add inlet atom methods */ + class_addbang(import_class,(t_method) import_output); + + /* add inlet selector methods */ + class_addmethod(import_class,(t_method) import_reset, + gensym("reset"), 0); +} -- cgit v1.2.1