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: c2392c9ed96b
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aac99d56443e
Choose a head ref
  • 7 commits
  • 5 files changed
  • 4 contributors

Commits on Feb 19, 2016

  1. Expanded the issue template

    Yorick Peterse committed Feb 19, 2016
    Copy the full SHA
    a85d286 View commit details
  2. Updated rubysl-pathname to 2.3

    Yorick Peterse committed Feb 19, 2016
    Copy the full SHA
    6b0d0bb View commit details
  3. Update rubinius-melbourne to 3.3

    Closes #3600
    ahmadsherif committed Feb 19, 2016
    Copy the full SHA
    619c693 View commit details

Commits on Feb 20, 2016

  1. Copy the full SHA
    2c4f171 View commit details
  2. Omit [ skip ci ] from GitHub release notes.

    Odd formatting necessary to avoid getting stripped for release notes.
    
    [ci skip]
    brixen committed Feb 20, 2016
    Copy the full SHA
    333e3d7 View commit details

Commits on Feb 21, 2016

  1. Fix configure script to enable C++11 regardless of LLVM version.

    The CodeDB work added C++11 usage into the VM source itself,
    but C++11 support was only enabled for LLVM >= 3.5,
    failing for users with lower supported LLVM versions.
    
    Resolves #3622.
    jemc committed Feb 21, 2016
    Copy the full SHA
    046bf33 View commit details
  2. Copy the full SHA
    aac99d5 View commit details
Showing with 24 additions and 20 deletions.
  1. +1 −1 Gemfile.lock
  2. +3 −2 configure
  3. +2 −2 gems_list.txt
  4. +16 −14 issue_template.md
  5. +2 −1 scripts/github.sh
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ GEM
rubinius-toolset (~> 3)
rubinius-compiler (3.0)
rubinius-instructions (3.0)
rubinius-melbourne (3.1)
rubinius-melbourne (3.3)
rubinius-processor (3.0)
rubinius-toolset (3.0)

5 changes: 3 additions & 2 deletions configure
Original file line number Diff line number Diff line change
@@ -667,8 +667,6 @@ int main() { LLVMContext &Context = getGlobalContext(); }
flags = '--ldflags'

if @llvm_api_version >= 305
@llvm_cxxflags << " -std=c++11"

# Starting with LLVM 3.5 the --system-libs option is required in order to
# link against libraries such as zlib. Prior to 3.5 this was handled by
# --ldflags.
@@ -678,6 +676,9 @@ int main() { LLVMContext &Context = getGlobalContext(); }
# Generate the actual flags. For whatever reason llvm-config also includes
# newlines in the output, so lets get rid of those while we're at it.
@llvm_ldflags = `#{@llvm_configure} #{flags}`.strip.gsub("\n", ' ')

# We use some C++11 features in the VM source, so we need to enable support.
@llvm_cxxflags << " -std=c++11"
end

def env(which)
4 changes: 2 additions & 2 deletions gems_list.txt
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ rubinius-coverage-2.0.3.gem
rubinius-debugger-2.2.1.gem
rubinius-developer_tools-2.0.0.gem
rubinius-instructions-3.0.gem
rubinius-melbourne-3.1.gem
rubinius-melbourne-3.3.gem
rubinius-processor-3.0.gem
rubinius-profiler-2.0.2.gem
rubinius-toolset-3.0.gem
@@ -76,7 +76,7 @@ rubysl-openssl-2.8.0.gem
rubysl-open-uri-2.0.0.gem
rubysl-optparse-2.0.1.gem
rubysl-ostruct-2.1.0.gem
rubysl-pathname-2.1.0.gem
rubysl-pathname-2.3.gem
rubysl-prettyprint-2.0.3.gem
rubysl-prime-2.0.1.gem
rubysl-profile-2.0.0.gem
30 changes: 16 additions & 14 deletions issue_template.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
### Summary
## Problem

### Reproduction
Please describe the problem here, try to keep it brief and clear.

Please keep this as simple as possible.
Either include a script here or add a link to
a gist or a repository. If it's a repo, please
detail `how` to run the example in the `README`.
## How to Reproduce

### Details
Please keep this as simple as possible and provide either a set of steps or a
script/application to reproduce this problem (and remove this sentence).

* `rbx -v`:
* `uname -a`:
* `config.rb` (as gist please, if relevant)
* `configure.log` (as gist please, if relevant)
## Configuration Details

### Stack Trace
* Output of `rbx -v`:
* Output of `uname -a`:
* Distribution name (in case of Linux/BSD):
* Contents of `config.rb` (as a Gist link):
* Contents of `configure.log` (as a Gist link):

(as gist please)
## Stack Trace

### Failing Spec
Use https://gist.github.com/ and replace this sentence with a link to said Gist.
In case of a SEGV please also include the GDB stack trace, see
http://rubinius.com/doc/en/how-to/obtaining-gdb-backtraces/ for more
information.
3 changes: 2 additions & 1 deletion scripts/github.sh
Original file line number Diff line number Diff line change
@@ -21,7 +21,8 @@ function rbx_github_release {
fi

log=$(git log --color=never --max-parents=1 --reverse --pretty='format:* %s (%an)%+b' \
"v$previous..v$version" | sed 's/\[ci skip\]//' | sed '/^$/N;/^\n$/D')
"v$previous..v$version" | sed 's/\[ci skip\]//' | sed 's/\[skip ci\]//' \
| sed '/^$/N;/^\n$/D')

unset GEM_HOME GEM_PATH GEM_ROOT