Merge branch 'tt532_headerizer_refactor'. After first pass at merge, …

…resolve conflicts, update MANIFEST and fix codingstd errors revealed during 'make fulltest'.
parrot · Dec 11, 2010 · 3aafa0b · 3aafa0b
2 parents ec3d188 + fd8c59a
commit 3aafa0b
Show file tree

Hide file tree

Showing 22 changed files with 4,974 additions and 767 deletions.
diff --git a/MANIFEST b/MANIFEST
@@ -428,6 +428,7 @@ docs/project/core_inclusion.pod                             [doc]
 docs/project/debian_packaging_guide.pod                     [doc]
 docs/project/git_terminology.pod                            [doc]
 docs/project/git_workflow.pod                               [doc]
+docs/project/merge_review_guidelines.pod                    [doc]
 docs/project/metacommitter_guide.pod                        [doc]
 docs/project/release_manager_guide.pod                      [doc]
 docs/project/roles_responsibilities.pod                     [doc]
@@ -1031,7 +1032,8 @@ lib/Parrot/H2inc.pm                                         [devel]lib
 lib/Parrot/Harness/DefaultTests.pm                          [devel]lib
 lib/Parrot/Harness/Options.pm                               [devel]lib
 lib/Parrot/Harness/Smoke.pm                                 [devel]lib
-lib/Parrot/Headerizer.pm                                    [devel]lib
+lib/Parrot/Headerizer/Functions.pm                          [devel]lib
+lib/Parrot/Headerizer/Object.pm                             [devel]lib
 lib/Parrot/IO/Directory.pm                                  [devel]lib
 lib/Parrot/IO/File.pm                                       [devel]lib
 lib/Parrot/IO/Path.pm                                       [devel]lib
@@ -2016,6 +2018,19 @@ t/steps/inter/yacc-01.t                                     [test]
 t/steps/inter/yacc-02.t                                     [test]
 t/stress/gc.t                                               [test]
 t/tools/create_language.t                                   [test]
+t/tools/dev/headerizer/01_functions.t                       [test]
+t/tools/dev/headerizer/02_methods.t                         [test]
+t/tools/dev/headerizer/testlib/fixedbooleanarray_pmc.in     [test]
+t/tools/dev/headerizer/testlib/function_decls.in            [test]
+t/tools/dev/headerizer/testlib/hvalidheader.in              [test]
+t/tools/dev/headerizer/testlib/imcc.in                      [test]
+t/tools/dev/headerizer/testlib/lack_directive.in            [test]
+t/tools/dev/headerizer/testlib/list.in                      [test]
+t/tools/dev/headerizer/testlib/list_h.in                    [test]
+t/tools/dev/headerizer/testlib/missingheaderfile.in         [test]
+t/tools/dev/headerizer/testlib/nci_pmc.in                   [test]
+t/tools/dev/headerizer/testlib/none.in                      [test]
+t/tools/dev/headerizer/testlib/validheader.in               [test]
 t/tools/dev/pmctree.t                                       [test]
 t/tools/dev/searchops.t                                     [test]
 t/tools/dev/searchops/samples.pm                            [test]

diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
@@ -1837,16 +1837,16 @@ RUNCORE_TEST_FILES = \
     --runcore-tests
 SRC_TEST_FILES = \
     t/src/*.t
-TOOLS_TEST_FILES = \
-    t/tools/*.t
+TOOLS_TEST_DIR = t/tools
+TOOLS_TEST_FILES = $(TOOLS_TEST_DIR)/tools/*.t
 LIBRARY_TEST_FILES = @library_tests@
-PMC2CUTILS_DIR = t/tools/pmc2cutils
+PMC2CUTILS_DIR = $(TOOLS_TEST_DIR)/pmc2cutils
 HARNESS_DIR = t/pharness
 BUILDTOOLS_TEST_FILES = \
     $(PMC2CUTILS_DIR)/*.t \
     $(HARNESS_DIR)/*.t
 MANIFEST_DIR = t/manifest
-INSTALL_TOOLS_DIR = t/tools/install
+INSTALL_TOOLS_DIR = $(TOOLS_TEST_DIR)/install
 MANIFEST_TEST_FILES = \
     $(MANIFEST_DIR)/*.t \
     $(INSTALL_TOOLS_DIR)/*.t
@@ -1859,6 +1859,7 @@ PBC_TEST_FILES = \
     t/op/testlib/test_strings.pbc \
     t/pmc/testlib/annotations.pbc \
     t/pmc/testlib/number.pbc
+HEADERIZER_TEST_FILES = $(TOOLS_TEST_DIR)/dev/headerizer/*.t
 
 # pbc files used for several tests;
 # not needed for build, hence this target is not included in 'all'
@@ -1921,7 +1922,8 @@ fulltest :
 	benchmark_tests \
 	manifest_tests \
 	examples_tests \
-	distro_tests
+	distro_tests \
+	headerizer_tests
 
 # bounds checking, slow core
 testb : test_prep
@@ -2007,6 +2009,10 @@ distro_tests : test_prep
 configure_tests :
 	$(PERL) t/harness $(CONFIGURE_TEST_FILES)
 
+# headerizer tests
+headerizer_tests : test_prep
+	$(PERL) t/harness $(HEADERIZER_TEST_FILES)
+
 # library tests - tests run by make test but not by make fulltest or make cover
 library_tests : test_prep
 	$(PERL) t/harness $(EXTRA_TEST_ARGS) $(LIBRARY_TEST_FILES)

diff --git a/lib/Parrot/Distribution.pm b/lib/Parrot/Distribution.pm
@@ -412,6 +412,17 @@ This is to exclude automatically generated C-language files Parrot might have.
             include/parrot/opsenum.h
             src/gc/malloc.c
             src/ops/core_ops.c
+            t/tools/dev/headerizer/testlib/fixedbooleanarray_pmc.in
+            t/tools/dev/headerizer/testlib/function_decls.in
+            t/tools/dev/headerizer/testlib/hvalidheader.in
+            t/tools/dev/headerizer/testlib/imcc.in
+            t/tools/dev/headerizer/testlib/lack_directive.in
+            t/tools/dev/headerizer/testlib/list.in
+            t/tools/dev/headerizer/testlib/list_h.in
+            t/tools/dev/headerizer/testlib/missingheaderfile.in
+            t/tools/dev/headerizer/testlib/nci_pmc.in
+            t/tools/dev/headerizer/testlib/none.in
+            t/tools/dev/headerizer/testlib/validheader.in
             } unless @exemptions;
 
         my $path = -f $file ? $file : $file->path;