Bump libsass to 3.5.0.beta.3

package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-sass",
   "version": "4.6.1",
-  "libsass": "3.5.0.beta.2",
+  "libsass": "3.5.0.beta.3",
   "description": "Wrapper around libsass",
   "license": "MIT",
   "bugs": "https://github.com/sass/node-sass/issues",
@@ -83,7 +83,7 @@
     "object-merge": "^2.5.1",
     "read-yaml": "^1.0.0",
     "rimraf": "^2.5.2",
-    "sass-spec": "3.5.0-1",
+    "sass-spec": "3.5.0-2",
     "unique-temp-dir": "^1.0.0"
   }
 }

src/libsass/.gitignore

@@ -12,6 +12,8 @@ VERSION
 .cproject
 .project
 .settings/
+*.db
+*.aps
 
 # Configuration stuff
 
@@ -68,6 +70,7 @@ bin/*
 .libs/
 win/bin
 *.user
+win/*.db
 
 # Final results
 

src/libsass/Readme.md

@@ -1,95 +1,98 @@
-LibSass
-=======
+LibSass - Sass compiler written in C++
+======================================
 
-by Aaron Leung ([@akhleung]), Hampton Catlin ([@hcatlin]), Marcel Greter ([@mgreter]) and Michael Mifsud ([@xzyfer])
+Currently maintained by Marcel Greter ([@mgreter]) and Michael Mifsud ([@xzyfer])  
+Originally created by Aaron Leung ([@akhleung]) and Hampton Catlin ([@hcatlin])
 
-[![Unix CI](https://travis-ci.org/sass/libsass.svg?branch=master)](https://travis-ci.org/sass/libsass)
-[![Windows CI](https://ci.appveyor.com/api/projects/status/github/sass/libsass?svg=true)](https://ci.appveyor.com/project/sass/libsass/branch/master)
-[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=283068)](https://www.bountysource.com/trackers/283068-libsass?utm_source=283068&utm_medium=shield&utm_campaign=TRACKER_BADGE)
-[![Coverage Status](https://img.shields.io/coveralls/sass/libsass.svg)](https://coveralls.io/r/sass/libsass?branch=feature%2Ftest-travis-ci-3)
-[![Join us](https://libsass-slack.herokuapp.com/badge.svg)](https://libsass-slack.herokuapp.com/)
+[![Unix CI](https://travis-ci.org/sass/libsass.svg?branch=master)](https://travis-ci.org/sass/libsass "Travis CI")
+[![Windows CI](https://ci.appveyor.com/api/projects/status/github/sass/libsass?svg=true)](https://ci.appveyor.com/project/sass/libsass/branch/master "Appveyor CI")
+[![Coverage Status](https://img.shields.io/coveralls/sass/libsass.svg)](https://coveralls.io/r/sass/libsass?branch=feature%2Ftest-travis-ci-3 "Code coverage of spec tests")
+[![Percentage of issues still open](http://isitmaintained.com/badge/open/sass/libsass.svg)](http://isitmaintained.com/project/sass/libsass "Percentage of issues still open")
+[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/sass/libsass.svg)](http://isitmaintained.com/project/sass/libsass "Average time to resolve an issue")
+[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=283068)](https://www.bountysource.com/trackers/283068-libsass?utm_source=283068&utm_medium=shield&utm_campaign=TRACKER_BADGE "Bountysource")
+[![Join us](https://libsass-slack.herokuapp.com/badge.svg)](https://libsass-slack.herokuapp.com/ "Slack communication channels")
 
-https://github.com/sass/libsass
 
-LibSass is just a library, but if you want to RUN LibSass,
-then go to https://github.com/sass/sassc or
-https://github.com/sass/sassc-ruby or
-[find your local implementer](docs/implementations.md).
+[LibSass](https://github.com/sass/libsass "LibSass GitHub Project") is just a library!
+If you want to use LibSass to compile Sass, you need an implementer. Some
+implementations are only bindings into other programming languages. But most also
+ship with a command line interface (CLI) you can use directly. There is also
+[SassC](https://github.com/sass/sassc), which is the official lightweight
+CLI tool built by the same people as LibSass.
 
-LibSass requires GCC 4.6+ or Clang/LLVM. If your OS is older, this version may not compile.
+### Excerpt of "sanctioned" implementations:
 
-On Windows, you need MinGW with GCC 4.6+ or VS 2013 Update 4+. It is also possible to build LibSass with Clang/LLVM on Windows.
+- https://github.com/sass/node-sass (Node.js)
+- https://github.com/sass/perl-libsass (Perl)
+- https://github.com/wellington/go-libsass (Go)
+- https://github.com/sass/sassc-ruby (Ruby)
+- https://github.com/sass/libsass-net (C#)
+- https://github.com/medialize/sass.js (JS)
+
+This list does not say anything about the quality of either the listed or not listed [implementations](docs/implementations.md)!  
+The authors of the listed projects above are just known to work regularly together with LibSass developers.
 
 About
 -----
 
-LibSass is a C/C++ port of the Sass CSS precompiler. The original version was written in Ruby, but this version is meant for efficiency and portability.
-
-This library strives to be light, simple, and easy to build and integrate with a variety of platforms and languages.
+LibSass is a C++ port of the original Ruby Sass CSS compiler with a [C API](docs/api-doc.md).
+We coded LibSass with portability and efficiency in mind. You can expect LibSass to be a lot
+faster than Ruby Sass and on par or faster than the best alternative CSS compilers around.
 
 Developing
 ----------
 
-As you may have noticed, the LibSass repo itself has
-no executables and no tests. Oh noes! How can you develop???
-
-Well, luckily, [SassC](http://github.com/sass/sassc) is the official binary wrapper for
-LibSass and is *always* kept in sync. SassC is used by continous integration systems in
-LibSass repository. When developing LibSass, it is best to actually
-checkout SassC and develop in that directory with the SassC spec
-and tests there.
-
-We even run Travis tests for SassC!
+As noted above, the LibSass repository does not contain any binaries or other way to execute
+LibSass. Therefore, you need an implementer to develop LibSass. Easiest is to start with
+the official [SassC](http://github.com/sass/sassc) CLI wrapper. It is *guaranteed* to compile
+with the latest code in LibSass master, since it is also used in the CI process. There is no
+limitation here, as you may use any other LibSass implementer to test your LibSass branch!
 
-Tests
+Testing
 -------
 
-Since LibSass is a pure library, tests are run through the [SassSpec](https://github.com/sass/sass-spec) project using the [SassC](http://github.com/sass/sassc) driver.
+Since LibSass is a pure library, tests are run through the [Sass-Spec](https://github.com/sass/sass-spec)
+project using the [SassC](http://github.com/sass/sassc) CLI wrapper. To run the tests against LibSass while
+developing, you can run `./script/spec`. This will clone SassC and Sass-Spec under the project folder and
+then run the Sass-Spec test suite. You may want to update the clones to ensure you have the latest version.
+Note that the scripts in the `./script` folder are mainly intended for our CI needs.
 
-To run tests against LibSass while developing, you can run `./script/spec`. This will clone SassC and Sass-Spec under the project folder and then run the Sass-Spec test suite. You may want to update the clones to ensure you have the latest version.
+Building
+--------
 
-### DEBUG builds
+To build LibSass you need GCC 4.6+ or Clang/LLVM. If your OS is older, you may need to upgrade
+them first (or install clang as an alternative). On Windows, you need MinGW with GCC 4.6+ or VS 2013
+Update 4+. It is also possible to build LibSass with Clang/LLVM on Windows with various build chains
+and/or command line interpreters.
 
-Set the environment variable `DEBUG` to `1` to enable debug builds that can be debugged
-with `gdb`, `lldb` and others. E.g.: use `$ DEBUG=1 ./script/spec` to run the tests with
-a debug build.
+See the [build docs for further instructions](docs/build.md)!
 
-Library Usage
+Compatibility
 -------------
 
-While LibSass is a library primarily written in C++, it provides a simple
-C interface which should be used by most implementers. LibSass does not do
-much on its own without an implementer. This can be a command line tool, like
-[sassc](https://github.com/sass/sassc) or a [binding](docs/implementations.md)
-to your favorite programing language.
-
-If you want to build or interface with LibSass, we recommend to check out the
-documentation pages about [building LibSass](docs/build.md) and
-the [C-API documentation](docs/api-doc.md).
+Current LibSass 3.4 should be compatible with Sass 3.4. Please refer to the [sass compatibility
+page](http://sass-compatibility.github.io/) for a more detailed comparison. But note that there
+are still a few incomplete edges which we are aware of. Otherwise LibSass has reached a good level
+of stability, thanks to our ever growing [Sass-Spec test suite](https://github.com/sass/sass-spec).
 
 About Sass
 ----------
 
-Sass is a CSS pre-processor language to add on exciting, new,
-awesome features to CSS. Sass was the first language of its kind
-and by far the most mature and up to date codebase.
+Sass is a CSS pre-processor language to add on exciting, new, awesome features to CSS. Sass was
+the first language of its kind and by far the most mature and up to date codebase.
 
-Sass was originally concieved of by the co-creator of this library,
-Hampton Catlin ([@hcatlin]). Most of the language has been the result of years
-of work by Natalie Weizenbaum ([@nex3]) and Chris Eppstein ([@chriseppstein]).
+Sass was originally conceived of by the co-creator of this library, Hampton Catlin ([@hcatlin]).
+Most of the language has been the result of years of work by Natalie Weizenbaum ([@nex3]) and
+Chris Eppstein ([@chriseppstein]).
 
 For more information about Sass itself, please visit http://sass-lang.com
 
-Initial development of libsass by Aaron Leung and Hampton Catlin was supported by [Moovweb](http://www.moovweb.com).
+Initial development of LibSass by Aaron Leung and Hampton Catlin was supported by [Moovweb](http://www.moovweb.com).
 
 Licensing
 ---------
 
-Our MIT license is designed to be as simple, and liberal as possible.
-
-sass2scss was originally written by [Marcel Greter][@mgreter]
-and he happily agreed to have it merged into the project.
-
+Our [MIT license](LICENSE) is designed to be as simple and liberal as possible.
 
 [@hcatlin]: https://github.com/hcatlin
 [@akhleung]: https://github.com/akhleung

src/libsass/appveyor.yml

@@ -7,8 +7,13 @@ environment:
   matrix:
   - Compiler: msvc
     Config: Release
+    Platform: Win32
   - Compiler: msvc
     Config: Debug
+    Platform: Win32
+  - Compiler: msvc
+    Config: Release
+    Platform: Win64
   - Compiler: mingw
     Build: static
   - Compiler: mingw
@@ -38,7 +43,7 @@ build_script:
       if ($env:Compiler -eq "mingw") {
         mingw32-make -j4 sassc
       } else {
-        msbuild /m:4 /p:Configuration=$env:Config sassc\win\sassc.sln
+        msbuild /m:4 /p:"Configuration=$env:Config;Platform=$env:Platform" sassc\win\sassc.sln
       }
 
       # print the branding art
@@ -84,4 +89,3 @@ test_script:
       } else {
         echo "Success!"
       }
-

src/libsass/res/resource.rc

@@ -18,18 +18,18 @@ BEGIN
   BEGIN
     BLOCK "080904b0"
     BEGIN
-      VALUE "CompanyName", "Libsass Organization"
+      VALUE "CompanyName", "Sass Open Source Foundation"
       VALUE "FileDescription", "A C/C++ implementation of a Sass compiler"
-      VALUE "FileVersion", "0.9.0.0"
+      VALUE "FileVersion", "1.0.0.0"
       VALUE "InternalName", "libsass"
-      VALUE "LegalCopyright", "©2014 libsass.org"
+      VALUE "LegalCopyright", "\251 2017 libsass.org"
       VALUE "OriginalFilename", "libsass.dll"
-      VALUE "ProductName", "Libsass Library"
-      VALUE "ProductVersion", "0.9.0.0"
+      VALUE "ProductName", "LibSass Library"
+      VALUE "ProductVersion", "1.0.0.0"
     END
   END
   BLOCK "VarFileInfo"
   BEGIN
     VALUE "Translation", 0x809, 1200
   END
-END
+END