Merge pull request #96 from glebm/ext-lib

Update libsass to v3.6.0 and fixes various issues (windows, cross-compilation, binary gems)

Author: bolandrm

.gitignore

@@ -12,5 +12,6 @@
 *.so
 *.o
 *.a
+*.gem
 mkmf.log
 vendor/bundle

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "ext/libsass"]
 	path = ext/libsass
-  url = git://github.com/sass/libsass.git
+	url = https://github.com/sass/libsass.git

README.md

@@ -6,7 +6,7 @@ This gem combines the speed of `libsass`, the [Sass C implementation](https://gi
 
 ### libsass Version
 
-[3.5.2](https://github.com/sass/libsass/releases/tag/3.5.2)
+[d225a09a](https://github.com/sass/libsass/commit/d225a09a152050d569c077f97bb944c8dc819d6f)
 
 ## Installation
 

Rakefile

@@ -1,15 +1,30 @@
-begin
-  require 'bundler/gem_tasks'
-rescue LoadError
-  puts 'Cannot load bundler/gem_tasks'
-end
-
-require 'tasks/libsass'
+require 'bundler/gem_tasks'
 
 task default: :test
 
+require 'rake/extensiontask'
+gem_spec = Gem::Specification.load("sassc.gemspec")
+Rake::ExtensionTask.new('libsass', gem_spec) do |ext|
+  ext.name = 'libsass'
+  ext.ext_dir = 'ext'
+  ext.lib_dir = 'lib/sassc'
+  ext.cross_compile = true
+  ext.cross_platform = %w[x86-mingw32 x64-mingw32 x86-linux x86_64-linux]
+  ext.cross_compiling do |spec|
+    spec.files.reject! { |path| File.fnmatch?('ext/*', path) }
+  end
+end
+
+desc 'Compile all native gems via rake-compiler-dock (Docker)'
+task 'gem:native' do
+  require 'rake_compiler_dock'
+  RakeCompilerDock.sh "bundle && gem i rake --no-document && "\
+                      "rake cross native gem MAKE='nice make -j`nproc`' "\
+                      "RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0"
+end
+
 desc "Run all tests"
-task test: 'libsass:compile' do
+task test: 'compile:libsass' do
   $LOAD_PATH.unshift('lib', 'test')
   Dir.glob('./test/**/*_test.rb') { |f| require f }
 end

ext/Rakefile

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+gem_root = File.expand_path('..', __dir__)
+libsass_dir = File.join(gem_root, 'ext', 'libsass')
+
+if !File.directory?(libsass_dir) ||
+   # '.', '..', and possibly '.git' from a failed checkout:
+   Dir.entries(libsass_dir).size <= 3
+  Dir.chdir(gem_root) { system('git submodule update --init') } or
+    fail 'Could not fetch libsass'
+end
+
+File.write 'Makefile', <<-MAKEFILE
+ifndef DESTDIR
+	LIBSASS_OUT = #{gem_root}/lib/sassc/libsass.so
+else
+	LIBSASS_OUT = $(DESTDIR)$(PREFIX)/libsass.so
+endif
+
+SUB_DIR := #{libsass_dir}
+SUB_TARGET := lib/libsass.so
+
+libsass.so:#{' clean' if ENV['CLEAN']}
+	$(MAKE) -C '$(SUB_DIR)' lib/libsass.so
+	cp '$(SUB_DIR)/lib/libsass.so' libsass.so
+	strip libsass.so
+
+install: libsass.so
+	cp libsass.so '$(LIBSASS_OUT)'
+
+clean:
+	$(MAKE) -C '$(SUB_DIR)' clean
+	rm -f '$(LIBSASS_OUT)' libsass.so
+
+.PHONY: clean install
+MAKEFILE

ext/extconf.rb

@@ -133,7 +133,7 @@ def output_style
 
     def load_paths
       paths = (@options[:load_paths] || []) + SassC.load_paths
-      paths.join(":") if paths.any?
+      paths.join(File::PATH_SEPARATOR) unless paths.empty?
     end
   end
 end

ext/libsass

@@ -8,7 +8,13 @@ module Native
 
     spec = Gem.loaded_specs["sassc"]
     gem_root = spec.gem_dir
-    ffi_lib "#{gem_root}/ext/libsass/lib/libsass.so"
+
+    ruby_version_so_path = "#{gem_root}/lib/sassc/#{RUBY_VERSION[/\d+.\d+/]}/libsass.so"
+    if File.exist?(ruby_version_so_path)
+      ffi_lib ruby_version_so_path
+    else
+      ffi_lib "#{gem_root}/lib/sassc/libsass.so"
+    end
 
     require_relative "native/sass_value"