Permalink
Browse files

Moved lib to library.

  • Loading branch information...
1 parent 713f8c3 commit f7fc614e2588483fd5814f59e8d128ef0fb6be74 @brixen brixen committed Oct 12, 2013
Showing with 13 additions and 167 deletions.
  1. +5 −4 configure
  2. 0 {lib → library}/abbrev.rb
  3. 0 {lib → library}/base64.rb
  4. 0 {lib → library}/benchmark.rb
  5. 0 {lib → library}/bigdecimal.rb
  6. 0 {lib → library}/bin/compile.rb
  7. 0 {lib → library}/bin/console.rb
  8. 0 {lib → library}/bin/docs.rb
  9. 0 {lib → library}/bin/gem.rb
  10. 0 {lib → library}/bin/irb.rb
  11. 0 {lib → library}/bin/rar.rb
  12. 0 {lib → library}/bin/render_profile.rb
  13. 0 {lib → library}/bin/report.rb
  14. 0 {lib → library}/cgi.rb
  15. 0 {lib → library}/cgi/session.rb
  16. 0 {lib → library}/cmath.rb
  17. 0 {lib → library}/complex.rb
  18. 0 {lib → library}/continuation.rb
  19. 0 {lib → library}/coverage.rb
  20. 0 {lib → library}/csv.rb
  21. 0 {lib → library}/curses.rb
  22. 0 {lib → library}/date.rb
  23. 0 {lib → library}/dbm.rb
  24. 0 {lib → library}/delegate.rb
  25. 0 {lib → library}/digest.rb
  26. 0 {lib → library}/drb.rb
  27. 0 {lib → library}/english.rb
  28. 0 {lib → library}/erb.rb
  29. 0 {lib → library}/etc.rb
  30. 0 {lib → library}/expect.rb
  31. 0 {lib → library}/fcntl.rb
  32. 0 {lib → library}/ffi/file_processor.rb
  33. 0 {lib → library}/ffi/generator.rb
  34. 0 {lib → library}/ffi/generators.rb
  35. 0 {lib → library}/ffi/generators/constants.rb
  36. 0 {lib → library}/ffi/generators/structures.rb
  37. 0 {lib → library}/ffi/generators/types.rb
  38. 0 {lib → library}/fiber.rb
  39. 0 {lib → library}/fileutils.rb
  40. 0 {lib → library}/find.rb
  41. 0 {lib → library}/forwardable.rb
  42. 0 {lib → library}/gauntlet_rubygems.rb
  43. 0 {lib → library}/gdbm.rb
  44. 0 {lib → library}/getoptlong.rb
  45. 0 {lib → library}/gserver.rb
  46. 0 {lib → library}/io/console.rb
  47. 0 {lib → library}/io/nonblock.rb
  48. 0 {lib → library}/io/wait.rb
  49. 0 {lib → library}/ipaddr.rb
  50. 0 {lib → library}/irb.rb
  51. 0 {lib → library}/json.rb
  52. 0 {lib → library}/logger.rb
  53. 0 {lib → library}/mathn.rb
  54. 0 {lib → library}/matrix.rb
  55. 0 {lib → library}/mkmf.rb
  56. 0 {lib → library}/monitor.rb
  57. 0 {lib → library}/mutex_m.rb
  58. 0 {lib → library}/net/ftp.rb
  59. 0 {lib → library}/net/http.rb
  60. 0 {lib → library}/net/imap.rb
  61. 0 {lib → library}/net/pop.rb
  62. 0 {lib → library}/net/protocol.rb
  63. 0 {lib → library}/net/smtp.rb
  64. 0 {lib → library}/net/telnet.rb
  65. 0 {lib → library}/nkf.rb
  66. 0 {lib → library}/observer.rb
  67. 0 {lib → library}/open-uri.rb
  68. 0 {lib → library}/open3.rb
  69. 0 {lib → library}/openssl.rb
  70. 0 {lib → library}/optparse.rb
  71. 0 {lib → library}/ostruct.rb
  72. 0 {lib → library}/pathname.rb
  73. 0 {lib → library}/prettyprint.rb
  74. 0 {lib → library}/prime.rb
  75. 0 {lib → library}/profile.rb
  76. 0 {lib → library}/profiler.rb
  77. 0 {lib → library}/pstore.rb
  78. 0 {lib → library}/pty.rb
  79. 0 {lib → library}/rational.rb
  80. 0 {lib → library}/rbconfig.rb
  81. 0 {lib → library}/rbconfig/datadir.rb
  82. 0 {lib → library}/readline.rb
  83. 0 {lib → library}/resolv.rb
  84. 0 {lib → library}/rexml.rb
  85. 0 {lib → library}/rinda.rb
  86. 0 {lib → library}/ripper.rb
  87. 0 {lib → library}/rss.rb
  88. 0 {lib → library}/rubinius/.gitignore
  89. 0 {lib → library}/rubinius/agent.rb
  90. 0 {lib → library}/rubinius/analyst.rb
  91. 0 {lib → library}/rubinius/bert.rb
  92. 0 {lib → library}/rubinius/bert/bert.rb
  93. 0 {lib → library}/rubinius/bert/decode.rb
  94. 0 {lib → library}/rubinius/bert/decoder.rb
  95. 0 {lib → library}/rubinius/bert/encode.rb
  96. 0 {lib → library}/rubinius/bert/encoder.rb
  97. 0 {lib → library}/rubinius/bert/types.rb
  98. 0 {lib → library}/rubinius/configuration.rb
  99. 0 {lib → library}/rubinius/configuration_variables.rb
  100. 0 {lib → library}/rubinius/documentation.rb
  101. 0 {lib → library}/rubinius/ffi.rb
  102. 0 {lib → library}/rubygems.rb
  103. 0 {lib → library}/rubygems/available_set.rb
  104. 0 {lib → library}/rubygems/basic_specification.rb
  105. 0 {lib → library}/rubygems/command.rb
  106. 0 {lib → library}/rubygems/command_manager.rb
  107. 0 {lib → library}/rubygems/commands/build_command.rb
  108. 0 {lib → library}/rubygems/commands/cert_command.rb
  109. 0 {lib → library}/rubygems/commands/check_command.rb
  110. 0 {lib → library}/rubygems/commands/cleanup_command.rb
  111. 0 {lib → library}/rubygems/commands/contents_command.rb
  112. 0 {lib → library}/rubygems/commands/dependency_command.rb
  113. 0 {lib → library}/rubygems/commands/environment_command.rb
  114. 0 {lib → library}/rubygems/commands/fetch_command.rb
  115. 0 {lib → library}/rubygems/commands/generate_index_command.rb
  116. 0 {lib → library}/rubygems/commands/help_command.rb
  117. 0 {lib → library}/rubygems/commands/install_command.rb
  118. 0 {lib → library}/rubygems/commands/list_command.rb
  119. 0 {lib → library}/rubygems/commands/lock_command.rb
  120. 0 {lib → library}/rubygems/commands/mirror_command.rb
  121. 0 {lib → library}/rubygems/commands/outdated_command.rb
  122. 0 {lib → library}/rubygems/commands/owner_command.rb
  123. 0 {lib → library}/rubygems/commands/pristine_command.rb
  124. 0 {lib → library}/rubygems/commands/push_command.rb
  125. 0 {lib → library}/rubygems/commands/query_command.rb
  126. 0 {lib → library}/rubygems/commands/rdoc_command.rb
  127. 0 {lib → library}/rubygems/commands/search_command.rb
  128. 0 {lib → library}/rubygems/commands/server_command.rb
  129. 0 {lib → library}/rubygems/commands/setup_command.rb
  130. 0 {lib → library}/rubygems/commands/sources_command.rb
  131. 0 {lib → library}/rubygems/commands/specification_command.rb
  132. 0 {lib → library}/rubygems/commands/stale_command.rb
  133. 0 {lib → library}/rubygems/commands/uninstall_command.rb
  134. 0 {lib → library}/rubygems/commands/unpack_command.rb
  135. 0 {lib → library}/rubygems/commands/update_command.rb
  136. 0 {lib → library}/rubygems/commands/which_command.rb
  137. 0 {lib → library}/rubygems/commands/yank_command.rb
  138. 0 {lib → library}/rubygems/compatibility.rb
  139. 0 {lib → library}/rubygems/config_file.rb
  140. 0 {lib → library}/rubygems/core_ext/kernel_gem.rb
  141. 0 {lib → library}/rubygems/core_ext/kernel_require.rb
  142. 0 {lib → library}/rubygems/defaults.rb
  143. 0 {lib → library}/rubygems/defaults/rbx.rb
  144. 0 {lib → library}/rubygems/dependency.rb
  145. 0 {lib → library}/rubygems/dependency_installer.rb
  146. 0 {lib → library}/rubygems/dependency_list.rb
  147. 0 {lib → library}/rubygems/dependency_resolver.rb
  148. 0 {lib → library}/rubygems/dependency_resolver/activation_request.rb
  149. 0 {lib → library}/rubygems/dependency_resolver/api_set.rb
  150. 0 {lib → library}/rubygems/dependency_resolver/api_specification.rb
  151. 0 {lib → library}/rubygems/dependency_resolver/composed_set.rb
  152. 0 {lib → library}/rubygems/dependency_resolver/current_set.rb
  153. 0 {lib → library}/rubygems/dependency_resolver/dependency_conflict.rb
  154. 0 {lib → library}/rubygems/dependency_resolver/dependency_request.rb
  155. 0 {lib → library}/rubygems/dependency_resolver/index_set.rb
  156. 0 {lib → library}/rubygems/dependency_resolver/index_specification.rb
  157. 0 {lib → library}/rubygems/dependency_resolver/installed_specification.rb
  158. 0 {lib → library}/rubygems/dependency_resolver/installer_set.rb
  159. 0 {lib → library}/rubygems/deprecate.rb
  160. 0 {lib → library}/rubygems/doctor.rb
  161. 0 {lib → library}/rubygems/errors.rb
  162. 0 {lib → library}/rubygems/exceptions.rb
  163. 0 {lib → library}/rubygems/ext.rb
  164. 0 {lib → library}/rubygems/ext/builder.rb
  165. 0 {lib → library}/rubygems/ext/cmake_builder.rb
  166. 0 {lib → library}/rubygems/ext/configure_builder.rb
  167. 0 {lib → library}/rubygems/ext/ext_conf_builder.rb
  168. 0 {lib → library}/rubygems/ext/rake_builder.rb
  169. 0 {lib → library}/rubygems/gem_runner.rb
  170. 0 {lib → library}/rubygems/gemcutter_utilities.rb
  171. 0 {lib → library}/rubygems/indexer.rb
  172. 0 {lib → library}/rubygems/install_default_message.rb
  173. 0 {lib → library}/rubygems/install_message.rb
  174. 0 {lib → library}/rubygems/install_update_options.rb
  175. 0 {lib → library}/rubygems/installer.rb
  176. 0 {lib → library}/rubygems/installer_test_case.rb
  177. 0 {lib → library}/rubygems/local_remote_options.rb
  178. 0 {lib → library}/rubygems/mock_gem_ui.rb
  179. 0 {lib → library}/rubygems/name_tuple.rb
  180. 0 {lib → library}/rubygems/package.rb
  181. 0 {lib → library}/rubygems/package/digest_io.rb
  182. 0 {lib → library}/rubygems/package/old.rb
  183. 0 {lib → library}/rubygems/package/tar_header.rb
  184. 0 {lib → library}/rubygems/package/tar_reader.rb
  185. 0 {lib → library}/rubygems/package/tar_reader/entry.rb
  186. 0 {lib → library}/rubygems/package/tar_test_case.rb
  187. 0 {lib → library}/rubygems/package/tar_writer.rb
  188. 0 {lib → library}/rubygems/package_task.rb
  189. 0 {lib → library}/rubygems/path_support.rb
  190. 0 {lib → library}/rubygems/platform.rb
  191. 0 {lib → library}/rubygems/psych_additions.rb
  192. 0 {lib → library}/rubygems/psych_tree.rb
  193. 0 {lib → library}/rubygems/rdoc.rb
  194. 0 {lib → library}/rubygems/remote_fetcher.rb
  195. 0 {lib → library}/rubygems/request.rb
  196. 0 {lib → library}/rubygems/request_set.rb
  197. 0 {lib → library}/rubygems/request_set/gem_dependency_api.rb
  198. 0 {lib → library}/rubygems/requirement.rb
  199. 0 {lib → library}/rubygems/security.rb
  200. 0 {lib → library}/rubygems/security/policies.rb
  201. 0 {lib → library}/rubygems/security/policy.rb
  202. 0 {lib → library}/rubygems/security/signer.rb
  203. 0 {lib → library}/rubygems/security/trust_dir.rb
  204. 0 {lib → library}/rubygems/server.rb
  205. 0 {lib → library}/rubygems/source.rb
  206. 0 {lib → library}/rubygems/source/installed.rb
  207. 0 {lib → library}/rubygems/source/local.rb
  208. 0 {lib → library}/rubygems/source/specific_file.rb
  209. 0 {lib → library}/rubygems/source_list.rb
  210. 0 {lib → library}/rubygems/source_local.rb
  211. 0 {lib → library}/rubygems/source_specific_file.rb
  212. 0 {lib → library}/rubygems/spec_fetcher.rb
  213. 0 {lib → library}/rubygems/specification.rb
  214. 0 {lib → library}/rubygems/ssl_certs/AddTrustExternalCARoot.pem
  215. 0 {lib → library}/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem
  216. 0 {lib → library}/rubygems/ssl_certs/GeoTrust_Global_CA.pem
  217. 0 {lib → library}/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
  218. 0 {lib → library}/rubygems/ssl_certs/ca-bundle.pem
  219. 0 {lib → library}/rubygems/stub_specification.rb
  220. 0 {lib → library}/rubygems/syck_hack.rb
  221. 0 {lib → library}/rubygems/test_case.rb
  222. 0 {lib → library}/rubygems/test_utilities.rb
  223. 0 {lib → library}/rubygems/text.rb
  224. 0 {lib → library}/rubygems/uninstaller.rb
  225. 0 {lib → library}/rubygems/uri_formatter.rb
  226. 0 {lib → library}/rubygems/user_interaction.rb
  227. 0 {lib → library}/rubygems/util/list.rb
  228. 0 {lib → library}/rubygems/validator.rb
  229. 0 {lib → library}/rubygems/version.rb
  230. 0 {lib → library}/rubygems/version_option.rb
  231. 0 {lib → library}/scanf.rb
  232. 0 {lib → library}/sdbm.rb
  233. 0 {lib → library}/securerandom.rb
  234. 0 {lib → library}/set.rb
  235. 0 {lib → library}/shellwords.rb
  236. 0 {lib → library}/singleton.rb
  237. 0 {lib → library}/socket.rb
  238. 0 {lib → library}/stringio.rb
  239. 0 {lib → library}/strscan.rb
  240. 0 {lib → library}/syslog.rb
  241. 0 {lib → library}/tempfile.rb
  242. 0 {lib → library}/test/unit.rb
  243. 0 {lib → library}/thread.rb
  244. 0 {lib → library}/thwait.rb
  245. 0 {lib → library}/time.rb
  246. 0 {lib → library}/timeout.rb
  247. 0 {lib → library}/tmpdir.rb
  248. 0 {lib → library}/tracer.rb
  249. 0 {lib → library}/tsort.rb
  250. 0 {lib → library}/ubygems.rb
  251. 0 {lib → library}/un.rb
  252. 0 {lib → library}/uri.rb
  253. 0 {lib → library}/weakref.rb
  254. 0 {lib → library}/webrick.rb
  255. 0 {lib → library}/win32ole.rb
  256. 0 {lib → library}/xmlrpc.rb
  257. 0 {lib → library}/yaml.rb
  258. 0 {lib → library}/zlib.rb
  259. +1 −1 rakelib/generator_task.rb
  260. +2 −2 rakelib/install.rake
  261. +2 −2 rakelib/kernel.rake
  262. +1 −1 rakelib/platform.rake
  263. +0 −154 rakelib/rubinius.rb
  264. +1 −2 rakelib/vm.rake
  265. +1 −1 vm/codegen/config_vars.rb
View
@@ -197,15 +197,15 @@ class Configure
if @appdir
dir = expand_install_dir @appdir
- @libdir = dir + "/lib"
+ @libdir = dir + "/library"
@runtimedir = dir + "/runtime"
@kerneldir = dir + "/kernel"
@sitedir = dir + "/site"
@vendordir = dir + "/vendor"
end
@bindir = @prefixdir + "/bin" unless @bindir
- @libdir = @prefixdir + "/lib" unless @libdir
+ @libdir = @prefixdir + "/library" unless @libdir
@runtimedir = @prefixdir + "/runtime" unless @runtimedir
@kerneldir = @prefixdir + "/kernel" unless @kerneldir
@sitedir = @prefixdir + "/site" unless @sitedir
@@ -1670,8 +1670,9 @@ int main() { return tgetnum(""); }
write_config_rb @config, config_settings
- Dir.mkdir "lib/rubinius" unless File.directory? "lib/rubinius"
- FileUtils.cp @config, "lib/rubinius/build_config.rb"
+ lib_rubinius_dir = "#{@sourcedir}/library/rubinius"
+ FileUtils.mkdir_p lib_rubinius_dir unless File.directory? lib_rubinius_dir
+ FileUtils.cp @config, "#{lib_rubinius_dir}/build_config.rb"
# Write the config file used to build the C++ VM.
Dir.mkdir "vm/gen" unless File.directory? "vm/gen"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,7 @@
require 'rake'
require 'rake/tasklib'
-require 'lib/ffi/file_processor'
+require 'library/ffi/file_processor'
##
View
@@ -187,7 +187,7 @@ exec #{BUILD_CONFIG[:stagingdir]}#{BUILD_CONFIG[:bindir]}/$EXE "$@"
task :lib do
if BUILD_CONFIG[:stagingdir]
- install_build_lib "#{BUILD_CONFIG[:sourcedir]}/lib", BUILD_CONFIG[:stagingdir]
+ install_build_lib "#{BUILD_CONFIG[:sourcedir]}/library", BUILD_CONFIG[:stagingdir]
end
end
@@ -205,7 +205,7 @@ exec #{BUILD_CONFIG[:stagingdir]}#{BUILD_CONFIG[:bindir]}/$EXE "$@"
task :documentation do
if BUILD_CONFIG[:stagingdir]
- install_documentation "#{BUILD_CONFIG[:sourcedir]}/lib", BUILD_CONFIG[:stagingdir]
+ install_documentation "#{BUILD_CONFIG[:sourcedir]}/library", BUILD_CONFIG[:stagingdir]
end
end
View
@@ -84,8 +84,8 @@ end
signature_file = "kernel/signature.rb"
bootstrap_files = FileList[
- "lib/rbconfig.rb",
- "lib/rubinius/build_config.rb",
+ "library/rbconfig.rb",
+ "library/rubinius/build_config.rb",
]
ffi_files = FileList[
View
@@ -1,4 +1,4 @@
-require File.expand_path('../../lib/ffi/generators', __FILE__)
+require File.expand_path('../../library/ffi/generators', __FILE__)
directory "runtime"
View
@@ -1,154 +0,0 @@
-
-def clear_compiler
- ENV.delete 'RBX_BOOTSTRAP'
- ENV.delete 'RBX_CORE'
- ENV.delete 'RBX_LOADER'
- ENV.delete 'RBX_PLATFORM'
-end
-
-def expand(path)
- File.expand_path path
-end
-
-def make(args = nil)
- if RUBY_PLATFORM =~ /bsd/ || RUBY_PLATFORM =~ /solaris/
- gmake = 'gmake'
- else
- gmake = 'make'
- end
- "#{ENV['MAKE'] || gmake} #{args}"
-end
-
-def rbx(*args)
- clear_compiler
-
- sh('bin/rbx', *args)
-end
-
-def newer?(file, cmp)
- File.exists?(cmp) and File.mtime(cmp) >= File.mtime(file)
-end
-
-def source_name(compiled)
- File.basename(compiled, '.*') + '.rb'
-end
-
-def compiled_name(source, dir)
- File.join(dir, File.basename(source, '.*') + '.rbc')
-end
-
-
-def compile(name, output=nil, check_mtime=false)
- if output
- dir = File.dirname(output)
-
- unless File.exists?(dir)
- FileUtils.mkdir_p dir
- end
-
- if check_mtime and File.exists?(output) and File.mtime(output) > File.mtime(name)
- return
- end
- end
-
- inc = "-Iruntime/stable/compiler.rba -rcompiler/compiler"
- flags = "-frbx-safe-math -frbx-kernel"
-
- if ENV['SYSTEM']
- sh "rbx compile -f #{flags} #{name} #{output}", :verbose => $verbose
- elsif ENV['GDB']
- sh "bin/rbx --gdb #{inc} compile #{flags} #{name} #{output}", :verbose => $verbose
- elsif ENV['NATIVE']
- sh "bin/rbx #{inc} compile #{flags} #{name} #{output}", :verbose => $verbose
- else
- ruby "lib/compiler/mri_compile.rb #{flags} #{name} #{output}"
- end
-end
-
-def compile_dir(dir)
- (Dir["#{dir}/*.rb"] + Dir["#{dir}/**/*.rb"]).each do |file|
- compile file, "#{file}c", true
- end
-end
-
-class CodeGroup
-
- def initialize(files, compile_dir, rba_name, load_order=true)
- if files.is_a?(FileList)
- @files = files
- else
- @files = FileList[files]
- end
-
- @output = nil
- @compile_dir = compile_dir
- @build_dir = File.join 'runtime', rba_name
- @rba_name = "#{rba_name}.rba"
-
- if load_order
- @load_order = File.join @compile_dir, 'load_order.txt'
- else
- @load_order = nil
- end
-
- @output = []
-
- make_tasks
- end
-
- attr_reader :output
-
- def clean
- sh "find #{@compile_dir} -name '*.rbc' -delete"
- end
-
- def compile_task
- @files.each do |source|
- runtime = File.join(@compile_dir, source.ext("rbc"))
-
- @output << runtime
-
- deps = [source].compact
-
- file runtime => deps do |t|
- compile t.prerequisites.first, t.name
- end
- end
- end
-
- def load_order_task
- return unless @load_order
-
- file @load_order => @files do
- create_load_order(@files, @load_order)
- end
- task "build:load_order" => @files do
- create_load_order(@files, @load_order)
- end
-
- @output << @load_order
- end
-
- def make_tasks
- FileUtils.mkdir_p @compile_dir unless File.exists? @compile_dir
-
- compile_task
- load_order_task
-
- @output
- end
-
-end
-
-def install_files(files, destination)
- files.sort.each do |path|
- next if File.directory? path
-
- file = path.sub %r%^(runtime|lib)/%, ''
- dest_file = File.join destination, file
- dest_dir = File.dirname dest_file
- mkdir_p dest_dir unless File.directory? dest_dir
-
- install path, dest_file, :mode => 0644, :verbose => true
- end
-end
View
@@ -1,4 +1,3 @@
-require 'rakelib/rubinius'
require 'rakelib/instruction_parser'
require 'rakelib/generator_task'
require 'rakelib/release'
@@ -236,7 +235,7 @@ task vm_release_h do |t|
end
end
-file 'vm/gen/config_variables.h' => %w[lib/rubinius/configuration.rb config.rb] do |t|
+file 'vm/gen/config_variables.h' => %w[library/rubinius/configuration.rb config.rb] do |t|
puts "GEN #{t.name}"
ruby 'vm/codegen/config_vars.rb', t.name
end
@@ -1,4 +1,4 @@
-$:.unshift File.expand_path("../../../lib", __FILE__)
+$:.unshift File.expand_path("../../../library", __FILE__)
require 'rubinius/configuration'

0 comments on commit f7fc614

Please sign in to comment.