From 9699bf0ce6b34c0d05c509925f3367f2200caad5 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Wed, 27 Apr 2016 02:34:19 +0200 Subject: remove squareball for good --- blogc.spec.in | 4 +--- build-aux/travis-build.sh | 1 - src/content-parser.c | 2 +- src/datetime-parser.c | 2 +- src/error.c | 2 +- src/file.c | 2 +- src/loader.c | 2 +- src/loader.h | 2 +- src/main.c | 2 +- src/renderer.c | 2 +- src/renderer.h | 2 +- src/source-parser.c | 2 +- src/source-parser.h | 2 +- src/template-parser.c | 2 +- src/template-parser.h | 2 +- tests/check_content_parser.c | 2 +- tests/check_error.c | 2 +- tests/check_loader.c | 2 +- tests/check_renderer.c | 2 +- tests/check_source_parser.c | 2 +- tests/check_template_parser.c | 2 +- 21 files changed, 20 insertions(+), 23 deletions(-) diff --git a/blogc.spec.in b/blogc.spec.in index adec43a..cc39b12 100644 --- a/blogc.spec.in +++ b/blogc.spec.in @@ -7,8 +7,6 @@ Summary: A blog compiler URL: @PACKAGE_URL@ Source0: https://github.com/blogc/blogc/releases/download/v@PACKAGE_VERSION@/blogc-@PACKAGE_VERSION@.tar.xz -BuildRequires: squareball-devel >= 0.2.0 - %description blogc(1) is a blog compiler. It converts source files and templates into blog/website resources. @@ -17,7 +15,7 @@ blog/website resources. %setup -q -n @PACKAGE_NAME@-@PACKAGE_VERSION@ %build -%configure --with-squareball=system +%configure make %{?_smp_mflags} %install diff --git a/build-aux/travis-build.sh b/build-aux/travis-build.sh index d03cafd..1fcac10 100755 --- a/build-aux/travis-build.sh +++ b/build-aux/travis-build.sh @@ -23,7 +23,6 @@ pushd build > /dev/null ../configure \ ${CHOST:+--host=${CHOST} --target=${CHOST}} \ --enable-ronn \ - --with-squareball=internal \ --disable-silent-rules \ ${CONFIGURE_ARGS} diff --git a/src/content-parser.c b/src/content-parser.c index 795cc34..0c99e31 100644 --- a/src/content-parser.c +++ b/src/content-parser.c @@ -13,8 +13,8 @@ #include #include -#include #include "content-parser.h" +#include "utils.h" // this is a half ass implementation of a markdown-like syntax. bugs are // expected. feel free to improve the parser and add new features. diff --git a/src/datetime-parser.c b/src/datetime-parser.c index 0aeb702..ad65ff7 100644 --- a/src/datetime-parser.c +++ b/src/datetime-parser.c @@ -17,8 +17,8 @@ #include #include "error.h" -#include #include "datetime-parser.h" +#include "utils.h" typedef enum { diff --git a/src/error.c b/src/error.c index f05049c..586386a 100644 --- a/src/error.c +++ b/src/error.c @@ -14,8 +14,8 @@ #include #include #include -#include #include "error.h" +#include "utils.h" blogc_error_t* diff --git a/src/file.c b/src/file.c index dec7c1b..f784d93 100644 --- a/src/file.c +++ b/src/file.c @@ -14,9 +14,9 @@ #include #include #include -#include #include "file.h" #include "error.h" +#include "utils.h" // this would belong to loader.c, but we need it in a separated file to be // able to mock it when unit testing the loader functions. diff --git a/src/loader.c b/src/loader.c index 8008c3a..5ca0aac 100644 --- a/src/loader.c +++ b/src/loader.c @@ -14,12 +14,12 @@ #include #include #include -#include #include "file.h" #include "source-parser.h" #include "template-parser.h" #include "loader.h" #include "error.h" +#include "utils.h" char* diff --git a/src/loader.h b/src/loader.h index 080aff6..32b58be 100644 --- a/src/loader.h +++ b/src/loader.h @@ -9,8 +9,8 @@ #ifndef _LOADER_H #define _LOADER_H -#include #include "error.h" +#include "utils.h" char* blogc_get_filename(const char *f); sb_slist_t* blogc_template_parse_from_file(const char *f, blogc_error_t **err); diff --git a/src/main.c b/src/main.c index 143c836..2338c9e 100644 --- a/src/main.c +++ b/src/main.c @@ -24,12 +24,12 @@ #include #include -#include #include "source-parser.h" #include "template-parser.h" #include "loader.h" #include "renderer.h" #include "error.h" +#include "utils.h" #ifndef PACKAGE_VERSION #define PACKAGE_VERSION "Unknown" diff --git a/src/renderer.c b/src/renderer.c index a7a7dd7..5af3b8a 100644 --- a/src/renderer.c +++ b/src/renderer.c @@ -13,13 +13,13 @@ #include #include #include -#include #include "datetime-parser.h" #include "error.h" #include "loader.h" #include "source-parser.h" #include "template-parser.h" #include "renderer.h" +#include "utils.h" const char* diff --git a/src/renderer.h b/src/renderer.h index 3ff62e7..2982ee8 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -10,7 +10,7 @@ #define _RENDERER_H #include -#include +#include "utils.h" const char* blogc_get_variable(const char *name, sb_trie_t *global, sb_trie_t *local); char* blogc_format_date(const char *date, sb_trie_t *global, sb_trie_t *local); diff --git a/src/source-parser.c b/src/source-parser.c index 67c3717..f250bd3 100644 --- a/src/source-parser.c +++ b/src/source-parser.c @@ -13,10 +13,10 @@ #include #include -#include #include "content-parser.h" #include "source-parser.h" #include "error.h" +#include "utils.h" typedef enum { diff --git a/src/source-parser.h b/src/source-parser.h index 460aedb..5cadf95 100644 --- a/src/source-parser.h +++ b/src/source-parser.h @@ -10,8 +10,8 @@ #define _SOURCE_PARSER_H #include -#include #include "error.h" +#include "utils.h" sb_trie_t* blogc_source_parse(const char *src, size_t src_len, blogc_error_t **err); diff --git a/src/template-parser.c b/src/template-parser.c index 6f23ef1..525f5f5 100644 --- a/src/template-parser.c +++ b/src/template-parser.c @@ -13,9 +13,9 @@ #include #include -#include #include "template-parser.h" #include "error.h" +#include "utils.h" typedef enum { diff --git a/src/template-parser.h b/src/template-parser.h index de5113e..a8b4e8b 100644 --- a/src/template-parser.h +++ b/src/template-parser.h @@ -9,8 +9,8 @@ #ifndef _TEMPLATE_PARSER_H #define _TEMPLATE_PARSER_H -#include #include "error.h" +#include "utils.h" /* * note: whitespace cleaners are NOT added to ast. we fix strings right during diff --git a/tests/check_content_parser.c b/tests/check_content_parser.c index 0eaab70..2444ebb 100644 --- a/tests/check_content_parser.c +++ b/tests/check_content_parser.c @@ -16,7 +16,7 @@ #include #include #include "../src/content-parser.h" -#include +#include "../src/utils.h" static void diff --git a/tests/check_error.c b/tests/check_error.c index 4effb08..8818b00 100644 --- a/tests/check_error.c +++ b/tests/check_error.c @@ -16,7 +16,7 @@ #include #include #include "../src/error.h" -#include +#include "../src/utils.h" static void diff --git a/tests/check_loader.c b/tests/check_loader.c index a07376a..4a5dc32 100644 --- a/tests/check_loader.c +++ b/tests/check_loader.c @@ -18,7 +18,7 @@ #include #include "../src/template-parser.h" #include "../src/loader.h" -#include +#include "../src/utils.h" static void diff --git a/tests/check_renderer.c b/tests/check_renderer.c index e863360..13e7309 100644 --- a/tests/check_renderer.c +++ b/tests/check_renderer.c @@ -19,7 +19,7 @@ #include "../src/renderer.h" #include "../src/source-parser.h" #include "../src/template-parser.h" -#include +#include "../src/utils.h" static sb_slist_t* diff --git a/tests/check_source_parser.c b/tests/check_source_parser.c index 477399c..d94dc70 100644 --- a/tests/check_source_parser.c +++ b/tests/check_source_parser.c @@ -17,7 +17,7 @@ #include #include "../src/source-parser.h" #include "../src/error.h" -#include +#include "../src/utils.h" static void diff --git a/tests/check_template_parser.c b/tests/check_template_parser.c index ed4328b..40a09be 100644 --- a/tests/check_template_parser.c +++ b/tests/check_template_parser.c @@ -17,7 +17,7 @@ #include #include "../src/template-parser.h" #include "../src/error.h" -#include +#include "../src/utils.h" static void -- cgit v1.2.3-18-g5258