update libsass to 3.1.0 fix with importer the node dont stopping issue.

fis-dev · Jan 26, 2015 · bac095f · bac095f
1 parent 26d057d
commit bac095f
Show file tree

Hide file tree

Showing 12 changed files with 840 additions and 64 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /build/*
 .DS_Store
-/node_modules
+/node_modules
+/vender
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "libsass"]
-	path = libsass
+	path = src/libsass
 	url = https://github.com/hcatlin/libsass.git
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 fis-sass
 =================
 
-包装了一下[libsass](https://github.com/mgreter/libsass)，相比[node-sass](https://github.com/andrew/node-sass), fis-sass能够兼容到更低的node版本，node >= 0.8.0。
+目前只在fis-parser-sass中使用，所以只只能保证`renderSync`是可用的。
 
-目前只在fis-parser-sass中使用，所以只提供了`renderSync`方法。
+node-sass 暂时有不少 bug, 所以不得已才有这个库，等后续 node-sass 完善了再去掉。
 
-使用方法请参考[node-sass](https://github.com/andrew/node-sass)。
+使用方法请参考[node-sass](https://github.com/andrew/node-sass)。
diff --git a/binding.cpp b/binding.cpp
diff --git a/binding.gyp b/binding.gyp
@@ -2,38 +2,42 @@
     'targets': [{
         'target_name': 'binding',
         'sources': [
-            'binding.cpp',
-            'lib/sync.cc',
-            'libsass/ast.cpp',
-            'libsass/base64vlq.cpp',
-            'libsass/bind.cpp',
-            'libsass/constants.cpp',
-            'libsass/context.cpp',
-            'libsass/contextualize.cpp',
-            'libsass/copy_c_str.cpp',
-            'libsass/error_handling.cpp',
-            'libsass/eval.cpp',
-            'libsass/expand.cpp',
-            'libsass/extend.cpp',
-            'libsass/file.cpp',
-            'libsass/functions.cpp',
-            'libsass/inspect.cpp',
-            'libsass/node.cpp',
-            'libsass/output_compressed.cpp',
-            'libsass/output_nested.cpp',
-            'libsass/parser.cpp',
-            'libsass/prelexer.cpp',
-            'libsass/remove_placeholders.cpp',
-            'libsass/sass.cpp',
-            'libsass/sass2scss.cpp',
-            'libsass/sass_interface.cpp',
-            'libsass/sass_util.cpp',
-            'libsass/source_map.cpp',
-            'libsass/to_c.cpp',
-            'libsass/to_string.cpp',
-            'libsass/units.cpp',
-            'libsass/utf8_string.cpp',
-            'libsass/util.cpp'
+            'src/binding.cpp',
+            'src/sass_context_wrapper.cpp',
+            'src/libsass/ast.cpp',
+            'src/libsass/base64vlq.cpp',
+            'src/libsass/bind.cpp',
+            'src/libsass/cencode.c',
+            'src/libsass/constants.cpp',
+            'src/libsass/context.cpp',
+            'src/libsass/contextualize.cpp',
+            'src/libsass/copy_c_str.cpp',
+            'src/libsass/error_handling.cpp',
+            'src/libsass/eval.cpp',
+            'src/libsass/expand.cpp',
+            'src/libsass/extend.cpp',
+            'src/libsass/file.cpp',
+            'src/libsass/functions.cpp',
+            'src/libsass/inspect.cpp',
+            'src/libsass/json.cpp',
+            'src/libsass/node.cpp',
+            'src/libsass/output_compressed.cpp',
+            'src/libsass/output_nested.cpp',
+            'src/libsass/parser.cpp',
+            'src/libsass/prelexer.cpp',
+            'src/libsass/remove_placeholders.cpp',
+            'src/libsass/sass.cpp',
+            'src/libsass/sass2scss.cpp',
+            'src/libsass/sass_context.cpp',
+            'src/libsass/sass_functions.cpp',
+            'src/libsass/sass_util.cpp',
+            'src/libsass/sass_values.cpp',
+            'src/libsass/source_map.cpp',
+            'src/libsass/to_c.cpp',
+            'src/libsass/to_string.cpp',
+            'src/libsass/units.cpp',
+            'src/libsass/utf8_string.cpp',
+            'src/libsass/util.cpp'
         ],
 
         'include_dirs': [
@@ -76,4 +80,4 @@
           ]
         }
     ]
-}
+}
diff --git a/build.js b/build.js
@@ -78,7 +78,7 @@ function download() {
         }
 
         // start to download.
-        var dest = './build/Release/binding.node';
+        var dest = './vender/' +process.platform + '-' + process.arch+ '/binding.node';
 
         if ( fs.existsSync( dest ) ) {
             console.log( 'The binding.node file exist, skip download.' );
@@ -88,7 +88,7 @@ function download() {
 
         util.download({
             remote: downloadUrl + modPath,
-            dest: './build/Release/binding.node'
+            dest: dest
         }, done);
 
     } else {
@@ -150,4 +150,4 @@ step( download, test, function( error ) {
     }
 }, function( error ) {
     process.exit( error ? 1 : 0 );
-});
+});