Mercurial > web-octave
diff Makefile @ 182:7a664b44fd8d
Use Bundler for consistent development environment with Jekyll.
* README.md: Update documentation for new development workflow
* Makefile: Remove custom tool version checks.
* _config.yml: Adapt to Bundler workflow.
* Gemfile: Document requirements for Bundler.
* Gemfile.lock: Document currently used tool versions for Bundler.
| author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
|---|---|
| date | Wed, 20 May 2020 14:05:39 +0900 |
| parents | 839113398e6f |
| children | acf1b848de1d |
line wrap: on
line diff
--- a/Makefile Wed May 20 13:28:25 2020 +0900 +++ b/Makefile Wed May 20 14:05:39 2020 +0900 @@ -8,15 +8,12 @@ export CVS_RSH -CHECK_GEM := $(shell command -v gem 2> /dev/null) -CHECK_JEKYLL := $(shell command -v jekyll 2> /dev/null) -CHECK_JEKYLL_VERSION = $(shell jekyll --version | grep ^jekyll | sed 's/^.* //g') - -deploy: | $(SAVANNAH_DIR) check_prerequisites +deploy: | $(SAVANNAH_DIR) # - # Build static website into the subdirectory `_site` using Jekyll + # Build static website into the subdirectory `_site` using Jekyll via + # Bundler # - jekyll build + bundle exec jekyll build # # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv # DANGEROUS STEP, omitted by default. @@ -57,18 +54,6 @@ # Now everything should be visible to the world. # -check_prerequisites: -ifndef CHECK_GEM - $(error "Command `gem` is not available please install rubygems") -endif -ifndef CHECK_JEKYLL - $(error "Command `jekyll` is not available. ${CHECK_JEKYLL_VERSION} Try `gem install jekyll`") -endif -ifneq "3.3" "$(word 1, $(sort 3.3 $(CHECK_JEKYLL_VERSION)))" - $(error "Detected Jekyll version ${CHECK_JEKYLL_VERSION} (>= 3.3 required).") -endif - @echo "All prerequisites fulfilled." - $(SAVANNAH_DIR): cd .. \ && cvs -z3 -d:ext:$(USRNAME)@cvs.savannah.gnu.org:/web/octave checkout -P octave