Skip to content
Closed
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
2 changes: 1 addition & 1 deletion modules/javafx.web/src/main/legal/libxml2.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## xmlsoft.org: libxml2 v2.13.8
## xmlsoft.org: libxml2 v2.14.5

### libxml2 License
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Updating libxml in OpenJFX:
- For windows
4. Configure libxml.
> cd modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src/win32
> cscript configure.js compiler=msvc catalog=no xml_debug=no docb=no ftp=no http=no iconv=no legacy=no mem_debug=no modules=no regexps=no run_debug=no schemas=no schematron=no valid=no xinclude=no xptr=no zlib=no

> cscript configure.js compiler=msvc catalog=no xml_debug=no http=no iconv=no legacy=no modules=no regexps=no schemas=no schematron=no valid=no xinclude=no xptr=no zlib=no
- Above command generates a header file `libxml\src\include\libxml\xmlversion.h` and may update the `src/config.h` file. (on all platforms)

4.1 Copy `libxml\src\include\libxml\xmlversion.h` to `libxml\win32\include\libxml\xmlversion.h'. xmlversion.h file defines several macros to control libxml features. We do not require all of the features to be enabled. Compare the generated `libxml\src\include\libxml\xmlversion.h` with existing `libxml\win32\include\libxml\xmlversion.h' and retain macro definitions from the later.

4.2 Copy `libxml\src\config.h` to `libxml\win32\config.h`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,80 +1,48 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */

/* A form that will not confuse apibuild.py */
#define ATTRIBUTE_DESTRUCTOR __attribute__((destructor))
/* Define to 1 if you have the declaration of `getentropy', and to 0 if you
don't. */
#define HAVE_DECL_GETENTROPY 0

/* Define to 1 if you have the <arpa/inet.h> header file. */
/* #undef HAVE_ARPA_INET_H */
/* Define to 1 if you have the declaration of `glob', and to 0 if you don't.
*/
#define HAVE_DECL_GLOB 1

/* Define if __attribute__((destructor)) is accepted */
#define HAVE_ATTRIBUTE_DESTRUCTOR 1
/* Define to 1 if you have the declaration of `mmap', and to 0 if you don't.
*/
#define HAVE_DECL_MMAP 1

/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1

/* Have dlopen based dso */
#define HAVE_DLOPEN /**/

/* Define to 1 if you have the <dl.h> header file. */
/* #undef HAVE_DL_H */

/* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1

/* Define to 1 if you have the `ftime' function. */
#define HAVE_FTIME 1

/* getentropy */
/* #undef HAVE_GETENTROPY */

/* Define to 1 if you have the `gettimeofday' function. */
#define HAVE_GETTIMEOFDAY 1

/* Define to 1 if you have the <glob.h> header file. */
#define HAVE_GLOB_H 1
/* Define to 1 if the system has the `destructor' function attribute */
#define HAVE_FUNC_ATTRIBUTE_DESTRUCTOR 1

/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1

/* Define if history library is there (-lhistory) */
/* Define if history library is available */
/* #undef HAVE_LIBHISTORY */

/* Define if readline library is there (-lreadline) */
/* Define if readline library is available */
/* #undef HAVE_LIBREADLINE */

/* Define to 1 if you have the <lzma.h> header file. */
/* #undef HAVE_LZMA_H */

/* Define to 1 if you have the `mmap' function. */
#define HAVE_MMAP 1

/* Define to 1 if you have the `munmap' function. */
#define HAVE_MUNMAP 1

/* mmap() is no good without munmap() */
#if defined(HAVE_MMAP) && !defined(HAVE_MUNMAP)
# undef /**/ HAVE_MMAP
#endif

/* Define to 1 if you have the <netdb.h> header file. */
/* #undef HAVE_NETDB_H */

/* Define to 1 if you have the <netinet/in.h> header file. */
/* #undef HAVE_NETINET_IN_H */

/* Define to 1 if you have the <poll.h> header file. */
/* #undef HAVE_POLL_H */

/* Define to 1 if you have the <pthread.h> header file. */
#define HAVE_PTHREAD_H /**/
#define HAVE_PTHREAD_H 1

/* Have shl_load based dso */
/* #undef HAVE_SHLLOAD */

/* Define to 1 if you have the `stat' function. */
#define HAVE_STAT 1

/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1

Expand All @@ -90,27 +58,9 @@
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1

/* Define to 1 if you have the <sys/mman.h> header file. */
#define HAVE_SYS_MMAN_H 1

/* Define to 1 if you have the <sys/random.h> header file. */
/* #define HAVE_SYS_RANDOM_H */

/* Define to 1 if you have the <sys/select.h> header file. */
/* #undef HAVE_SYS_SELECT_H */

/* Define to 1 if you have the <sys/socket.h> header file. */
/* #undef HAVE_SYS_SOCKET_H */

/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1

/* Define to 1 if you have the <sys/timeb.h> header file. */
#define HAVE_SYS_TIMEB_H 1

/* Define to 1 if you have the <sys/time.h> header file. */
#define HAVE_SYS_TIME_H 1

/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1

Expand All @@ -133,7 +83,7 @@
#define PACKAGE_NAME "libxml2"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "libxml2 2.13.6"
#define PACKAGE_STRING "libxml2 2.14.5"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libxml2"
Expand All @@ -142,21 +92,18 @@
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION "2.13.6"
#define PACKAGE_VERSION "2.14.5"

/* Define to 1 if all of the C90 standard headers exist (not just the ones
required in a freestanding environment). This macro is provided for
backward compatibility; new code need not use it. */
#define STDC_HEADERS 1

/* Support for IPv6 */
/* #undef SUPPORT_IP6 */

/* Version number of package */
#define VERSION "2.13.6"
#define VERSION "2.14.5"

/* Determine what socket length (socklen_t) data type is */
/* #undef XML_SOCKLEN_T */
/* System configuration directory (/etc) */
#define XML_SYSCONFDIR "/usr/local/etc"

/* TLS specifier */
/* #undef XML_THREAD_LOCAL */
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
*
* the version string like "1.2.3"
*/
#define LIBXML_DOTTED_VERSION "2.13.6"
#define LIBXML_DOTTED_VERSION "2.14.5"

/**
* LIBXML_VERSION:
*
* the version number: 1.2.3 value is 10203
*/
#define LIBXML_VERSION 21306
#define LIBXML_VERSION 21405

/**
* LIBXML_VERSION_STRING:
Expand All @@ -44,7 +44,7 @@
* Macro to check that the libxml version in use is compatible with
* the version the software has been compiled against
*/
#define LIBXML_TEST_VERSION xmlCheckVersion(21306);
#define LIBXML_TEST_VERSION xmlCheckVersion(21405);

/**
* LIBXML_THREAD_ENABLED:
Expand All @@ -67,11 +67,9 @@
/**
* LIBXML_TREE_ENABLED:
*
* Whether the DOM like tree manipulation API support is configured in
* Always enabled since 2.14.0
*/
#if 1
#define LIBXML_TREE_ENABLED
#endif

/**
* LIBXML_OUTPUT_ENABLED:
Expand Down Expand Up @@ -127,15 +125,6 @@
#define LIBXML_SAX1_ENABLED
#endif

/**
* LIBXML_FTP_ENABLED:
*
* Whether the FTP support is configured in
*/
#if 0
#define LIBXML_FTP_ENABLED
#endif

/**
* LIBXML_HTTP_ENABLED:
*
Expand Down Expand Up @@ -166,11 +155,9 @@
/**
* LIBXML_LEGACY_ENABLED:
*
* Whether the deprecated APIs are compiled in for compatibility
* Removed in 2.14
*/
#if 0
#define LIBXML_LEGACY_ENABLED
#endif
#undef LIBXML_LEGACY_ENABLED

/**
* LIBXML_C14N_ENABLED:
Expand Down Expand Up @@ -208,15 +195,6 @@
#define LIBXML_XPTR_ENABLED
#endif

/**
* LIBXML_XPTR_LOCS_ENABLED:
*
* Whether support for XPointer locations is configured in
*/
#if 0
#define LIBXML_XPTR_LOCS_ENABLED
#endif

/**
* LIBXML_XINCLUDE_ENABLED:
*
Expand Down Expand Up @@ -265,11 +243,9 @@
/**
* LIBXML_UNICODE_ENABLED:
*
* Whether the Unicode related interfaces are compiled in
* Removed in 2.14
*/
#if 0
#define LIBXML_UNICODE_ENABLED
#endif
#undef LIBXML_UNICODE_ENABLED

/**
* LIBXML_REGEXP_ENABLED:
Expand Down
Loading