Merge pull request #1040 from saper/libsass3.3src

Import libsass 3.3 code
sass · Sep 18, 2015 · 9336a1d · 9336a1d
2 parents 8352799 + 3f0ef90
commit 9336a1d
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 56 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,6 +8,7 @@ cache:
 
 environment:
   SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true
+  GYP_MSVS_VERSION: 2013
   matrix:
     - nodejs_version: 0.10
     - nodejs_version: 0.12
@@ -21,7 +22,7 @@ install:
   - node --version
   - npm --version
   - git submodule update --init --recursive
-  - npm install --msvs_version=2013
+  - npm install
 
 test_script: npm test
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "node-sass",
   "version": "3.3.3",
-  "libsass": "3.2.5",
+  "libsass": "3.3.0-beta2",
   "description": "Wrapper around libsass",
   "license": "MIT",
   "homepage": "https://github.com/sass/node-sass",

diff --git a/src/binding.cpp b/src/binding.cpp
@@ -9,7 +9,7 @@ Sass_Import_List sass_importer(const char* cur_path, Sass_Importer_Entry cb, str
 {
   void* cookie = sass_importer_get_cookie(cb);
   struct Sass_Import* previous = sass_compiler_get_last_import(comp);
-  const char* prev_path = sass_import_get_path(previous);
+  const char* prev_path = sass_import_get_imp_path(previous);
   CustomImporterBridge& bridge = *(static_cast<CustomImporterBridge*>(cookie));
 
   std::vector<void*> argv;

diff --git a/src/custom_function_bridge.h b/src/custom_function_bridge.h
@@ -2,7 +2,8 @@
 #define CUSTOM_FUNCTION_BRIDGE_H
 
 #include <nan.h>
-#include <sass_context.h>
+#include <sass/values.h>
+#include <sass/functions.h>
 #include "callback_bridge.h"
 
 class CustomFunctionBridge : public CallbackBridge<Sass_Value*> {

diff --git a/src/custom_importer_bridge.h b/src/custom_importer_bridge.h
@@ -2,7 +2,8 @@
 #define CUSTOM_IMPORTER_BRIDGE_H
 
 #include <nan.h>
-#include <sass_context.h>
+#include <sass/functions.h>
+#include <sass/values.h>
 #include "callback_bridge.h"
 
 typedef Sass_Import_List SassImportList;

diff --git a/src/libsass b/src/libsass
diff --git a/src/libsass.gyp b/src/libsass.gyp
@@ -11,66 +11,71 @@
          'DEBUG'
       ],
       'sources': [
-        'libsass/ast.cpp',
-        'libsass/base64vlq.cpp',
-        'libsass/bind.cpp',
-        'libsass/cencode.c',
-        'libsass/constants.cpp',
-        'libsass/context.cpp',
-        'libsass/contextualize.cpp',
-        'libsass/contextualize_eval.cpp',
-        'libsass/cssize.cpp',
-        'libsass/emitter.cpp',
-        'libsass/error_handling.cpp',
-        'libsass/eval.cpp',
-        'libsass/expand.cpp',
-        'libsass/extend.cpp',
-        'libsass/file.cpp',
-        'libsass/functions.cpp',
-        'libsass/inspect.cpp',
-        'libsass/json.cpp',
-        'libsass/lexer.cpp',
-        'libsass/listize.cpp',
-        'libsass/node.cpp',
-        'libsass/output.cpp',
-        'libsass/parser.cpp',
-        'libsass/plugins.cpp',
-        'libsass/position.cpp',
-        'libsass/prelexer.cpp',
-        'libsass/remove_placeholders.cpp',
-        'libsass/sass.cpp',
-        'libsass/sass2scss.cpp',
-        'libsass/sass_context.cpp',
-        'libsass/sass_functions.cpp',
-        'libsass/sass_util.cpp',
-        'libsass/sass_values.cpp',
-        'libsass/source_map.cpp',
-        'libsass/to_c.cpp',
-        'libsass/to_string.cpp',
-        'libsass/units.cpp',
-        'libsass/utf8_string.cpp',
-        'libsass/util.cpp'
+        'libsass/src/ast.cpp',
+        'libsass/src/base64vlq.cpp',
+        'libsass/src/bind.cpp',
+        'libsass/src/cencode.c',
+        'libsass/src/color_maps.cpp',
+        'libsass/src/constants.cpp',
+        'libsass/src/context.cpp',
+        'libsass/src/cssize.cpp',
+        'libsass/src/emitter.cpp',
+        'libsass/src/environment.cpp',
+        'libsass/src/error_handling.cpp',
+        'libsass/src/eval.cpp',
+        'libsass/src/expand.cpp',
+        'libsass/src/extend.cpp',
+        'libsass/src/file.cpp',
+        'libsass/src/functions.cpp',
+        'libsass/src/inspect.cpp',
+        'libsass/src/json.cpp',
+        'libsass/src/lexer.cpp',
+        'libsass/src/listize.cpp',
+        'libsass/src/memory_manager.cpp',
+        'libsass/src/node.cpp',
+        'libsass/src/output.cpp',
+        'libsass/src/parser.cpp',
+        'libsass/src/plugins.cpp',
+        'libsass/src/position.cpp',
+        'libsass/src/prelexer.cpp',
+        'libsass/src/remove_placeholders.cpp',
+        'libsass/src/sass.cpp',
+        'libsass/src/sass2scss.cpp',
+        'libsass/src/sass_context.cpp',
+        'libsass/src/sass_functions.cpp',
+        'libsass/src/sass_interface.cpp',
+        'libsass/src/sass_util.cpp',
+        'libsass/src/sass_values.cpp',
+        'libsass/src/source_map.cpp',
+        'libsass/src/to_c.cpp',
+        'libsass/src/to_string.cpp',
+        'libsass/src/to_value.cpp',
+        'libsass/src/units.cpp',
+        'libsass/src/utf8_string.cpp',
+        'libsass/src/util.cpp',
+        'libsass/src/values.cpp'
       ],
       'cflags!': [
+        '-fno-rtti',
         '-fno-exceptions'
       ],
       'cflags_cc!': [
+        '-fno-rtti',
         '-fno-exceptions'
       ],
       'cflags_cc': [
         '-fexceptions',
         '-frtti',
       ],
+      'include_dirs': [ 'libsass/include' ],
       'direct_dependent_settings': {
-        'include_dirs': [ 'libsass' ],
+        'include_dirs': [ 'libsass/include' ],
       },
       'conditions': [
         ['OS=="mac"', {
           'xcode_settings': {
-            'OTHER_CPLUSPLUSFLAGS': [
-              '-std=c++11',
-              '-stdlib=libc++'
-            ],
+            'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
+            'CLANG_CXX_LIBRARY': 'libc++',
             'OTHER_LDFLAGS': [],
             'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
             'GCC_ENABLE_CPP_RTTI': 'YES',
@@ -82,10 +87,17 @@
             'VCCLCompilerTool': {
               'AdditionalOptions': [
                 '/GR',
-                '/EHs'
+                '/EHsc'
               ]
             }
-          }
+          },
+          'conditions': [
+             ['MSVS_VERSION < "2015"', {
+               'sources': [
+                 'libsass/src/c99func.c'
+               ]
+             }]
+          ]
         }],
         ['OS!="win"', {
           'cflags_cc+': [

diff --git a/src/sass_context_wrapper.h b/src/sass_context_wrapper.h
@@ -5,7 +5,7 @@
 #include <memory>
 #include <nan.h>
 #include <stdlib.h>
-#include <sass_context.h>
+#include <sass/context.h>
 #include "custom_function_bridge.h"
 #include "custom_importer_bridge.h"
 

diff --git a/src/sass_types/factory.h b/src/sass_types/factory.h
@@ -2,7 +2,7 @@
 #define SASS_TYPES_FACTORY_H
 
 #include <nan.h>
-#include <sass_values.h>
+#include <sass/values.h>
 #include "value.h"
 
 namespace SassTypes

diff --git a/src/sass_types/value.h b/src/sass_types/value.h
@@ -2,7 +2,7 @@
 #define SASS_TYPES_VALUE_H
 
 #include <nan.h>
-#include <sass_values.h>
+#include <sass/values.h>
 
 namespace SassTypes
 {

diff --git a/test/fixtures/spec b/test/fixtures/spec