[PD-cvs] externals/loaders libdir.c,1.2,1.3

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/externals/loaders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29658

Modified Files:
	libdir.c 
Log Message:
libdir.c

Index: libdir.c
===================================================================
RCS file: /cvsroot/pure-data/externals/loaders/libdir.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** libdir.c	20 Nov 2006 04:14:16 -0000	1.2
--- libdir.c	21 Nov 2006 00:36:20 -0000	1.3
***************
*** 1,14 ****
  #include "m_pd.h"
  #include "s_stuff.h"
  #include <stdio.h>
  #include <string.h>
  #include <unistd.h>
  
  static char *version = "$Revision$";
  
! /* 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.
   *
   * Ultimately, the meta file will be read for meta data, specifically for
--- 1,30 ----
  #include "m_pd.h"
  #include "s_stuff.h"
+ #include "g_canvas.h"
  #include <stdio.h>
  #include <string.h>
  #include <unistd.h>
  
+ /* 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$";
  
! /* 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
***************
*** 24,74 ****
  {
      int fd = -1;
!     char searchpathname[MAXPDSTRING], helppathname[MAXPDSTRING], 
!         fullclassname[MAXPDSTRING], dirbuf[MAXPDSTRING], *nameptr;
!     
!     post("libdir_loader classname: %s\n", classname);
  
!     /* look for meta file (classname)/(classname)-meta.pd <hans at 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);
  	}
!     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 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);
!     }
      if (sys_verbose) 
          post("Loaded libdir %s from %s", classname, dirbuf);
--- 40,81 ----
  {
      int fd = -1;
!     char fullclassname[MAXPDSTRING], dirbuf[MAXPDSTRING], *nameptr;
! 	t_canvasenvironment *canvasenvironment;
  
! /* 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);
  	}
! 	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);
***************
*** 79,85 ****
--- 86,100 ----
  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 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);
  }