X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FExtUtils%2FEmbed.pm;h=8643d9898d5730d1139f197a96771202ec5cde00;hb=8881896e2b6c75868d2a80cf3faaa4960cc38832;hp=39d797e430273f215d41a5b65d424eda9052c565;hpb=2ae324a7ad5d4e616e757c311984fd86d5857ddd;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/ExtUtils/Embed.pm b/lib/ExtUtils/Embed.pm index 39d797e..8643d98 100644 --- a/lib/ExtUtils/Embed.pm +++ b/lib/ExtUtils/Embed.pm @@ -1,4 +1,4 @@ -# $Id: Embed.pm,v 1.22 1997/01/30 00:37:09 dougm Exp $ +# $Id: Embed.pm,v 1.2501 $ require 5.002; package ExtUtils::Embed; @@ -6,6 +6,7 @@ require Exporter; require FileHandle; use Config; use Getopt::Std; +use File::Spec; #Only when we need them #require ExtUtils::MakeMaker; @@ -17,11 +18,7 @@ use vars qw(@ISA @EXPORT $VERSION ); use strict; -$VERSION = sprintf("%d.%02d", q$Revision: 1.2201 $ =~ /(\d+)\.(\d+)/); -#for the namespace change -$Devel::embed::VERSION = "99.99"; - -sub Version { $VERSION; } +$VERSION = sprintf("%d.%02d", q$Revision: 1.2506_00 $ =~ /(\d+)\.(\d+)/); @ISA = qw(Exporter); @EXPORT = qw(&xsinit &ldopts @@ -35,10 +32,23 @@ sub Version { $VERSION; } $Verbose = 0; $lib_ext = $Config{lib_ext} || '.a'; +sub is_cmd { $0 eq '-e' } + +sub my_return { + my $val = shift; + if(is_cmd) { + print $val; + } + else { + return $val; + } +} + sub xsinit { my($file, $std, $mods) = @_; my($fh,@mods,%seen); $file ||= "perlxsi.c"; + my $xsinit_proto = "pTHX"; if (@_) { @mods = @$mods if $mods; @@ -62,10 +72,10 @@ sub xsinit { @mods = grep(!$seen{$_}++, @mods); print $fh &xsi_header(); - print $fh "EXTERN_C void xs_init _((void));\n\n"; + print $fh "EXTERN_C void xs_init ($xsinit_proto);\n\n"; print $fh &xsi_protos(@mods); - print $fh "\nEXTERN_C void\nxs_init()\n{\n"; + print $fh "\nEXTERN_C void\nxs_init($xsinit_proto)\n{\n"; print $fh &xsi_body(@mods); print $fh "}\n"; @@ -73,37 +83,22 @@ sub xsinit { sub xsi_header { return < #include -#ifdef __cplusplus -} -# ifndef EXTERN_C -# define EXTERN_C extern "C" -# endif -#else -# ifndef EXTERN_C -# define EXTERN_C extern -# endif -#endif - EOF } sub xsi_protos { my(@exts) = @_; my(@retval,%seen); - + my $boot_proto = "pTHX_ CV* cv"; foreach $_ (@exts){ my($pname) = canon('/', $_); my($mname, $cname); ($mname = $pname) =~ s!/!::!g; ($cname = $pname) =~ s!/!__!g; - my($ccode) = "EXTERN_C void boot_${cname} _((CV* cv));\n"; + my($ccode) = "EXTERN_C void boot_${cname} ($boot_proto);\n"; next if $seen{$ccode}++; push(@retval, $ccode); } @@ -114,8 +109,9 @@ sub xsi_body { my(@exts) = @_; my($pname,@retval,%seen); my($dl) = canon('/','DynaLoader'); + push(@retval, "\tchar *file = __FILE__;\n"); push(@retval, "\tdXSUB_SYS;\n") if $] > 5.002; - push(@retval, "\tchar *file = __FILE__;\n\n"); + push(@retval, "\n"); foreach $_ (@exts){ my($pname) = canon('/', $_); @@ -150,7 +146,6 @@ sub ldopts { my(@mods,@link_args,@argv); my($dllib,$config_libs,@potential_libs,@path); local($") = ' ' unless $" eq ' '; - my $MM = bless {} => 'MY'; if (scalar @_) { @link_args = @$link_args if $link_args; @mods = @$mods if $mods; @@ -166,25 +161,29 @@ sub ldopts { } } $std = 1 unless scalar @link_args; - @path = $path ? split(/:/, $path) : @INC; + my $sep = $Config{path_sep} || ':'; + @path = $path ? split(/\Q$sep/, $path) : @INC; push(@potential_libs, @link_args) if scalar @link_args; - push(@potential_libs, $Config{libs}) if defined $std; + # makemaker includes std libs on windows by default + if ($^O ne 'MSWin32' and defined($std)) { + push(@potential_libs, $Config{perllibs}); + } push(@mods, static_ext()) if $std; my($mod,@ns,$root,$sub,$extra,$archive,@archives); print STDERR "Searching (@path) for archives\n" if $Verbose; foreach $mod (@mods) { - @ns = split('::', $mod); + @ns = split(/::|\/|\\/, $mod); $sub = $ns[-1]; - $root = $MM->catdir(@ns); + $root = File::Spec->catdir(@ns); print STDERR "searching for '$sub${lib_ext}'\n" if $Verbose; foreach (@path) { - next unless -e ($archive = $MM->catdir($_,"auto",$root,"$sub$lib_ext")); + next unless -e ($archive = File::Spec->catdir($_,"auto",$root,"$sub$lib_ext")); push @archives, $archive; - if(-e ($extra = $MM->catdir($_,"auto",$root,"extralibs.ld"))) { + if(-e ($extra = File::Spec->catdir($_,"auto",$root,"extralibs.ld"))) { local(*FH); if(open(FH, $extra)) { my($libs) = ; chomp $libs; @@ -199,12 +198,18 @@ sub ldopts { } #print STDERR "\@potential_libs = @potential_libs\n"; - my $libperl = (grep(/^(-l\w+perl)$/, @link_args))[0] || "-lperl"; + my $libperl; + if ($^O eq 'MSWin32') { + $libperl = $Config{libperl}; + } + else { + $libperl = (grep(/^-l\w*perl\w*$/, @link_args))[0] || "-lperl"; + } + my $lpath = File::Spec->catdir($Config{archlibexp}, 'CORE'); + $lpath = qq["$lpath"] if $^O eq 'MSWin32'; my($extralibs, $bsloadlibs, $ldloadlibs, $ld_run_path) = - $MM->ext(join ' ', - $MM->catdir("-L$Config{archlibexp}", "CORE"), " $libperl", - @potential_libs); + MM->ext(join ' ', "-L$lpath", $libperl, @potential_libs); my $ld_or_bs = $bsloadlibs || $ldloadlibs; print STDERR "bs: $bsloadlibs ** ld: $ldloadlibs" if $Verbose; @@ -212,24 +217,25 @@ sub ldopts { print STDERR "ldopts: '$linkage'\n" if $Verbose; return $linkage if scalar @_; - print "$linkage\n"; + my_return("$linkage\n"); } sub ccflags { - print " $Config{ccflags} "; + my_return(" $Config{ccflags} "); } sub ccdlflags { - print " $Config{ccdlflags} "; + my_return(" $Config{ccdlflags} "); } sub perl_inc { - print " -I$Config{archlibexp}/CORE "; + my $dir = File::Spec->catdir($Config{archlibexp}, 'CORE'); + $dir = qq["$dir"] if $^O eq 'MSWin32'; + my_return(" -I$dir "); } sub ccopts { - ccflags; - perl_inc; + ccflags . perl_inc; } sub canon { @@ -254,6 +260,7 @@ ExtUtils::Embed - Utilities for embedding Perl in C/C++ applications perl -MExtUtils::Embed -e xsinit + perl -MExtUtils::Embed -e ccopts perl -MExtUtils::Embed -e ldopts =head1 DESCRIPTION @@ -272,7 +279,7 @@ ccdlflags(), xsi_header(), xsi_protos(), xsi_body() =head1 FUNCTIONS -=over +=over 4 =item xsinit() @@ -309,7 +316,7 @@ B<[@modules]> is an array ref, same as additional arguments mentioned above. This will generate code with an B function that glues the perl B function -to the C B function and writes it to a file named "xsinit.c". +to the C B function and writes it to a file named F. Note that B is a special case where it must call B directly. @@ -355,7 +362,7 @@ we should find B When looking for B relative to a search path, we should find B -Keep in mind, you can always supply B +Keep in mind that you can always supply B as an additional linker argument. B<--> Elist of linker argsE @@ -369,7 +376,7 @@ When invoked with parameters the following are accepted and optional: C -Where, +Where: B<$std> is boolean, equivalent to the B<-std> option. @@ -392,7 +399,7 @@ This will print arguments for linking with B, B and extensions found in B<$Config{static_ext}>. This includes libraries found in B<$Config{libs}> and the first ModuleName.a library for each extension that is found by searching B<@INC> or the path -specifed by the B<-I> option. +specified by the B<-I> option. In addition, when ModuleName.a is found, additional linker arguments are picked up from the B file in the same directory. @@ -454,14 +461,14 @@ This function returns a string of B prototypes for each @modul This function returns a string of calls to B that glue the module B function to B for each @modules. -B uses the xsi_* functions to generate most of it's code. +B uses the xsi_* functions to generate most of its code. =back =head1 EXAMPLES For examples on how to use B for building C/C++ applications -with embedded perl, see the eg/ directory and L. +with embedded perl, see L. =head1 SEE ALSO