Hack for Parrot 1.0, in order to load external library.

Currently, Parrot is not able to load languages/lua/library/*.pbc, so libraries are put in library/lua/*.pbc
fperrad · Mar 16, 2009 · 396ba52 · 396ba52
1 parent d71495b
commit 396ba52
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/config/makefiles/root.in b/config/makefiles/root.in
@@ -418,8 +418,10 @@ install: installable
 	$(CHMOD) 0755 $(BIN_DIR)/parrot-luap@exe@
 	-$(MKPATH) $(LIB_DIR)/languages/lua
 	$(CP) lua.pbc $(LIB_DIR)/languages/lua/lua.pbc
-	-$(MKPATH) $(LIB_DIR)/languages/lua/library
-	$(CP) library/*.pbc $(LIB_DIR)/languages/lua/library
+#	-$(MKPATH) $(LIB_DIR)/languages/lua/library
+#	$(CP) library/*.pbc $(LIB_DIR)/languages/lua/library
+	-$(MKPATH) $(LIB_DIR)/library/lua
+	$(CP) library/*.pbc $(LIB_DIR)/library/lua
 	-$(MKPATH) $(MANDIR)/man1
 	pod2man lua.pir > $(MANDIR)/man1/parrot-lua.1
 	pod2man luap.pir > $(MANDIR)/man1/parrot-luap.1

diff --git a/src/lib/luapackage.pir b/src/lib/luapackage.pir
@@ -65,7 +65,8 @@ LIST
     _loaders[$P2] = loader_PBCroot
 
     setpath(_package, 'path', 'LUA_PATH', './?.lua;languages/lua/src/lib/?.lua')
-    setpath(_package, 'pbcpath', 'LUA_PBCPATH', 'languages/lua/library/?.pbc;./?.pbc;./?.pir')
+#    setpath(_package, 'pbcpath', 'LUA_PBCPATH', 'languages/lua/library/?.pbc;./?.pbc;./?.pir')
+    setpath(_package, 'pbcpath', 'LUA_PBCPATH', 'languages/lua/library/?.pbc;lua/?.pbc;./?.pbc;./?.pir')
 
     .local pmc _lua__REGISTRY
     _lua__REGISTRY = get_hll_global '_REGISTRY'

diff --git a/t/package.t b/t/package.t
@@ -284,7 +284,7 @@ print(type(package.pbcpath))
 print(package.pbcpath)
 CODE
 string
-languages/lua/library/?.pbc;./?.pbc;./?.pir
+languages/lua/library/?.pbc;lua/?.pbc;./?.pbc;./?.pir
 OUTPUT
 
 $ENV{LUA_PBCPATH} = "?.pbc";
@@ -298,7 +298,7 @@ $ENV{LUA_PBCPATH} = ";;languages/lua/?.pbc";
 language_output_is( 'lua', << 'CODE', << 'OUTPUT', 'table package.pbcpath' );
 print(package.pbcpath)
 CODE
-;languages/lua/library/?.pbc;./?.pbc;./?.pir;languages/lua/?.pbc
+;languages/lua/library/?.pbc;lua/?.pbc;./?.pbc;./?.pir;languages/lua/?.pbc
 OUTPUT
 
 delete $ENV{LUA_PBCPATH};