changeset 21946:a50fa3266a0a

Truffle/SL/Debugging: add to the SLREPL debugger an artificial static dependency on SLLanguage, to ensure that it will be on the class path. This is a workaround for the lack of a mechanism to record such dynamic dependencies in the face of complaint by j"canonicalizeprojects".
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Tue, 16 Jun 2015 18:11:23 -0700
parents 179c3a0bac32
children 9f70fc90169d
files graal/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLServer.java mx/suite.py
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLServer.java	Tue Jun 16 17:27:17 2015 -0700
+++ b/graal/com.oracle.truffle.sl.tools/src/com/oracle/truffle/sl/tools/debug/SLREPLServer.java	Tue Jun 16 18:11:23 2015 -0700
@@ -32,6 +32,7 @@
 import com.oracle.truffle.api.source.*;
 import com.oracle.truffle.api.vm.*;
 import com.oracle.truffle.api.vm.TruffleVM.Language;
+import com.oracle.truffle.sl.*;
 import com.oracle.truffle.tools.debug.engine.*;
 import com.oracle.truffle.tools.debug.shell.*;
 import com.oracle.truffle.tools.debug.shell.client.*;
@@ -48,6 +49,9 @@
  */
 public final class SLREPLServer implements REPLServer {
 
+    // TODO (mlvdv) remove when there's a better way to express this dependency
+    @SuppressWarnings("unused") private static final Class<SLLanguage> DYNAMIC_DEPENDENCY = com.oracle.truffle.sl.SLLanguage.class;
+
     public static void main(String[] args) {
         // Cheating for the prototype: start from SL, rather than from the client.
         final SLREPLServer server = new SLREPLServer();
--- a/mx/suite.py	Tue Jun 16 17:27:17 2015 -0700
+++ b/mx/suite.py	Tue Jun 16 18:11:23 2015 -0700
@@ -329,7 +329,8 @@
      "com.oracle.truffle.sl.tools" : {
       "subDir" : "graal",
       "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.truffle.tools.debug.shell"],
+      "dependencies" : ["com.oracle.truffle.tools.debug.shell",
+                        "com.oracle.truffle.sl"],
       "checkstyle" : "com.oracle.truffle.api",
       "javaCompliance" : "1.7",
       "workingSets" : "Truffle,SimpleLanguage,Tools",