diff --git a/README.md b/README.md index c4c447e..15c9231 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,6 @@ stylesheet.apply(documentString, params, function(err, result){ Libxmljs integration -------------------- -:warning: right now node-libxslt is only compatible with the temporary fork [albanm/libxmljs](https://github.com/albanm/libxmljs). -This situation will end if the [related pull request](https://github.com/polotek/libxmljs/pull/247) is accepted. - Node-libxslt depends on [libxmljs](https://github.com/polotek/libxmljs/issues/226) in the same way that [libxslt](http://xmlsoft.org/libxslt/) depends on [libxml](http://xmlsoft.org/). This dependancy makes possible to bundle and to load in memory libxml only once for users of both libraries. It is possible to work with libxmljs documents instead of strings: @@ -108,4 +105,4 @@ Environment compatibility For now 64bits linux and 32bits windows are confirmed. Other environments are probably ok, but not checked. Please report an issue if you encounter some difficulties. -Node-libxslt depends on [node-gyp](https://github.com/TooTallNate/node-gyp), you will have to go through its installation. This can be a bit painful mostly for windows users. There is no system dependancy otherwise, libxslt is bundled in the project. \ No newline at end of file +Node-libxslt depends on [node-gyp](https://github.com/TooTallNate/node-gyp), you will need to meet its requirements. This can be a bit painful mostly for windows users. The node-gyp version bundled in your npm will have to be greater than 0.13.0, so you might have to follow [these instructions to upgrade](https://github.com/TooTallNate/node-gyp/wiki/Updating-npm's-bundled-node-gyp). There is no system dependancy otherwise, libxslt is bundled in the project. \ No newline at end of file diff --git a/deps/libxslt/libxslt.gyp b/deps/libxslt/libxslt.gyp index 29203d8..6001f27 100644 --- a/deps/libxslt/libxslt.gyp +++ b/deps/libxslt/libxslt.gyp @@ -5,7 +5,7 @@ 'xmljs_libraries%': [], }, 'target_defaults': { - 'default_configuration': 'Debug', + 'default_configuration': 'Release', 'configurations': { 'Debug': { 'defines': [ 'DEBUG', '_DEBUG' ], @@ -25,8 +25,8 @@ } }, 'defines': ['HAVE_CONFIG_H','LIBXSLT_STATIC'], - 'include_dirs': [ - '.', + 'include_dirs': [ + '.', # platform and arch-specific headers 'config/<(OS)/<(target_arch)', '<@(xmljs_include_dirs)' @@ -60,10 +60,10 @@ 'libxslt/xsltutils.c' ], 'link_settings': { - 'libraries': [ - '<@(xmljs_libraries)', - ] - }, + 'libraries': [ + '<@(xmljs_libraries)', + ] + }, 'direct_dependent_settings': { 'defines': ['LIBXSLT_STATIC'], 'include_dirs': ['.', '<@(xmljs_include_dirs)', 'config/<(OS)/<(target_arch)'], @@ -88,10 +88,10 @@ 'libxslt' ], 'link_settings': { - 'libraries': [ - '<@(xmljs_libraries)' - ] - } + 'libraries': [ + '<@(xmljs_libraries)' + ] + } } ] } \ No newline at end of file diff --git a/package.json b/package.json index d204aad..990108d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "libxslt", - "version": "0.1.4", + "version": "0.1.5", "description": "Node.js bindings for libxslt compatible with libxmljs", "main": "index.js", "scripts": {