Merge branch 'master' into deploy

* master:
  Fix Travis CI issue
  Update haxe.rb
pull/821/head
Thibaut Courouble 7 years ago
commit 2e0c9b0688

@ -1 +1,4 @@
language: ruby
before_script:
- gem update --system
- gem update bundler

@ -302,7 +302,7 @@ credits = [
'https://www.haskell.org/ghc/license'
], [
'Haxe',
'2005-2016 Haxe Foundation',
'2005-2018 Haxe Foundation',
'MIT',
'https://haxe.org/foundation/open-source.html'
], [

@ -10,7 +10,7 @@ module Docs
options[:container] = '.span9'
options[:attribution] = <<-HTML
&copy; 2005&ndash;2016 Haxe Foundation<br>
&copy; 2005&ndash;2018 Haxe Foundation<br>
Licensed under a MIT license.
HTML
@ -20,7 +20,7 @@ module Docs
code: 'https://github.com/HaxeFoundation/haxe'
}
options[:skip_patterns] = [/\A(?:cpp|cs|flash|java|js|neko|php|python)/i]
options[:skip_patterns] = [/\A(?:cpp|cs|flash|java|js|neko|php|python|lua|hl|sys)/i]
end
version 'C++' do
@ -51,6 +51,18 @@ module Docs
self.base_url = 'https://api.haxe.org/php/'
end
version 'Lua' do
self.base_url = 'https://api.haxe.org/lua/'
end
version 'HashLink' do
self.base_url = 'https://api.haxe.org/hl/'
end
version 'Sys' do
self.base_url = 'https://api.haxe.org/sys/'
end
version 'Python' do
self.base_url = 'https://api.haxe.org/python/'
end

Loading…
Cancel
Save