Skip to content

Commit

Permalink
use openjdk7 and disable invoke dynamic in jruby
Browse files Browse the repository at this point in the history
  • Loading branch information
hone committed Jul 31, 2012
1 parent 56c6f6d commit c4f2cc0
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions lib/language_pack/ruby.rb
Expand Up @@ -12,7 +12,7 @@ class LanguagePack::Ruby < LanguagePack::Base
NODE_VERSION = "0.4.7"
NODE_JS_BINARY_PATH = "node-#{NODE_VERSION}"
JVM_BASE_URL = "http://heroku-jvm-langpack-java.s3.amazonaws.com"
JVM_VERSION = "openjdk6-latest"
JVM_VERSION = "openjdk7-latest"

# detects if this is a valid Ruby app
# @return [Boolean] true if it's a Ruby app
Expand All @@ -35,7 +35,7 @@ def default_config_vars
"GEM_PATH" => slug_vendor_base,
}

ruby_version_jruby? ? vars.merge("JAVA_OPTS" => default_java_opts) : vars
ruby_version_jruby? ? vars.merge("JAVA_OPTS" => default_java_opts, "JRUBY_OPTS" => default_jruby_opts) : vars
end

def default_process_types
Expand Down Expand Up @@ -155,6 +155,12 @@ def default_java_opts
"-Xmx384m -Xss512k -XX:+UseCompressedOops -Dfile.encoding=UTF-8"
end

# default JRUBY_OPTS
# return [String] string of JRUBY_OPTS
def default_jruby_opts
"-Xcompile.invokedynamic=false"
end

# list the available valid ruby versions
# @note the value is memoized
# @return [Array] list of Strings of the ruby versions available
Expand Down Expand Up @@ -190,6 +196,7 @@ def setup_profiled

if ruby_version_jruby?
set_env_default "JAVA_OPTS", default_java_opts
set_env_default "JRUBY_OPTS", default_jruby_opts
end
end

Expand Down

0 comments on commit c4f2cc0

Please sign in to comment.