Merge branch pmc_headers_move back to trunk.

MANIFEST requires regenerating. git-svn-id: https://svn.parrot.org/parrot/trunk@42440 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
parrot · Nov 12, 2009 · 2578309 · 2578309
1 parent 21456aa
commit 2578309
Show file tree

Hide file tree

Showing 61 changed files with 230 additions and 200 deletions.
diff --git a/MANIFEST.generated b/MANIFEST.generated
@@ -229,26 +229,26 @@ src/pmc/hash.dump                                 [devel]src
 src/pmc/integer.dump                              [devel]src
 src/pmc/multisub.dump                             [devel]src
 src/pmc/object.dump                               [devel]src
-src/pmc/pmc_boolean.h                             [devel]include
-src/pmc/pmc_class.h                               [devel]include
-src/pmc/pmc_callsignature.h                       [devel]include
-src/pmc/pmc_continuation.h                        [devel]include
-src/pmc/pmc_context.h                             [devel]include
-src/pmc/pmc_default.h                             [devel]include
-src/pmc/pmc_fixedintegerarray.h                   [devel]include
-src/pmc/pmc_fixedpmcarray.h                       [devel]include
-src/pmc/pmc_float.h                               [devel]include
-src/pmc/pmc_hash.h                                [devel]include
-src/pmc/pmc_integer.h                             [devel]include
-src/pmc/pmc_multisub.h                            [devel]include
-src/pmc/pmc_object.h                              [devel]include
-src/pmc/pmc_parrotlibrary.h                       [devel]include
-src/pmc/pmc_resizablepmcarray.h                   [devel]include
-src/pmc/pmc_role.h                                [devel]include
-src/pmc/pmc_scalar.h                              [devel]include
-src/pmc/pmc_string.h                              [devel]include
-src/pmc/pmc_sub.h                                 [devel]include
-src/pmc/pmc_undef.h                               [devel]include
+include/pmc/pmc_boolean.h                         [devel]include
+include/pmc/pmc_class.h                           [devel]include
+include/pmc/pmc_callsignature.h                   [devel]include
+include/pmc/pmc_continuation.h                    [devel]include
+include/pmc/pmc_context.h                         [devel]include
+include/pmc/pmc_default.h                         [devel]include
+include/pmc/pmc_fixedintegerarray.h               [devel]include
+include/pmc/pmc_fixedpmcarray.h                   [devel]include
+include/pmc/pmc_float.h                           [devel]include
+include/pmc/pmc_hash.h                            [devel]include
+include/pmc/pmc_integer.h                         [devel]include
+include/pmc/pmc_multisub.h                        [devel]include
+include/pmc/pmc_object.h                          [devel]include
+include/pmc/pmc_parrotlibrary.h                   [devel]include
+include/pmc/pmc_resizablepmcarray.h               [devel]include
+include/pmc/pmc_role.h                            [devel]include
+include/pmc/pmc_scalar.h                          [devel]include
+include/pmc/pmc_string.h                          [devel]include
+include/pmc/pmc_sub.h                             [devel]include
+include/pmc/pmc_undef.h                           [devel]include
 src/pmc/resizablepmcarray.dump                    [devel]src
 src/pmc/role.dump                                 [devel]src
 src/pmc/scalar.dump                               [devel]src

diff --git a/compilers/imcc/imcc.y b/compilers/imcc/imcc.y
@@ -21,7 +21,7 @@
 #define PARSER_MAIN
 #include "imc.h"
 #include "parrot/dynext.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 #include "pbc.h"
 #include "parser.h"
 #include "optimizer.h"

diff --git a/compilers/imcc/imcparser.c b/compilers/imcc/imcparser.c
@@ -103,7 +103,7 @@
 #define PARSER_MAIN
 #include "imc.h"
 #include "parrot/dynext.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 #include "pbc.h"
 #include "parser.h"
 #include "optimizer.h"

diff --git a/compilers/imcc/instructions.c b/compilers/imcc/instructions.c
@@ -9,7 +9,7 @@
 #include "imc.h"
 #include "pbc.h"
 #include "optimizer.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 
 /*
 

diff --git a/compilers/imcc/main.c b/compilers/imcc/main.c
@@ -34,7 +34,7 @@ IMCC helpers.
 #include "parrot/longopt.h"
 #include "parrot/imcc.h"
 #include "parrot/runcore_api.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 #include "pbc.h"
 #include "parser.h"
 

diff --git a/compilers/imcc/optimizer.c b/compilers/imcc/optimizer.c
@@ -73,7 +73,7 @@ e.g. eliminate new Px .PerlUndef because Px where different before
 #include "imc.h"
 #include "pbc.h"
 #include "optimizer.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_context.h"
 
 /* HEADERIZER HFILE: compilers/imcc/optimizer.h */
 

diff --git a/compilers/imcc/parser_util.c b/compilers/imcc/parser_util.c
@@ -21,8 +21,8 @@
 #include "imc.h"
 #include "parrot/dynext.h"
 #include "parrot/embed.h"
-#include "../../src/pmc/pmc_sub.h"
-#include "../../src/pmc/pmc_context.h"
+#include "pmc/pmc_sub.h"
+#include "pmc/pmc_context.h"
 #include "pbc.h"
 #include "parser.h"
 #include "optimizer.h"

diff --git a/compilers/imcc/pbc.c b/compilers/imcc/pbc.c
@@ -6,8 +6,8 @@
 #include "imc.h"
 #include "pbc.h"
 #include "parrot/packfile.h"
-#include "../src/pmc/pmc_sub.h"
-#include "../src/pmc/pmc_context.h"
+#include "pmc/pmc_sub.h"
+#include "pmc/pmc_context.h"
 
 /* HEADERIZER HFILE: compilers/imcc/pbc.h */
 

diff --git a/config/auto/cgoto.pm b/config/auto/cgoto.pm
@@ -63,9 +63,9 @@ sub _evaluate_cgoto {
 # generated by config/auto/cgoto.pm
 
 $(OPS_DIR)/core_ops_cg$(O): $(GENERAL_H_FILES) $(OPS_DIR)/core_ops_cg.c \
-	$(SRC_DIR)/pmc/pmc_parrotlibrary.h
+	$(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h
 $(OPS_DIR)/core_ops_cgp$(O): $(GENERAL_H_FILES) $(OPS_DIR)/core_ops_cgp.c \
-	$(SRC_DIR)/pmc/pmc_parrotlibrary.h
+	$(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h
 $(SRC_DIR)/runcore/cores.c: $(INC_DIR)/oplib/core_ops_cgp.h
 
 $(INC_DIR)/oplib/core_ops_cg.h: $(OPS_DIR)/core_ops_cg.c

diff --git a/config/auto/pmc.pm b/config/auto/pmc.pm
@@ -77,7 +77,7 @@ END
         $parent_dumps .= "src/pmc/$_.dump "
             foreach reverse( ( $self->pmc_parents($pmc) ) );
         my $parent_headers = '';
-        $parent_headers .= "src/pmc/pmc_$_.h "
+        $parent_headers .= "include/pmc/pmc_$_.h "
             for $self->pmc_parents($pmc);
 
         # add dependencies that result from METHOD usage.
@@ -86,7 +86,7 @@ END
         if (contains_pccmethod($pmc_fname)) {
             $pccmethod_depend = 'lib/Parrot/Pmc2c/PCCMETHOD.pm';
             if ($pmc ne 'fixedintegerarray') {
-                $pccmethod_depend .= ' src/pmc/pmc_fixedintegerarray.h';
+                $pccmethod_depend .= ' include/pmc/pmc_fixedintegerarray.h';
             }
         }
         my $include_headers = get_includes($pmc_fname);
@@ -98,16 +98,16 @@ src/pmc/$pmc.c : src/pmc/$pmc.dump
 src/pmc/$pmc.dump : vtable.dump $parent_dumps src/pmc/$pmc.pmc \$(PMC2C_FILES) $pccmethod_depend
 \t\$(PMC2CD) src/pmc/$pmc.pmc
 
-src/pmc/pmc_$pmc.h: src/pmc/$pmc.c
+\$(PMC_INC_DIR)/pmc/pmc_$pmc.h: src/pmc/$pmc.c
 
-src/pmc/$pmc\$(O): src/pmc/pmc_${pmc}.h src/pmc/$pmc.str \$(NONGEN_HEADERS) \\
-    $parent_headers $include_headers src/pmc/pmc_continuation.h \\
-    src/pmc/pmc_context.h src/pmc/pmc_fixedintegerarray.h
+src/pmc/$pmc\$(O): include/pmc/pmc_${pmc}.h src/pmc/$pmc.str \$(NONGEN_HEADERS) \\
+    $parent_headers $include_headers include/pmc/pmc_continuation.h \\
+    include/pmc/pmc_context.h include/pmc/pmc_fixedintegerarray.h
 
 END
     }
 
-    # src/pmc/$pmc\$(O): \$(NONGEN_HEADERS) $parent_headers src/pmc/pmc_$pmc.h
+    # src/pmc/$pmc\$(O): \$(NONGEN_HEADERS) $parent_headers include/pmc/pmc_$pmc.h
 
     # build list of libraries for link line in Makefile
     my $slash = $conf->data->get('slash');
@@ -173,6 +173,7 @@ PMC: for my $pmc_file ( split( /\s+/, $pmc_list ) ) {
         TEMP_pmc_classes_o   => $TEMP_pmc_classes_o,
         TEMP_pmc_classes_str => $TEMP_pmc_classes_str,
         TEMP_pmc_classes_pmc => $TEMP_pmc_classes_pmc,
+        pmc_inc              => 'include',
     );
 
     return 1;
@@ -272,6 +273,8 @@ sub get_includes {
           $include = "include/" . $include;
         } elsif ($include =~ m/^pmc_|\.str$/) { # local pmc header
           $include = "src/pmc/" . $include;
+        } elsif ($include =~ m/^pmc\/pmc_|\.h$/) { # local pmc header
+          $include = "include/" . $include;
         } # else it's probably a system header, don't depend on it.
         push @retval, $include;
     }

diff --git a/config/gen/makefiles/dynpmc.in b/config/gen/makefiles/dynpmc.in
@@ -20,7 +20,7 @@ LIBPARROT     := @libparrot_ldflags@
 BUILD_TOOLS_DIR := $(BUILD_DIR)@slash@tools@slash@build
 BUILD_LIB_DIR   := $(BUILD_DIR)@slash@blib@slash@lib
 PMC2C           := $(PERL) $(BUILD_TOOLS_DIR)@slash@pmc2c.pl
-INCLUDES        := -I$(BUILD_DIR)@slash@include -I@build_dir@@slash@src@slash@pmc
+INCLUDES        := -I$(BUILD_DIR)@slash@include -I@build_dir@@slash@include@slash@pmc
 LINKARGS        := $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@
 
 PMC2CD := $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --dump

diff --git a/config/gen/makefiles/pirc.in b/config/gen/makefiles/pirc.in
@@ -14,7 +14,7 @@ RECONFIGURE   := $(PERL) @build_dir@/tools/dev/reconfigure.pl
 CC            := @cc@
 O             := @o@
 EXE           := @exe@
-CC_INC        := -I../../include
+CC_INC        := -I../../include -I../../include/pmc
 C_LIBS        := @libs@
 CC_SHARED     := @cc_shared@
 CFLAGS        := $(CC_INC) @ccflags@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ $(CC_SHARED)