Skip to content
Permalink
Browse files

[js] Fix the js build after recent build system changes

  • Loading branch information...
pmurias committed Jun 27, 2019
1 parent 9b63996 commit ea7957101d4cf72723ceff9a928c8a0435a5c52e
@@ -34,6 +34,15 @@ sub rule($target, $source, *@actions) {
$target;
}
say("JS_CORE_SOURCES = @insert_filelist(core_sources)@
@for_specs(
JS_CORE_@ucspec@_SOURCES = \\
@insert_filelist(rev_core_sources)@
)@");
say("
JS_BUILD_DIR = @nfp(js/moar)@
");
constant('JS_BLIB', '@js_blib@');
constant('JS_BUILD_DIR', '@js_build_dir@');
constant('JS_NQP', '@js_nqp@');
@@ -120,17 +129,19 @@ rule($Metamodel-combined, '$(COMMON_BOOTSTRAP_SOURCES)',
my $Bootstrap-combined := combine(:sources('$(BOOTSTRAP_SOURCES)'), :file<Perl6-BOOTSTRAP.nqp>);
my $CORE-combined := $build_dir ~ "/CORE.setting";
rule($CORE-combined, '@js_core_sources@',
rule($CORE-combined, '$(JS_CORE_SOURCES)',
'@echo "The following step can take a very long time, please be patient."',
"\$(JS_NQP) \@script(gen-cat.nqp)@ js -f \@ctx_template(core_sources)@ > {nfp($CORE-combined)}"
'$(CONFIGURE) --expand @shquot(@template(core_sources)@)@ \\',
'--out @nfpq($(JS_BUILD_DIR)/core_sources)@ \\',
'--set-var=backend=@backend@',
"\$(JS_NQP) \@script(gen-cat.nqp)\@ js -f \@nfpq(\$(JS_BUILD_DIR)/core_sources)\@ > {nfp($CORE-combined)}"
);
say('@for_specs(');
my $CORE-spec-combined := $build_dir ~ "/CORE.@lcspec@.setting";
rule($CORE-spec-combined, '@ctx_template(js_core_sources)@',
rule($CORE-spec-combined, '$(JS_CORE_@ucspec@_SOURCES)',
'@echo "The following step can take a very long time, please be patient."',
"\$(JS_NQP) \@script(gen-cat.nqp)@ js -f \@ctx_template(js_core_sources)@ > {nfp($CORE-spec-combined)}"
"\$(JS_NQP) \@script(gen-cat.nqp)@ js \$(JS_CORE_\@ucspec\@_SOURCES) > {nfp($CORE-spec-combined)}"
);
say("\n)@");

This file was deleted.

@@ -1 +1 @@
2019.03-253-g5190ce935
2019.03-258-g0784193e2
@@ -42,7 +42,7 @@ src/core/Bool.pm6
src/core/Order.pm6
src/core/Num.pm6
src/core/Buf.pm6
@if(backend==moar
@if(backend!=jvm
src/core/Uni.pm6
src/core/Collation.pm6)@
src/core/Encoding/Decoder.pm6
@@ -165,7 +165,10 @@ src/core/Awaitable.pm6
src/core/Awaiter.pm6
src/core/Scheduler.pm6
src/core/Env.pm6
src/core/ThreadPoolScheduler.pm6
@if(backend!=js
src/core/ThreadPoolScheduler.pm6)@
@if(backend==js
src/core/JavaScriptScheduler.pm6)@
src/core/CurrentThreadScheduler.pm6
src/core/Promise.pm6
src/core/Channel.pm6
@@ -175,6 +178,8 @@ src/core/IO/Socket.pm6
src/core/IO/Socket/INET.pm6
src/core/IO/Socket/Async.pm6
src/core/Proc.pm6
@if(backend==js
src/vm/js/FakeRun.pm6)@
src/core/signals.pm6
src/core/Proc/Async.pm6
src/core/Systemic.pm6
@@ -209,10 +214,15 @@ src/core/CompUnit/Repository/Unknown.pm6
@if(backend==jvm
src/vm/jvm/CompUnit/Repository/Java.pm6
src/vm/jvm/CompUnit/Repository/JavaRuntime.pm6)@
@if(backend==js
src/vm/js/CompUnit/Repository/FileSystemWithRecording.pm6
src/vm/js/CompUnit/Repository/NodeJs.pm6)@
src/core/Argfiles.pm6
src/core/Process.pm6
src/core/Slang.pm6
src/core/Metamodel/Primitives.pm6
src/core/REPL.pm6
@if(backend==js
src/core/WrappedJSObject.pm6)@
src/core/Rakudo/Metaops.pm6
src/core/core_epilogue.pm6

0 comments on commit ea79571

Please sign in to comment.
You can’t perform that action at this time.