Skip to content
Snippets Groups Projects
Commit d62084b6 authored by Raniere Silva's avatar Raniere Silva Committed by GitHub
Browse files

Merge pull request #119 from itcarroll/gh-pages

Knit episodes only when any one RMarkdown source changes
parents 3d96a51a 8fb905e0
Branches
Tags
No related merge requests found
...@@ -9,6 +9,7 @@ DST=_site ...@@ -9,6 +9,7 @@ DST=_site
# Controls # Controls
.PHONY : commands clean files .PHONY : commands clean files
.NOTPARALLEL:
all : commands all : commands
## commands : show all commands. ## commands : show all commands.
...@@ -16,11 +17,11 @@ commands : ...@@ -16,11 +17,11 @@ commands :
@grep -h -E '^##' ${MAKEFILES} | sed -e 's/## //g' @grep -h -E '^##' ${MAKEFILES} | sed -e 's/## //g'
## serve : run a local server. ## serve : run a local server.
serve : lesson-rmd serve : lesson-md
${JEKYLL} serve ${JEKYLL} serve
## site : build files but do not run a server. ## site : build files but do not run a server.
site : lesson-rmd site : lesson-md
${JEKYLL} build ${JEKYLL} build
# repo-check : check repository settings. # repo-check : check repository settings.
...@@ -53,7 +54,7 @@ workshop-check : ...@@ -53,7 +54,7 @@ workshop-check :
## ---------------------------------------- ## ----------------------------------------
## Commands specific to lesson websites. ## Commands specific to lesson websites.
.PHONY : lesson-check lesson-rmd lesson-files lesson-fixme .PHONY : lesson-check lesson-md lesson-files lesson-fixme
# RMarkdown files # RMarkdown files
RMD_SRC = $(wildcard _episodes_rmd/??-*.Rmd) RMD_SRC = $(wildcard _episodes_rmd/??-*.Rmd)
...@@ -79,9 +80,12 @@ HTML_DST = \ ...@@ -79,9 +80,12 @@ HTML_DST = \
$(patsubst _extras/%.md,${DST}/%/index.html,$(wildcard _extras/*.md)) \ $(patsubst _extras/%.md,${DST}/%/index.html,$(wildcard _extras/*.md)) \
${DST}/license/index.html ${DST}/license/index.html
## lesson-rmd : convert Rmarkdown files to markdown ## lesson-md : convert Rmarkdown files to markdown
lesson-rmd: $(RMD_SRC) lesson-md : ${RMD_DST}
@bin/knit_lessons.sh $(RMD_SRC)
# Use of .NOTPARALLEL makes rule execute only once
${RMD_DST} : ${RMD_SRC}
@bin/knit_lessons.sh ${RMD_SRC}
## lesson-check : validate lesson Markdown. ## lesson-check : validate lesson Markdown.
lesson-check : lesson-check :
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment