Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 891d9dc36a0e
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d7b4a3ae8e30
Choose a head ref
  • 3 commits
  • 182 files changed
  • 1 contributor

Commits on Dec 14, 2014

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b209e38 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8798016 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d7b4a3a View commit details
Showing with 82,060 additions and 17 deletions.
  1. +13 −0 configure
  2. +16 −0 rakelib/blueprint.rb
  3. +5 −0 vendor/libyaml/.gitignore
  4. +16 −0 vendor/libyaml/CMakeLists.txt
  5. +19 −0 vendor/libyaml/LICENSE
  6. +18 −0 vendor/libyaml/Makefile.am
  7. +810 −0 vendor/libyaml/Makefile.in
  8. +27 −0 vendor/libyaml/README
  9. +9,577 −0 vendor/libyaml/aclocal.m4
  10. +80 −0 vendor/libyaml/config.h.in
  11. +1,530 −0 vendor/libyaml/config/config.guess
  12. +1,773 −0 vendor/libyaml/config/config.sub
  13. +688 −0 vendor/libyaml/config/depcomp
  14. +527 −0 vendor/libyaml/config/install-sh
  15. +9,661 −0 vendor/libyaml/config/ltmain.sh
  16. +331 −0 vendor/libyaml/config/missing
  17. +14,029 −0 vendor/libyaml/configure
  18. +73 −0 vendor/libyaml/configure.ac
  19. +222 −0 vendor/libyaml/doc/doxygen.cfg
  20. +83 −0 vendor/libyaml/doc/html/annotated.html
  21. BIN vendor/libyaml/doc/html/bc_s.png
  22. +78 −0 vendor/libyaml/doc/html/classes.html
  23. BIN vendor/libyaml/doc/html/closed.png
  24. +949 −0 vendor/libyaml/doc/html/doxygen.css
  25. BIN vendor/libyaml/doc/html/doxygen.png
  26. +72 −0 vendor/libyaml/doc/html/files.html
  27. +123 −0 vendor/libyaml/doc/html/functions.html
  28. +116 −0 vendor/libyaml/doc/html/functions_0x62.html
  29. +119 −0 vendor/libyaml/doc/html/functions_0x63.html
  30. +115 −0 vendor/libyaml/doc/html/functions_0x64.html
  31. +142 −0 vendor/libyaml/doc/html/functions_0x65.html
  32. +111 −0 vendor/libyaml/doc/html/functions_0x66.html
  33. +112 −0 vendor/libyaml/doc/html/functions_0x68.html
  34. +124 −0 vendor/libyaml/doc/html/functions_0x69.html
  35. +103 −0 vendor/libyaml/doc/html/functions_0x6b.html
  36. +120 −0 vendor/libyaml/doc/html/functions_0x6c.html
  37. +128 −0 vendor/libyaml/doc/html/functions_0x6d.html
  38. +103 −0 vendor/libyaml/doc/html/functions_0x6e.html
  39. +112 −0 vendor/libyaml/doc/html/functions_0x6f.html
  40. +132 −0 vendor/libyaml/doc/html/functions_0x70.html
  41. +103 −0 vendor/libyaml/doc/html/functions_0x71.html
  42. +119 −0 vendor/libyaml/doc/html/functions_0x72.html
  43. +195 −0 vendor/libyaml/doc/html/functions_0x73.html
  44. +147 −0 vendor/libyaml/doc/html/functions_0x74.html
  45. +103 −0 vendor/libyaml/doc/html/functions_0x75.html
  46. +112 −0 vendor/libyaml/doc/html/functions_0x76.html
  47. +109 −0 vendor/libyaml/doc/html/functions_0x77.html
  48. +123 −0 vendor/libyaml/doc/html/functions_vars.html
  49. +116 −0 vendor/libyaml/doc/html/functions_vars_0x62.html
  50. +119 −0 vendor/libyaml/doc/html/functions_vars_0x63.html
  51. +115 −0 vendor/libyaml/doc/html/functions_vars_0x64.html
  52. +142 −0 vendor/libyaml/doc/html/functions_vars_0x65.html
  53. +111 −0 vendor/libyaml/doc/html/functions_vars_0x66.html
  54. +112 −0 vendor/libyaml/doc/html/functions_vars_0x68.html
  55. +124 −0 vendor/libyaml/doc/html/functions_vars_0x69.html
  56. +103 −0 vendor/libyaml/doc/html/functions_vars_0x6b.html
  57. +120 −0 vendor/libyaml/doc/html/functions_vars_0x6c.html
  58. +128 −0 vendor/libyaml/doc/html/functions_vars_0x6d.html
  59. +103 −0 vendor/libyaml/doc/html/functions_vars_0x6e.html
  60. +112 −0 vendor/libyaml/doc/html/functions_vars_0x6f.html
  61. +132 −0 vendor/libyaml/doc/html/functions_vars_0x70.html
  62. +103 −0 vendor/libyaml/doc/html/functions_vars_0x71.html
  63. +119 −0 vendor/libyaml/doc/html/functions_vars_0x72.html
  64. +195 −0 vendor/libyaml/doc/html/functions_vars_0x73.html
  65. +147 −0 vendor/libyaml/doc/html/functions_vars_0x74.html
  66. +103 −0 vendor/libyaml/doc/html/functions_vars_0x75.html
  67. +112 −0 vendor/libyaml/doc/html/functions_vars_0x76.html
  68. +109 −0 vendor/libyaml/doc/html/functions_vars_0x77.html
  69. +699 −0 vendor/libyaml/doc/html/globals.html
  70. +113 −0 vendor/libyaml/doc/html/globals_defs.html
  71. +110 −0 vendor/libyaml/doc/html/globals_enum.html
  72. +405 −0 vendor/libyaml/doc/html/globals_eval.html
  73. +228 −0 vendor/libyaml/doc/html/globals_func.html
  74. +158 −0 vendor/libyaml/doc/html/globals_type.html
  75. +349 −0 vendor/libyaml/doc/html/group__basic.html
  76. +845 −0 vendor/libyaml/doc/html/group__emitter.html
  77. +691 −0 vendor/libyaml/doc/html/group__events.html
  78. +91 −0 vendor/libyaml/doc/html/group__export.html
  79. +824 −0 vendor/libyaml/doc/html/group__nodes.html
  80. +635 −0 vendor/libyaml/doc/html/group__parser.html
  81. +251 −0 vendor/libyaml/doc/html/group__styles.html
  82. +276 −0 vendor/libyaml/doc/html/group__tokens.html
  83. +137 −0 vendor/libyaml/doc/html/group__version.html
  84. +63 −0 vendor/libyaml/doc/html/index.html
  85. +74 −0 vendor/libyaml/doc/html/modules.html
  86. BIN vendor/libyaml/doc/html/nav_f.png
  87. BIN vendor/libyaml/doc/html/nav_h.png
  88. BIN vendor/libyaml/doc/html/open.png
  89. +137 −0 vendor/libyaml/doc/html/structyaml__alias__data__s.html
  90. +264 −0 vendor/libyaml/doc/html/structyaml__document__s.html
  91. +1,321 −0 vendor/libyaml/doc/html/structyaml__emitter__s.html
  92. +525 −0 vendor/libyaml/doc/html/structyaml__event__s.html
  93. +137 −0 vendor/libyaml/doc/html/structyaml__mark__s.html
  94. +120 −0 vendor/libyaml/doc/html/structyaml__node__pair__s.html
  95. +449 −0 vendor/libyaml/doc/html/structyaml__node__s.html
  96. +1,248 −0 vendor/libyaml/doc/html/structyaml__parser__s.html
  97. +126 −0 vendor/libyaml/doc/html/structyaml__simple__key__s.html
  98. +120 −0 vendor/libyaml/doc/html/structyaml__tag__directive__s.html
  99. +442 −0 vendor/libyaml/doc/html/structyaml__token__s.html
  100. +120 −0 vendor/libyaml/doc/html/structyaml__version__directive__s.html
  101. BIN vendor/libyaml/doc/html/tab_a.png
  102. BIN vendor/libyaml/doc/html/tab_b.png
  103. BIN vendor/libyaml/doc/html/tab_h.png
  104. BIN vendor/libyaml/doc/html/tab_s.png
  105. +59 −0 vendor/libyaml/doc/html/tabs.css
  106. +546 −0 vendor/libyaml/doc/html/yaml_8h.html
  107. +17 −0 vendor/libyaml/include/Makefile.am
  108. +481 −0 vendor/libyaml/include/Makefile.in
  109. +1,971 −0 vendor/libyaml/include/yaml.h
  110. +4 −0 vendor/libyaml/src/Makefile.am
  111. +542 −0 vendor/libyaml/src/Makefile.in
  112. +1,392 −0 vendor/libyaml/src/api.c
  113. +394 −0 vendor/libyaml/src/dumper.c
  114. +2,329 −0 vendor/libyaml/src/emitter.c
  115. +444 −0 vendor/libyaml/src/loader.c
  116. +1,374 −0 vendor/libyaml/src/parser.c
  117. +469 −0 vendor/libyaml/src/reader.c
  118. +3,580 −0 vendor/libyaml/src/scanner.c
  119. +141 −0 vendor/libyaml/src/writer.c
  120. +657 −0 vendor/libyaml/src/yaml_private.h
  121. +8 −0 vendor/libyaml/tests/Makefile.am
  122. +680 −0 vendor/libyaml/tests/Makefile.in
  123. +800 −0 vendor/libyaml/tests/example-deconstructor-alt.c
  124. +1,130 −0 vendor/libyaml/tests/example-deconstructor.c
  125. +217 −0 vendor/libyaml/tests/example-reformatter-alt.c
  126. +202 −0 vendor/libyaml/tests/example-reformatter.c
  127. +311 −0 vendor/libyaml/tests/run-dumper.c
  128. +327 −0 vendor/libyaml/tests/run-emitter.c
  129. +63 −0 vendor/libyaml/tests/run-loader.c
  130. +63 −0 vendor/libyaml/tests/run-parser.c
  131. +63 −0 vendor/libyaml/tests/run-scanner.c
  132. +354 −0 vendor/libyaml/tests/test-reader.c
  133. +29 −0 vendor/libyaml/tests/test-version.c
  134. +24 −0 vendor/libyaml/win32/Makefile.am
  135. +381 −0 vendor/libyaml/win32/Makefile.in
  136. +4 −0 vendor/libyaml/win32/config.h
  137. +102 −0 vendor/libyaml/win32/vc6/example_deconstructor.dsp
  138. +102 −0 vendor/libyaml/win32/vc6/example_deconstructor_alt.dsp
  139. +102 −0 vendor/libyaml/win32/vc6/example_reformatter.dsp
  140. +102 −0 vendor/libyaml/win32/vc6/example_reformatter_alt.dsp
  141. +206 −0 vendor/libyaml/win32/vc6/libyaml.dsw
  142. +102 −0 vendor/libyaml/win32/vc6/run_dumper.dsp
  143. +102 −0 vendor/libyaml/win32/vc6/run_emitter.dsp
  144. +102 −0 vendor/libyaml/win32/vc6/run_loader.dsp
  145. +102 −0 vendor/libyaml/win32/vc6/run_parser.dsp
  146. +102 −0 vendor/libyaml/win32/vc6/run_scanner.dsp
  147. +102 −0 vendor/libyaml/win32/vc6/test_reader.dsp
  148. +102 −0 vendor/libyaml/win32/vc6/test_version.dsp
  149. +136 −0 vendor/libyaml/win32/vc6/yaml.dsp
  150. +147 −0 vendor/libyaml/win32/vc6/yamldll.dsp
  151. +134 −0 vendor/libyaml/win32/vs2003/example_deconstructor.vcproj
  152. +134 −0 vendor/libyaml/win32/vs2003/example_deconstructor_alt.vcproj
  153. +134 −0 vendor/libyaml/win32/vs2003/example_reformatter.vcproj
  154. +134 −0 vendor/libyaml/win32/vs2003/example_reformatter_alt.vcproj
  155. +128 −0 vendor/libyaml/win32/vs2003/libyaml.sln
  156. +134 −0 vendor/libyaml/win32/vs2003/run_dumper.vcproj
  157. +134 −0 vendor/libyaml/win32/vs2003/run_emitter.vcproj
  158. +134 −0 vendor/libyaml/win32/vs2003/run_loader.vcproj
  159. +134 −0 vendor/libyaml/win32/vs2003/run_parser.vcproj
  160. +134 −0 vendor/libyaml/win32/vs2003/run_scanner.vcproj
  161. +134 −0 vendor/libyaml/win32/vs2003/test_reader.vcproj
  162. +134 −0 vendor/libyaml/win32/vs2003/test_version.vcproj
  163. +149 −0 vendor/libyaml/win32/vs2003/yaml.vcproj
  164. +166 −0 vendor/libyaml/win32/vs2003/yamldll.vcproj
  165. +201 −0 vendor/libyaml/win32/vs2008/example_deconstructor.vcproj
  166. +201 −0 vendor/libyaml/win32/vs2008/example_deconstructor_alt.vcproj
  167. +201 −0 vendor/libyaml/win32/vs2008/example_reformatter.vcproj
  168. +201 −0 vendor/libyaml/win32/vs2008/example_reformatter_alt.vcproj
  169. +124 −0 vendor/libyaml/win32/vs2008/libyaml.sln
  170. +201 −0 vendor/libyaml/win32/vs2008/run_dumper.vcproj
  171. +201 −0 vendor/libyaml/win32/vs2008/run_emitter.vcproj
  172. +201 −0 vendor/libyaml/win32/vs2008/run_loader.vcproj
  173. +201 −0 vendor/libyaml/win32/vs2008/run_parser.vcproj
  174. +201 −0 vendor/libyaml/win32/vs2008/run_scanner.vcproj
  175. +201 −0 vendor/libyaml/win32/vs2008/test_reader.vcproj
  176. +201 −0 vendor/libyaml/win32/vs2008/test_version.vcproj
  177. +215 −0 vendor/libyaml/win32/vs2008/yaml.vcproj
  178. +243 −0 vendor/libyaml/win32/vs2008/yamldll.vcproj
  179. +10 −0 vendor/libyaml/yaml-0.1.pc.in
  180. +16 −12 vm/builtin/system.cpp
  181. +5 −5 vm/util/logger.cpp
  182. +1 −0 vm/util/logger.hpp
13 changes: 13 additions & 0 deletions configure
Original file line number Diff line number Diff line change
@@ -454,6 +454,7 @@ class Configure

feature "execinfo", true
feature "vendor-zlib", false
feature "vendor-yaml", false
feature "alloc-tracking", false
feature "fibers", true
feature "dtrace", false
@@ -1157,6 +1158,11 @@ int main() { return tgetnum(""); }
end

def enable_features
if @features["vendor-yaml"].value
@include_dirs << "#{@vendored_libdir}/libyaml/include"
@lib_dirs << "#{@vendored_libdir}/libyaml/src/.libs"
end

if @features["vendor-zlib"].value
# Our vendored zlib uses long as the crc_table type
# If we update vendored zlib in the future, we have to
@@ -1272,6 +1278,12 @@ int main() { return tgetnum(""); }
end
end

unless @features["vendor-yaml"].value
unless has_header("yaml.h")
failure "yaml.h is required"
end
end

unless has_header("openssl/ssl.h")
failure "openssl/ssl.h is required"
end
@@ -1550,6 +1562,7 @@ int main() { return tgetnum(""); }
:darwin => @darwin,
:bsd => @bsd,
:linux => @linux,
:vendor_yaml => @features["vendor-yaml"].value,
:vendor_zlib => @features["vendor-zlib"].value,
:vm_release_h => @vm_release_h,
:bootstrap_gems => @bootstrap_gems,
16 changes: 16 additions & 0 deletions rakelib/blueprint.rb
Original file line number Diff line number Diff line change
@@ -162,6 +162,22 @@
gcc.add_library udis
files << udis

if Rubinius::BUILD_CONFIG[:vendor_yaml]
yaml = i.external_lib "vendor/libyaml" do |l|
l.cflags = ["-I#{src}/vendor/libyaml/include"] + gcc.cflags
l.objects = [l.file("src/.libs/libyaml.a")]
l.to_build do |x|
unless File.exist?("Makefile") and File.exist?("config.h")
x.command "sh -c './configure --enable-static --disable-shared'"
end

x.command make
end
end
gcc.add_library yaml
files << yaml
end

if Rubinius::BUILD_CONFIG[:vendor_zlib]
zlib = i.external_lib "vendor/zlib" do |l|
l.cflags = ["-I#{src}/vendor/zlib"] + gcc.cflags
5 changes: 5 additions & 0 deletions vendor/libyaml/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config.*
libtool
Makefile
tests/*
yaml-0.1.pc
16 changes: 16 additions & 0 deletions vendor/libyaml/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Minimal CMake project for building a static library under Windows.

cmake_minimum_required (VERSION 2.8)
project (yaml C)

set (YAML_VERSION_MAJOR 0)
set (YAML_VERSION_MINOR 1)
set (YAML_VERSION_PATCH 4)
set (YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}")

file (GLOB SRC src/*.c)

include_directories (include win32)
add_definitions (-DHAVE_CONFIG_H -DYAML_DECLARE_STATIC)
add_library (yaml STATIC ${SRC})

19 changes: 19 additions & 0 deletions vendor/libyaml/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) 2006 Kirill Simonov

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
18 changes: 18 additions & 0 deletions vendor/libyaml/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
## Run `./bootstrap` to generate the "Makefile.in" files in this directory and
## the "$SUBDIRS" subdirectories.

SUBDIRS = include src . tests win32

EXTRA_DIST = README LICENSE CMakeLists.txt doc/doxygen.cfg

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = yaml-0.1.pc

maintainer-clean-local:
-rm -f aclocal.m4 config.h.in configure config/*
-find ${builddir} -name Makefile.in -exec rm -f '{}' ';'

.PHONY: bootstrap
bootstrap: maintainer-clean
./bootstrap

Loading