Merge pull request sass#12 from wellington/unity

Unity
thatguystone · Jul 31, 2015 · 4a1feb3 · 4a1feb3
2 parents 65de12c + 4b2093d
commit 4a1feb3
Show file tree

Hide file tree

Showing 55 changed files with 101 additions and 195 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -43,7 +43,7 @@ install:
       Invoke-WebRequest -UserAgent wget -Uri $url -OutFile go1.5beta1.windows-amd64.zip
       &7z x -oC:\go15 go1.5beta1.windows-amd64.zip > $null
   - go version
-  - go get ./...
+  - go get github.com/wellington/spritewell
 
 build_script:
-  - go build -x -ldflags "-extldflags '-static'" github.com/wellington/go-libsass
+  - go build -x -ldflags "-extldflags '-static'"
diff --git a/libs/ast.cpp b/libs/ast.cpp
diff --git a/libs/base64vlq.cpp b/libs/base64vlq.cpp
diff --git a/libs/bind.cpp b/libs/bind.cpp
diff --git a/libs/color_maps.cpp b/libs/color_maps.cpp
diff --git a/libs/constants.cpp b/libs/constants.cpp
diff --git a/libs/context.cpp b/libs/context.cpp
diff --git a/libs/cssize.cpp b/libs/cssize.cpp
diff --git a/libs/emitter.cpp b/libs/emitter.cpp
diff --git a/libs/environment.cpp b/libs/environment.cpp
diff --git a/libs/error_handling.cpp b/libs/error_handling.cpp
diff --git a/libs/eval.cpp b/libs/eval.cpp
diff --git a/libs/expand.cpp b/libs/expand.cpp
diff --git a/libs/extend.cpp b/libs/extend.cpp
diff --git a/libs/file.cpp b/libs/file.cpp
diff --git a/libs/functions.cpp b/libs/functions.cpp
diff --git a/libs/inspect.cpp b/libs/inspect.cpp
diff --git a/libs/json.cpp b/libs/json.cpp
diff --git a/libs/lexer.cpp b/libs/lexer.cpp
diff --git a/libs/listize.cpp b/libs/listize.cpp
diff --git a/libs/memory_manager.cpp b/libs/memory_manager.cpp
diff --git a/libs/node.cpp b/libs/node.cpp
diff --git a/libs/output.cpp b/libs/output.cpp
diff --git a/libs/parser.cpp b/libs/parser.cpp
diff --git a/libs/plugins.cpp b/libs/plugins.cpp
diff --git a/libs/position.cpp b/libs/position.cpp
diff --git a/libs/prelexer.cpp b/libs/prelexer.cpp
diff --git a/libs/remove_placesholders.cpp b/libs/remove_placesholders.cpp
diff --git a/libs/sass.cpp b/libs/sass.cpp
diff --git a/libs/sass2scss.cpp b/libs/sass2scss.cpp
diff --git a/libs/sass2scss_bind.h b/libs/sass2scss_bind.h
diff --git a/libs/sass_context.cpp b/libs/sass_context.cpp
diff --git a/libs/sass_functions.cpp b/libs/sass_functions.cpp
diff --git a/libs/sass_util.cpp b/libs/sass_util.cpp
diff --git a/libs/sass_values.cpp b/libs/sass_values.cpp
diff --git a/libs/sass_version.h b/libs/sass_version.h
diff --git a/libs/source_map.cpp b/libs/source_map.cpp
diff --git a/libs/to_c.cpp b/libs/to_c.cpp
diff --git a/libs/to_string.cpp b/libs/to_string.cpp
diff --git a/libs/to_value.cpp b/libs/to_value.cpp
diff --git a/libs/toscss.go b/libs/toscss.go
@@ -1,7 +1,7 @@
 package libs
 
 // #include <stdlib.h>
-// #include "sass2scss_bind.h"
+// #include "sass2scss.h"
 import "C"
 import (
 	"io"

diff --git a/libs/units.cpp b/libs/units.cpp
diff --git a/libs/unity.cpp b/libs/unity.cpp
@@ -0,0 +1,43 @@
+#ifndef USE_LIBSASS
+#include "../libsass-build/ast.cpp"
+#include "../libsass-build/base64vlq.cpp"
+#include "../libsass-build/bind.cpp"
+#include "../libsass-build/color_maps.cpp"
+#include "../libsass-build/constants.cpp"
+#include "../libsass-build/context.cpp"
+#include "../libsass-build/cssize.cpp"
+#include "../libsass-build/emitter.cpp"
+#include "../libsass-build/environment.cpp"
+#include "../libsass-build/error_handling.cpp"
+#include "../libsass-build/eval.cpp"
+#include "../libsass-build/expand.cpp"
+#include "../libsass-build/extend.cpp"
+#include "../libsass-build/file.cpp"
+#include "../libsass-build/functions.cpp"
+#include "../libsass-build/inspect.cpp"
+#include "../libsass-build/json.cpp"
+#include "../libsass-build/lexer.cpp"
+#include "../libsass-build/listize.cpp"
+#include "../libsass-build/node.cpp"
+#include "../libsass-build/memory_manager.cpp"
+#include "../libsass-build/output.cpp"
+#include "../libsass-build/parser.cpp"
+#include "../libsass-build/plugins.cpp"
+#include "../libsass-build/position.cpp"
+#include "../libsass-build/prelexer.cpp"
+#include "../libsass-build/remove_placeholders.cpp"
+#include "../libsass-build/sass2scss.cpp"
+#include "../libsass-build/sass_context.cpp"
+#include "../libsass-build/sass_functions.cpp"
+#include "../libsass-build/sass_util.cpp"
+#include "../libsass-build/sass.cpp"
+#include "../libsass-build/sass_values.cpp"
+#include "../libsass-build/source_map.cpp"
+#include "../libsass-build/to_c.cpp"
+#include "../libsass-build/to_string.cpp"
+#include "../libsass-build/to_value.cpp"
+#include "../libsass-build/units.cpp"
+#include "../libsass-build/utf8_string.cpp"
+#include "../libsass-build/util.cpp"
+#include "../libsass-build/values.cpp"
+#endif
diff --git a/libs/utf8_string.cpp b/libs/utf8_string.cpp
diff --git a/libs/util.cpp b/libs/util.cpp
diff --git a/libs/values.cpp b/libs/values.cpp
diff --git a/libs/wrap_main.go b/libs/wrap_main.go
@@ -3,7 +3,7 @@
 package libs
 
 // #cgo CFLAGS: -O2 -fPIC
-// #cgo CPPFLAGS: -w -I../libsass-build/include
+// #cgo CPPFLAGS: -w -I../libsass-build -I../libsass-build/include
 // #cgo CXXFLAGS: -g -std=c++0x -pedantic -Wno-c++11-extensions -O2 -fPIC
 // #cgo LDFLAGS: -lstdc++ -lm
 // #cgo darwin linux LDFLAGS: -ldl

diff --git a/libs/b64/cencode.h → libsass-build/b64/cencode.h b/libs/b64/cencode.h → libsass-build/b64/cencode.h
diff --git a/libs/b64/encode.h → libsass-build/b64/encode.h b/libs/b64/encode.h → libsass-build/b64/encode.h
diff --git a/libsass-build/include/sass_version.h b/libsass-build/include/sass_version.h
@@ -2,7 +2,7 @@
 #define SASS_VERSION_H
 
 #ifndef LIBSASS_VERSION
-#define LIBSASS_VERSION "3.2.5-151-g9b4e"
+#define LIBSASS_VERSION "3.2.5-155-g295b"
 #endif
 
 #endif