Skip to content

Commit 9b6ac43

Browse files
authored
Merge pull request #825 from samyron/fix-jruby-java-build
Fix JRuby Java extension build on Windows
2 parents a497c71 + 90680fa commit 9b6ac43

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Rakefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,15 @@ desc "Generate parser with ragel"
4848
task :ragel => [JAVA_PARSER_SRC]
4949

5050
if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
51+
path_separator = File::PATH_SEPARATOR
5152
ENV['JAVA_HOME'] ||= [
5253
'/usr/local/java/jdk',
5354
'/usr/lib/jvm/java-6-openjdk',
5455
'/Library/Java/Home',
5556
].find { |c| File.directory?(c) }
5657
if ENV['JAVA_HOME']
5758
warn " *** JAVA_HOME is set to #{ENV['JAVA_HOME'].inspect}"
58-
ENV['PATH'] = ENV['PATH'].split(/:/).unshift(java_path = "#{ENV['JAVA_HOME']}/bin") * ':'
59+
ENV['PATH'] = ENV['PATH'].split(/path_separator/).unshift(java_path = "#{ENV['JAVA_HOME']}/bin") * path_separator
5960
warn " *** java binaries are assumed to be in #{java_path.inspect}"
6061
else
6162
warn " *** JAVA_HOME was not set or could not be guessed!"
@@ -65,7 +66,7 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
6566
JRUBY_JAR = File.join(CONFIG["libdir"], "jruby.jar")
6667
if File.exist?(JRUBY_JAR)
6768
JAVA_SOURCES.each do |src|
68-
classpath = (Dir['java/lib/*.jar'] << 'java/src' << JRUBY_JAR) * ':'
69+
classpath = (Dir['java/lib/*.jar'] << 'java/src' << JRUBY_JAR) * path_separator
6970
obj = src.sub(/\.java\Z/, '.class')
7071
file obj => src do
7172
sh 'javac', '-classpath', classpath, '-source', '1.8', '-target', '1.8', src

0 commit comments

Comments
 (0)