Merge branch 'include-dir-layout-v2' Fixes CLOWNFISH-102.
The only difference to the original pull request is that the copy_headers method was moved from Hierarchy to BindCore. Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/0bacc88b Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/0bacc88b Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/0bacc88b Branch: refs/heads/master Commit: 0bacc88bf74126ddb6ee09e34aaabe99af5edd0a Parents: 978b013 719095c Author: Nick Wellnhofer <[email protected]> Authored: Fri Jul 22 14:18:11 2016 +0200 Committer: Nick Wellnhofer <[email protected]> Committed: Fri Jul 22 14:18:11 2016 +0200 ---------------------------------------------------------------------- compiler/c/cfc.c | 2 + compiler/common/test/cfclash/bar/Bar.cfp | 5 +- .../test/cfclash/class/AnimalExtension.cfp | 5 +- compiler/common/test/cfclash/foo/Foo.cfh | 25 -- compiler/common/test/cfclash/foo/Foo.cfp | 4 - .../common/test/cfinc/Animal/v0.1.0/Animal.cfh | 21 ++ .../test/cfinc/Animal/v0.1.0/Animal/Dog.cfh | 28 ++ .../test/cfinc/Animal/v0.1.0/Animal/Util.cfh | 23 ++ .../common/test/cfinc/Animal/v0.1.0/parcel.json | 4 + compiler/common/test/cfinc/Foo/v1.0.0/Foo.cfh | 25 ++ .../common/test/cfinc/Foo/v1.0.0/parcel.json | 4 + compiler/include/CFC.h | 1 + compiler/perl/lib/Clownfish/CFC.pm | 16 +- compiler/perl/lib/Clownfish/CFC.xs | 38 +- compiler/perl/lib/Clownfish/CFC/Perl/Build.pm | 22 +- compiler/perl/t/403-parcel.t | 15 +- compiler/perl/t/404-file.t | 9 +- compiler/perl/t/500-hierarchy.t | 2 +- compiler/src/CFCBindCore.c | 74 +++- compiler/src/CFCBindCore.h | 9 + compiler/src/CFCBindFile.c | 15 - compiler/src/CFCC.c | 6 - compiler/src/CFCCHtml.c | 21 -- compiler/src/CFCClass.c | 32 +- compiler/src/CFCFile.c | 10 +- compiler/src/CFCFile.h | 8 +- compiler/src/CFCHierarchy.c | 223 +++++++---- compiler/src/CFCJson.c | 279 ++++++++++++++ compiler/src/CFCJson.h | 57 +++ compiler/src/CFCParcel.c | 371 +++++-------------- compiler/src/CFCParcel.h | 26 +- compiler/src/CFCParseHeader.y | 2 +- compiler/src/CFCPerl.c | 10 - compiler/src/CFCTestDocuComment.c | 2 +- compiler/src/CFCTestFile.c | 5 +- compiler/src/CFCTestHierarchy.c | 71 +--- compiler/src/CFCTestParcel.c | 46 ++- compiler/src/CFCTestParser.c | 2 +- compiler/src/CFCTestSymbol.c | 4 +- compiler/src/CFCTestType.c | 13 +- compiler/src/CFCUtil.c | 9 + compiler/src/CFCVersion.c | 13 + compiler/src/CFCVersion.h | 3 + devel/bin/setup_env.bat | 2 +- devel/bin/setup_env.sh | 2 +- runtime/c/install.bat | 5 +- runtime/c/install.sh | 19 +- runtime/core/Clownfish.cfp | 3 +- runtime/test/TestClownfish.cfp | 1 + 49 files changed, 936 insertions(+), 656 deletions(-) ----------------------------------------------------------------------
