Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

vms: fix and test multi-dot filenames

t/codingstd/filenames.t missed generated and violating filenames.
.travis.yml still violates vms: todo, but low prio
  • Loading branch information...
commit 47714ecd8963eccf6ecf4c02b9356b1e5e35a6dc 1 parent 72b4ef0
@rurban rurban authored
View
2  .gitignore
@@ -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
View
4 Configure.pl
@@ -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);
View
2  config/gen/makefiles/root.in
@@ -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 \
View
2  config/init/manifest.pm
@@ -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;
View
2  lib/Parrot/Configure/Compiler.pm
@@ -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";
View
10 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;
@@ -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_-.>
@@ -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;
}
Please sign in to comment.
Something went wrong with that request. Please try again.