Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Check RAKUDO_DIR for perl6.pbc

  • Loading branch information...
commit c2480acb967190a11819cfa2f12e57f37ad688be 1 parent 5db9a01
@viklund authored
View
15 Makefile.PL
@@ -9,6 +9,9 @@ use File::Spec;
my $parrot_dir = $ENV{PARROT_DIR}
or die 'Please set $PARROT_DIR (see README).'."\n";
+my $rakudo_dir = $ENV{RAKUDO_DIR}
+ or die 'Please set $RAKUDO_DIR (see README).'."\n";
+
$ENV{PERL6LIB}
or die 'Please set $PERL6LIB (see README).'."\n";
@@ -17,7 +20,16 @@ if ( ! -d $parrot_dir ) {
exit 1;
} elsif ( ! -x File::Spec->catfile( $parrot_dir, 'parrot' )) {
print STDERR "Couldn't find parrot executable in $parrot_dir, "
- . "have you compiled?";
+ . "have you compiled?\n";
+ exit 1;
+}
+
+if ( ! -d $rakudo_dir ) {
+ print STDERR "Not a directory $rakudo_dir, exiting...\n";
+ exit 1;
+} elsif ( ! -f File::Spec->catfile( $rakudo_dir, 'perl6.pbc' )) {
+ print STDERR "Couldn't find perl6.pbc file in $rakudo_dir, "
+ . "have you compiled?\n";
exit 1;
}
@@ -26,6 +38,7 @@ my @infiles = map { $_.'.in' } qw< Makefile test_wiki.sh wiki.sh >;
my %replacements = (
PARROT_DIR => $parrot_dir,
+ RAKUDO_DIR => $rakudo_dir,
);
if ( !-e 'lib/Test.pm' ) {
View
5 Makefile.in
@@ -1,4 +1,5 @@
PARROT_DIR=<PARROT_DIR>
+RAKUDO_DIR=<RAKUDO_DIR>
SOURCES=lib/CGI.pm lib/Text/Markup/Wiki/Minimal.pm \
lib/Text/Markup/Wiki/MediaWiki.pm lib/Test.pm \
@@ -13,7 +14,7 @@ PIRS=$(SOURCES:.pm=.pir)
all: $(PIRS)
%.pir: %.pm
- $(PARROT_DIR)/parrot $(PARROT_DIR)/languages/rakudo/perl6.pbc --target=pir --output=$@ $<
+ $(PARROT_DIR)/parrot $(RAKUDO_DIR)/perl6.pbc --target=pir --output=$@ $<
clean:
rm -f $(PIRS)
@@ -21,5 +22,5 @@ clean:
tests: test
test: all
- prove -e '$(PARROT_DIR)/parrot $(PARROT_DIR)/languages/rakudo/perl6.pbc'\
+ prove -e '$(PARROT_DIR)/parrot $(RAKUDO_DIR)/perl6.pbc'\
-r --nocolor t/
View
7 README
@@ -54,11 +54,12 @@ REPOSITORY LAYOUT
RUNNING NOVEMBER
----------------
-Before building November you have to set the PARROT_DIR and PERL6LIB
-environment variables to include the lib/ subdirectory of the November
-repository. In bash, that would look like this:
+Before building November you have to set the PARROT_DIR, RAKUDO_DIR and
+PERL6LIB environment variables to include the lib/ subdirectory of the
+November repository. In bash, that would look like this:
$ export PARROT_DIR=/path/to/parrot
+ $ export RAKUDO_DIR=/path/to/rakudo
$ export PERL6LIB=/path/to/repository/of/november/lib
After that, you can build as usual.
View
3  test_wiki.sh.in
@@ -2,8 +2,9 @@
QS=$1
PARROT_DIR=<PARROT_DIR>
+RAKUDO_DIR=<RAKUDO_DIR>
env REQUEST_METHOD=GET \
SERVER_NAME='test.foo' \
SERVER_PORT='80' \
REQUEST_URI=$QS \
-$PARROT_DIR/parrot $PARROT_DIR/languages/rakudo/perl6.pbc wiki
+$PARROT_DIR/parrot $RAKUDO_DIR/perl6.pbc wiki
View
3  wiki.sh.in
@@ -1,4 +1,5 @@
#!/bin/sh
PARROT_DIR=<PARROT_DIR>
-exec $PARROT_DIR/parrot $PARROT_DIR/languages/rakudo/perl6.pbc wiki
+RAKUDO_DIR=<RAKUDO_DIR>
+exec $PARROT_DIR/parrot $RAKUDO_DIR/perl6.pbc wiki
Please sign in to comment.
Something went wrong with that request. Please try again.