Merge pull request processing#1636 from Manindra29/jdiMod

benfry · benfry · commit 6b334aa17579 · 2013-04-11T05:14:58.000-07:00
Moving on to eclipse jdi, getting rid of tools.jar dependency
diff --git a/app/.classpath b/app/.classpath
@@ -21,5 +21,9 @@
 	<classpathentry kind="lib" path="lib/apple.jar"/>
 	<classpathentry kind="lib" path="test/lib/junit-4.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/org-netbeans-swing-outline.jar"/>
+	<classpathentry kind="lib" path="lib/com.ibm.icu_4.4.2.v20110823.jar"/>
+	<classpathentry kind="lib" path="lib/jdi.jar"/>
+	<classpathentry kind="lib" path="lib/jdimodel.jar"/>
+	<classpathentry kind="lib" path="lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/app/build.xml b/app/build.xml
@@ -116,7 +116,7 @@
 	   excludes="**/tools/format/**" 
 	   encoding="UTF-8" 
 	   includeAntRuntime="false" 
-	   classpath="../core/library/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/jdt-core.jar; lib/jna.jar; lib/org-netbeans-swing-outline.jar"
+	   classpath="../core/library/core.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/jdt-core.jar; lib/jna.jar; lib/org-netbeans-swing-outline.jar;lib/com.ibm.icu_4.4.2.v20110823.jar;lib/jdi.jar;lib/jdimodel.jar;lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar"
 	   debug="on">
       <src path="src" />
       <src path="generated" />
diff --git a/app/lib/com.ibm.icu_4.4.2.v20110823.jar b/app/lib/com.ibm.icu_4.4.2.v20110823.jar
diff --git a/app/lib/jdi.jar b/app/lib/jdi.jar
diff --git a/app/lib/jdimodel.jar b/app/lib/jdimodel.jar
diff --git a/app/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar b/app/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar
diff --git a/app/src/processing/mode/java/runner/EventThread.java b/app/src/processing/mode/java/runner/EventThread.java
@@ -363,7 +363,9 @@ private void exceptionEvent(ExceptionEvent event) {
 //    com.sun.jdi.ObjectReference or = event.exception();
 //    System.out.println("exceptionEvent() fired " + or);
 //    System.out.println("catch location " + event.catchLocation());
-    
+    for (ThreadReference thread : vm.allThreads()) {
+      thread.suspend();
+    }
     parent.exception(event);
     
     /*
diff --git a/app/src/processing/mode/java/runner/Runner.java b/app/src/processing/mode/java/runner/Runner.java
@@ -290,8 +290,7 @@ protected String[] getSketchParams() {
       }
 
       params.add(PApplet.ARGS_DISPLAY + "=" + runDisplay);
-      params.add(PApplet.ARGS_SKETCH_FOLDER + "=" +
-                 build.getSketchPath());
+      
 
       if (presenting) {
         params.add(PApplet.ARGS_FULL_SCREEN);
@@ -305,6 +304,10 @@ protected String[] getSketchParams() {
       }
 
       params.add(build.getSketchClassName());
+      params.add(PApplet.ARGS_SKETCH_FOLDER + "=" +
+        build.getSketchPath());
+      // Adding sketch path in the end coz it's likely to
+      // contain spaces and things go wrong on UNIX systems.
     }
 
 //    String outgoing[] = new String[params.size()];
@@ -329,16 +332,13 @@ protected VirtualMachine launchVirtualMachine(String[] vmParams,
     // Using localhost instead of 127.0.0.1 sometimes causes a
     // "Transport Error 202" error message when trying to run.
     // http://dev.processing.org/bugs/show_bug.cgi?id=895
-    String addr = "127.0.0.1:" + (8000 + (int) (Math.random() * 1000));
+    // String addr = "127.0.0.1:" + (8000 + (int) (Math.random() * 1000));
     //String addr = "localhost:" + (8000 + (int) (Math.random() * 1000));
-    //String addr = "" + (8000 + (int) (Math.random() * 1000));
+    String addr = "" + (8000 + (int) (Math.random() * 1000));
 
     String commandArgs =
       "java -Xrunjdwp:transport=dt_socket,address=" + addr + ",suspend=y ";
-    if (Base.isWindows()) {
-      commandArgs =
-        "java -Xrunjdwp:transport=dt_shmem,address=" + addr + ",suspend=y ";
-    } else if (Base.isMacOS()) {
+    if (Base.isMacOS()) {
       // Decided to just set this to 1.6 only, because otherwise it's gonna
       // be a shitshow if folks are getting Apple's 1.6 with 32-bit and
       // Oracle's 1.7 when run in 64-bit mode. ("Why does my sketch suck in
@@ -484,7 +484,7 @@ protected void generateTrace(PrintWriter writer) {
     //if (writer != null) {
     eventThread = new EventThread(this, vm, excludes, writer);
     eventThread.start();
-    eventThread.setEventRequests(watchFields);
+    //eventThread.setEventRequests(watchFields); //redundant?
     //}
 
     //redirectOutput();
@@ -538,9 +538,9 @@ protected void generateTrace(PrintWriter writer) {
 
 
   protected Connector findConnector(String connectorName) {
-    List connectors = Bootstrap.virtualMachineManager().allConnectors();
-//    List connectors =
-//      org.eclipse.jdi.Bootstrap.virtualMachineManager().allConnectors();
+//    List connectors = Bootstrap.virtualMachineManager().allConnectors();
+    List connectors =
+      org.eclipse.jdi.Bootstrap.virtualMachineManager().allConnectors();
 
     // debug: code to list available connectors
 //    Iterator iter2 = connectors.iterator();
diff --git a/build/build.xml b/build/build.xml
@@ -75,6 +75,10 @@
     <include name="app/lib/ant.jar" />
     <include name="app/lib/ant-launcher.jar" />
     <include name="app/lib/org-netbeans-swing-outline.jar" />
+    <include name="app/lib/jdi.jar" />
+    <include name="app/lib/jdimodel.jar" />
+    <include name="app/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar" />
+    <include name="app/lib/com.ibm.icu_4.4.2.v20110823.jar" />
   </fileset>
 
   <target name="build" description="Build Processing.">
diff --git a/build/linux/processing b/build/linux/processing
@@ -17,7 +17,7 @@
 
 
 # JARs required from JDK (anywhere in/below the JDK home directory)
-JDKLIBS="rt.jar tools.jar"
+JDKLIBS="rt.jar"
 
 # Set this to non-zero for logging
 LOGGING=0
diff --git a/build/macosx/template.app/Contents/Info.plist b/build/macosx/template.app/Contents/Info.plist
@@ -84,7 +84,7 @@
       <!-- In 0149, removed /System/Library/Java from the CLASSPATH because
            it can cause problems if users have installed weird files there.
            http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
-      <string>$JAVAROOT/lib/pde.jar:$JAVAROOT/core/library/core.jar:$JAVAROOT/lib/ant.jar:$JAVAROOT/lib/ant-launcher.jar:$JAVAROOT/lib/antlr.jar:$JAVAROOT/lib/jna.jar:$JAVAROOT/lib/org-netbeans-swing-outline.jar</string>
+      <string>$JAVAROOT/lib/pde.jar:$JAVAROOT/core/library/core.jar:$JAVAROOT/lib/ant.jar:$JAVAROOT/lib/ant-launcher.jar:$JAVAROOT/lib/antlr.jar:$JAVAROOT/lib/jna.jar:$JAVAROOT/lib/org-netbeans-swing-outline.jar:$JAVAROOT/lib/com.ibm.icu_4.4.2.v20110823.jar:$JAVAROOT/lib/jdi.jar:$JAVAROOT/lib/jdimodel.jar:$JAVAROOT/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar</string>
 
       <!-- More properties can be found in http://developer.apple.com/releasenotes/Java/java141/system_properties/chapter_4_section_1.html#//apple_ref/doc/uid/TP30000285 -->
       <key>Properties</key>
diff --git a/build/windows/launcher/config-cmd.xml b/build/windows/launcher/config-cmd.xml
@@ -20,9 +20,13 @@
     <cp>lib/jna.jar</cp>
     <cp>lib/antlr.jar</cp>
     <cp>lib/ant.jar</cp>
-    <cp>lib/ant-launcher.jar</cp>
+    <cp>lib/ant-launcher.jar</cp>    
     <cp>lib/org-netbeans-swing-outline.jar</cp>
-    <cp>%EXEDIR%/java/lib/tools.jar</cp>
+    <cp>lib/com.ibm.icu_4.4.2.v20110823.jar</cp>
+    <cp>lib/jdi.jar</cp>
+    <cp>lib/jdimodel.jar</cp>
+    <cp>lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar</cp>
+    <!-- <cp>%EXEDIR%/java/lib/tools.jar</cp> -->
   </classPath>
   <jre>
     <path>java</path>
diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
@@ -22,7 +22,11 @@
     <cp>lib/ant.jar</cp>
     <cp>lib/ant-launcher.jar</cp>
     <cp>lib/org-netbeans-swing-outline.jar</cp>
-    <cp>%EXEDIR%/java/lib/tools.jar</cp>
+    <cp>lib/com.ibm.icu_4.4.2.v20110823.jar</cp>
+    <cp>lib/jdi.jar</cp>
+    <cp>lib/jdimodel.jar</cp>
+    <cp>lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar</cp>
+    <!-- <cp>%EXEDIR%/java/lib/tools.jar</cp> -->
   </classPath>
   <jre>
     <path>java</path>
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -10253,6 +10253,16 @@ static public void runSketch(final String args[], final PApplet constructedApple
       argIndex++;
     }
 
+    // Now that sketch path is passed in args after the sketch name
+    // it's not set in the above loop(the above loop breaks after
+    // finding sketch name). So setting sketch path here.
+    for (int i = 0; i < args.length; i++) {
+      if(args[i].startsWith(ARGS_SKETCH_FOLDER)){
+        folder = args[i].substring(args[i].indexOf('=') + 1);
+        //System.err.println("SF set " + folder);
+      }
+    }
+
     // Set this property before getting into any GUI init code
     //System.setProperty("com.apple.mrj.application.apple.menu.about.name", name);
     // This )*)(*@#$ Apple crap don't work no matter where you put it
