Skip to content

Merge upstream changes to support node 8.1.4 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
0e1691f
Precompiled binary support
rchipka May 11, 2016
f19b439
turn on -Wall -Werror and fix existing warnings
defunctzombie May 23, 2016
cb3b396
travis: remove node v8 and iojs
defunctzombie May 23, 2016
b98227f
fix unused variable during build
defunctzombie May 23, 2016
0f820dd
remove -Wall -Werror from libxml2 build
defunctzombie May 23, 2016
e1cea05
Merge pull request #411 from libxmljs/fix-build
defunctzombie May 23, 2016
abfa5a6
Bump libxml to 2.9.4
gagern Jun 2, 2016
d461c8e
Include upstream copyright notice for libxml2 (#419)
gagern Jun 3, 2016
96e257f
Merge pull request #407 from rchipka/issue-395
rchipka Jan 11, 2017
ecd5d34
Windows builds for Node 6 & 7
rchipka Jan 12, 2017
25f795f
Better memory usage check
rchipka Jan 12, 2017
5f9a2c7
Update binary package name
rchipka Jan 12, 2017
0e22bb8
Merge pull request #445 from rchipka/master
rchipka Jan 12, 2017
68adb3d
v0.18.1
rchipka Jan 12, 2017
1a193ab
Merge pull request #446 from rchipka/master
rchipka Jan 12, 2017
8df7002
New build archs, deploy as tar.gz, always use MSVS 2015
rchipka Jan 12, 2017
292ac28
Merge pull request #447 from rchipka/master
rchipka Jan 12, 2017
d299d95
v0.18.2
rchipka Jan 12, 2017
422798f
Merge pull request #448 from rchipka/master
rchipka Jan 12, 2017
cb87eaf
Bump NAN to v2.5.x
rchipka Jan 13, 2017
56fc7d4
Merge pull request #450 from rchipka/master
rchipka Jan 13, 2017
35c4ccf
v0.18.3
rchipka Jan 13, 2017
779417c
Merge pull request #452 from rchipka/master
rchipka Jan 16, 2017
a74096e
v0.18.4
rchipka Jan 16, 2017
ea352f4
Merge pull request #453 from rchipka/master
rchipka Jan 16, 2017
4f62604
Merge pull request #417 from gagern/libxml-2.9.4
rchipka Jan 17, 2017
eb7a49c
Remove -Werror, avoid libxml shared lib
rchipka Jan 17, 2017
b363c48
Merge pull request #454 from rchipka/no-static-lib
rchipka Jan 17, 2017
73ea34f
Precompiled linux/macOS binaries
Jun 26, 2017
14c2cc0
v0.18.5
Jun 26, 2017
0bdb56e
Use before_deploy
Jun 26, 2017
84c15c2
Merge pull request #470 from rchipka/master
rchipka Jun 26, 2017
7ab0b78
Fix macOS builds
Jun 26, 2017
5480e48
Merge pull request #471 from rchipka/master
rchipka Jun 26, 2017
b7c63d6
Fix env
Jun 26, 2017
88ebe3d
Merge pull request #472 from rchipka/master
rchipka Jun 26, 2017
73bf70a
Fix macOS build
Jun 27, 2017
497dbfc
v0.18.6
Jun 27, 2017
e7e53fa
Merge pull request #473 from rchipka/master
rchipka Jun 27, 2017
8d6ba69
Add node 7 & 8 builds (#475)
pietermees Jun 28, 2017
5ca9deb
v0.18.7
rchipka Jun 29, 2017
b5725c8
Merge branch 'master' of git://github.com/libxmljs/libxmljs into libx…
murrayju Jul 18, 2017
e6bec36
Merge remote-tracking branch 'origin/libxmljs-master'
murrayju Jul 18, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "vendor/libxml"]
path = vendor/libxml
url = git://git.gnome.org/libxml2
59 changes: 39 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,45 @@
language: node_js

env:
- CXX=g++-4.8

- CXX=g++-4.8
os:
- linux
- osx
node_js:
- "0.10"
- "0.12"
- iojs-1
- iojs-2
- iojs-3
- 4
- 6

- '0.10'
- '0.12'
- 4
- 6
- 7
- 8
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8

apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
sudo: false

before_install:
- $CXX --version
- case ${TRAVIS_NODE_VERSION} in 0.8*|0.10*) npm install -g npm@2 ;; esac
- if [[ $TRAVIS_OS_NAME == "osx" ]]; then export CXX=clang; fi
- $CXX --version

- PUBLISH_BINARY=false
- echo $TRAVIS_BRANCH
- echo `git describe --tags --always HEAD`

- case ${TRAVIS_NODE_VERSION} in 0.8*|0.10*) npm install -g npm@2 ;; esac
- npm config set progress false
- npm config set spin false
- npm install -g node-gyp node-pre-gyp
install:
- npm install --build-from-source
before_deploy:
- node-pre-gyp package 2>&1
deploy:
provider: releases
api_key:
secure: TVbS63BPfzMu5MlVgusGAe3tUEogStb8M2m/E+XzTF1NsSVqwClL/DJSI1Gvhqbnex7sllsbyV+WzRuU5n3o/bRlQWRqBRKOnTACWcVGbXSelTczIvqEIjc5IJA/EQJHUIL9TnDwqN2NyoIqdOrPeNh5apKzDzwFqvvqXGfBbAM=
file: build/stage/libxmljs/libxmljs/releases/download/**/*.tar.gz
file_glob: true
skip_cleanup: true
on:
tags: true
75 changes: 63 additions & 12 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,73 @@
environment:
matrix:
- nodejs_version: LTS
- nodejs_version: Stable
npm_version: latest
gyp_version: latest
pre_gyp_version: latest
github_release_token:
secure: en/UnoFHA3RsSAHM5c6zb3RAMa4V01lC3pYG1YrHSeOPFu78SUA/0lOjNe3pp8RG
matrix:
- nodejs_version: 0.10
npm_version: 4.0.3
gyp_version: 3.5.0
pre_gyp_version: 0.6.36
- nodejs_version: 0.12
npm_version: 4.0.3
gyp_version: 3.5.0
pre_gyp_version: 0.6.36
- nodejs_version: 4
- nodejs_version: 5
- nodejs_version: 6
- nodejs_version: 7
- nodejs_version: 8

os:
- Visual Studio 2013
- Visual Studio 2015
platform:
- x86
- x64

image: Visual Studio 2015

artifacts:
- path: build\**\*.tar.gz
name: libxml_binary

install:
- ps: Install-Product node $env:nodejs_version
- node --version
- ps: Install-Product node $env:nodejs_version $env:platform
- npm --version
- npm config set msvs_version 2015
- npm config set python C:\Python27\python.exe
- npm install -g npm@%npm_version%
- npm --version
- git submodule update --init --recursive
- npm install -g node-gyp@%gyp_version%
- npm install -g node-pre-gyp@%pre_gyp_version%

# work around an issue with node-gyp v3.3.1 and node 4x
# https://github.com/nodejs/node-gyp/issues/921
- npm config set -g cafile=package.json
- npm config set -g strict-ssl=false
- npm config set registry http://registry.npmjs.org/

build_script:
- npm install
- npm install --msvs_version=2015

test_script:
- npm test
- node --expose-gc node_modules/nodeunit/bin/nodeunit test

after_test:
- node-pre-gyp package 2>&1

deploy:
- provider: GitHub
release: $(APPVEYOR_REPO_TAG_NAME)
artifact: libxml_binary
auth_token: $(github_release_token)
draft: false
prerelease: false
on:
appveyor_repo_tag: true

deploy: off
after_deploy:
- npm config delete -g cafile
- npm config delete -g strict-ssl
- npm config delete registry
- node-pre-gyp clean
- npm install --fallback-to-build=false
- node --expose-gc node_modules/nodeunit/bin/nodeunit test
5 changes: 5 additions & 0 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
'vendor/libxml/include',
"<!(node -e \"require('nan')\")"
],
'cflags': [ '-Wall' ],
'xcode_settings': {
'OTHER_CFLAGS': [ '-Wall' ]
},
'sources': [
'src/libxmljs.cc',
'src/xml_attribute.cc',
Expand Down Expand Up @@ -70,6 +74,7 @@
# node-gyp 2.x doesn't add this anymore
# https://github.com/TooTallNate/node-gyp/pull/612
'xcode_settings': {
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
'OTHER_LDFLAGS': [
'-undefined dynamic_lookup'
],
Expand Down
3 changes: 2 additions & 1 deletion lib/document.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ module.exports.fromHtmlFragment = function(string, opts) {
throw new Error('fromHtmlFragment options must be an object');
}

opts.excludeImpliedElements = true;
opts.doctype = false;
opts.implied = false;

return bindings.fromHtml(string, opts);
};
Expand Down
Loading