Merge pull request #1439 from am11/master

Uses VS2015 for CI builds

Author: xzyfer

appveyor.yml

@@ -1,18 +1,18 @@
+os: Visual Studio 2015
+
 environment:
   CTEST_OUTPUT_ON_FAILURE: 1
+  ruby_version: 22-x64
+  TargetPath: sassc/bin/sassc
   matrix:
   - Compiler: msvc
     Config: Release
-    ruby_version: "21-x64"
   - Compiler: msvc
     Config: Debug
-    ruby_version: "21-x64"
   - Compiler: mingw
     Build: static
-    ruby_version: "21-x64"
   - Compiler: mingw
     Build: shared
-    ruby_version: "21-x64"
 
 cache:
   - C:\Ruby%ruby_version%\lib\ruby\gems
@@ -22,7 +22,7 @@ install:
   - git clone https://github.com/sass/sass-spec.git
   - set PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - ps: |
-      if(!(gem which minitest 2>$nul)) { gem install minitest }
+      if(!(gem which minitest 2>$nul)) { gem install minitest --no-ri --no-rdoc }
       if ($env:Compiler -eq "mingw" -AND -Not (Test-Path "C:\mingw64")) {
         # Install MinGW.
         $url  = "http://sourceforge.net/projects/mingw-w64/files/"
@@ -40,31 +40,16 @@ build_script:
       if ($env:Compiler -eq "mingw") {
         mingw32-make -j4 sassc
       } else {
-        msbuild /m:4 /p:Configuration=$env:Config win\libsass.sln
-      }
-  - ps: |
-      if ($env:Compiler -eq "mingw") {
-        sassc\bin\sassc.exe -v
-        ruby -v
-      } else {
-        if ($env:Config -eq "Debug") {
-          win\bin\Debug\sassc.exe -v
-          ruby -v
-        } else {
-          win\bin\sassc.exe -v
-          ruby -v
-        }
+        msbuild /m:4 /p:Configuration=$env:Config sassc\win\sassc.sln
       }
 
+      # print the branding art
+      mv script/branding script/branding.ps1
+      script/branding.ps1
+
+      # print the version info
+      &$env:TargetPath -v
+      ruby -v
+
 test_script:
-  - ps: |
-      if ($env:Compiler -eq "mingw") {
-        ruby sass-spec\sass-spec.rb -c sassc\bin\sassc.exe -s --ignore-todo sass-spec/spec
-      } else {
-        if ($env:Config -eq "Debug") {
-          echo "test runner in debug mode build via msvc will throw debug assertions"
-          echo ruby sass-spec\sass-spec.rb -c win\bin\Debug\sassc.exe -s --ignore-todo sass-spec/spec
-        } else {
-          ruby sass-spec\sass-spec.rb -c win\bin\sassc.exe -s --ignore-todo sass-spec/spec
-        }
-      }
+  - ps: ruby sass-spec/sass-spec.rb -c $env:TargetPath -s --ignore-todo sass-spec/spec

src/c99func.c

@@ -0,0 +1,59 @@
+/*
+  Copyright (C) 2011 Joseph A. Adams ([email protected])
+  All rights reserved.
+
+  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 the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NONSTDC_NO_DEPRECATE
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+#ifdef snprintf
+#undef snprintf
+#endif
+
+static int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
+{
+    int count = -1;
+
+    if (size != 0)
+        count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
+    if (count == -1)
+        count = _vscprintf(format, ap);
+
+    return count;
+}
+
+int snprintf(char* str, size_t size, const char* format, ...)
+{
+    int count;
+    va_list ap;
+
+    va_start(ap, format);
+    count = c99_vsnprintf(str, size, format, ap);
+    va_end(ap);
+
+    return count;
+}

src/json.cpp

@@ -34,35 +34,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef _MSC_VER
-
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #include <stdarg.h>
-#define snprintf c99_snprintf
-
-inline int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
-{
-    int count = -1;
-
-    if (size != 0)
-        count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
-    if (count == -1)
-        count = _vscprintf(format, ap);
-
-    return count;
-}
-
-inline int c99_snprintf(char* str, size_t size, const char* format, ...)
-{
-    int count;
-    va_list ap;
-
-    va_start(ap, format);
-    count = c99_vsnprintf(str, size, format, ap);
-    va_end(ap);
-
-    return count;
-}
-#endif // _MSC_VER
+#ifdef snprintf
+#undef snprintf
+#endif
+extern "C" int snprintf(char *, size_t, const char *, ...);
+#endif
 
 #define out_of_memory() do {                    \
     fprintf(stderr, "Out of memory.\n");    \