Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Change some dependency rules to make them work with VMS make #863

Closed
wants to merge 7 commits into from

1 participant

mvorl
mvorl

The VMS make utilities MMS/MMK always need an action if they determine that a target is
older than a denpendency element.

Besides, rules like

some/header.h : some/source.c

some/source.c : some/file.dump
$(PMC2CC) some/source.pmc

don't reflect the building process, as both the C and header file are generated
by the $(PMCCC) call.

Martin Vorla... and others added some commits
Martin Vorländer Fix a bug that causes parrot to fail on platforms where size_t is an …
…unsigned type.
ab7ec2a
mvorl mvorl Merge remote-tracking branch 'upstream/master' 91438ff
mvorl mvorl Fix some unix path-building that doesn't work on VMS. a1ecb98
mvorl mvorl Change some dependency rules to make them work with MMS/MMK (VMS make…
… utilities).

The VMS make utilities always need an action if they determine that a target is
older than a denpendency element.

Besides, rules like

some/header.h : some/source.c

some/source.c : some/file.dump
	$(PMC2CC) some/source.pmc

don't reflect the building process, as both the C and header file are generated
by the $(PMCCC) call.
38cf8d9
mvorl mvorl Revert "Change some dependency rules to make them work with MMS/MMK (…
…VMS make utilities)."

This reverts commit 38cf8d9.
16f278b
mvorl mvorl Place dependency changes in branch c376548
mvorl mvorl Merge branch 'master' into vms-depend_h_c bf72c5c
mvorl mvorl closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 3, 2012
  1. Fix a bug that causes parrot to fail on platforms where size_t is an …

    Martin Vorländer authored
    …unsigned type.
Commits on Oct 17, 2012
  1. mvorl
Commits on Oct 18, 2012
  1. mvorl
  2. mvorl

    Change some dependency rules to make them work with MMS/MMK (VMS make…

    mvorl authored
    … utilities).
    
    The VMS make utilities always need an action if they determine that a target is
    older than a denpendency element.
    
    Besides, rules like
    
    some/header.h : some/source.c
    
    some/source.c : some/file.dump
    	$(PMC2CC) some/source.pmc
    
    don't reflect the building process, as both the C and header file are generated
    by the $(PMCCC) call.
  3. mvorl

    Revert "Change some dependency rules to make them work with MMS/MMK (…

    mvorl authored
    …VMS make utilities)."
    
    This reverts commit 38cf8d9.
  4. mvorl
Commits on Oct 20, 2012
  1. mvorl
This page is out of date. Refresh to see the latest.
4 config/auto/perldoc.pm
View
@@ -20,6 +20,7 @@ use strict;
use warnings;
use File::Temp qw (tempfile );
+use File::Spec qw (catfile );
use base qw(Parrot::Configure::Step);
use Parrot::Configure::Utils ':auto';
@@ -35,8 +36,7 @@ sub _init {
sub runstep {
my ( $self, $conf ) = @_;
- my $slash = $conf->data->get('slash');
- my $cmd = $conf->data->get('scriptdirexp_provisional') . $slash . q{perldoc};
+ my $cmd = File::Spec->catfile($conf->data->get('scriptdirexp_provisional'), q{perldoc});
my ( $fh, $filename ) = tempfile( UNLINK => 1 );
my $content = capture_output("$cmd -ud $filename perldoc") || undef;
3  lib/Parrot/Pmc2c/Pmc2cMain.pm
View
@@ -91,8 +91,9 @@ sub new {
die "Must have key 'args' which is a reference to a list of the remaining arguments"
unless ( defined $allargsref->{args} and ref( $allargsref->{args} ) eq q{ARRAY} );
+ my $base = File::Spec->catdir($allargsref->{bin},'..','..');
unshift @{ $allargsref->{include} },
- '.', "$allargsref->{bin}/../..", "$allargsref->{bin}/../../src/pmc", "$allargsref->{bin}/../../src/dynpmc";
+ '.', $base, File::Spec->catdir($base,'src','pmc'), File::Spec->catdir($base,'src','dynpmc');
foreach my $opt ( qw(nolines) ) {
if ( !defined $allargsref->{opt}{$opt} ) {
6 lib/Parrot/Pmc2c/VTable.pm
View
@@ -6,6 +6,7 @@ use warnings;
use Storable ();
use Parrot::Vtable ();
use Parrot::Pmc2c::Method ();
+use File::Spec ();
use File::Basename;
use Cwd qw(cwd);
@@ -51,8 +52,9 @@ sub dump {
my ($self) = @_;
my $dump_filename =
- cwd() . q{/}
- . basename( Parrot::Pmc2c::UtilFunctions::filename( $self->filename, '.dump' ) );
+ File::Spec->catfile( cwd(),
+ basename( Parrot::Pmc2c::UtilFunctions::filename( $self->filename, '.dump' ) )
+ );
Storable::nstore( $self, $dump_filename );
return $dump_filename;
}
7 tools/build/pmc2c.pl
View
@@ -5,8 +5,9 @@
use warnings;
use Getopt::Long ();
use FindBin qw($Bin);
-use lib "$Bin/../lib"; # install location
-use lib "$Bin/../../lib"; # build location
+use File::Spec ();
+use lib File::Spec->catdir($Bin,'..','lib'); # install location
+use lib File::Spec->catdir($Bin,'..','..','lib'); # build location
use Parrot::Pmc2c::Pmc2cMain ();
my ( %action, %options, @pmc_include_paths );
@@ -42,7 +43,7 @@
);
if ( $action{default} ) {
- $self->dump_vtable("$Bin/../../src/vtable.tbl");
+ $self->dump_vtable(File::Spec->catfile($Bin,'..','..','src','vtable.tbl'));
exit;
}
Something went wrong with that request. Please try again.