novarobot
/
webperl-for
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated for Perl v5.28.1

Browse Source
master
Hauke D 7 years ago
parent ad53548513
commit 32a3bbb8a1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File

7
build/build.pl
Unescape Escape View File

@ -120,17 +120,18 @@ if (!-e $C{PERLSRCDIR}) {
} }
GITSTUFF: { GITSTUFF: {
my $d = pushd($C{PERLSRCDIR}); my $d = pushd($C{PERLSRCDIR});
my $remhead;
eval { eval {
git 'fetch'; git 'fetch';
$remhead = git 'log', '-1', '--format=%h', 'origin/'.$C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE};
1 } or do { 1 } or do {
warn $@; warn $@;
# Maybe we don't have network connectivity # Maybe we don't have network connectivity
if (prompt("Whoops, 'git fetch' failed. Continue anyway? [Yn]","y")=~/^\s*y/i) if (prompt("Whoops, 'git' failed. Continue anyway? [Yn]","y")=~/^\s*y/i)
{ last GITSTUFF } { last GITSTUFF }
else { die "git fetch failed, aborting" } else { die "git fetch failed, aborting" }
}; };
my $myhead = git 'log', '-1', '--format=%h', $C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE}; my $myhead = git 'log', '-1', '--format=%h', $C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE};
my $remhead = git 'log', '-1', '--format=%h', 'origin/'.$C{PERL_BRANCH}, {chomp=>1,show_cmd=>$VERBOSE};
say STDERR "# Local branch is at $myhead, remote is $remhead"; say STDERR "# Local branch is at $myhead, remote is $remhead";
if ($myhead ne $remhead) { if ($myhead ne $remhead) {
git 'merge-base', '--is-ancestor', $remhead, $myhead, {allow_exit=>[0,1]}; git 'merge-base', '--is-ancestor', $remhead, $myhead, {allow_exit=>[0,1]};
@ -372,7 +373,7 @@ if ($needs_reconfig || !-e $destdir || $opts{remakeout}) {
safelink( $C{PERLSRCDIR}->file('ext','WebPerl','t','WebPerl.t'), safelink( $C{PERLSRCDIR}->file('ext','WebPerl','t','WebPerl.t'),
$destdir->file('dev','WebPerl.t') ); $destdir->file('dev','WebPerl.t') );
safelink( $C{PERLSRCDIR}->file('ext','WebPerl','lib','WebPerl.pm'), safelink( $C{PERLSRCDIR}->file('ext','WebPerl','lib','WebPerl.pm'),
$destdir->file('lib','5.28.0','wasm','WebPerl.pm') ); #TODO: should figure this directory out dynamically $destdir->file('lib',$C{PERLVER}=~s/^v(?=5)//r,'wasm','WebPerl.pm') );
#TODO Later: Provide an easy way for users to add files to the virtual file system #TODO Later: Provide an easy way for users to add files to the virtual file system

2
build/emperl_config.sh
Unescape Escape View File

@ -27,7 +27,7 @@ export EMPERL_OUTPUTDIR="$BASEDIR/work/outputperl"
# Don't edit the following options unless you know what you're doing! # Don't edit the following options unless you know what you're doing!
# Note to self: In build.pl, we take advantage of the fact that on Perls >=v5.10.0, "$^V" is the same as the tag name. # Note to self: In build.pl, we take advantage of the fact that on Perls >=v5.10.0, "$^V" is the same as the tag name.
export EMPERL_PERLVER="v5.28.0" export EMPERL_PERLVER="v5.28.1"
export EMPERL_PREFIX="/opt/perl" export EMPERL_PREFIX="/opt/perl"
# Note: strace shows this is how file_packager.py is called: ["/usr/bin/python", "/home/haukex/emsdk/emscripten/1.38.28/tools/file_packager.py", "emperl.data", "--from-emcc", "--export-name=Module", "--preload", "/home/haukex/code/webperl/work/outputperl/opt/perl@/opt/perl", "--no-heap-copy"] # Note: strace shows this is how file_packager.py is called: ["/usr/bin/python", "/home/haukex/emsdk/emscripten/1.38.28/tools/file_packager.py", "emperl.data", "--from-emcc", "--export-name=Module", "--preload", "/home/haukex/code/webperl/work/outputperl/opt/perl@/opt/perl", "--no-heap-copy"]
export EMPERL_PRELOAD_FILE="$EMPERL_OUTPUTDIR$EMPERL_PREFIX@$EMPERL_PREFIX" export EMPERL_PRELOAD_FILE="$EMPERL_OUTPUTDIR$EMPERL_PREFIX@$EMPERL_PREFIX"

Write Preview
Loading…
Cancel
Save