From e24f8c336d3a2507d5c6e829787930cc1a5bfac9 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Tue, 21 Nov 2006 00:36:20 +0000
Subject: libdir.c
svn path=/trunk/; revision=6348
---
externals/loaders/libdir.c | 115 +++++++++++++++++++++++++--------------------
1 file changed, 65 insertions(+), 50 deletions(-)
(limited to 'externals/loaders')
diff --git a/externals/loaders/libdir.c b/externals/loaders/libdir.c
index 035744f5..58703ca5 100644
--- a/externals/loaders/libdir.c
+++ b/externals/loaders/libdir.c
@@ -1,15 +1,31 @@
#include "m_pd.h"
#include "s_stuff.h"
+#include "g_canvas.h"
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-static char *version = "$Revision: 1.2 $";
+/* 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 */
+};
+
-/* This loader opens a directory as a library. In the long run, the idea is
- * that one folder will have all of objects files, all of the related
- * *-help.pd files, a file with meta data for the help system, etc. Then to
- * install the lib, it would just be dropped into extra, or the path anywhere.
+static char *version = "$Revision: 1.3 $";
+
+/* This loader opens a directory with a -meta.pd file as a library. In the
+ * long run, the idea is that one folder will have all of objects files, all
+ * of the related *-help.pd files, a file with meta data for the help system,
+ * etc. Then to install the lib, it would just be dropped into extra, or
+ * anywhere in the global classpath.
*
* Ultimately, the meta file will be read for meta data, specifically for
* the auto-generated Help system, but for other things too. Right now,
@@ -23,53 +39,44 @@ static char *version = "$Revision: 1.2 $";
static int libdir_loader(t_canvas *canvas, char *classname)
{
int fd = -1;
- char searchpathname[MAXPDSTRING], helppathname[MAXPDSTRING],
- fullclassname[MAXPDSTRING], dirbuf[MAXPDSTRING], *nameptr;
-
- post("libdir_loader classname: %s\n", classname);
+ char fullclassname[MAXPDSTRING], dirbuf[MAXPDSTRING], *nameptr;
+ t_canvasenvironment *canvasenvironment;
- /* look for meta file (classname)/(classname)-meta.pd <hans@at.or.at> */
- /* TODO: add "-META" to the meta filename */
- strncpy(fullclassname, classname, MAXPDSTRING - 6);
- strcat(fullclassname, "/");
- strncat(fullclassname, classname, MAXPDSTRING - strlen(fullclassname) - 6);
- strcat(fullclassname, "-meta");
- post("libdir_loader trying fullclassname: '%s'\n", fullclassname);
-// post("patch dir: '%s'",canvas->gl_env->ce_dir->s_name);
- if ((fd = open_via_path("", fullclassname, ".pd",
- dirbuf, &nameptr, MAXPDSTRING, 1)) < 0)
- {
- return (0);
+/* look for meta file (classname)/(classname)-meta.pd */
+ strncpy(fullclassname, classname, MAXPDSTRING - 6);
+ strcat(fullclassname, "/");
+ strncat(fullclassname, classname, MAXPDSTRING - strlen(fullclassname) - 6);
+ strcat(fullclassname, "-meta");
+
+ /* if this is being called from a canvas, then add the library path to the
+ * canvas-local path */
+ if(canvas)
+ {
+ post("libdir_loader: adding %s to the canvas-local path", classname);
+ canvasenvironment = canvas_getenv(canvas);
+ if ((fd = canvas_open(0, fullclassname, ".pd",
+ dirbuf, &nameptr, MAXPDSTRING, 0)) < 0)
+ {
+ return (0);
+ }
+ close(fd);
+ // TODO: have this add to the canvas-local path only
+ canvasenvironment->ce_path = namelist_append(canvasenvironment->ce_path,
+ dirbuf, 0);
}
- close(fd);
- post("libdir_loader loaded fullclassname: '%s'\n", fullclassname);
-
- /* create full path to libdir for adding to the paths */
- strcpy(searchpathname,dirbuf);
-// strcat(searchpathname,"/");
-// strncat(searchpathname,classname, MAXPDSTRING-strlen(searchpathname));
-
- strncpy(helppathname, sys_libdir->s_name, MAXPDSTRING-30);
- helppathname[MAXPDSTRING-30] = 0;
- strcat(helppathname, "/doc/5.reference/");
- strcat(helppathname, classname);
-
- // TODO: have this add to the canvas-local path only
- sys_searchpath = namelist_append_files(sys_searchpath, searchpathname);
- /* this help path supports having the help files in a complete library
- * directory format, where everything is in one folder. The help meta
- * system needs to be implemented for this to work with the new Help
- * menu/browser system. Ultimately, /path/to/extra will have to be added
- * to sys_helppath in order for this to work properly.<hans@at.or.at> */
- sys_helppath = namelist_append_files(sys_helppath, searchpathname);
-
- /* this should be changed to use sys_debuglevel */
- if (sys_verbose)
- {
- post("Added to search path: %s", searchpathname);
- post("Added to help path: %s", searchpathname);
- post("Added to help path: %s", helppathname);
- }
+ else
+ {
+ post("libdir_loader: adding %s to the global classpath", classname);
+ post("\tThis is deprecated behavior.");
+ if ((fd = open_via_path("", fullclassname, ".pd",
+ dirbuf, &nameptr, MAXPDSTRING, 0)) < 0)
+ {
+ return (0);
+ }
+ close(fd);
+ sys_searchpath = namelist_append(sys_searchpath, dirbuf, 0);
+ }
+ /* post("libdir_loader loaded fullclassname: '%s'\n", fullclassname); */
if (sys_verbose)
post("Loaded libdir %s from %s", classname, dirbuf);
@@ -78,8 +85,16 @@ static int libdir_loader(t_canvas *canvas, char *classname)
void libdir_setup(void)
{
+/* relies on t.grill's loader functionality, fully added in 0.40 */
+#if (PD_MINOR_VERSION >= 40)
sys_register_loader(libdir_loader);
+#else
+ error("to function, this needs to be compiled against Pd 0.40 or higher,\n");
+ post("\tor a version that has sys_register_loader()");
+#endif
post("libdir loader %s",version);
post("\twritten by Hans-Christoph Steiner <hans@at.or.at>");
post("\tcompiled on "__DATE__" at "__TIME__ " ");
+ post("\tcompiled against Pd version %d.%d.%d.%s", PD_MAJOR_VERSION,
+ PD_MINOR_VERSION, PD_BUGFIX_VERSION, PD_TEST_VERSION);
}
--
cgit v1.2.1