@@ -15,10 +15,11 @@ my $rakudo_dir = $ENV{RAKUDO_DIR} $ENV{PERL6LIB} or die 'Please set $PERL6LIB (see README).'."\n"; +my $parrot_exec = $^O eq 'MSWin32' ? 'parrot.exe' : 'parrot'; if ( ! -d $parrot_dir ) { - print STDERR "Not a directory $parrot_dir, exiting...\n"; - exit 1; -} elsif ( ! -x File::Spec->catfile( $parrot_dir, 'parrot' )) { + print STDERR "Not a directory $parrot_dir, exiting...\n"; + exit 1; +} elsif ( ! -x File::Spec->catfile( $parrot_dir, $parrot_exec )) { print STDERR "Couldn't find parrot executable in $parrot_dir, " . "have you compiled?\n"; exit 1; @@ -37,8 +38,9 @@ my @scripts = qw< test_wiki.sh wiki.sh >; my @infiles = map { $_.'.in' } qw< Makefile test_wiki.sh wiki.sh >; my %replacements = ( - PARROT_DIR => $parrot_dir, - RAKUDO_DIR => $rakudo_dir, + PARROT_DIR => $parrot_dir, + PARROT_EXEC => $parrot_exec, + RAKUDO_DIR => $rakudo_dir, ); if ( !-e 'lib/Test.pm' ) { Makefile.PL @@ -1,3 +1,4 @@ +PARROT_EXEC=<PARROT_EXEC> PARROT_DIR=<PARROT_DIR> RAKUDO_DIR=<RAKUDO_DIR> @@ -14,7 +15,8 @@ PIRS=$(SOURCES:.pm=.pir) all: $(PIRS) %.pir: %.pm - $(PARROT_DIR)/parrot $(RAKUDO_DIR)/perl6.pbc --target=pir --output=$@ $< + $(PARROT_DIR)/$(PARROT_EXEC) $(RAKUDO_DIR)/perl6.pbc --target=pir\ + --output=$@ $< clean: rm -f $(PIRS) @@ -22,5 +24,5 @@ clean: tests: test test: all - prove -e '$(PARROT_DIR)/parrot $(RAKUDO_DIR)/perl6.pbc'\ + prove -e '$(PARROT_DIR)/$(PARROT_EXEC) $(RAKUDO_DIR)/perl6.pbc'\ -r --nocolor t/ Makefile.in 9aaeacf1b1c8e8489b915fe50877c709f2bfeedc Carl Masak cmasak@gmail.com http://github.com/viklund/november/commit/5165940425e95956220f3b0696da1e10a705b9bc 5165940425e95956220f3b0696da1e10a705b9bc 2009-04-06T22:10:35-07:00 2009-04-06T22:10:35-07:00 [Makefile.*] made some changes for Windows ec36b1b76d3dc88978d90e8c993293e0ad1dd321 Carl Masak cmasak@gmail.com