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

Commits on Apr 24, 2016

  1. Compile in debug mode when in git submodule 

    We currently compile in debug mode if there is a `.git` directory in the project
root.

This compiles Rubinius in debug mode even if `.git` is a file, so that
we compile in debug mode when rubinius is in a git submodule.
    @dylanmckay
    dylanmckay committed Apr 24, 2016
    Copy the full SHA
    29cf6de View commit details

  2. Merge pull request #3639 from dylanmckay/extend-release-script 

    Compile in debug mode when in git submodule
    @brixen
    brixen committed Apr 24, 2016
    Copy the full SHA
    6b205fa View commit details
Showing with 6 additions and 1 deletion.
  1. +1 −1 configure
  2. +5 −0 rakelib/release.rb
2 changes: 1 addition & 1 deletion configure
View file
Original file line number Diff line number Diff line change
@@ -167,7 +167,7 @@ class Configure
@ruby_libversion = @ruby_version.split(/\./)[0..1].join.to_i

# Configure settings
@release_build = !git_directory
@release_build = !in_git?
end

# Set up system commands to run in cmd.exe on Windows. Either Windows
5 changes: 5 additions & 0 deletions rakelib/release.rb
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,11 @@ def git_directory
File.directory?(git_dir) && git_dir
end

def in_git?
git_dir = File.expand_path "../../.git", __FILE__
File.exist?(git_dir) && git_dir
end

def revision_file
File.expand_path "../../.revision", __FILE__
end