[svn:parrot] r48695 - trunk/compilers/opsc/src/Ops
cotto at svn.parrot.org
cotto at svn.parrot.org
Fri Aug 27 16:15:55 UTC 2010
Author: cotto
Date: Fri Aug 27 16:15:54 2010
New Revision: 48695
URL: https://trac.parrot.org/parrot/changeset/48695
Log:
make ops2c smarter about finding VERSION with an installed vs non-installed Parrot
This allows Rakudo to build again, fixing TT #1757.
Modified:
trunk/compilers/opsc/src/Ops/File.pm
Modified: trunk/compilers/opsc/src/Ops/File.pm
==============================================================================
--- trunk/compilers/opsc/src/Ops/File.pm Fri Aug 27 14:34:16 2010 (r48694)
+++ trunk/compilers/opsc/src/Ops/File.pm Fri Aug 27 16:15:54 2010 (r48695)
@@ -295,9 +295,23 @@
}
method _set_version() {
- my $config := _config();
- my $version_filename := $config<prefix> ~ $config<slash> ~ 'VERSION';
- my $version := pir::chopn__ssi(slurp($version_filename), 1);
+ my $config := _config();
+ my $version_filename;
+ if $config<installed> {
+ $version_filename :=
+ $config<libdir> ~
+ $config<versiondir> ~
+ $config<slash> ~
+ 'VERSION';
+ }
+ else {
+ $version_filename :=
+ $config<prefix> ~
+ $config<slash> ~
+ 'VERSION';
+ }
+
+ my $version := pir::chopn__ssi(slurp($version_filename), 1);
#say("# $version");
my @bits := split('.', $version);
self<version_major> := @bits[0];
More information about the parrot-commits
mailing list