Merge branch 'develop'

tuananh · Jul 1, 2017 · cabd6d4 · cabd6d4
2 parents a2b398f + bfc932e
commit cabd6d4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,26 @@
 language: node_js
+os:
+  - linux
+  - osx
 node_js:
-- '6'
-- '7'
-- '8'
+  - '6'
+  - '7'
+  - '8'
 env:
-- CXX=g++-4.9
+  - CXX=g++-4.9
 addons:
   apt:
     sources:
-    - ubuntu-toolchain-r-test
+      - ubuntu-toolchain-r-test
     packages:
-    - g++-4.9
-
+      - g++-4.9
+before_install:
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then export CXX=clang++; fi
+  - $CXX --version
+  - echo $TRAVIS_BRANCH
+  - echo `git describe --tags --always HEAD`
+  - npm config set progress false
+  - npm config set spin false
 script:
   - npm test
   - if [[ $TRAVIS_TAG ]] ||

diff --git a/binding.gyp b/binding.gyp
@@ -39,12 +39,15 @@
     'xcode_settings': {
       'OTHER_CPLUSPLUSFLAGS': [
         '-std=c++11',
+        '-stdlib=libc++',
         '-fexceptions',
         '-Wall',
         '-march=native',
         '-Ofast'
       ],
-
+      'OTHER_LDFLAGS':[
+        '-stdlib=libc++'
+      ]
     }
   }, {
     "target_name": "action_after_build",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "camaro",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Transforming XML to JSON using Node.js binding to native pugixml parser library",
   "homepage": "https://github.com/tuananh/camaro",
   "bugs": "https://github.com/tuananh/camaro/issues",