You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2014/11/23 18:43:16 UTC
[04/16] lucy-clownfish git commit: Add CommonMark to C build
Add CommonMark to C build
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/49169201
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/49169201
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/49169201
Branch: refs/heads/markdown
Commit: 49169201ff0a27ed1e62623fd2e30026e142796d
Parents: 144f0b2
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sun Nov 9 13:38:00 2014 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sun Nov 23 17:33:56 2014 +0100
----------------------------------------------------------------------
compiler/common/charmonizer.c | 4 ++++
compiler/common/charmonizer.main | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/49169201/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.c b/compiler/common/charmonizer.c
index ea0a1f6..0bc9db3 100644
--- a/compiler/common/charmonizer.c
+++ b/compiler/common/charmonizer.c
@@ -7779,6 +7779,8 @@ S_write_makefile(struct chaz_CLI *cli) {
NULL);
char *src_dir = chaz_Util_join(dir_sep, base_dir, "src", NULL);
char *include_dir = chaz_Util_join(dir_sep, base_dir, "include", NULL);
+ char *cmark_dir = chaz_Util_join(dir_sep, base_dir, "modules",
+ "CommonMark", "src", NULL);
char *parse_header = chaz_Util_join(dir_sep, src_dir, "CFCParseHeader",
NULL);
char *cfc_exe = chaz_Util_join("", "cfc", exe_ext, NULL);
@@ -7815,6 +7817,7 @@ S_write_makefile(struct chaz_CLI *cli) {
chaz_CFlags_add_include_dir(makefile_cflags, ".");
chaz_CFlags_add_include_dir(makefile_cflags, include_dir);
chaz_CFlags_add_include_dir(makefile_cflags, src_dir);
+ chaz_CFlags_add_include_dir(makefile_cflags, cmark_dir);
if (chaz_CLI_defined(cli, "enable-coverage")) {
chaz_CFlags_enable_code_coverage(makefile_cflags);
}
@@ -7832,6 +7835,7 @@ S_write_makefile(struct chaz_CLI *cli) {
sfc.test_cfc_objs = chaz_MakeFile_add_var(makefile, "TEST_CFC_OBJS", NULL);
chaz_Make_list_files(src_dir, "c", S_source_file_callback, &sfc);
+ chaz_Make_list_files(cmark_dir, "c", S_source_file_callback, &sfc);
scratch = chaz_Util_join("", parse_header, obj_ext, NULL);
chaz_MakeVar_append(sfc.common_objs, scratch);
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/49169201/compiler/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.main b/compiler/common/charmonizer.main
index 4794e7d..419b3c9 100644
--- a/compiler/common/charmonizer.main
+++ b/compiler/common/charmonizer.main
@@ -104,6 +104,8 @@ S_write_makefile(struct chaz_CLI *cli) {
NULL);
char *src_dir = chaz_Util_join(dir_sep, base_dir, "src", NULL);
char *include_dir = chaz_Util_join(dir_sep, base_dir, "include", NULL);
+ char *cmark_dir = chaz_Util_join(dir_sep, base_dir, "modules",
+ "CommonMark", "src", NULL);
char *parse_header = chaz_Util_join(dir_sep, src_dir, "CFCParseHeader",
NULL);
char *cfc_exe = chaz_Util_join("", "cfc", exe_ext, NULL);
@@ -140,6 +142,7 @@ S_write_makefile(struct chaz_CLI *cli) {
chaz_CFlags_add_include_dir(makefile_cflags, ".");
chaz_CFlags_add_include_dir(makefile_cflags, include_dir);
chaz_CFlags_add_include_dir(makefile_cflags, src_dir);
+ chaz_CFlags_add_include_dir(makefile_cflags, cmark_dir);
if (chaz_CLI_defined(cli, "enable-coverage")) {
chaz_CFlags_enable_code_coverage(makefile_cflags);
}
@@ -157,6 +160,7 @@ S_write_makefile(struct chaz_CLI *cli) {
sfc.test_cfc_objs = chaz_MakeFile_add_var(makefile, "TEST_CFC_OBJS", NULL);
chaz_Make_list_files(src_dir, "c", S_source_file_callback, &sfc);
+ chaz_Make_list_files(cmark_dir, "c", S_source_file_callback, &sfc);
scratch = chaz_Util_join("", parse_header, obj_ext, NULL);
chaz_MakeVar_append(sfc.common_objs, scratch);