Merge 173014e into d4d74ef

.gitignore

@@ -53,6 +53,10 @@ libsass/*
 *.lo
 *.so
 *.dll
+*.h.gch
+*.h.pch
+*.hpp.gch
+*.hpp.pch
 *.a
 *.suo
 *.sdf

.travis.yml

@@ -61,10 +61,6 @@ matrix:
 
 script:
   - ./script/ci-build-libsass
-  - ./script/ci-build-plugin math
-  - ./script/ci-build-plugin glob
-  - ./script/ci-build-plugin digest
-  - ./script/ci-build-plugin tests
 before_install: ./script/ci-install-deps
 install: ./script/ci-install-compiler
 after_success: ./script/ci-report-coverage

GNUmakefile.am

@@ -29,7 +29,7 @@ if ENABLE_TESTS
 
 SASS_SASSC_PATH ?= $(top_srcdir)/sassc
 SASS_SPEC_PATH ?= $(top_srcdir)/sass-spec
-LIBSASS_SPEC_PATH ?= $(top_srcdir)/libsass-spec
+SASS_SPEC_ROOT ?= $(top_srcdir)/sass-spec
 
 noinst_PROGRAMS = tester
 tester_LDADD = src/libsass.la
@@ -50,41 +50,25 @@ AM_RB_LOG_FLAGS = $(RUBY)
 SASS_TEST_FLAGS = --impl libsass
 SASS_TEST_FLAGS += -r $(SASS_SPEC_PATH)/spec
 SASS_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
-LIBSASS_TEST_FLAGS = --impl libsass
-LIBSASS_TEST_FLAGS += -r $(LIBSASS_SPEC_PATH)/spec
-LIBSASS_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
-COMPRESSED_TEST_FLAGS = --impl libsass
-COMPRESSED_TEST_FLAGS += -r $(LIBSASS_SPEC_PATH)/styles/compressed
-COMPRESSED_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
-COMPRESSED_TEST_FLAGS += --cmd-args="-t compressed"
+SASS_TEST_FLAGS += --cmd-args "-I $(SASS_SPEC_ROOT)/spec"
 AM_TESTS_ENVIRONMENT = TEST_FLAGS='$(SASS_TEST_FLAGS)'
 
 SASS_TESTER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
 
 test:
 	$(SASS_TESTER) $(SASS_TEST_FLAGS)
-	$(SASS_TESTER) $(LIBSASS_TEST_FLAGS)
-	$(SASS_TESTER) $(COMPRESSED_TEST_FLAGS)
 
 test_build:
 	$(SASS_TESTER) $(SASS_TEST_FLAGS)
-	$(SASS_TESTER) $(LIBSASS_TEST_FLAGS)
-	$(SASS_TESTER) $(COMPRESSED_TEST_FLAGS)
 
 test_full:
 	$(SASS_TESTER) --run-todo $(SASS_TEST_FLAGS)
-	$(SASS_TESTER) --run-todo $(LIBSASS_TEST_FLAGS)
-	$(SASS_TESTER) --run-todo $(COMPRESSED_TEST_FLAGS)
 
 test_probe:
 	$(SASS_TESTER) --probe-todo $(SASS_TEST_FLAGS)
-	$(SASS_TESTER) --probe-todo $(LIBSASS_TEST_FLAGS)
-	$(SASS_TESTER) --probe-todo $(COMPRESSED_TEST_FLAGS)
 
 test_interactive:
 	$(SASS_TESTER) --interactive $(SASS_TEST_FLAGS)
-	$(SASS_TESTER) --interactive $(LIBSASS_TEST_FLAGS)
-	$(SASS_TESTER) --interactive $(COMPRESSED_TEST_FLAGS)
 
 .PHONY: test test_build test_full test_probe
 

Makefile

@@ -16,14 +16,24 @@ CFLAGS   ?= -Wall
 CXXFLAGS ?= -Wall
 LDFLAGS  ?= -Wall
 ifndef COVERAGE
-  CFLAGS   += -O2
-  CXXFLAGS += -O2
-  LDFLAGS  += -O2
+  CFLAGS   += -O3 -pipe -DNDEBUG -fomit-frame-pointer
+  CXXFLAGS += -O3 -pipe -DNDEBUG -fomit-frame-pointer
+  LDFLAGS  += -O3 -pipe -DNDEBUG -fomit-frame-pointer
 else
   CFLAGS   += -O1 -fno-omit-frame-pointer
   CXXFLAGS += -O1 -fno-omit-frame-pointer
   LDFLAGS  += -O1 -fno-omit-frame-pointer
 endif
+ifeq "$(LIBSASS_GPO)" "generate"
+  CFLAGS   += -fprofile-generate
+  CXXFLAGS += -fprofile-generate
+  LDFLAGS  += -fprofile-generate -Wl,-fprofile-instr-generate
+endif
+ifeq "$(LIBSASS_GPO)" "use"
+  CFLAGS   += -fprofile-use
+  CXXFLAGS += -fprofile-use
+  LDFLAGS  += -fprofile-use -Wl,-fprofile-instr-use
+endif
 CAT ?= $(if $(filter $(OS),Windows_NT),type,cat)
 
 ifneq (,$(findstring /cygdrive/,$(PATH)))
@@ -84,6 +94,9 @@ else
 	CXXFLAGS += -I include
 endif
 
+CFLAGS   += -I $(SASS_LIBSASS_PATH)/src
+CXXFLAGS += -I $(SASS_LIBSASS_PATH)/src
+
 CFLAGS   += $(EXTRA_CFLAGS)
 CXXFLAGS += $(EXTRA_CXXFLAGS)
 LDFLAGS  += $(EXTRA_LDFLAGS)
@@ -144,7 +157,7 @@ SASS_SASSC_PATH ?= sassc
 SASS_SPEC_PATH ?= sass-spec
 SASS_SPEC_SPEC_DIR ?= spec
 LIBSASS_SPEC_PATH ?= libsass-spec
-LIBSASS_SPEC_SPEC_DIR ?= spec
+LIBSASS_SPEC_SPEC_DIR ?= suites
 SASSC_BIN = $(SASS_SASSC_PATH)/bin/sassc
 RUBY_BIN = ruby
 
@@ -177,6 +190,7 @@ endif
 include Makefile.conf
 OBJECTS = $(addprefix src/,$(SOURCES:.cpp=.o))
 COBJECTS = $(addprefix src/,$(CSOURCES:.c=.o))
+HEADOBJS = $(addprefix src/,$(HPPFILES:.hpp=.hpp.gch))
 RCOBJECTS = $(RESOURCES:.rc=.o)
 
 DEBUG_LVL ?= NONE
@@ -185,6 +199,7 @@ CLEANUPS ?=
 CLEANUPS += $(RCOBJECTS)
 CLEANUPS += $(COBJECTS)
 CLEANUPS += $(OBJECTS)
+CLEANUPS += $(HEADOBJS)
 CLEANUPS += $(LIBSASS_LIB)
 
 all: $(BUILD)
@@ -218,15 +233,18 @@ lib/libsass.dll: $(COBJECTS) $(OBJECTS) $(RCOBJECTS) | lib
 	$(CXX) -shared $(LDFLAGS) -o $@ $(COBJECTS) $(OBJECTS) $(RCOBJECTS) $(LDLIBS) \
 	-s -Wl,--subsystem,windows,--out-implib,lib/libsass.a
 
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-%.o: %.rc
+$(RCOBJECTS): %.o: %.rc
 	$(WINDRES) -i $< -o $@
 
-%.o: %.cpp
+$(OBJECTS): %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
+$(COBJECTS): %.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+$(HEADOBJS): %.hpp.gch: %.hpp
+	$(CXX) $(CXXFLAGS) -x c++-header -c -o $@ $<
+
 %: %.o static
 	$(CXX) $(CXXFLAGS) -o $@ $+ $(LDFLAGS) $(LDLIBS)
 
@@ -252,12 +270,18 @@ $(DESTDIR)$(PREFIX)/include/%.h: include/%.h \
 	$(INSTALL) -v -m0644 "$<" "$@"
 
 install-headers: $(DESTDIR)$(PREFIX)/include/sass.h \
-                 $(DESTDIR)$(PREFIX)/include/sass2scss.h \
                  $(DESTDIR)$(PREFIX)/include/sass/base.h \
-                 $(DESTDIR)$(PREFIX)/include/sass/version.h \
-                 $(DESTDIR)$(PREFIX)/include/sass/values.h \
+                 $(DESTDIR)$(PREFIX)/include/sass/compiler.h \
                  $(DESTDIR)$(PREFIX)/include/sass/context.h \
-                 $(DESTDIR)$(PREFIX)/include/sass/functions.h
+                 $(DESTDIR)$(PREFIX)/include/sass/enums.h \
+                 $(DESTDIR)$(PREFIX)/include/sass/error.h \
+                 $(DESTDIR)$(PREFIX)/include/sass/functions.h \
+                 $(DESTDIR)$(PREFIX)/include/sass/fwdecl.h \
+                 $(DESTDIR)$(PREFIX)/include/sass/import.h \
+                 $(DESTDIR)$(PREFIX)/include/sass/lists.h \
+                 $(DESTDIR)$(PREFIX)/include/sass/traces.h \
+                 $(DESTDIR)$(PREFIX)/include/sass/values.h \
+                 $(DESTDIR)$(PREFIX)/include/sass/version.h
 
 $(DESTDIR)$(PREFIX)/lib/%.a: lib/%.a \
                              | $(DESTDIR)$(PREFIX)/lib
@@ -302,55 +326,55 @@ test_build: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
 	--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
 	$(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
 	$(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
 	$(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
 	$(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested
 
 test_full: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
 	--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
 	--run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
 	--run-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
 	--run-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
 	--run-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested
 
 test_probe: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
 	--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
 	--probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
 	--probe-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
 	--probe-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
 	--probe-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested
 
 test_interactive: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
 	--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
 	--interactive $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
 	--interactive $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
 	--interactive $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
 	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
-	--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
+	--cmd-args "-I . -I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
 	--interactive $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested
 
 clean-objects: | lib