Skip to content

Commit

Permalink
vms: fix and test multi-dot filenames
Browse files Browse the repository at this point in the history
t/codingstd/filenames.t missed generated and violating filenames.
.travis.yml still violates vms: todo, but low prio
  • Loading branch information
Reini Urban committed Aug 23, 2012
1 parent 2d0fc71 commit fc115a5
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -46,7 +46,7 @@ cachegrind.out.*
/.parrot_current_sha1
/.parrot_current_git_describe
/CFLAGS
/MANIFEST.configure.generated
/MANIFEST_configure.generated
/Makefile
/TAGS
/all_cstring.str
Expand Down
4 changes: 2 additions & 2 deletions Configure.pl
Expand Up @@ -68,9 +68,9 @@
? '"'.join("\" \"", map {qq($_)} @ARGV).'"'
: '');

# Log files created by Configure.pl in MANIFEST.configure.generated
# Log files created by Configure.pl in MANIFEST_configure.generated
$conf->{active_configuration} = 1;
unlink 'MANIFEST.configure.generated';
unlink 'MANIFEST_configure.generated';

# Run the actual steps from Parrot::Configure
$conf->runsteps or exit(1);
Expand Down
2 changes: 1 addition & 1 deletion config/gen/makefiles/root.in
Expand Up @@ -223,7 +223,7 @@ CONFIGURE_GENERATED_FILES = \
$(GEN_CONFIGS) \
$(GEN_MAKEFILES) \
myconfig \
MANIFEST.configure.generated \
MANIFEST_configure.generated \
.configure_trace.sto \
.parrot_current_rev \
.parrot_current_sha1 \
Expand Down
2 changes: 1 addition & 1 deletion config/init/manifest.pm
Expand Up @@ -33,7 +33,7 @@ sub _init {
sub runstep {
my ( $self, $conf ) = @_;

$conf->append_configure_log('MANIFEST.configure.generated');
$conf->append_configure_log('MANIFEST_configure.generated');
if ( $conf->options->get('nomanicheck') ) {
$self->set_result('skipped');
return 1;
Expand Down
2 changes: 1 addition & 1 deletion lib/Parrot/Configure/Compiler.pm
Expand Up @@ -730,7 +730,7 @@ sub append_configure_log {
my $conf = shift;
my $target = shift;
if ( $conf->{active_configuration} ) {
my $generated_log = 'MANIFEST.configure.generated';
my $generated_log = 'MANIFEST_configure.generated';
open my $GEN, '>>', $generated_log
or die "Can't open $generated_log for appending: $!";
print $GEN "$target\n";
Expand Down
10 changes: 9 additions & 1 deletion t/codingstd/filenames.t
@@ -1,5 +1,5 @@
#! perl
# Copyright (C) 2006-2009, Parrot Foundation.
# Copyright (C) 2006-2012, Parrot Foundation.

use strict;
use warnings;
Expand Down Expand Up @@ -37,6 +37,8 @@ conform to a set of highly portable standards.
Files with more than one dot ( '.' ) in their filename are problematic on
some platforms (e.g. VMS) hence avoid these in Parrot.
Even generated files have to obey this.
=item No strange characters in filenames
Filenames are restricted to the characters C<a-zA-Z0-9_-.>
Expand Down Expand Up @@ -64,6 +66,12 @@ if (@ARGV){
}
else {
my $manifest = maniread('MANIFEST');
if (-e 'MANIFEST.generated') {
my $mani2 = maniread('MANIFEST.generated');
for (keys %$mani2) {
$manifest->{$_} = $mani2->{$_} unless /(lib|cyg)parrot/;
}
}
# Give ports a little more leeway
@files = grep {! /^ports/} sort keys %$manifest;
}
Expand Down

0 comments on commit fc115a5

Please sign in to comment.