History

Merge pull request #1308 from simon04/openjdk-11

Simon Legner committed 5 years ago

Commit 7976b042 parents d6008f1 8bfc6544 files · +32 −4Browse files

Unified · Split

4 files
  1. assets/javascripts/templates/pages/about_tmpl.coffee +1 −1
  2. docs/file-scrapers.md +18 −0
  3. lib/docs/filters/openjdk/clean_html.rb +5 −2
  4. lib/docs/scrapers/openjdk.rb +8 −1
assets/javascripts/templates/pages/about_tmpl.coffee+1−1
@@ -548,7 +548,7 @@ credits = [ · 547 unmodified lines
548 'https://octave.org/doc/interpreter/'548 'https://octave.org/doc/interpreter/'
549 ], [549 ], [
550 'OpenJDK',550 'OpenJDK',
551 '1993-2017, Oracle and/or its affiliates. All rights reserved.<br>Licensed under the GNU General Public License, version 2, with the Classpath Exception.<br>Various third party code in OpenJDK is licensed under different licenses.<br>Java and OpenJDK are trademarks or registered trademarks of Oracle and/or its affiliates.',551 '1993, 2020, Oracle and/or its affiliates. All rights reserved.<br>Licensed under the GNU General Public License, version 2, with the Classpath Exception.<br>Various third party code in OpenJDK is licensed under different licenses.<br>Java and OpenJDK are trademarks or registered trademarks of Oracle and/or its affiliates.',
552 'GPLv2',552 'GPLv2',
553 'http://openjdk.java.net/legal/gplv2+ce.html'553 'http://openjdk.java.net/legal/gplv2+ce.html'
554 ], [554 ], [
docs/file-scrapers.md+18−0
@@ -80,6 +80,24 @@ $GS = '/usr/local/opt/ghostscript/bin/gs'; # GhostScript · 79 unmodified lines
80 80
81## OpenJDK81## OpenJDK
82 82
83https://packages.debian.org/sid/openjdk-11-doc
84
85```sh
86mkdir docs/openjdk~11
87curl --remote-name http://ftp.debian.org/debian/pool/main/o/openjdk-11/openjdk-11-doc_11.0.9.1+1-1_all.deb
88bsdtar --extract --to-stdout --file openjdk-11-doc_11.0.9.1+1-1_all.deb data.tar.xz | \
89bsdtar --extract --xz --file - --strip-components=6 --directory=docs/openjdk\~11/ ./usr/share/doc/openjdk-11-jre-headless/api/
90```
91
92https://packages.debian.org/sid/openjdk-8-doc
93
94```sh
95mkdir docs/openjdk~8
96curl --remote-name http://ftp.debian.org/debian/pool/main/o/openjdk-8/openjdk-8-doc_8u272-b10-1_all.deb
97bsdtar --extract --to-stdout --file openjdk-8-doc_8u272-b10-1_all.deb data.tar.xz | \
98bsdtar --extract --xz --file - --strip-components=6 --directory=docs/openjdk\~8/ ./usr/share/doc/openjdk-8-jre-headless/api/
99```
100
83## Perl101## Perl
84 102
85## PHP103## PHP
lib/docs/filters/openjdk/clean_html.rb+5−2
@@ -33,7 +33,7 @@ module Docs · 32 unmodified lines
33 node.content = node.content.remove(' Summary').remove(' Detail').pluralize33 node.content = node.content.remove(' Summary').remove(' Detail').pluralize
34 end34 end
35 35
36 if root_page?36 if root_page? && version == '8'
37 css('.header')[1].remove37 css('.header')[1].remove
38 css('.contentContainer')[0].remove38 css('.contentContainer')[0].remove
39 css('.contentContainer')[-1].remove39 css('.contentContainer')[-1].remove
@@ -45,7 +45,10 @@ module Docs · 5 unmodified lines
45 end45 end
46 end46 end
47 47
48 at_css('h1').content = "OpenJDK #{release} Documentation" + (version != release ? " (#{version.split(' ').last})" : '')48 end
49
50 if root_page?
51 at_css('h1').content = "OpenJDK #{release} Documentation"
49 end52 end
50 53
51 css('table').each do |node|54 css('table').each do |node|
lib/docs/scrapers/openjdk.rb+8−1
@@ -18,13 +18,20 @@ module Docs · 17 unmodified lines
18 /doc-files\//]18 /doc-files\//]
19 19
20 options[:attribution] = <<-HTML20 options[:attribution] = <<-HTML
21 &copy; 1993&ndash;2017, Oracle and/or its affiliates. All rights reserved.<br>21 &copy; 1993, 2020, Oracle and/or its affiliates. All rights reserved.<br>
22 Documentation extracted from Debian's OpenJDK Development Kit package.<br>22 Documentation extracted from Debian's OpenJDK Development Kit package.<br>
23 Licensed under the GNU General Public License, version 2, with the Classpath Exception.<br>23 Licensed under the GNU General Public License, version 2, with the Classpath Exception.<br>
24 Various third party code in OpenJDK is licensed under different licenses (see Debian package).<br>24 Various third party code in OpenJDK is licensed under different licenses (see Debian package).<br>
25 Java and OpenJDK are trademarks or registered trademarks of Oracle and/or its affiliates.25 Java and OpenJDK are trademarks or registered trademarks of Oracle and/or its affiliates.
26 HTML26 HTML
27 27
28 version '11' do
29 self.release = '11.0.9'
30 self.root_path = 'index.html'
31 self.base_url = 'https://docs.oracle.com/en/java/javase/11/docs/api/'
32 options[:only_patterns] = [/\Ajava\./]
33 end
34
28 version '8' do35 version '8' do
29 self.release = '8'36 self.release = '8'
30 37