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	'https://github.com/clojure/clojure/blob/master/epl-v10.html'	163	'https://github.com/clojure/clojure/blob/master/epl-v10.html'
164	], [	164	], [
165	'CMake',	165	'CMake',
166	'2000-2018 Kitware, Inc. and Contributors',	166	'2000-2019 Kitware, Inc. and Contributors',
167	'BSD',	167	'BSD',
168	'https://cmake.org/licensing/'	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	'prop_sf' => 'Properties: Source Files',	20	'prop_sf' => 'Properties: Source Files',
21	'prop_test' => 'Properties: Tests',	21	'prop_test' => 'Properties: Tests',
22	'prop_tgt' => 'Properties: Targets',	22	'prop_tgt' => 'Properties: Targets',
		23	'envvar' => 'Environment Variables',
23	'variable' => 'Variables' }	24	'variable' => 'Variables' }
24		25
25	def get_name	26	def get_name

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

     options[:title] = false
     options[:root_title] = 'CMake Reference Documentation'
     options[:skip] = %w(release/index.html genindex.html search.html)
-    options[:skip_patterns] = [/\Agenerator/, /\Ainclude/, /\Arelease/]
+    options[:skip_patterns] = [/\Agenerator/, /\Acpack_gen/, /\Ainclude/, /\Arelease/]
     options[:attribution] = <<-HTML
-      &copy; 2000&ndash;2018 Kitware, Inc. and Contributors<br>
+      &copy; 2000&ndash;2019 Kitware, Inc. and Contributors<br>
       Licensed under the BSD 3-clause License.
     HTML
+    version '3.15' do
+      self.release = '3.15.2'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
+    end
+    version '3.14' do
+      self.release = '3.14.6'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
+    end
+    version '3.13' do
+      self.release = '3.13.5'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
+    end
     version '3.12' do
-      self.release = '3.12.1'
+      self.release = '3.12.4'
-      self.base_url = 'https://cmake.org/cmake/help/v3.12/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
     version '3.11' do
       self.release = '3.11.4'
-      self.base_url = 'https://cmake.org/cmake/help/v3.11/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
     version '3.10' do
       self.release = '3.10.3'
-      self.base_url = 'https://cmake.org/cmake/help/v3.10/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
     version '3.9' do
       self.release = '3.9.6'
-      self.base_url = 'https://cmake.org/cmake/help/v3.9/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
     version '3.8' do
       self.release = '3.8.2'
-      self.base_url = 'https://cmake.org/cmake/help/v3.8/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
     version '3.7' do
       self.release = '3.7.2'
-      self.base_url = 'https://cmake.org/cmake/help/v3.7/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
     version '3.6' do
       self.release = '3.6.3'
-      self.base_url = 'https://cmake.org/cmake/help/v3.6/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
     version '3.5' do
       self.release = '3.5.2'
-      self.base_url = 'https://cmake.org/cmake/help/v3.5/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
     def get_latest_version(opts)