Version bump and follow up the libsass v2.0

Author: dahlia

MANIFEST.in

@@ -1,6 +1,7 @@
 include *.h
 include *.hpp
 include *.cpp
+include Makefile
 include Makefile.am
 include win32/*.h
 include test/*.scss

docs/changes.rst

@@ -1,6 +1,23 @@
 Changelog
 =========
 
+Version 0.5.0
+-------------
+
+To be released.
+
+- Follow up the libsass upstream: :commit:`v2.0` --- See the `release note`__
+  of Libsass.
+
+  - Added indented syntax support (:file:`*.sass` files).
+  - Added expanded selector support (BEM).
+  - Added string functions.
+  - Fixed UTF-8 support.
+  - Backward incompatibility: broken extends.
+
+__ https://github.com/hcatlin/libsass/releases/tag/v2.0
+
+
 Unstable version 0.4.2.20140529.cd3ee1cbe3
 ------------------------------------------
 

sass.py

@@ -22,7 +22,7 @@
 
 __all__ = ('MODES', 'OUTPUT_STYLES', 'SOURCE_COMMENTS', 'CompileError',
            'and_join', 'compile')
-__version__ = '0.4.2'
+__version__ = '0.5.0'
 
 
 #: (:class:`collections.Mapping`) The dictionary of output styles.

setup.py

@@ -22,23 +22,26 @@
 
 
 MAKEFILE_SOURCES_LIST_RE = re.compile(r'''
-    (?: ^ | \n ) libsass_la_SOURCES [ \t]* = [ \t]*
+    (?: ^ | \n ) (?: libsass_la_ )? SOURCES [ \t]* = [ \t]*
     (?P<sources> (?: (?: $ | [ \t] | \\ [\n] )+
                      [^ \n\t\\]+ )+ )
 ''', re.VERBOSE)
 
 
-with open('Makefile.am') as makefile:
-    sources_match = MAKEFILE_SOURCES_LIST_RE.search(makefile.read())
-    sources_list = sources_match.group('sources').replace('\\\n', ' ')
-    libsass_sources = sources_list.split()
+libsass_sources = set()
+for makefilename in 'Makefile', 'Makefile.am':
+    with open(makefilename) as makefile:
+        sources_match = MAKEFILE_SOURCES_LIST_RE.search(makefile.read())
+        sources_list = sources_match.group('sources').replace('\\\n', ' ')
+        libsass_sources.update(sources_list.split())
+libsass_sources = list(libsass_sources)
 
 libsass_headers = [
     'sass_interface.h', 'sass.h', 'win32/unistd.h'
 ]
 libsass_headers.extend(glob.glob('*.hpp'))
 include_dirs = ['sass2scss']
-sources = ['pysass.c', 'sass2scss/sass2scss.cpp']
+sources = ['pysass.c']
 sources.extend(libsass_sources)
 
 if sys.platform == 'win32':
@@ -158,7 +161,10 @@ def run(self):
     packages=['sassutils'],
     py_modules=['sass', 'sassc', 'sasstests'],
     package_data={
-        '': ['README.rst', 'Makefile.am', 'win32/*.h', 'test/*.sass']
+        '': [
+            'README.rst', 'Makefile', 'Makefile.am',
+            'win32/*.h', 'test/*.sass'
+        ]
     },
     scripts=['sassc.py'],
     license='MIT License',

utf8_string.cpp

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <cmath>
+#include <cstdlib>
 
 namespace Sass {
   namespace UTF_8 {