[svn:ponie] r381 - trunk

Author: nnunley
Date: Wed Jan 25 15:38:58 2006
New Revision: 381

Modified:
   trunk/   (props changed)
   trunk/Configure.pl
   trunk/write_makefile.pl
Log:
 r10161@norman:  nnunley | 2005-09-07 11:42:33 +0100
 Initial import of ponie.
 r15938@norman:  nnunley | 2006-01-16 22:13:51 +0000
 Update the tools path.
 r16190@norman:  nnunley | 2006-01-25 21:49:15 +0000
 Incremental movement towards compiling with current parrot trunk.
 r16191@norman:  nnunley | 2006-01-25 22:46:49 +0000
 Reverting old commenting out of parrot header files
 r16192@norman:  nnunley | 2006-01-25 22:47:18 +0000
 Reverting old commenting out of parrot header files
 r16193@norman:  nnunley | 2006-01-25 22:52:26 +0000
 Getting rid of parrot/config.h, as it doesn't help the compile.


Modified: trunk/Configure.pl
==============================================================================
--- trunk/Configure.pl	(original)
+++ trunk/Configure.pl	Wed Jan 25 15:38:58 2006
@@ -78,7 +78,7 @@ push @config_args,"-Dversiononly=n";
 
 delete($ENV{'PERL5LIB'});
 
-chdir('parrot')  || die "You need to checkout parrot inside ponie";
+chdir('parrot')  || die "You need to checkout parrot inside ponie: $!";
 system($^X,'Configure.pl',
        @ARGV)
   && die "error";
@@ -109,6 +109,7 @@ unless (-e 'config.sh' && -e 'config.h' 
     system('sh','Configure',@config_args)  && die "error";;
 
     my $inc_path = "$dir/parrot/include";
+    my $inc_path_parrot_pmc = "$dir/parrot/src/pmc";
     my $inc_path_pmc = "$dir/src/pmc";
     my @lib_path = ("$dir/parrot/blib/lib", "$dir/src/pmc");
 
@@ -126,7 +127,7 @@ unless (-e 'config.sh' && -e 'config.h' 
     if (" $Parrot::Config::PConfig{libs} " =~ / -lgmp /) {
 	$bonus_libs .= " -lgmp";
     }
-    $munge{cppflags} = $munge{ccflags} = " -I${inc_path} -I${inc_path_pmc}";
+    $munge{cppflags} = $munge{ccflags} = " -I${inc_path} -I{$inc_path_parrot_pmc} -I${inc_path_pmc}";
     $munge{ldflags} = $munge{lddlflags}
       = join '', map " -L$_", @lib_path;
     $munge{libs} = $munge{perllibs} = "$bonus_libs ";

Modified: trunk/write_makefile.pl
==============================================================================
--- trunk/write_makefile.pl	(original)
+++ trunk/write_makefile.pl	Wed Jan 25 15:38:58 2006
@@ -46,7 +46,7 @@ print <<"EOM";
 
 PERL=$^X -I$parrotdir/lib
 CC=$Config{cc}
-CFLAGS=$Config{ccflags} -DPONIE_CORE -g -I$parrotdir/classes -I$parrotdir/include -I$top/perl
+CFLAGS=$Config{ccflags} -DPONIE_CORE -g -I$top/src/pmc -I$parrotdir/src/pmc -I$parrotdir/include -I$top/perl 
 
 libponie$Config{_a}: $allobjs $configobj
 	ar -r \$\@ \$\?

• [svn:ponie] r381 - trunk by nnunley