Hack this to use modules in classpath for now

headius · Jan 22, 2024 · 49ecb57 · 49ecb57
1 parent b260d48
commit 49ecb57
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/rakelib/commands.rake b/rakelib/commands.rake
@@ -6,9 +6,11 @@ rescue Exception => ex
 end
 require 'rbconfig'
 
+JRUBY_CLASSPATH = Dir["lib/modules/*.jar"].join(':')
+
 def initialize_paths
   ant.path(:id => "jruby.execute.classpath") do
-    pathelement :path => "lib/jruby.jar"
+    pathelement :path => JRUBY_CLASSPATH
   end
 
   ant.path(:id => "test.class.path") do
@@ -18,7 +20,7 @@ def initialize_paths
     pathelement :path => File.join(BUILD_LIB_DIR, 'bsf.jar')
     pathelement :path => File.join(BUILD_LIB_DIR, 'commons-logging.jar')
     #  pathelement :path => "${java.class.path}"/>
-    pathelement :path => File.join(LIB_DIR, 'jruby.jar')
+    pathelement :path => JRUBY_CLASSPATH
     pathelement :location => TEST_CLASSES_DIR
     pathelement :path => File.join(TEST_DIR, 'jruby', 'requireTest.jar')
     pathelement :location => TEST_DIR
@@ -36,7 +38,7 @@ def jruby(java_options = {}, &code)
   puts "JAVA options: #{java_options.inspect}"
 
   ant.java(java_options) do
-    classpath :path => 'lib/jruby.jar'
+    classpath :path => JRUBY_CLASSPATH
     sysproperty :key => "jruby.home", :value => BASE_DIR
     instance_eval(&code) if block_given?
   end