[svn:parrot] r42448 - trunk/lib/Parrot/Pmc2c

fperrad at svn.parrot.org fperrad at svn.parrot.org
Thu Nov 12 14:36:43 UTC 2009


Author: fperrad
Date: Thu Nov 12 14:36:41 2009
New Revision: 42448
URL: https://trac.parrot.org/parrot/changeset/42448

Log:
fix merge pmc_headers_move (r42440) on Windows

Modified:
   trunk/lib/Parrot/Pmc2c/UtilFunctions.pm

Modified: trunk/lib/Parrot/Pmc2c/UtilFunctions.pm
==============================================================================
--- trunk/lib/Parrot/Pmc2c/UtilFunctions.pm	Thu Nov 12 12:35:06 2009	(r42447)
+++ trunk/lib/Parrot/Pmc2c/UtilFunctions.pm	Thu Nov 12 14:36:41 2009	(r42448)
@@ -5,7 +5,6 @@
 use strict;
 use warnings;
 
-use File::Spec ();
 use Fatal qw(open close);
 
 use base qw( Exporter );
@@ -278,13 +277,15 @@
 sub filename {
     my ( $filename, $type, $is_dynamic ) = @_;
 
+    $filename =~ s/\\/\//g;
+
     # Core PMC emit header files inside include/pmc. All others in original directory
     if ($type eq '.h') {
         if (defined ($is_dynamic) && $is_dynamic) {
             $filename =~ s{(\w+)\.\w+$}{pmc_$1.h};
         }
         else {
-            $filename =~ s{(?:.*/)?(\w+)\.\w+$}{File::Spec->catfile('include', 'pmc', "pmc_$1.h")}e;
+            $filename =~ s{(?:.*/)?(\w+)\.\w+$}{include/pmc/pmc_$1.h};
         }
     }
     $filename =~ s/\.\w+$/.c/            if ( $type eq ".c" );


More information about the parrot-commits mailing list