aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMouq <alexmoquin@gmail.com>2014-03-16 23:14:04 -0400
committerMouq <alexmoquin@gmail.com>2014-03-16 23:14:04 -0400
commit4a394218f093b51c8137904488cbae4188d68ced (patch)
treefa037b921375ff99efadec7c858d0a11403e9ef0
parent786ece4752468ddedd333ac5ee42de992848fa47 (diff)
Let ufo, panda, and p6doc figure out what they're running on
-rw-r--r--tools/build/Makefile.in6
-rw-r--r--tools/build/bin-install.pl10
2 files changed, 12 insertions, 4 deletions
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index 27e1199..1a4928f 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -71,19 +71,19 @@ modules-install-p:
@echo "== Installing modules for Parrot"
$(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_P_INSTALL) $(DESTDIR)$(PERL6_P_LANG_DIR)/lib pir pir $(MODULES)
@echo "== Installing binaries for Parrot"
- $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo-p modules/panda/bin/panda-p modules/doc/bin/p6doc-p
+ $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) p modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc
modules-install-j:
@echo "== Installing modules for JVM"
$(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_J_INSTALL) $(DESTDIR)$(PERL6_J_LANG_DIR)/lib jar jar $(MODULES)
@echo "== Installing binaries for JVM"
- $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(JVM_BIN_DIR) modules/ufo/bin/ufo-j modules/panda/bin/panda-j modules/doc/bin/p6doc-j
+ $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(JVM_BIN_DIR) j modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc
modules-install-m:
@echo "== Installing modules for MoarVM"
$(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_M_INSTALL) $(DESTDIR)$(PERL6_M_LANG_DIR)/lib moarvm mbc $(MODULES)
@echo "== Installing binaries for MoarVM"
- $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(MOAR_BIN_DIR) modules/ufo/bin/ufo-m modules/panda/bin/panda-m modules/doc/bin/p6doc-m
+ $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(MOAR_BIN_DIR) m modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc
modules-test:
$(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_INSTALL) modules/MODULES.txt
diff --git a/tools/build/bin-install.pl b/tools/build/bin-install.pl
index 1c71cea..1b47942 100644
--- a/tools/build/bin-install.pl
+++ b/tools/build/bin-install.pl
@@ -4,7 +4,7 @@ use strict;
use warnings;
use File::Spec;
-my ($p6bin, $dest, @files) = @ARGV;
+my ($p6bin, $dest, $post, @files) = @ARGV;
die "Usage: $0 <perl6_binary> <destination_path> <source_files>"
unless $p6bin && $dest;
@@ -25,4 +25,12 @@ for my $filename (@files) {
close $OUT or die "Error while closing file '$dest/$basename': $!";
close $IN;
chmod 0755, "$dest/$basename";
+ open my $ALIAS, '>', "$dest/$basename-$post"
+ or die "Cannot write file '$dest/$basename-$post' for installing it: $!";
+ printf { $ALIAS } <<'EOA', $p6bin, $dest, $basename;
+#!/bin/sh
+exec %s %s/%s "$@"
+EOA
+ close $ALIAS or die "Error while closing file '$dest/$basename-$post': $!";
+ chmod 0755, "$dest/$basename-$post";
}