Changeset fd8dfe7

Timestamp:

Jun 2, 2009, 11:53:14 AM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

8daf504

Parents:

ee183be

git-author:

Nelson Elhage <nelhage@mit.edu> (06/01/09 22:45:53)

git-committer:

Nelson Elhage <nelhage@mit.edu> (06/02/09 11:53:14)

Message:

Load perl code from the filesystem at runtime.

Remove perlwrap.pm and associated code, and instead do 'use BarnOwl'
at boot time to load cdoe from the file system at runtime. In
addition, add appropriate 'use' statements to the .pm files to cause
everything to get loaded.

Files:

• Makefile.in (modified) (2 diffs)
• perl/lib/BarnOwl.pm (modified) (2 diffs)
• perl/lib/BarnOwl/Message.pm (modified) (1 diff)
• perl/lib/BarnOwl/Style.pm (modified) (1 diff)
• perlconfig.c (modified) (3 diffs)
• perlglue.xs (modified) (2 diffs)
• perlwrap.pm (deleted)

Makefile.in

@@ -39 +39 @@
 BASE_OBJS = $(BASE_SRCS:.c=.o)
 
-GEN_C = varstubs.c perlglue.c perlwrap.c
+GEN_C = varstubs.c perlglue.c
 GEN_H = owl_prototypes.h 
 GEN_O = $(GEN_C:.c=.o)
@@ -97 +97 @@
         perl stubgen.pl > varstubs.c
 
-perlwrap.c: perlwrap.pm encapsulate.pl
-        perl encapsulate.pl perlwrap.pm owl_perlwrap_codebuff > perlwrap.c
-
 # Only move owl_prototypes.h into place if the new one is different
 owl_prototypes.h: codelist.pl varstubs.c $(BASE_SRCS)

perl/lib/BarnOwl.pm

@@ -3 +3 @@
 
 package BarnOwl;
+
+BEGIN {
+# bootstrap in C bindings and glue
+    *owl:: = \*BarnOwl::;
+    bootstrap BarnOwl 1.2;
+};
+
+use lib(get_data_dir() . "/lib");
+use lib(get_config_dir() . "/lib");
+
+use BarnOwl::Hook;
+use BarnOwl::Hooks;
+use BarnOwl::Message;
+use BarnOwl::Style;
+use BarnOwl::Timer;
 
 =head1 NAME
@@ -136 +151 @@
 
 =cut
-
-
-BEGIN {
-# bootstrap in C bindings and glue
-    *owl:: = \*BarnOwl::;
-    bootstrap BarnOwl 1.2;
-};
-
-use lib(get_data_dir() . "/lib");
-use lib(get_config_dir() . "/lib");
 
 # perlconfig.c will set this to the value of the -c command-line

perl/lib/BarnOwl/Message.pm

@@ -3 +3 @@
 
 package BarnOwl::Message;
+
+use BarnOwl::Message::Admin;
+use BarnOwl::Message::AIM;
+use BarnOwl::Message::Generic;
+use BarnOwl::Message::Loopback;
+use BarnOwl::Message::Zephyr;
 
 sub new {

perl/lib/BarnOwl/Style.pm

@@ -3 +3 @@
 
 package BarnOwl::Style;
+
+use BarnOwl::Style::Basic;
+use BarnOwl::Style::Default;
+use BarnOwl::Style::Legacy;
+use BarnOwl::Style::OneLine;
 
 # This takes a zephyr to be displayed and modifies it to be displayed

perlconfig.c

@@ -9 +9 @@
 
 static const char fileIdent[] = "$Id$";
-
-extern char *owl_perlwrap_codebuff;
 
 extern XS(boot_BarnOwl);
@@ -304 +302 @@
   char *err;
   char *args[4] = {"", "-e", "0;", NULL};
+  AV *inc;
+  char *path;
 
   /* create and initialize interpreter */
@@ -348 +348 @@
   }
 
-  eval_pv(owl_perlwrap_codebuff, FALSE);
+  /* Add the system lib path to @INC */
+  inc = get_av("INC", 0);
+  path = owl_sprintf("%s/lib", owl_get_datadir());
+  av_unshift(inc, 1);
+  av_store(inc, 0, newSVpv(path, 0));
+  owl_free(path);
+
+  eval_pv("use BarnOwl;", FALSE);
 
   if (SvTRUE(ERRSV)) {

perlglue.xs

@@ -17 +17 @@
          *************************************************************
          * These functions, when they are intended to be user-visible,
-         * are documented in perlwrap.pm. If you add functions to this
-         * file, add the appropriate documentation there!
+         * are documented in perl/lib/BarnOwl.pm. If you add functions
+         * to this file, add the appropriate documentation there!
          *
          * If the function is simple enough, we simply define its
@@ -25 +25 @@
          * simple version here that takes arguments in as flat a
          * manner as possible, to simplify the XS code, put it in
-         * BarnOwl::Intenal::, and write a perl wrapper in perlwrap.pm
+         * BarnOwl::Intenal::, and write a perl wrapper in BarnOwl.pm
          * that munges the arguments as appropriate and calls the
          * internal version.