Merge pull request #1046 from simon04/cmake-3.15

Jasper van Merle committed 7 years ago

Commit a41b7f02 parents 6646b10 dc2503d3 files · +28 −12Browse files

Unified · Split

3 files

assets/javascripts/templates/pages/about_tmpl.coffee +1 −1
lib/docs/filters/cmake/entries.rb +1 −0
lib/docs/scrapers/cmake.rb +26 −11

assets/javascripts/templates/pages/about_tmpl.coffee+1−1

@@ -163,7 +163,7 @@ credits = [ · 162 unmodified lines
163	163	'https://github.com/clojure/clojure/blob/master/epl-v10.html'
164	164	], [
165	165	'CMake',
166		− '2000-2018 Kitware, Inc. and Contributors',
	166	+ '2000-2019 Kitware, Inc. and Contributors',
167	167	'BSD',
168	168	'https://cmake.org/licensing/'
169	169	], [

lib/docs/filters/cmake/entries.rb+1−0

@@ -20,6 +20,7 @@ module Docs · 19 unmodified lines
20	20	'prop_sf' => 'Properties: Source Files',
21	21	'prop_test' => 'Properties: Tests',
22	22	'prop_tgt' => 'Properties: Targets',
	23	+ 'envvar' => 'Environment Variables',
23	24	'variable' => 'Variables' }
24	25
25	26	def get_name

lib/docs/scrapers/cmake.rb+26−11

@@ -13,51 +13,66 @@ module Docs · 12 unmodified lines
13	13	options[:title] = false
14	14	options[:root_title] = 'CMake Reference Documentation'
15	15	options[:skip] = %w(release/index.html genindex.html search.html)
16		− options[:skip_patterns] = [/\Agenerator/, /\Ainclude/, /\Arelease/]
	16	+ options[:skip_patterns] = [/\Agenerator/, /\Acpack_gen/, /\Ainclude/, /\Arelease/]
17	17
18	18	options[:attribution] = <<-HTML
19		− © 2000–2018 Kitware, Inc. and Contributors<br>
	19	+ © 2000–2019 Kitware, Inc. and Contributors<br>
20	20	Licensed under the BSD 3-clause License.
21	21	HTML
22	22
	23	+ version '3.15' do
	24	+ self.release = '3.15.2'
	25	+ self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
	26	+ end
	27	+
	28	+ version '3.14' do
	29	+ self.release = '3.14.6'
	30	+ self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
	31	+ end
	32	+
	33	+ version '3.13' do
	34	+ self.release = '3.13.5'
	35	+ self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
	36	+ end
	37	+
23	38	version '3.12' do
24		− self.release = '3.12.1'
25		− self.base_url = 'https://cmake.org/cmake/help/v3.12/'
	39	+ self.release = '3.12.4'
	40	+ self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
26	41	end
27	42
28	43	version '3.11' do
29	44	self.release = '3.11.4'
30		− self.base_url = 'https://cmake.org/cmake/help/v3.11/'
	45	+ self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
31	46	end
32	47
33	48	version '3.10' do
34	49	self.release = '3.10.3'
35		− self.base_url = 'https://cmake.org/cmake/help/v3.10/'
	50	+ self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
36	51	end
37	52
38	53	version '3.9' do
39	54	self.release = '3.9.6'
40		− self.base_url = 'https://cmake.org/cmake/help/v3.9/'
	55	+ self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
41	56	end
42	57
43	58	version '3.8' do
44	59	self.release = '3.8.2'
45		− self.base_url = 'https://cmake.org/cmake/help/v3.8/'
	60	+ self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
46	61	end
47	62
48	63	version '3.7' do
49	64	self.release = '3.7.2'
50		− self.base_url = 'https://cmake.org/cmake/help/v3.7/'
	65	+ self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
51	66	end
52	67
53	68	version '3.6' do
54	69	self.release = '3.6.3'
55		− self.base_url = 'https://cmake.org/cmake/help/v3.6/'
	70	+ self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
56	71	end
57	72
58	73	version '3.5' do
59	74	self.release = '3.5.2'
60		− self.base_url = 'https://cmake.org/cmake/help/v3.5/'
	75	+ self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
61	76	end
62	77
63	78	def get_latest_version(opts)