Fix broken build setups

Author: dahlia

MANIFEST.in

@@ -3,7 +3,7 @@ include *.hpp
 include *.cpp
 include Makefile
 include Makefile.am
+include utf8/*.h
 include win32/*.h
 include test/*.scss
-include sass2scss/sass2scss.*
 include README.rst

docs/changes.rst

@@ -6,8 +6,20 @@ Version 0.6.0
 
 To be released.
 
+- Follow up the libsass upstream: :commit:`3.0` --- See the `release note`__
+  of Libsass.
+
+  - Decent extends support
+  - Basic Sass Maps Support 
+  - Better UTF-8 Support
+  - ``call()`` function
+  - Better Windows Support
+  - Spec Enhancements
+
 - Added missing `partial import`_ support.  [:issue:`27` by item4]
+- :const:`~sass.SOURCE_COMMENTS` became deprecated.
 
+__ https://github.com/sass/libsass/releases/tag/3.0
 .. _partial import: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#partials
 
 

pysass.c renamed to pysass.cpp

@@ -18,24 +18,20 @@
 #define PySass_Bytes_AS_STRING(o) PyString_AS_STRING(o)
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct PySass_Pair {
     char *label;
     int value;
 };
 
 static struct PySass_Pair PySass_output_style_enum[] = {
-    {"nested", SASS_STYLE_NESTED},
-    {"expanded", SASS_STYLE_EXPANDED},
-    {"compact", SASS_STYLE_COMPACT},
-    {"compressed", SASS_STYLE_COMPRESSED},
-    {NULL}
-};
-
-static struct PySass_Pair PySass_source_comments_enum[] = {
-    {"none", SASS_SOURCE_COMMENTS_NONE},
-    {"line_numbers", SASS_SOURCE_COMMENTS_DEFAULT},  /* alias of "default" */
-    {"default", SASS_SOURCE_COMMENTS_DEFAULT},
-    {"map", SASS_SOURCE_COMMENTS_MAP},
+    {(char *) "nested", SASS_STYLE_NESTED},
+    {(char *) "expanded", SASS_STYLE_EXPANDED},
+    {(char *) "compact", SASS_STYLE_COMPACT},
+    {(char *) "compressed", SASS_STYLE_COMPRESSED},
     {NULL}
 };
 
@@ -87,17 +83,16 @@ PySass_compile_filename(PyObject *self, PyObject *args) {
 
     context = sass_new_file_context();
     context->input_path = filename;
-    if (source_comments == SASS_SOURCE_COMMENTS_MAP &&
-        PySass_Bytes_Check(source_map_filename)) {
+    if (source_comments && PySass_Bytes_Check(source_map_filename)) {
         size_t source_map_file_len = PySass_Bytes_GET_SIZE(source_map_filename);
         if (source_map_file_len) {
-            char *source_map_file = malloc(source_map_file_len + 1);
+            char *source_map_file = (char *) malloc(source_map_file_len + 1);
             strncpy(
                 source_map_file, 
                 PySass_Bytes_AS_STRING(source_map_filename),
                 source_map_file_len + 1
             );
-            context->source_map_file = source_map_file;
+            context->options.source_map_file = source_map_file;
         }
     }
     context->options.output_style = output_style;
@@ -178,13 +173,10 @@ void PySass_make_enum_dict(PyObject *enum_dict, struct PySass_Pair *pairs) {
 }
 
 void PySass_init_module(PyObject *module) {
-    PyObject *output_styles, *source_comments;
+    PyObject *output_styles;
     output_styles = PyDict_New();
     PySass_make_enum_dict(output_styles, PySass_output_style_enum);
     PyModule_AddObject(module, "OUTPUT_STYLES", output_styles);
-    source_comments = PyDict_New();
-    PySass_make_enum_dict(source_comments, PySass_source_comments_enum);
-    PyModule_AddObject(module, "SOURCE_COMMENTS", source_comments);
 }
 
 #if PY_MAJOR_VERSION >= 3
@@ -220,3 +212,7 @@ init_sass()
 }
 
 #endif
+
+#ifdef __cplusplus
+}
+#endif

sass.py

@@ -18,7 +18,7 @@
 
 from six import string_types, text_type
 
-from _sass import (OUTPUT_STYLES, SOURCE_COMMENTS, compile_dirname,
+from _sass import (OUTPUT_STYLES, compile_dirname,
                    compile_filename, compile_string)
 
 __all__ = ('MODES', 'OUTPUT_STYLES', 'SOURCE_COMMENTS', 'CompileError',
@@ -34,7 +34,9 @@
 #: Keys are mode names, and values are corresponding flag integers.
 #:
 #: .. versionadded:: 0.4.0
-SOURCE_COMMENTS = SOURCE_COMMENTS
+#:
+#: .. deprecated:: 0.6.0
+SOURCE_COMMENTS = {'none': 0, 'line_numbers': 1, 'default': 1, 'map': 2}
 
 #: (:class:`collections.Set`) The set of keywords :func:`compile()` can take.
 MODES = set(['string', 'filename', 'dirname'])

setup.py

@@ -40,17 +40,10 @@
     'sass_interface.h', 'sass.h', 'win32/unistd.h'
 ]
 libsass_headers.extend(glob.glob('*.hpp'))
-include_dirs = ['sass2scss']
-sources = ['pysass.c']
+include_dirs = ['utf8']
+sources = ['pysass.cpp']
 sources.extend(libsass_sources)
 
-if not os.path.isdir('sass2scss') and os.path.isdir('.git'):
-    print('Submodules seem not initialized yet.'
-          'You can initialize it by the following command:',
-          file=sys.stderr)
-    print('\tgit submodule update --init', file=sys.stderr)
-    raise SystemExit(1)
-
 if sys.platform == 'win32':
     from distutils.msvc9compiler import get_build_version
     vscomntools_env = 'VS{0}{1}COMNTOOLS'.format(
@@ -84,13 +77,17 @@ def spawn(self, cmd):
     flags = ['-I' + os.path.abspath('win32')]
     link_flags = []
 else:
-    flags = ['-fPIC', '-Wall', '-Wno-parentheses']
+    flags = ['-fPIC', '-xc++', '-std=c++11', '-Wall', '-Wno-parentheses']
     platform.mac_ver()
-    if platform.system() == 'Darwin' and \
-       tuple(map(int, platform.mac_ver()[0].split('.'))) >= (10, 9):
-        flags.append(
-            '-Wno-error=unused-command-line-argument-hard-error-in-future'
-        )
+    if platform.system() == 'Darwin':
+        flags.extend([
+            '-stdlib=libc++',
+            '-mmacosx-version-min=10.7',
+        ])
+        if tuple(map(int, platform.mac_ver()[0].split('.'))) >= (10, 9):
+            flags.append(
+                '-Wno-error=unused-command-line-argument-hard-error-in-future',
+            )
     link_flags = ['-fPIC', '-lstdc++']
 
 sass_extension = Extension(
@@ -99,6 +96,7 @@ def spawn(self, cmd):
     depends=libsass_headers,
     extra_compile_args=['-c', '-O2'] + flags,
     extra_link_args=link_flags,
+    language='c++',
 )