[svn:parrot] r36720 - trunk/src
allison at svn.parrot.org
allison at svn.parrot.org
Sat Feb 14 08:12:24 UTC 2009
Author: allison
Date: Sat Feb 14 08:12:24 2009
New Revision: 36720
URL: https://trac.parrot.org/parrot/changeset/36720
Log:
[install] Search versioned install directories for runtime library, include,
and dynext.
Modified:
trunk/src/library.c
Modified: trunk/src/library.c
==============================================================================
--- trunk/src/library.c Sat Feb 14 08:10:29 2009 (r36719)
+++ trunk/src/library.c Sat Feb 14 08:12:24 2009 (r36720)
@@ -159,7 +159,7 @@
{
ASSERT_ARGS(parrot_init_library_paths)
PMC *paths;
- STRING *entry;
+ STRING *entry, *version, *versionlib;
PMC * const iglobals = interp->iglobals;
PMC * const config_hash =
@@ -192,6 +192,12 @@
entry = CONST_STRING(interp, "lib/parrot/");
VTABLE_push_string(interp, paths, entry);
+ version = CONST_STRING(interp, PARROT_VERSION);
+ versionlib = Parrot_str_append(interp, entry, version);
+ entry = Parrot_str_append(interp, versionlib, CONST_STRING(interp, "/include/"));
+ VTABLE_push_string(interp, paths, entry);
+
+
/* define library paths */
paths = pmc_new(interp, enum_class_ResizableStringArray);
VTABLE_set_pmc_keyed_int(interp, lib_paths,
@@ -211,6 +217,8 @@
VTABLE_push_string(interp, paths, entry);
entry = CONST_STRING(interp, "lib/parrot/");
VTABLE_push_string(interp, paths, entry);
+ entry = Parrot_str_append(interp, versionlib, CONST_STRING(interp, "/library/"));
+ VTABLE_push_string(interp, paths, entry);
/* define dynext paths */
paths = pmc_new(interp, enum_class_ResizableStringArray);
@@ -222,6 +230,8 @@
VTABLE_push_string(interp, paths, entry);
entry = CONST_STRING(interp, "lib/parrot/dynext/");
VTABLE_push_string(interp, paths, entry);
+ entry = Parrot_str_append(interp, versionlib, CONST_STRING(interp, "/dynext/"));
+ VTABLE_push_string(interp, paths, entry);
/* shared exts */
paths = pmc_new(interp, enum_class_ResizableStringArray);
More information about the parrot-commits
mailing list