Merge pull request #9 from awwaiid/resources-lib

Further use of RESOURCES

Thank you very much! I'd have copied just the same :)

Author: niner

Build.pm

@@ -10,16 +10,17 @@ class Build is Panda::Builder {
     }
 
     method build($dir) {
-        mkdir "$dir/resources" unless "$dir/resources".IO.e;
-
         my %vars = get-vars($dir);
         %vars<INCLUDEPY> = get_config_var('INCLUDEPY');
         my $library = get_config_var('LIBRARY');
         $library ~~ s/\.a$//;
         $library ~~ s/^lib//;
         %vars<LIBRARYPY> = $library;
         %vars<LIBPLPY> = get_config_var('LIBPL');
-        process-makefile($dir, %vars);
+        %vars<pyhelper> = $*VM.platform-library-name('pyhelper'.IO);
+        mkdir "$dir/resources" unless "$dir/resources".IO.e;
+        mkdir "$dir/resources/libraries" unless "$dir/resources/libraries".IO.e;
+        process-makefile('.', %vars);
 
         my $goback = $*CWD;
         chdir($dir);

META.info

@@ -1,11 +1,12 @@
 {
     "name" : "Inline::Python",
-    "version" : "*",
+    "version" : "0.1",
     "author" : "github:niner",
     "description" : "Use Python code and libraries in a Perl 6 program",
     "depends" : [ "LibraryMake" ],
     "provides" : {
         "Inline::Python" : "lib/Inline/Python.pm6"
     },
+    "resources" : [ "libraries/pyhelper" ],
     "source-url" : "git://github.com/niner/Inline-Python.git"
 }

Makefile.in

@@ -1,8 +1,12 @@
 .PHONY: clean test
-all: %DESTDIR%/resources/pyhelper%SO%
+
+all: %DESTDIR%/resources/libraries/%pyhelper%
+
 clean:
-	rm %DESTDIR%/resources/pyhelper%SO%
-%DESTDIR%/resources/pyhelper%SO%: pyhelper.c
-	%CC% pyhelper.c -Wall -I"%INCLUDEPY%" -L"%LIBPLPY%" -l%LIBRARYPY% -shared -o %DESTDIR%/resources/pyhelper%SO% %CCSHARED% -g
+	rm %DESTDIR%/resources/libraries/%pyhelper%
+
+%DESTDIR%/resources/libraries/%pyhelper%: pyhelper.c
+	%CC% pyhelper.c -Wall -I"%INCLUDEPY%" -L"%LIBPLPY%" -l%LIBRARYPY% -shared -o %DESTDIR%/resources/libraries/%pyhelper% %CCSHARED% -g
+
 test: all
 	prove -e 'perl6 -Ilib' t

configure.pl6

@@ -13,7 +13,9 @@ $library ~~ s/\.a$//;
 $library ~~ s/^lib//;
 %vars<LIBRARYPY> = $library;
 %vars<LIBPLPY> = get_config_var('LIBPL');
+%vars<pyhelper> = $*VM.platform-library-name('pyhelper'.IO);
 mkdir 'resources' unless 'resources'.IO.e;
+mkdir 'resources/libraries' unless 'resources/libraries'.IO.e;
 process-makefile('.', %vars);
 shell(%vars<MAKE>);
 

lib/Inline/Python.pm6

@@ -8,12 +8,9 @@ has &!call_method;
 use NativeCall;
 
 sub native(Sub $sub) {
-    my $so = $*VM.config<dll>;
-    $so ~~ s!^.*\%s!pyhelper!;
-
-    my Str $path = %?RESOURCES{$so}.Str;
+    my Str $path = %?RESOURCES<libraries/pyhelper>.Str;
     unless $path {
-        die "unable to find $so";
+        die "unable to find pyhelper library";
     }
     trait_mod:<is>($sub, :native($path));
 }