Mercurial > blahgd > experimental
changeset 749:a75dcef8b289
config: use config file for dvipng binary path
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> |
|---|---|
| date | Thu, 15 Oct 2015 12:36:54 -0400 |
| parents | c0e3520ab021 |
| children | 77da250e8b15 |
| files | README config.c config.cmake config.h.in math.c |
| diffstat | 5 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/README Thu Oct 15 12:30:03 2015 -0400 +++ b/README Thu Oct 15 12:36:54 2015 -0400 @@ -34,7 +34,7 @@ TAGCLOUD_MAX_SIZE - max font size of tag cloud entries DEFAULT_LATEX_BIN - default path to latex binary - DVIPNG_BIN - path to dvipng binary + DEFAULT_DVIPNG_BIN - default path to dvipng binary PREVIEW_SECRET - key used to previewing unpublished posts
--- a/config.c Thu Oct 15 12:30:03 2015 -0400 +++ b/config.c Thu Oct 15 12:36:54 2015 -0400 @@ -137,6 +137,8 @@ config_load_url(lv, CONFIG_PHOTO_BASE_URL, &config.photo_base_url); config_load_str(lv, CONFIG_LATEX_BIN, &config.latex_bin, DEFAULT_LATEX_BIN); + config_load_str(lv, CONFIG_DVIPNG_BIN, &config.dvipng_bin, + DEFAULT_DVIPNG_BIN); val_putref(lv); @@ -151,6 +153,7 @@ printf("config.bug_base_url = %s\n", str_cstr(config.bug_base_url)); printf("config.photo_base_url = %s\n", str_cstr(config.photo_base_url)); printf("config.latex_bin = %s\n", str_cstr(config.latex_bin)); + printf("config.dvipng_bin = %s\n", str_cstr(config.dvipng_bin)); return 0; }
--- a/config.cmake Thu Oct 15 12:30:03 2015 -0400 +++ b/config.cmake Thu Oct 15 12:36:54 2015 -0400 @@ -36,7 +36,7 @@ set_default(TAGCLOUD_MAX_SIZE 18) set_default(DEFAULT_LATEX_BIN "/usr/bin/latex") -set_default(DVIPNG_BIN "/opt/local/bin/dvipng") +set_default(DEFAULT_DVIPNG_BIN "/usr/bin/dvipng") set_default(PREVIEW_SECRET 0x1985)
--- a/config.h.in Thu Oct 15 12:30:03 2015 -0400 +++ b/config.h.in Thu Oct 15 12:36:54 2015 -0400 @@ -46,7 +46,7 @@ #cmakedefine TAGCLOUD_MAX_SIZE ${TAGCLOUD_MAX_SIZE} #cmakedefine DEFAULT_LATEX_BIN "${DEFAULT_LATEX_BIN}" -#cmakedefine DVIPNG_BIN "${DVIPNG_BIN}" +#cmakedefine DEFAULT_DVIPNG_BIN "${DEFAULT_DVIPNG_BIN}" #cmakedefine PREVIEW_SECRET ${PREVIEW_SECRET} @@ -65,6 +65,7 @@ #define CONFIG_WIKI_BASE_URL "wiki-base-url" #define CONFIG_PHOTO_BASE_URL "photo-base-url" #define CONFIG_LATEX_BIN "latex-bin" +#define CONFIG_DVIPNG_BIN "dvipng-bin" /* * prototypes, etc. for config.c @@ -84,6 +85,7 @@ struct str *wiki_base_url; struct str *photo_base_url; struct str *latex_bin; + struct str *dvipng_bin; }; extern struct config config;
--- a/math.c Thu Oct 15 12:30:03 2015 -0400 +++ b/math.c Thu Oct 15 12:36:54 2015 -0400 @@ -91,8 +91,9 @@ if (system(cmd)) goto err_chdir; - snprintf(cmd, sizeof(cmd), DVIPNG_BIN " -T tight -x 1200 -z 9 " - "-bg Transparent -o %s %s > /dev/null", pngpath, dvipath); + snprintf(cmd, sizeof(cmd), "%s -T tight -x 1200 -z 9 " + "-bg Transparent -o %s %s > /dev/null", + str_cstr(config.dvipng_bin), pngpath, dvipath); LOG("math cmd: '%s'", cmd); if (system(cmd)) goto err_chdir;