Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
8269131: Update libxml2 to version 2.9.12
Reviewed-by: kcr, jvos
- Loading branch information
Showing
62 changed files
with
2,772 additions
and
2,552 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 0 additions & 6 deletions
6
modules/javafx.web/src/main/native/Source/ThirdParty/libxml/README.javafx
This file was deleted.
Oops, something went wrong.
51 changes: 51 additions & 0 deletions
51
modules/javafx.web/src/main/native/Source/ThirdParty/libxml/UPDATING.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
Updating libxml in OpenJFX: | ||
|
||
1. Download respective libxml source tarball from here: http://xmlsoft.org/sources. | ||
Alternatively we can also clone the libxml repo from github. (url- https://gitlab.gnome.org/GNOME/libxml2.git) | ||
|
||
2. Extract contents into `modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src` directory. | ||
|
||
3. We do not have any local changes in the libxml source but libxml source needs to be configured before integrating into JavaFX. Below are platform wise steps to configure. | ||
|
||
- 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 | ||
|
||
- 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` | ||
|
||
5. Remove files & directories which are not relevant to JavaFX WebKit. | ||
|
||
- For Mac | ||
6. Configure libxml. | ||
> cd modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src | ||
> ./configure | ||
|
||
6.1 Copy `libxml\src\include\libxml\xmlversion.h` to `libxml\mac\include\libxml\xmlversion.h` and follow same guidelines as Windows to retain changes from our repo. | ||
|
||
6.2 Copy libxml\src\config.h to libxml\mac\config.h | ||
|
||
- For Linux | ||
7. Configure libxml. | ||
> cd modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src | ||
> ./configure | ||
|
||
7.1 Copy `libxml\src\include\libxml\xmlversion.h` to `libxml\linux\include\libxml\xmlversion.h` and follow same guidelines as Windows to retain changes from our repo. | ||
|
||
7.2 Copy libxml\src\config.h to libxml\linux\config.h | ||
|
||
8. Helper commands for removing tabs and trailing whitespaces from source files(.h and .c). | ||
|
||
8.1 > cd modules/javafx.web/src/main/native/Source/ThirdParty/libxml | ||
|
||
8.2 Remove tabs from source files: | ||
> sudo apt install moreutils | ||
> find src/ -name "*.c" -type f -exec bash -c 'expand -t 4 "$0" | sponge "$0"' {} \; | ||
> find src/ -name "*.h" -type f -exec bash -c 'expand -t 4 "$0" | sponge "$0"' {} \; | ||
|
||
8.3 Remove trailing whitespaces from source files: | ||
> find src/ -name “*.c” -type f -exec sed --in-place 's/[[:space:]]\+$//' {} \+ | ||
> find src/ -name “*.h” -type f -exec sed --in-place 's/[[:space:]]\+$//' {} \+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
52c076c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues