From: Vadim Konovalov Date: Mon, 4 Aug 2003 00:01:08 +0000 (+0400) Subject: wince distribution X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1fa63a09180676351ddecaea07a2347a1016bbf6;p=p5sagit%2Fp5-mst-13.2.git wince distribution Message-ID: <039c01c359fa$1e755d50$195ec3d9@vad> p4raw-id: //depot/perl@20458 --- diff --git a/wince/makedist.pl b/wince/makedist.pl index be447e8..7216834 100644 --- a/wince/makedist.pl +++ b/wince/makedist.pl @@ -12,13 +12,10 @@ my %opts = ( # actually this is just perl.exe and perlXX.dll # but can be extended by additional exts # ... (as soon as this will be implemented :) - 'include-modules' => '', # TODO - 'exclude-modules' => '', # TODO - #??? 'only-modules' => '', # TODO 'cross-name' => 'wince', - 'strip-pod' => 0, # TODO strip POD from perl modules - 'adaptation' => 0, # TODO do some adaptation, such as stripping such - # occurences as "if ($^O eq 'VMS'){...}" for certain modules + 'strip-pod' => 0, # strip POD from perl modules + 'adaptation' => 1, # do some adaptation, such as stripping such + # occurences as "if ($^O eq 'VMS'){...}" for Dynaloader.pm 'zip' => 0, # perform zip 'clean-exts' => 0, #options itself @@ -93,8 +90,20 @@ if ($opts{'verbose'} >=1) { print STDERR "Copying perl core extensions...\n"; } for (@efiles) { - /^(.*)\/([^\/]+)\/([^\/]+)$/; - copy "../ext/$_", "$opts{distdir}/lib/$1/$3"; + if (m#^.*?/lib/(.*)$#) { + copy "../ext/$_", "$opts{distdir}/lib/$1"; + } + else { + /^(.*)\/([^\/]+)\/([^\/]+)$/; + copy "../ext/$_", "$opts{distdir}/lib/$1/$3"; + } +} +my ($dynaloader_pm); +if ($opts{adaptation}) { + # let's copy our Dynaloader.pm (make this optional?) + open my $fhdyna, ">$opts{distdir}/lib/Dynaloader.pm"; + print $fhdyna $dynaloader_pm; + close $fhdyna; } # Config.pm, perl binaries @@ -104,9 +113,13 @@ if ($opts{'verbose'} >=1) { copy "../xlib/$opts{'cross-name'}/Config.pm", "$opts{distdir}/lib/Config.pm"; copy "$opts{'cross-name'}/perl.exe", "$opts{distdir}/bin/perl.exe"; copy "$opts{'cross-name'}/perl.dll", "$opts{distdir}/bin/perl.dll"; -# how do we know exact name of perl.dll?) +# how do we know exact name of perl.dll? # auto +my %aexcl = (socket=>'Socket_1'); +# Socket.dll and may be some other conflict with same file in \windows dir +# on WinCE, %aexcl needed to replace it with a different name that however +# will be found by Dynaloader my @afiles; chdir "../xlib/$opts{'cross-name'}/auto"; find({no_chdir=>1,wanted=>sub{push @afiles, $_ if /\.(dll|bs)$/}},'.'); @@ -115,7 +128,12 @@ if ($opts{'verbose'} >=1) { print STDERR "Copying binaries for perl core extensions...\n"; } for (@afiles) { - copy "../xlib/$opts{'cross-name'}/auto/$_", "$opts{distdir}/lib/auto/$_"; + if (/^(.*)\/(\w+)\.dll$/i && exists $aexcl{lc($2)}) { + copy "../xlib/$opts{'cross-name'}/auto/$_", "$opts{distdir}/lib/auto/$1/$aexcl{lc($2)}.dll"; + } + else { + copy "../xlib/$opts{'cross-name'}/auto/$_", "$opts{distdir}/lib/auto/$_"; + } } sub copy($$) { @@ -128,7 +146,11 @@ sub copy($$) { # actually following regexp is suspicious to not work everywhere. # but we've checked on our set of modules, and it's fit for our purposes $ffrom =~ s/^=\w+.*?^=cut(?:\n|\Z)//msg; - # $ffrom =~ s/^__END__.*\Z//msg; # TODO -- deal with Autoload + unless ($ffrom=~/\bAutoLoader\b/) { + # this logic actually strip less than could be stripped, but we're + # not risky. Just strip only of no mention of AutoLoader + $ffrom =~ s/^__END__.*\Z//msg; + } } mkpath $1 if $fnto=~/^(.*)\/([^\/]+)$/; open my $fhout, ">$fnto"; @@ -147,6 +169,128 @@ getopts.pl hostname.pl look.pl newgetopt.pl pwd.pl termcap.pl EOS %extexclusions = map {$_=>1} split/\s/, <<"EOS"; EOS +$dynaloader_pm=<<'EOS'; +# This module designed *only* for WinCE +# if you encounter a problem with this file, try using original Dynaloader.pm +# from perl distribution, it's larger but essentially the same. +package DynaLoader; +our $VERSION = 1.04; + +$dl_debug ||= 0; + +@dl_require_symbols = (); # names of symbols we need + +#@dl_librefs = (); # things we have loaded +#@dl_modules = (); # Modules we have loaded + +boot_DynaLoader('DynaLoader') if defined(&boot_DynaLoader) && !defined(&dl_error); + +print STDERR "DynaLoader not linked into this perl\n" + unless defined(&boot_DynaLoader); + +1; # End of main code + +sub croak{require Carp;Carp::croak(@_)} +sub bootstrap_inherit { + my $module = $_[0]; + local *isa = *{"$module\::ISA"}; + local @isa = (@isa, 'DynaLoader'); + bootstrap(@_); +} +sub bootstrap { + # use local vars to enable $module.bs script to edit values + local(@args) = @_; + local($module) = $args[0]; + local(@dirs, $file); + + unless ($module) { + require Carp; + Carp::confess("Usage: DynaLoader::bootstrap(module)"); + } + + croak("Can't load module $module, dynamic loading not available in this perl.\n") + unless defined(&dl_load_file); + + my @modparts = split(/::/,$module); + my $modfname = $modparts[-1]; + my $modpname = join('/',@modparts); + for (@INC) { + my $dir = "$_/auto/$modpname"; + next unless -d $dir; + my $try = "$dir/$modfname.dll"; + last if $file = ( (-f $try) && $try); + + $try = "$dir/${modfname}_1.dll"; + last if $file = ( (-f $try) && $try); + push @dirs, $dir; + } + $file = dl_findfile(map("-L$_",@dirs,@INC), $modfname) unless $file; + + croak("Can't locate loadable object for module $module in \@INC (\@INC contains: @INC)") + unless $file; + + (my $bootname = "boot_$module") =~ s/\W/_/g; + @dl_require_symbols = ($bootname); + + # optional '.bootstrap' perl script + my $bs = $file; + $bs =~ s/(\.\w+)?(;\d*)?$/\.bs/; + if (-s $bs) { # only read file if it's not empty + eval { do $bs; }; + warn "$bs: $@\n" if $@; + } + + my $libref = dl_load_file($file, 0) or + croak("Can't load '$file' for module $module: ".dl_error()); + + push(@dl_librefs,$libref); # record loaded object + + my @unresolved = dl_undef_symbols(); + if (@unresolved) { + require Carp; + Carp::carp("Undefined symbols present after loading $file: @unresolved\n"); + } + + my $boot_symbol_ref = dl_find_symbol($libref, $bootname) or + croak("Can't find '$bootname' symbol in $file\n"); + + push(@dl_modules, $module); + + boot: + my $xs = dl_install_xsub("${module}::bootstrap", $boot_symbol_ref, $file); + &$xs(@args); +} + +sub dl_findfile { + my (@args) = @_; + my (@dirs, $dir); + my (@found); + + arg: foreach(@args) { + if (m:/: && -f $_) { + push(@found,$_); + last arg unless wantarray; + next; + } + + if (s:^-L::) {push(@dirs, $_); next;} + if (m:/: && -d $_) {push(@dirs, $_); next;} + + for $dir (@dirs) { + next unless -d $dir; + for my $name (/\.dll$/i?($_):("$_.dll",$_)) { + print STDERR " checking in $dir for $name\n" if $dl_debug; + if (-f "$dir/$name") { + push(@found, "$dir/$name"); + next arg; + } + } + } + } + return $found[0] unless wantarray; + @found; +} +EOS }