Skip to content

Commit b6ae44f

Browse files
committedMar 1, 2017
Try to eliminate some of the guess work one Mac/Linux.
1 parent 7b02cae commit b6ae44f

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed
 

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ rebar.lock
1919
*.bak
2020
compile_commands.json
2121
rebar3.crashdump
22+
priv/sass/Gemfile.lock
23+
priv/sass/ruby
24+
priv/sass/.bundle

‎priv/make/gen.mk

+9-7
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@ SASS_DIR = priv/sass
22
DOCS_ROOT = $(ROOT_DIR)/docs
33
DOCS_STABLE_BUILD_DIR = $(DOCS_ROOT)/current
44
DOCS_DEV_BUILD_DIR = $(DOCS_ROOT)/dev
5-
SASS = sass --no-cache -f --trace
5+
SASS = bundle exec sass --no-cache -f --trace
66
SASS_MIN = $(SASS) --style compressed
7-
SASS_WATCH = sass --no-cache --watch --trace
7+
SASS_WATCH = bundle exec sass --no-cache --watch --trace
88

99
sass:
1010
sudo gem update --system
11-
sudo gem install sass
11+
sudo gem install bundler
12+
@cd $(SASS_DIR) && bundler install --path=.
1213

1314
css:
1415
@echo "\nGenerating minimized and regular versions of CSS files for $(DEPLOYMENT) ..."
1516
@echo
16-
@$(SASS_MIN) $(SASS_DIR)/lfe-$(DEPLOYMENT).scss \
17+
@cd $(SASS_DIR) && $(SASS_MIN) lfe-$(DEPLOYMENT).scss \
1718
$(DOCS_ROOT)/$(DEPLOYMENT)/css/bootstrap-min.css
18-
@$(SASS) $(SASS_DIR)/lfe-$(DEPLOYMENT).scss \
19+
@cd $(SASS_DIR) && $(SASS) lfe-$(DEPLOYMENT).scss \
1920
$(DOCS_ROOT)/$(DEPLOYMENT)/css/bootstrap.css
2021
@echo "Done.\n"
2122

@@ -30,8 +31,9 @@ css-1.3: css
3031

3132
css-watch: DEPLOYMENT = dev
3233
css-watch:
33-
@$(SASS_WATCH) \
34-
$(SASS_DIR)/lfe-$(DEPLOYMENT).scss:$(DOCS_ROOT)/$(DEPLOYMENT)/css/bootstrap-min.css &
34+
@cd $(SASS_DIR) && \
35+
$(SASS_WATCH) \
36+
lfe-$(DEPLOYMENT).scss:$(DOCS_ROOT)/$(DEPLOYMENT)/css/bootstrap-min.css &
3537

3638
css-watch-dev: DEPLOYMENT = dev
3739
css-watch-dev: css-watch

‎priv/sass/Gemfile

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source "http://rubygems.org"
2+
3+
ruby '~> 2.0.0'
4+
5+
gem 'sass', '~> 3.4', '>= 3.4.23'

0 commit comments

Comments
 (0)
Please sign in to comment.