Skip to content

Commit

Permalink
Enable SET_CURRENT_SOURCE() for better reporting (tmm1, joedamato).
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Weaver committed Sep 3, 2009
1 parent 08431fd commit 4b629fb
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 287 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
@@ -1,4 +1,6 @@

v4.5. Enable SET_CURRENT_SOURCE() for better reporting (tmm1, joedamato).

v4.4. Switch to Ruby 1.8.7p174.

v4.3. Build against OpenSSL 0.9.8j or later (kennethkalmer). Bugfixes (Pete Hodgson, joshuabates).
Expand Down
4 changes: 1 addition & 3 deletions Manifest
Expand Up @@ -14,10 +14,8 @@ ext/snapshot.h
lib/bleak_house.rb
lib/bleak_house/analyzer.rb
lib/bleak_house/hook.rb
ruby/openssl.patch
ruby/ruby-1.8.7-p174.tar.bz2
ruby/ruby187.patch
ruby/valgrind.patch
ruby/ruby-1.8.7.patch
test/benchmark/bench.rb
test/test_helper.rb
test/unit/test_bleak_house.rb
4 changes: 2 additions & 2 deletions ext/build_ruby.rb
Expand Up @@ -32,7 +32,7 @@ def which(basename)
end

if which('ruby-bleak-house') and
(patchlevel = `ruby-bleak-house -e "puts RUBY_PATCHLEVEL"`.to_i) >= 904
(patchlevel = `ruby-bleak-house -e "puts RUBY_PATCHLEVEL"`.to_i) >= 905
puts "** Binary `ruby-bleak-house` is already available (patchlevel #{patchlevel})"
else
# Build
Expand Down Expand Up @@ -60,7 +60,7 @@ def which(basename)
Dir.chdir("ruby-1.8.7-p174") do

puts "** Patch Ruby"
execute("patch -p1 < '#{source_dir}/ruby187.patch'")
execute("patch -p1 < '#{source_dir}/ruby-1.8.7.patch'")

env = Config::CONFIG.map do |key, value|
"#{key}=#{value.inspect}" if key.upcase == key and value
Expand Down
2 changes: 1 addition & 1 deletion lib/bleak_house.rb
@@ -1,5 +1,5 @@

unless RUBY_PATCHLEVEL >= 904
unless RUBY_PATCHLEVEL >= 905
raise "This build of Ruby has not been successfully patched for BleakHouse."
end

Expand Down
157 changes: 0 additions & 157 deletions ruby/openssl.patch

This file was deleted.

11 changes: 10 additions & 1 deletion ruby/ruby187.patch → ruby/ruby-1.8.7.patch
Expand Up @@ -290,6 +290,15 @@ index 11264f7..09ec7a6 100644
#include <stdio.h>

#include "st.h"
@@ -1149,7 +1149,7 @@ static VALUE trace_func = 0;
static int tracing = 0;
static void call_trace_func _((rb_event_t,NODE*,VALUE,ID,VALUE));

-#if 0
+#if 1
#define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
ruby_sourceline = nd_line(ruby_current_node))
#else
@@ -5290,6 +5296,9 @@ assign(self, lhs, val, pcall)
int pcall;
{
Expand Down Expand Up @@ -449,5 +458,5 @@ index 70fc28a..76aa188 100644
+++ b/version.h
@@ -5,2 +5,2 @@
-#define RUBY_PATCHLEVEL 174
+#define RUBY_PATCHLEVEL 904
+#define RUBY_PATCHLEVEL 905

123 changes: 0 additions & 123 deletions ruby/valgrind.patch

This file was deleted.

0 comments on commit 4b629fb

Please sign in to comment.