From b950d9f66cf6f901729025c5e63aa02b4d209d41 Mon Sep 17 00:00:00 2001 From: KTB <ktb83@users.noreply.github.com> Date: Fri, 15 Nov 2019 08:13:13 -0500 Subject: [PATCH] Updates Makefile to replace Ruby Sass with SassC This commit replaces the use of the Ruby Sass scss command with SassC's sassc command. Due to the more limited functionality of sassc, output directories must be created prior to running the command and only one file may be processed at a time unlike the many-to-many mode functionality of the scss command. --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d2735a9..c580a2a 100755 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -SASS=scss -SASSFLAGS=--sourcemap=none +SASS=sassc +SASSFLAGS=-M -t expanded GLIB_COMPILE_RESOURCES=glib-compile-resources RES_DIR=src/gtk-3.0 SCSS_DIR=$(RES_DIR)/scss @@ -14,8 +14,12 @@ UTILS=scripts/utils.sh all: clean gresource css: - $(SASS) --update $(SASSFLAGS) $(SCSS_DIR):$(DIST_DIR) - $(SASS) --update $(SASSFLAGS) $(SCSS_DIR320):$(DIST_DIR320) + mkdir $(DIST_DIR) + $(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk.scss $(DIST_DIR)/gtk.css + $(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk-dark.scss $(DIST_DIR)/gtk-dark.css + mkdir $(DIST_DIR320) + $(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk.scss $(DIST_DIR320)/gtk.css + $(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk-dark.scss $(DIST_DIR320)/gtk-dark.css gresource: css $(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR) $(RES_DIR)/gtk.gresource.xml