Skip to content
Browse files

Merge branch 'dev-tool-reload'

  • Loading branch information...
2 parents 3126aba + 5fac311 commit c77c925f61561b834d6d1d5541944351f6a497de @timfel timfel committed Oct 21, 2011
Showing with 7 additions and 7 deletions.
  1. +2 −4 Rakefile
  2. +5 −3 rakelib/contrib/ottobehrens/stone.rb
View
6 Rakefile
@@ -180,12 +180,10 @@ The netldiname parameter determines which netldi to use (default: ENV['gs64ldi']
raise "Need a file to read." unless file
raise "Can't open input file: #{file.inspect}" unless File.exists?(file)
- if file.end_with? ".gs"
- stone.input_file file, true
- elsif file.end_with? ".rb"
+ if file.end_with? ".rb"
system "maglev-ruby -Mcommit --stone #{server_name} #{file}"
else
- raise "Can only load .gs and .rb files"
+ stone.input_file file, true
end
end
end
View
8 rakelib/contrib/ottobehrens/stone.rb
@@ -5,9 +5,11 @@
require 'tempfile'
class Stone
- FORK_ENV = {}
- def FORK_ENV.pairs
- each_pair.collect {|k,v| "#{k}=#{v}" }.join(" ")
+ unless defined? FORK_ENV
+ FORK_ENV = {}
+ def FORK_ENV.pairs
+ each_pair.collect {|k,v| "#{k}=#{v}" }.join(" ")
+ end
end
include Rake::DSL if defined? Rake::VERSION # support both Rake 0.8.7 and 0.9.2

0 comments on commit c77c925

Please sign in to comment.
Something went wrong with that request. Please try again.