Skip to content

Commit

Permalink
fixing buildlibs.sh for docker (#109)
Browse files Browse the repository at this point in the history
* disabling cmark tests

also defaulting TERM

* not compiling examples

* fixing trailing whitespace in README

* fixing tput colors by providing it -t $TERM flag
  • Loading branch information
miki725 authored Sep 4, 2023
1 parent e526c7b commit a1c81aa
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Con4m makes it easy to give users rich configurability via config
files and command line flags. You just have to write a spec to get
your config file format and your command line flags / parsing.
your config file format and your command line flags / parsing.

You can do all of your input validation either through Con4m's built
in constraints, or through custom validation routines (themselves
Expand Down Expand Up @@ -231,4 +231,3 @@ Con4m is open source under the Apache 2.0 license.
Con4m was written by John Viega ([email protected]), originally
for Chalk and other to-be-named projects, because other options for
flexibile configs (like HCL, or YAML DSLs) all kinda suck.

11 changes: 8 additions & 3 deletions files/bin/buildlibs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ function color {
esac
shift

echo -n $(tput setaf ${CODE})$@$(tput op)
export TERM=${TERM:-vt100}
echo -n $(tput -T ${TERM} setaf ${CODE})$@$(tput -T ${TERM} op)
}

function colorln {
Expand Down Expand Up @@ -203,9 +204,12 @@ function ensure_cmark {
ensure_musl
get_src cmark-gfm https://github.com/github/cmark-gfm
colorln CYAN "Building cmark-gfm"
mkdir build
cd build
cmake -DCMARK_TESTS=0 ..
make
mv build/src/libcmark-gfm.a ${MY_LIBS}
mv build/extensions/libcmark-gfm-extensions.a ${MY_LIBS}
mv src/libcmark-gfm.a ${MY_LIBS}
mv extensions/libcmark-gfm-extensions.a ${MY_LIBS}
if [[ -f ${MY_LIBS}/libcmark-gfm.a ]] ; then
echo $(color GREEN Installed cmark-gtm to:) ${MY_LIBS}/libcmark-gfm.a
else
Expand All @@ -219,6 +223,7 @@ function ensure_gumbo {
if ! copy_from_package libgumbo.a ; then
ensure_musl
get_src sigil-gumbo https://github.com/Sigil-Ebook/sigil-gumbo/
sed -i '/examples/d' CMake*
colorln CYAN "Cooking up some gumbo"
mkdir build
cd build
Expand Down

0 comments on commit a1c81aa

Please sign in to comment.