[svn:parrot] r36200 - in trunk: . config/gen config/gen/makefiles

[fperrad at svn.parrot.org]

Author: fperrad
Date: Sat Jan 31 15:00:44 2009
New Revision: 36200
URL: https://trac.parrot.org/parrot/changeset/36200

Log:
[configure] rename a Perl template & fix coding standard

Added:
   trunk/config/gen/makefiles/parrot_embed_pl.in
      - copied, changed from r36176, trunk/config/gen/makefiles/parrot_embed.in
Deleted:
   trunk/config/gen/makefiles/parrot_embed.in
Modified:
   trunk/MANIFEST
   trunk/config/gen/makefiles.pm

Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST	Sat Jan 31 14:58:16 2009	(r36199)
+++ trunk/MANIFEST	Sat Jan 31 15:00:44 2009	(r36200)
@@ -1,7 +1,7 @@
 # ex: set ro:
 # $Id$
 #
-# generated by tools/dev/mk_manifest_and_skip.pl Fri Jan 30 18:10:18 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Fri Jan 30 22:08:08 2009 UT
 #
 # See tools/dev/install_files.pl for documentation on the
 # format of this file.
@@ -325,7 +325,7 @@
 config/gen/makefiles/json.in                                []
 config/gen/makefiles/languages.in                           []
 config/gen/makefiles/nqp.in                                 []
-config/gen/makefiles/parrot_embed.in                        []
+config/gen/makefiles/parrot_embed_pl.in                     []
 config/gen/makefiles/parrot_pc.in                           []
 config/gen/makefiles/pct.in                                 []
 config/gen/makefiles/pge.in                                 []

Modified: trunk/config/gen/makefiles.pm
==============================================================================
--- trunk/config/gen/makefiles.pm	Sat Jan 31 14:58:16 2009	(r36199)
+++ trunk/config/gen/makefiles.pm	Sat Jan 31 15:00:44 2009	(r36200)
@@ -31,7 +31,7 @@
         'ext/Makefile' => { SOURCE => 'config/gen/makefiles/ext.in', },
 
         'ext/Parrot-Embed/Makefile.PL' => {
-            SOURCE            => 'config/gen/makefiles/parrot_embed.in',
+            SOURCE            => 'config/gen/makefiles/parrot_embed_pl.in',
             replace_slashes   => 0,
             conditioned_lines => 1,
         },

Deleted: trunk/config/gen/makefiles/parrot_embed.in
==============================================================================
--- trunk/config/gen/makefiles/parrot_embed.in	Sat Jan 31 15:00:44 2009	(r36199)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,66 +0,0 @@
-# Copyright (C) 2007, The Perl Foundation.
-# $Id$
-#
-use Cwd;
-use Config;
-use File::Copy;
-use ExtUtils::MakeMaker;
-
-copy( 'lib/Parrot/Embed.xs', 'Embed.xs' );
-
-# cross-platform commands and paths
-my %config;
-$config{CC}              = '@cc@';
-$config{PARROTDIR}       = '../..';
-$config{PARROT}          = '.. at slash@.. at slash@parrot at exe@';
-$config{C_LIBS}          = '@libs@';
-$config{INCLUDE}         = "$config{PARROTDIR}/include";
-#UNLESS(win32):$config{ALL_PARROT_LIBS} = "@libparrot_ldflags@ $config{C_LIBS}";
-$config{ABS_PARROTDIR}   = Cwd::realpath(
-                               File::Spec->rel2abs( $config{PARROTDIR} ) );
-$config{LDDLFLAGS}       = $Config{lddlflags};
-
-if ($config{CC} eq 'cl')
-{
-    $config{LDDLFLAGS} .= qq| -libpath:"$config{ABS_PARROTDIR} "|
-        .  File::Spec->catfile( $config{ABS_PARROTDIR}, 'libparrot.lib' );
-}
-
-WriteMakefile(
-    'NAME'         => 'Parrot::Embed',
-    'VERSION_FROM' => 'lib/Parrot/Embed.pm',
-    'PREREQ_PM'    => { 'ExtUtils::CBuilder' => 0 },
-#IF(win32):    'LIBS'         => [ $config{C_LIBS} ],
-#ELSE:    'LIBS'         => [ $config{ALL_PARROT_LIBS} ],
-#IF(win32):    'OBJECT'       => "@libparrot_ldflags@ Embed at o@",
-    'INC'          => "-I$config{INCLUDE}",
-    'PM'           => { map { $_ => "blib/$_" } <lib/Parrot/*pm> },
-    'clean'        => { FILES => '*.xs t/greet.pbc' },
-    'LDDLFLAGS'    => $config{LDDLFLAGS},
-);
-
-package MY;
-
-sub postamble
-{
-    "t/greet.pbc:\n\t$config{PARROT} -o t/greet.pbc t/greet.pir\n";
-}
-
-sub test
-{
-    my $inherited   = shift->SUPER::test(@_);
-    return $inherited unless $config{cc} eq 'cl';
-
-    my $dynlib_path = "\tset PATH=%PATH%:$config{ABS_PARROTDIR}";
-    $inherited      =~ s{^(test.*ic ::.*)$}{$1\n$dynlib_path}mg;
-
-    return $inherited;
-}
-
-sub dynamic_lib
-{
-    my $inherited  = shift->SUPER::dynamic_lib(@_);
-    my $sub_target = quotemeta( ': $(OBJECT)' );
-    $inherited     =~ s{($sub_target)}{$1 t/greet.pbc};
-    $inherited;
-}

Copied and modified: trunk/config/gen/makefiles/parrot_embed_pl.in (from r36176, trunk/config/gen/makefiles/parrot_embed.in)
==============================================================================
--- trunk/config/gen/makefiles/parrot_embed.in	Fri Jan 30 17:53:12 2009	(r36176, copy source)
+++ trunk/config/gen/makefiles/parrot_embed_pl.in	Sat Jan 31 15:00:44 2009	(r36200)
@@ -1,6 +1,10 @@
 # Copyright (C) 2007, The Perl Foundation.
 # $Id$
 #
+
+use strict;
+use warnings;
+
 use Cwd;
 use Config;
 use File::Copy;
@@ -64,3 +68,10 @@
     $inherited     =~ s{($sub_target)}{$1 t/greet.pbc};
     $inherited;
 }
+
+# Local Variables:
+#   mode: cperl
+#   cperl-indent-level: 4
+#   fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4: