Author: nickg
Date: Mon Jan 9 17:03:53 2006
New Revision: 11032
Added:
trunk/config/gen/makefiles/parrot.pc.in (contents, props changed)
Modified:
trunk/MANIFEST
trunk/config/gen/makefiles.pm
trunk/lib/Parrot/Configure/Step.pm
Log:
Create parrot.pc in build directory. Still needs to be installed into
<prefix>/lib/pkconfig and put into releases. Have introduced a quoting
notation for ${name}.
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Mon Jan 9 17:03:53 2006
@@ -176,6 +176,7 @@ config/gen/makefiles/lisp.in
config/gen/makefiles/lua.in []
config/gen/makefiles/miniperl.in []
config/gen/makefiles/ook.in []
+config/gen/makefiles/parrot.pc.in []
config/gen/makefiles/parrot_compiler.in []
config/gen/makefiles/pge.in []
config/gen/makefiles/punie.in []
Modified: trunk/config/gen/makefiles.pm
==============================================================================
--- trunk/config/gen/makefiles.pm (original)
+++ trunk/config/gen/makefiles.pm Mon Jan 9 17:03:53 2006
@@ -210,6 +210,9 @@ sub makefiles
commentType => '#',
replace_slashes => 1
);
+ genfile(
+ 'config/gen/makefiles/parrot.pc.in' => 'parrot.pc'
+ );
if ($conf->data->get('has_perldoc')) {
Added: trunk/config/gen/makefiles/parrot.pc.in
==============================================================================
--- (empty file)
+++ trunk/config/gen/makefiles/parrot.pc.in Mon Jan 9 17:03:53 2006
@@ -0,0 +1,10 @@
+prefix=${prefix}
+exec_prefix=${{prefix}}
+libdir=${{exec_prefix}}/lib
+includedir=${{prefix}}/include
+
+Name: parrot
+Description: virtual machine to execute bytecode for interpreted languages
+Version: ${VERSION}
+Libs: -L${{libdir}} -lparrot ${icu_shared} ${libs}
+Cflags: -I${{includedir}}
Modified: trunk/lib/Parrot/Configure/Step.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Step.pm (original)
+++ trunk/lib/Parrot/Configure/Step.pm Mon Jan 9 17:03:53 2006
@@ -205,8 +205,8 @@ sub genfile
print $out "\n"; # extra newline after header
}
- # this loop can not be impliment as a foreach loop as the body is dependant
- # on <IN> being evaluated lazily
+ # this loop can not be implemented as a foreach loop as the body
+ # is dependant on <IN> being evaluated lazily
while (my $line = <$in>) {
# everything after the line starting with #perl is eval'ed
if ($line =~ /^#perl/ && $options{feature_file}) {
@@ -250,6 +250,8 @@ sub genfile
# replace \* with \\*, so make will not eat the \
$line =~ s{(\\\*)}{\\$1}g;
}
+ # Unquote text quoted using ${{word}} notation
+ $line =~ s/\${{(\w+)}}/\${$1}/g;
print $out $line;
}
