commit sassc for openSUSE:Factory

Hello community, here is the log from the commit of package sassc for openSUSE:Factory checked in at 2017-04-26 21:44:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sassc (Old) and /work/SRC/openSUSE:Factory/.sassc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sassc" Wed Apr 26 21:44:13 2017 rev:2 rq:490836 version:3.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sassc/sassc.changes 2017-01-25 23:20:30.448365463 +0100 +++ /work/SRC/openSUSE:Factory/.sassc.new/sassc.changes 2017-04-26 21:44:14.663256417 +0200 @@ -1,0 +2,61 @@ +Mon Feb 13 11:41:32 UTC 2017 - ronisbr@gmail.com + +- Run spec-cleaner. +- Remove `TODO` file since it has been removed by upstream. +- Version bump to 3.4.2. + Upstream changelog: + + Version 3.4.2 + ------------- + + * Features + + - Sass 3.4.23: Support url() with quotes in unknown directives + (@mgreter, #2243) + + * Fixes + + - Test bootstrap ignoring SASS_SPEC_PATH and SASS_SASSC_PATH + environment variables (@xzyfer, #2265) + - Incorrect equality of interpolated values (@mgreter, #2261) + - Incorrect error when @content is inside @at-root (@mgreter, + #2260) + - C-API copy_options function losing some options (@mgreter, + #2257) + - Segfault with calling calc (@mgreter, @xzyfer) + + Version 3.4.1 + ------------- + + * Features + + - Add --sass flag for indented syntax support from stdin + (@docteurklein, #204) + + * Fixes + + - Ability to static compile VCR libs (@am11, #199) + - Sourcemap file not being written (@am11, #202) + + Version 3.4.0 + ------------- + + * Features + + - Change output to binary mode (@mgreter, #170) + - Add .editorconfig (@nschonni, #184) + - Add Windows CI (@am11, #189) + - Remove -ldl flag for OpenBSD (@parhs, #197) + - Update CLA to match LibSass (@nschonni, #186) + + * Fixes + + - Automake compile on msys2 and mingw64 (@mgreter @aroig, #174) + - Hanging when called with no args or STDIN piped data (@uizfb, + #179) + - Misc fixes to build scripts (@nschonni, #184 #183) + - Remove old unreferenced files (@nschonni, #185) + - Memory leak by freeing options we allocated (@mgreter, #196) + - Clang warning (-Warray-bounds) (@mgreter, #198) + +------------------------------------------------------------------- Old: ---- sassc-3.3.6.tar.gz New: ---- sassc-3.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sassc.spec ++++++ --- /var/tmp/diff_new_pack.7qNgPd/_old 2017-04-26 21:44:15.507137285 +0200 +++ /var/tmp/diff_new_pack.7qNgPd/_new 2017-04-26 21:44:15.515136155 +0200 @@ -1,7 +1,7 @@ # # spec file for package sassc # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: sassc -Version: 3.3.6 +Version: 3.4.2 Release: 0 -License: MIT Summary: Libsass command line driver -Url: https://github.com/sass/sassc/ +License: MIT Group: Development/Tools/Other +Url: https://github.com/sass/sassc/ Source: https://github.com/sass/sassc/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: automake BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: make BuildRequires: libsass-devel BuildRequires: libtool +BuildRequires: make %description SassC is a C/C++ port of the Sass engine. The point is to be @@ -42,15 +43,15 @@ %build autoreconf -fiv -./configure --prefix=%{_prefix} +%configure make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} %{?_smp_mflags} +%make_install %files %defattr(-,root,root) -%doc LICENSE Readme.md TODO +%doc LICENSE Readme.md %{_bindir}/%{name} %changelog ++++++ sassc-3.3.6.tar.gz -> sassc-3.4.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/.editorconfig new/sassc-3.4.2/.editorconfig --- old/sassc-3.3.6/.editorconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/sassc-3.4.2/.editorconfig 2016-12-16 00:01:35.000000000 +0100 @@ -0,0 +1,15 @@ +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false + +[*.vcxproj,*.vcxproj.filter,*.sln] +end_of_line = crlf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/.gitignore new/sassc-3.4.2/.gitignore --- old/sassc-3.3.6/.gitignore 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/.gitignore 2016-12-16 00:01:35.000000000 +0100 @@ -48,3 +48,5 @@ lib/pkgconfig/ .sass-cache *.user +*.db +*.opendb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/.travis.yml new/sassc-3.4.2/.travis.yml --- old/sassc-3.3.6/.travis.yml 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/.travis.yml 2016-12-16 00:01:35.000000000 +0100 @@ -6,16 +6,17 @@ - clang env: - - AUTOTOOLS=no BUILD=shared - - AUTOTOOLS=no BUILD=static - - AUTOTOOLS=yes BUILD=shared - - AUTOTOOLS=yes BUILD=static + global: + - SASS_LIBSASS_PATH=$TRAVIS_BUILD_DIR/libsass + matrix: + - AUTOTOOLS=no BUILD=shared + - AUTOTOOLS=no BUILD=static + - AUTOTOOLS=yes BUILD=shared + - AUTOTOOLS=yes BUILD=static before_install: - gem install sass - git clone https://github.com/sass/libsass.git - - cd libsass && git submodule init && git submodule update && cd .. - - export SASS_LIBSASS_PATH=$TRAVIS_BUILD_DIR/libsass script: - ./script/ci-build-libsass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/LICENSE new/sassc-3.4.2/LICENSE --- old/sassc-3.3.6/LICENSE 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/LICENSE 2016-12-16 00:01:35.000000000 +0100 @@ -1,5 +1,5 @@ -Copyright (C) 2012 by Hampton Catlin +Copyright (C) 2012-2016 by the Sass Open Source Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/Makefile new/sassc-3.4.2/Makefile --- old/sassc-3.3.6/Makefile 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/Makefile 2016-12-16 00:01:35.000000000 +0100 @@ -136,8 +136,10 @@ ifneq (Windows,$(TARGET)) ifneq (FreeBSD,$(UNAME)) - LDFLAGS += -ldl - LDLIBS += -ldl + ifneq (OpenBSD,$(UNAME)) + LDFLAGS += -ldl + LDLIBS += -ldl + endif endif endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/Readme.md new/sassc-3.4.2/Readme.md --- old/sassc-3.3.6/Readme.md 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/Readme.md 2016-12-16 00:01:35.000000000 +0100 @@ -1,9 +1,10 @@ SassC ======= -[](http://travis-ci.org/sass/sassc) +[](http://travis-ci.org/sass/sassc) +[](https://ci.appveyor.com/project/sass/sassc/branch/master) -Written by Aaron Leung (@akhleung) and Hampton Catlin (@hcatlin) +by Aaron Leung ([@akhleung]), Hampton Catlin ([@hcatlin]), Marcel Greter ([@mgreter]) and Michael Mifsud ([@xzyfer]) http://github.com/sass/sassc @@ -24,13 +25,14 @@ 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 created by the co-creator of this library, -Hampton Catlin (@hcatlin). The extension and continuing evolution -of the language has all been the result of years of work by Natalie -Weizenbaum (@nex3) and Chris Eppstein (@chriseppstein). +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]). For more information about Sass itself, please visit http://sass-lang.com +Initial development of SassC by Aaron Leung and Hampton Catlin was supported by [Moovweb](http://www.moovweb.com). + Documentation ------------- @@ -39,7 +41,14 @@ * [Testing on Unix](docs/testing/unix-instructions.md) * [Testing on Windows](docs/testing/windows-instructions.md) -Contribution Agreement ----------------------- +Licensing +--------- + +Our MIT license is designed to be as simple, and liberal as possible. -Any contribution to the project are seen as copyright assigned to Hampton Catlin. Your contribution warrants that you have the right to assign copyright on your work. This is to ensure that the project remains free and open -- similar to the Apache Foundation. +[@hcatlin]: https://github.com/hcatlin +[@akhleung]: https://github.com/akhleung +[@chriseppstein]: https://github.com/chriseppstein +[@nex3]: https://github.com/nex3 +[@mgreter]: https://github.com/mgreter +[@xzyfer]: https://github.com/xzyfer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/TODO new/sassc-3.4.2/TODO --- old/sassc-3.3.6/TODO 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -TODO - -* Respond properly to --help -* Take STDIN -* Specify output file -* Ability to specify include paths diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/appveyor.yml new/sassc-3.4.2/appveyor.yml --- old/sassc-3.3.6/appveyor.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/sassc-3.4.2/appveyor.yml 2016-12-16 00:01:35.000000000 +0100 @@ -0,0 +1,48 @@ +os: Visual Studio 2015 + +environment: + LIBSASS_DIR: ..\libsass + matrix: + - configuration: Debug + - configuration: Release + +cache: + - C:\Ruby%ruby_version%\lib\ruby\gems + +install: + - git clone https://github.com/sass/libsass.git + - cd libsass + - git clone https://github.com/sass/sass-spec + - cd %APPVEYOR_BUILD_FOLDER% + +build: + parallel: true + project: win\sassc.sln + +after_build: + - bin\sassc -v + - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" + - dumpbin /dependents bin\sassc.exe # equivalent of Unix' lld utility + +test_script: + - gem install sass minitest + - ruby libsass\sass-spec\sass-spec.rb -c bin\sassc -s libsass\sass-spec\spec + +test: off +# Turn off the test script to speedup the CI builds, set it to on or remove the previous line when needed. + +artifacts: + path: bin + +deploy: + provider: GitHub + description: $(APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED) + auth_token: + secure: xGL+pDUi3VJOZWGREe3wEGuZaOVA/Mg2BEhjHYIaUoKQCBhY1V9B6xNtix4CB1+8 + + draft: true + prerelease: false + on: + branch: master + appveyor_repo_tag: true # deploy on tag push only + configuration: Release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/configure.ac new/sassc-3.4.2/configure.ac --- old/sassc-3.3.6/configure.ac 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/configure.ac 2016-12-16 00:01:35.000000000 +0100 @@ -13,8 +13,6 @@ # Though they look like gcc flags! AM_INIT_AUTOMAKE([foreign parallel-tests -Wall]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])]) -# would fail with mingw otherwise -m4_pattern_allow([AM_PROG_AR]) # the new prefered way # only need install path @@ -49,17 +47,19 @@ # Check fails on Travis, but it works fine # AX_CXX_COMPILE_STDCXX_11([ext],[optional]) AC_CHECK_TOOL([AR], [ar], [false]) -if test "x$is_mingw32" != "xyes"; then - AC_CHECK_TOOL([DLLTOOL], [dlltool], [false]) - AC_CHECK_TOOL([DLLWRAP], [dllwrap], [false]) - AC_CHECK_TOOL([WINDRES], [windres], [false]) -fi +AC_CHECK_TOOL([DLLTOOL], [dlltool], [false]) +AC_CHECK_TOOL([DLLWRAP], [dllwrap], [false]) +AC_CHECK_TOOL([WINDRES], [windres], [false]) +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) AM_PROG_AR([]) LT_INIT([dlopen]) +AS_CASE([$host], [*-*-mingw*], [is_mingw32=yes], [is_mingw32=no]) +AM_CONDITIONAL(COMPILER_IS_MINGW32, test "x$is_mingw32" = "xyes") + +dnl The dlopen() function is in the C library for *BSD and in +dnl libdl on GLIBC-based systems if test "x$is_mingw32" != "xyes"; then - dnl The dlopen() function is in the C library for *BSD and in - dnl libdl on GLIBC-based systems. Windows uses `LoadLibrary`! AC_SEARCH_LIBS([dlopen], [dl dld], [], [ AC_MSG_ERROR([unable to find the dlopen() function]) ]) @@ -98,9 +98,6 @@ AM_CONDITIONAL(ENABLE_COVERAGE, test "x$enable_cov" = "xyes") -AS_CASE([$host], [*-*-mingw32], [is_mingw32=yes], [is_mingw32=no]) -AM_CONDITIONAL(COMPILER_IS_MINGW32, test "x$is_mingw32" = "xyes") - AC_MSG_NOTICE([Building sassc ($VERSION)]) AC_CONFIG_FILES([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/docs/building/unix-instructions.md new/sassc-3.4.2/docs/building/unix-instructions.md --- old/sassc-3.3.6/docs/building/unix-instructions.md 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/docs/building/unix-instructions.md 2016-12-16 00:01:35.000000000 +0100 @@ -1,10 +1,6 @@ # Building On Unix -To build SassC, you must have either local copy of the LibSass source or it must be installed into your system. For development, please use the source version. You must then setup an environment variable pointing to the libsass folder, like: - -```bash -export SASS_LIBSASS_PATH=/Users/you/path/libsass -``` +To build SassC, you must have either local copy of the LibSass source or it must be installed into your system. For development, please use the source version. The executable will be in the bin folder. To run it, simply try something like @@ -14,29 +10,28 @@ # Step-by-step -1. Clone the libsass repo: +1. Clone the SassC repo ```bash - git clone https://github.com/sass/libsass.git - ``` - -2. Edit your .bash_profile to include libsass directory: - ```bash - export SASS_LIBSASS_PATH=/Users/you/path/libsass + git clone https://github.com/sass/sassc.git ``` -3. Clone the sassC repo +1. cd into the SassC repo ```bash - git clone https://github.com/sass/sassc.git + cd ./sassc ``` -4. cd into the sassC repo +1. Type 'script/bootstrap' to clone [`libsass`](https://github.com/sass/libsass) and [`sass-spec`](https://github.com/sass/sass-spec) into the parent directory + ```bash + script/bootstrap + ``` +Alternately, if you already have libsass cloned or installed, you can edit your `.bash_profile` to include libsass directory: ```bash - cd ./sassc + export SASS_LIBSASS_PATH=/Users/you/path/libsass ``` -5. Type 'make' +1. Type 'make' ```bash make ``` -6. Job done! +1. Job done! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/docs/building/windows-instructions.md new/sassc-3.4.2/docs/building/windows-instructions.md --- old/sassc-3.3.6/docs/building/windows-instructions.md 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/docs/building/windows-instructions.md 2016-12-16 00:01:35.000000000 +0100 @@ -2,11 +2,13 @@ To build SassC, the following pre-requisites must be met: -* Local copy of the LibSass source and `sassc` directory in the root of `libsass`. +* Local copy of the LibSass source. * Visual Studio 2013 Express for Desktop or higher. Additionally, it is recommended to have `git` installed and available in `PATH`, so to deduce the `libsass` and `sassc` version information. For instance, if GitHub for Windows (https://windows.github.com/) is installed, the `PATH` will have an entry resembling: `X:\Users\\AppData\Local\GitHub\PortableGit_\cmd\` (where `X` is the drive letter of system drive). If `git` is not available, inquiring the LibSass and SassC versions will result in `[NA]`. +> Note that with `Debug` or `Release` we statically compile VC runtime libraries (e.g. `MSVCP140.dll`) in sassc.exe which result in self-dependent / portable binary that is comparatively large in size. There are separate build configurations for shared runtime: `Debug without static runtime` and `Release without static runtime`, which produce the binary dependent on [VS2015 Redistributable package](https://www.microsoft.com/en-gb/download/details.aspx?id=48145) on the target system. If your target system (where you want to execute sassc.exe) already has VCR (via redistributable pack or Visual Studio itself), it is highly recommended to use this shared configuration. This way when the shared runtime libs receive an updated (performance improvements or bug fixes), the statically compiled image will not be able to take advantage of such updates. + ## Obtaining the Sources: If `git` in available in `PATH`, open `cmd` or `PowerShell` and run: @@ -21,7 +23,7 @@ git clone https://github.com/sass/sassc ``` -Otherwise download LibSass and SassC sources from github, unzip and arrange so the structure looks like: `libsass\sass`. +Otherwise download LibSass and SassC sources from github, unzip and arrange so the structure looks like: `libsass\sassc`. If you want LibSass repo directory to be placed somewhere else, then set the environment variable `LIBSASS_DIR` with relative path based at the location of `sassc.sln`. ## From Visual Studio: Open `projects\libsass\sassc\win\sassc.sln`, and do the finger dance `Ctrl+Shift+B` to build `sassc.exe`. @@ -40,17 +42,17 @@ * If the platform is 32-bit Windows, replace `ProgramFiles(x86)` with `ProgramFiles`. * To build with Visual Studio 2015, replace `12.0` with `14.0` in the aforementioned command. +* To build 32-bit binary, add `/p:Platform=Win32`. +* To build 64-bit binary, add `/p:platform=Win64`. -In `cmd`, run: +For example, in `cmd`, run: ```cmd cd projects\libsass\sassc -:: debug build: -"%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild" win\sassc.sln - -:: or release build: -"%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild" win\sassc.sln /p:Configuration=Release +:: 32-bit debug build with statically compiled runtime libs: +"%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild" win\sassc.sln ^ +/p:Configuration=Debug /p:Platform=Win32 ``` In `PowerShell`, the above variant would be: @@ -58,13 +60,13 @@ ```powershell cd projects\libsass\sassc -# debug build: -&"${env:ProgramFiles(x86)}\MSBuild\12.0\Bin\MSBuild" win\sassc.sln - -# or release build: -&"${env:ProgramFiles(x86)}\MSBuild\12.0\Bin\MSBuild" win\sassc.sln /p:Configuration=Release +# 64-bit release build without statically compiled runtime libs: +&"${env:ProgramFiles(x86)}\MSBuild\12.0\Bin\MSBuild" win\sassc.sln ` +/p:Configuration='Release without static runtime' /p:Platform=Win64 ``` +You can also override the `LIBSASS_DIR` path by augmenting msbuild properties, such as: `/p:LIBSASS_DIR=../../some/path/leading/to/libsass;Configuration=Release`. + The executable will be in the bin folder under sassc (`sassc\bin\sassc.exe`). To run it, simply try something like ```cmd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/sassc.c new/sassc-3.4.2/sassc.c --- old/sassc-3.3.6/sassc.c 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/sassc.c 2016-12-16 00:01:35.000000000 +0100 @@ -2,6 +2,9 @@ #ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS 1 #endif +#ifndef _CRT_NONSTDC_NO_WARNINGS +#define _CRT_NONSTDC_NO_WARNINGS 1 +#endif #endif #include @@ -19,8 +22,13 @@ #endif #ifdef _WIN32 +#include +#include #include +#define isatty(h) _isatty(h) +#define fileno(m) _fileno(m) + int get_argv_utf8(int* argc_ptr, char*** argv_ptr) { int argc; char** argv; @@ -40,6 +48,8 @@ *argv_ptr = argv; return 0; } +#else +#include #endif int output(int error_status, const char* error_message, const char* output_string, const char* outfile) { @@ -52,7 +62,7 @@ return 1; } else if (output_string) { if(outfile) { - FILE* fp = fopen(outfile, "w"); + FILE* fp = fopen(outfile, "wb"); if(!fp) { perror("Error opening output file"); return 1; @@ -65,6 +75,9 @@ fclose(fp); } else { + #ifdef _WIN32 + setmode(fileno(stdout), O_BINARY); + #endif printf("%s", output_string); } return 0; @@ -125,6 +138,7 @@ struct Sass_File_Context* ctx = sass_make_file_context(input_path); struct Sass_Context* ctx_out = sass_file_context_get_context(ctx); if (outfile) sass_option_set_output_path(options, outfile); + const char* srcmap_file = sass_option_get_source_map_file(options); sass_option_set_input_path(options, input_path); sass_file_context_set_options(ctx, options); @@ -137,12 +151,12 @@ outfile ); - if (ret == 0 && sass_option_get_source_map_file(options)) { + if (ret == 0 && srcmap_file) { ret = output( sass_context_get_error_status(ctx_out), sass_context_get_error_message(ctx_out), sass_context_get_source_map_string(ctx_out), - sass_option_get_source_map_file(options) + srcmap_file ); } @@ -188,6 +202,7 @@ printf(" -m, --sourcemap Emit source map.\n"); printf(" -M, --omit-map-comment Omits the source map url comment.\n"); printf(" -p, --precision Set the precision for numbers.\n"); + printf(" -a, --sass Treat input as indented syntax.\n"); printf(" -v, --version Display compiled versions.\n"); printf(" -h, --help Display this help message.\n"); printf("\n"); @@ -206,6 +221,11 @@ #ifdef _WIN32 get_argv_utf8(&argc, &argv); #endif + if ((argc == 1) && isatty(fileno(stdin))) { + print_usage(argv[0]); + return 0; + } + char *outfile = 0; int from_stdin = 0; bool generate_source_map = false; @@ -228,10 +248,11 @@ { "omit-map-comment", no_argument, 0, 'M' }, { "precision", required_argument, 0, 'p' }, { "version", no_argument, 0, 'v' }, + { "sass", no_argument, 0, 'a' }, { "help", no_argument, 0, 'h' }, { NULL, 0, NULL, 0} }; - while ((c = getopt_long(argc, argv, "vhslmMp:t:I:P:", long_options, &long_index)) != -1) { + while ((c = getopt_long(argc, argv, "vhslmMap:t:I:P:", long_options, &long_index)) != -1) { switch (c) { case 's': from_stdin = 1; @@ -271,11 +292,16 @@ sass_option_set_precision(options, atoi(optarg)); // TODO: make this more robust if (sass_option_get_precision(options) < 0) sass_option_set_precision(options, 5); break; + case 'a': + sass_option_set_is_indented_syntax_src(options, true); + break; case 'v': print_version(); + sass_delete_options(options); return 0; case 'h': print_usage(argv[0]); + sass_delete_options(options); return 0; case '?': /* Unrecognized flag or missing an expected value */ @@ -283,6 +309,7 @@ invalid_usage(argv[0]); default: fprintf(stderr, "Unknown error while processing arguments\n"); + sass_delete_options(options); return 2; } } @@ -293,7 +320,8 @@ } int result; - if(optind < argc && strcmp(argv[optind], "-") != 0 && !from_stdin) { + const char* dash = "-"; + if(optind < argc && strcmp(argv[optind], dash) != 0 && !from_stdin) { if (optind + 1 < argc) { outfile = argv[optind + 1]; } @@ -312,5 +340,7 @@ result = compile_stdin(options, outfile); } + sass_delete_options(options); + return result; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/sassloop.c new/sassc-3.4.2/sassloop.c --- old/sassc-3.3.6/sassloop.c 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/sassloop.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -#include -#include -#include -#include "libsass/sass_interface.h" - -int main(int argc, char** argv) -{ - if (argc < 3) { - printf("Usage: sassloop [INPUT FILE] [ITERATIONS]\n"); - return 0; - } - int i; - for (i = 0; i < atoi(argv[2]); ++i) { - printf("\n***\n*** PASS %d ***\n***\n\n", i); - struct sass_file_context* ctx = sass_new_file_context(); - printf("*** ALLOCATED A NEW CONTEXT\n"); - ctx->options.include_paths = ""; - ctx->options.output_style = SASS_STYLE_NESTED; - ctx->input_path = argv[1]; - printf("*** POPULATED THE CONTEXT\n"); - sass_compile_file(ctx); - printf("*** COMPILED THE FILE\n"); - if (ctx->error_status) { - if (ctx->error_message) printf("%s", ctx->error_message); - else printf("An error occured; no error message available.\n"); - } - else if (ctx->output_string) { - printf("%s", ctx->output_string); - } - else { - printf("Unknown internal error.\n"); - } - - sass_free_file_context(ctx); - printf("*** DEALLOCATED THE CONTEXT\n"); - sleep(1); - } - return 0; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/script/bootstrap new/sassc-3.4.2/script/bootstrap --- old/sassc-3.3.6/script/bootstrap 1970-01-01 01:00:00.000000000 +0100 +++ new/sassc-3.4.2/script/bootstrap 2016-12-16 00:01:35.000000000 +0100 @@ -0,0 +1,26 @@ +#!/bin/bash + +set -e + +SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../ && pwd )" + +if [ "x$SASS_LIBSASS_PATH" == "x" ]; then + export SASS_LIBSASS_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../libsass/ && pwd )" + echo "SASS_LIBSASS_PATH variable is missing missing, so using $SASS_LIBSASS_PATH" +fi +if [ ! -d "$SASS_LIBSASS_PATH" ]; then + git clone https://github.com/sass/libsass.git "$SASS_LIBSASS_PATH" +else + echo "LibSass already exists, skiping Git Clone" +fi + +if [ "x$SASS_SPEC_PATH" == "x" ]; then + export SASS_SPEC_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../sass-spec/ && pwd )" + echo "SASS_SPEC_PATH variable is missing, so using $SASS_SPEC_PATH" +fi + +if [ ! -d "$SASS_SPEC_PATH" ]; then + git clone https://github.com/sass/sass-spec.git "$SASS_SPEC_PATH" +else + echo "sass-spec already exists, skiping Git Clone" +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/spec.rb new/sassc-3.4.2/spec.rb --- old/sassc-3.3.6/spec.rb 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/spec.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -#!/usr/bin/env ruby - -puts "This is now in https://github.com/sass/sass-spec" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/win/sassc.sln new/sassc-3.4.2/win/sassc.sln --- old/sassc-3.3.6/win/sassc.sln 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/win/sassc.sln 2016-12-16 00:01:35.000000000 +0100 @@ -1,22 +1,60 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sassc", "sassc.vcxproj", "{E4030474-AFC9-4CC6-BEB6-D846F631502B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".SolutionItems", ".SolutionItems", "{66CDE359-E53F-46E9-9B1E-EC30B50D30AF}" + ProjectSection(SolutionItems) = preProject + ..\.editorconfig = ..\.editorconfig + ..\.gitignore = ..\.gitignore + ..\.travis.yml = ..\.travis.yml + ..\appveyor.yml = ..\appveyor.yml + ..\LICENSE = ..\LICENSE + ..\Readme.md = ..\Readme.md + ..\sassc_version.h.in = ..\sassc_version.h.in + ..\version.sh = ..\version.sh + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{5CDEB969-5B7C-4653-BD2D-51D0222BD53D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "building", "building", "{1B7DFCCC-9806-43B5-8739-5E2D9C55CE42}" + ProjectSection(SolutionItems) = preProject + ..\docs\building\unix-instructions.md = ..\docs\building\unix-instructions.md + ..\docs\building\windows-instructions.md = ..\docs\building\windows-instructions.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testing", "testing", "{4F8D4A73-7FE3-4602-8B46-68FEC98BD69E}" + ProjectSection(SolutionItems) = preProject + ..\docs\testing\unix-instructions.md = ..\docs\testing\unix-instructions.md + ..\docs\testing\windows-instructions.md = ..\docs\testing\windows-instructions.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug without static runtime|Win32 = Debug without static runtime|Win32 + Debug without static runtime|Win64 = Debug without static runtime|Win64 Debug|Win32 = Debug|Win32 Debug|Win64 = Debug|Win64 + Release without static runtime|Win32 = Release without static runtime|Win32 + Release without static runtime|Win64 = Release without static runtime|Win64 Release|Win32 = Release|Win32 Release|Win64 = Release|Win64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Debug without static runtime|Win32.ActiveCfg = Debug without static runtime|Win32 + {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Debug without static runtime|Win32.Build.0 = Debug without static runtime|Win32 + {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Debug without static runtime|Win64.ActiveCfg = Debug without static runtime|x64 + {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Debug without static runtime|Win64.Build.0 = Debug without static runtime|x64 {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Debug|Win32.ActiveCfg = Debug|Win32 {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Debug|Win32.Build.0 = Debug|Win32 {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Debug|Win64.ActiveCfg = Debug|x64 {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Debug|Win64.Build.0 = Debug|x64 + {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Release without static runtime|Win32.ActiveCfg = Release without static runtime|Win32 + {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Release without static runtime|Win32.Build.0 = Release without static runtime|Win32 + {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Release without static runtime|Win64.ActiveCfg = Release without static runtime|x64 + {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Release without static runtime|Win64.Build.0 = Release without static runtime|x64 {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Release|Win32.ActiveCfg = Release|Win32 {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Release|Win32.Build.0 = Release|Win32 {E4030474-AFC9-4CC6-BEB6-D846F631502B}.Release|Win64.ActiveCfg = Release|x64 @@ -25,4 +63,9 @@ GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {5CDEB969-5B7C-4653-BD2D-51D0222BD53D} = {66CDE359-E53F-46E9-9B1E-EC30B50D30AF} + {1B7DFCCC-9806-43B5-8739-5E2D9C55CE42} = {5CDEB969-5B7C-4653-BD2D-51D0222BD53D} + {4F8D4A73-7FE3-4602-8B46-68FEC98BD69E} = {5CDEB969-5B7C-4653-BD2D-51D0222BD53D} + EndGlobalSection EndGlobal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/win/sassc.vcxproj new/sassc-3.4.2/win/sassc.vcxproj --- old/sassc-3.3.6/win/sassc.vcxproj 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/win/sassc.vcxproj 2016-12-16 00:01:35.000000000 +0100 @@ -3,9 +3,10 @@ <PropertyGroup> [NA] [NA] - ..\.. + ..\.. $(LIBSASS_DIR)\src $(LIBSASS_DIR)\src + $(LIBSASS_DIR)\include </PropertyGroup> <Target Name="GitVersion"> <Exec Command="git -C .. describe --abbrev=4 --dirty --always --tags" LogStandardErrorAsError="true" ContinueOnError="true" ConsoleToMSBuild="true"> @@ -40,6 +41,14 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Debug without static runtime|Win32"> + <Configuration>Debug without static runtime</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug without static runtime|x64"> + <Configuration>Debug without static runtime</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -48,6 +57,14 @@ <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release without static runtime|Win32"> + <Configuration>Release without static runtime</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release without static runtime|x64"> + <Configuration>Release without static runtime</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Label="Globals"> @@ -68,92 +85,54 @@ <PropertyGroup Label="VS2015 toolset selection" Condition="'$(VisualStudioVersion)' == '14.0'"> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' Or '$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <UseDebugLibraries>true</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32' Or '$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' Or '$(Configuration)|$(Platform)' == 'Debug|x64'"> + <PropertyGroup Condition="$(Configuration.StartsWith('Debug'))"> <LinkIncremental>true</LinkIncremental> + <UseDebugLibraries>true</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|Win32' Or '$(Configuration)|$(Platform)' == 'Release|x64'"> + <PropertyGroup Condition="$(Configuration.StartsWith('Release'))"> <LinkIncremental>false</LinkIncremental> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>..;posix;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..;posix;$(LIBSASS_INCLUDES_DIR);$(LIBSASS_HEADERS_DIR);$(LIBSASS_INCLUDES_DIR)\sass;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AssemblerListingLocation>$(IntDir)/%(RelativeDir)/</AssemblerListingLocation> + <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName> + <XMLDocumentationFileName>$(IntDir)/%(RelativeDir)/</XMLDocumentationFileName> </ClCompile> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ItemDefinitionGroup Condition="$(Configuration.StartsWith('Debug'))"> <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader></PrecompiledHeader> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">WIN64;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary Condition="'$(Configuration)'!='Debug without static runtime'">MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ItemDefinitionGroup Condition="$(Configuration.StartsWith('Release'))"> <ClCompile> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader></PrecompiledHeader> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">WIN64;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary Condition="'$(Configuration)'!='Release without static runtime'">MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sassc-3.3.6/win/sassc.vcxproj.filters new/sassc-3.4.2/win/sassc.vcxproj.filters --- old/sassc-3.3.6/win/sassc.vcxproj.filters 2016-04-23 11:23:54.000000000 +0200 +++ new/sassc-3.4.2/win/sassc.vcxproj.filters 2016-12-16 00:01:35.000000000 +0100 @@ -27,6 +27,48 @@ <ClInclude Include="posix\getopt.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass.h"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass2scss.h"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\base.h"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\context.h"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\functions.h"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\values.h"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\version.h"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_HEADERS_DIR)\b64\cencode.h"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass.hpp"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_context.hpp"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_functions.hpp"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_values.hpp"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_HEADERS_DIR)\check_nesting.hpp"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> + <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\version.h.in"> + <Filter>LibSass\Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup Label="Sources"> <ClCompile Include="..\sassc.c"> @@ -35,6 +77,12 @@ <ClCompile Include="posix\getopt.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Condition="$(VisualStudioVersion) &lt; 14.0" Include="$(LIBSASS_SRC_DIR)\c99func.c"> + <Filter>LibSass\Source Files</Filter> + </ClCompile> + <ClCompile Include="$(LIBSASS_SRC_DIR)\check_nesting.cpp"> + <Filter>LibSass\Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup Label="LibSass Headers"> <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast.hpp"> @@ -58,9 +106,6 @@ <ClInclude Include="$(LIBSASS_HEADERS_DIR)\bind.hpp"> <Filter>LibSass\Header Files</Filter> </ClInclude> - <ClInclude Include="$(LIBSASS_SRC_DIR)\cencode.h"> - <Filter>LibSass\Header Files</Filter> - </ClInclude> <ClInclude Include="$(LIBSASS_HEADERS_DIR)\color_maps.hpp"> <Filter>LibSass\Header Files</Filter> </ClInclude> @@ -160,9 +205,6 @@ <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_c.hpp"> <Filter>LibSass\Header Files</Filter> </ClInclude> - <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_string.hpp"> - <Filter>LibSass\Header Files</Filter> - </ClInclude> <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_value.hpp"> <Filter>LibSass\Header Files</Filter> </ClInclude> @@ -279,9 +321,6 @@ <ClCompile Include="$(LIBSASS_SRC_DIR)\sass.cpp"> <Filter>LibSass\Source Files</Filter> </ClCompile> - <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_interface.cpp"> - <Filter>LibSass\Source Files</Filter> - </ClCompile> <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_context.cpp"> <Filter>LibSass\Source Files</Filter> </ClCompile> @@ -303,9 +342,6 @@ <ClCompile Include="$(LIBSASS_SRC_DIR)\to_c.cpp"> <Filter>LibSass\Source Files</Filter> </ClCompile> - <ClCompile Include="$(LIBSASS_SRC_DIR)\to_string.cpp"> - <Filter>LibSass\Source Files</Filter> - </ClCompile> <ClCompile Include="$(LIBSASS_SRC_DIR)\to_value.cpp"> <Filter>LibSass\Source Files</Filter> </ClCompile> @@ -322,4 +358,4 @@ <Filter>LibSass\Source Files</Filter> </ClCompile> </ItemGroup> -</Project> +</Project> \ No newline at end of file