Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Configure now verifies sufficient parrot revision (or dies).

This completes RT #64868.
  • Loading branch information...
commit 1f4ec5d5651f83de1fa9a6f03d6a37e01b52adf9 1 parent 43f257d
@pmichaud pmichaud authored
Showing with 20 additions and 5 deletions.
  1. +20 −5 Configure.pl
View
25 Configure.pl
@@ -17,6 +17,12 @@
exit(0);
}
+ # Determine the revision of Parrot we require
+ open my $REQ, "build/PARROT_REVISION"
+ || die "cannot open build/PARROT_REVISION\n";
+ my $required = 0+<$REQ>;
+ close $REQ;
+
# Update/generate parrot build if needed
if ($options{'gen-parrot'}) {
my @opts = @{ $options{'gen-parrot-option'} || [] };
@@ -40,13 +46,22 @@
# Get configuration information from parrot_config
my %config = read_parrot_config(@parrot_config_exe);
- unless (%config) {
- die <<'END';
-Unable to locate parrot_config.
-To automatically checkout (svn) and build a copy of parrot,
+
+ my $parrot_errors = '';
+ if (!%config) {
+ $parrot_errors .= "Unable to locate parrot_config\n";
+ }
+ elsif ($required > $config{'revision'}) {
+ $parrot_errors .= "Parrot revision r$required required (currently r$config{'revision'})\n";
+ }
+
+ if ($parrot_errors) {
+ die <<"END";
+$parrot_errors
+To automatically checkout (svn) and build a copy of parrot r$required,
try re-running Configure.pl with the '--gen-parrot' option.
Or, use the '--parrot-config' option to explicitly specify
-the location of parrot_config.
+the location of parrot_config to be used to build Rakudo Perl.
END
}
Please sign in to comment.
Something went wrong with that request. Please try again.