added target folder back to the classpath for loading Java classes

usethesource · Jun 17, 2024 · f879803 · f879803
1 parent b212c7e
commit f879803
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/src/org/rascalmpl/library/util/Eval.java b/src/org/rascalmpl/library/util/Eval.java
@@ -243,7 +243,7 @@ public RascalRuntime(PathConfig pcfg, InputStream input, OutputStream stderr, Ou
 				eval.addRascalSearchPath((ISourceLocation) path);
 			}
 
-			ClassLoader cl = new SourceLocationClassLoader(pcfg.getLibs(), ShellEvaluatorFactory.class.getClassLoader());
+			ClassLoader cl = new SourceLocationClassLoader(pcfg.getLibsAndTarget(), ShellEvaluatorFactory.class.getClassLoader());
 			eval.addClassLoader(cl);
 		}
 

diff --git a/src/org/rascalmpl/library/util/PathConfig.java b/src/org/rascalmpl/library/util/PathConfig.java
@@ -289,6 +289,10 @@ public PathConfig addIgnoreLoc(ISourceLocation dir) throws IOException {
 	public IList getLibs() {
         return vf.list(libs.toArray(new IValue[0]));
     }
+
+    public IList getLibsAndTarget() {
+        return getLibs().append(getBin());
+    }
 
 	public PathConfig addLibLoc(ISourceLocation dir) throws IOException {
 		List<ISourceLocation> extendedlibs = new ArrayList<ISourceLocation>(libs);

diff --git a/src/org/rascalmpl/shell/ShellEvaluatorFactory.java b/src/org/rascalmpl/shell/ShellEvaluatorFactory.java
@@ -77,7 +77,7 @@ public static void configureProjectEvaluator(Evaluator evaluator, ISourceLocatio
             evaluator.addRascalSearchPath((ISourceLocation) path);
         }
 
-        ClassLoader cl = new SourceLocationClassLoader(pcfg.getLibs(), ShellEvaluatorFactory.class.getClassLoader());
+        ClassLoader cl = new SourceLocationClassLoader(pcfg.getLibsAndTarget(), ShellEvaluatorFactory.class.getClassLoader());
         evaluator.addClassLoader(cl);    
     }
 

diff --git a/src/org/rascalmpl/test/infrastructure/RascalJUnitTestRunner.java b/src/org/rascalmpl/test/infrastructure/RascalJUnitTestRunner.java
@@ -111,7 +111,7 @@ public static void configureProjectEvaluator(Evaluator evaluator, ISourceLocatio
                 evaluator.addRascalSearchPath((ISourceLocation) path); 
             }
 
-            ClassLoader cl = new SourceLocationClassLoader(pcfg.getLibs(), ShellEvaluatorFactory.class.getClassLoader());
+            ClassLoader cl = new SourceLocationClassLoader(pcfg.getLibsAndTarget(), ShellEvaluatorFactory.class.getClassLoader());
             evaluator.addClassLoader(cl);
         }
         catch (AssertionError e) {

diff --git a/src/org/rascalmpl/uri/classloaders/PathConfigClassLoader.java b/src/org/rascalmpl/uri/classloaders/PathConfigClassLoader.java
@@ -21,6 +21,6 @@
  */
 public class PathConfigClassLoader extends SourceLocationClassLoader {
     public PathConfigClassLoader(PathConfig pcfg, ClassLoader parent) {
-        super(pcfg.getLibs(), parent);
+        super(pcfg.getLibsAndTarget(), parent);
     }
 }