Skip to content
Permalink
Browse files
Merge remote-tracking branch 'origin' into codedb-ffi-io
  • Loading branch information
brixen committed Feb 5, 2016
2 parents 5236ec1 + e401fc7 commit 3b1d1676151cdda841353e556257ee6c144bf522
Show file tree
Hide file tree
Showing 250 changed files with 7,465 additions and 8,170 deletions.
@@ -82,7 +82,8 @@ Gemfile.installed.lock
# rubysl-digest installs this header
vm/include/capi/ruby/digest.h

/kernel/signature.rb
/core/signature.rb
/core/build_config.rb

# Generated documentation
doc/generated/vm
@@ -1,10 +1,11 @@
language: cpp
sudo: required
dist: trusty
compiler:
- clang
os:
- linux
- osx
sudo: false
ruby: 2.2.0
before_install:
- echo $LANG
@@ -15,8 +16,7 @@ before_install:
- gem --version
before_script:
- travis_retry bundle
- if [ $TRAVIS_OS_NAME == linux ]; then travis_retry ./configure --llvm-config=./vendor/llvm/Release/bin/llvm-config; fi
- if [ $TRAVIS_OS_NAME == osx ]; then travis_retry ./configure; fi
- ./configure
script: rake ci
after_success:
- if [ $TRAVIS_BRANCH == $TRAVIS_TAG ]; then ./scripts/deploy.sh all; fi
@@ -16,7 +16,7 @@ GEM
rubinius-toolset (~> 3)
rubinius-compiler (3.0)
rubinius-instructions (3.0)
rubinius-melbourne (3.0)
rubinius-melbourne (3.1)
rubinius-processor (3.0)
rubinius-toolset (3.0)

@@ -157,7 +157,7 @@ task :rebuild => %w[clean build]
desc 'Remove rubinius build files'
task :clean => %w[
vm:clean
kernel:clean
core:clean
clean:crap
]

@@ -176,16 +176,6 @@ namespace :clean do
end
end

desc "Run the Rubinius documentation website"
task :docs do
require 'kernel/delta/options'
require 'rbconfig'
require 'webrick'
require 'lib/rubinius/documentation'

Rubinius::Documentation.main
end

desc "Run specs in default (configured) mode but do not rebuild on failure"
task :spec => %w[build vm:test] do
clean_environment
@@ -200,11 +190,11 @@ task :ci do
Rake::Task["spec"].invoke
end

desc "Print list of items marked to-do in kernel/ (@todo|TODO)"
desc "Print list of items marked to-do in core/ (@todo|TODO)"
task :todos do

# create array with files to be checked
filesA = Dir['kernel/**/*.*']
filesA = Dir['core/*.*']

# search for @todo or TODO
filesA.sort!.each do |filename|
@@ -20,7 +20,7 @@ end

root = File.expand_path File.dirname(__FILE__)

require File.join(root, "kernel", "delta", "options")
require File.join(root, "core", "options")

class Configure

@@ -91,7 +91,7 @@ class Configure
@libdir = nil
@encdir = nil
@runtimedir = nil
@kerneldir = nil
@coredir = nil
@sitedir = nil
@vendordir = nil
@mandir = nil
@@ -228,15 +228,15 @@ class Configure

@libdir = dir + "/library"
@runtimedir = dir + "/runtime"
@kerneldir = dir + "/kernel"
@coredir = dir + "/core"
@sitedir = dir + "/site"
@vendordir = dir + "/vendor"
end

@bindir = @prefixdir + "/bin" unless @bindir
@libdir = @prefixdir + "/library" unless @libdir
@runtimedir = @prefixdir + "/runtime" unless @runtimedir
@kerneldir = @prefixdir + "/kernel" unless @kerneldir
@coredir = @prefixdir + "/core" unless @coredir
@sitedir = @prefixdir + "/site" unless @sitedir
@vendordir = @prefixdir + "/vendor" unless @vendordir
@mandir = @prefixdir + "/man" unless @mandir
@@ -245,7 +245,7 @@ class Configure

@encdir = @libdir + "/encoding/converter"

dirs = [@bindir, @libdir, @runtimedir, @kerneldir, @sitedir, @vendordir,
dirs = [@bindir, @libdir, @runtimedir, @coredir, @sitedir, @vendordir,
@mandir, @gemsdir, @includedir, @encdir]

parts = dirs.map { |d| d.split "/" }
@@ -1594,7 +1594,7 @@ int main() { return tgetnum(""); }
:libdir => @libdir,
:encdir => @encdir,
:runtimedir => @runtimedir,
:kerneldir => @kerneldir,
:coredir => @coredir,
:sitedir => @sitedir,
:vendordir => @vendordir,
:includedir => @includedir,
@@ -1622,9 +1622,7 @@ int main() { return tgetnum(""); }

write_config_rb @config, config_settings

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"
FileUtils.cp @config, "#{@sourcedir}/core/build_config.rb"

# Write the config file used to build the C++ VM.
Dir.mkdir "vm/gen" unless File.directory? "vm/gen"
@@ -1636,7 +1634,8 @@ int main() { return tgetnum(""); }
#define RBX_BIN_PATH "#{@bindir}"
#define RBX_GEMS_PATH "#{@gemsdir}"
#define RBX_RUNTIME_PATH "#{@runtimedir}"
#define RBX_KERNEL_PATH "#{@kerneldir}"
#define RBX_KERNEL_PATH "#{@coredir}"
#define RBX_CORE_PATH "#{@coredir}"
#define RBX_LIB_PATH "#{@libdir}"
#define RBX_ENC_PATH "#{@encdir}"
#define RBX_HDR_PATH "#{@includedir}"
@@ -1923,7 +1922,7 @@ bin: #{@prefixdir}#{@bindir}
lib: #{@prefixdir}#{@libdir}
include: #{@prefixdir}#{@includedir}
runtime: #{@prefixdir}#{@runtimedir}
kernel: #{@prefixdir}#{@kerneldir}
core: #{@prefixdir}#{@coredir}
site: #{@prefixdir}#{@sitedir}
vendor: #{@prefixdir}#{@vendordir}
man: #{@prefixdir}#{@mandir}
File renamed without changes.

0 comments on commit 3b1d167

Please sign in to comment.