Merge pull request #491 from manav-mj/debugger

Debugger for Android Mode

Author: codeanticode

.gitignore

@@ -1,5 +1,7 @@
 mode/processing-core.zip
-mode/mode/*.jar
+mode/mode/AndroidMode.jar
+mode/mode/gradle-tooling-api*
+mode/mode/slf4j*
 
 mode/libraries/vr/library
 mode/tools/SDKUpdated/tool

build.gradle

@@ -32,6 +32,7 @@ allprojects {
     ext.slf4jVersion = '1.7.10'
     ext.gradlewVersion = '4.4.1'
     ext.toolsLibVersion = '26.0.0-dev'
+    ext.jdtVersion = '3.11.100'
 
     Properties modeProperties = new Properties()
     modeProperties.load(project.rootProject.file("mode/mode.properties").newDataInputStream())
@@ -93,9 +94,11 @@ task dist {
         // Copy assets to build dir
         FileUtils.copyDirectory(file("mode/templates"), file("${root}/templates"))
         FileUtils.copyDirectory(file("mode/examples"), file("${root}/examples"))
-        FileUtils.copyDirectory(file("mode/icons"), file("${root}/icons"))
-        FileUtils.copyDirectory(file("mode/mode"), file("${root}/mode"))
+        FileUtils.copyDirectory(file("mode/icons"), file("${root}/icons"))        
         FileUtils.copyDirectory(file("mode/theme"), file("${root}/theme"))
+        FileUtils.copyDirectory(file("mode/mode"), file("${root}/mode"))
+        delete "${root}/mode/jdi.jar"
+        delete "${root}/mode/jdimodel.jar"
 
         Files.copy(file("mode/processing-core.zip").toPath(),
                    file("${root}/processing-core.zip").toPath(), REPLACE_EXISTING);

mode/build.gradle

@@ -7,16 +7,21 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 // https://stackoverflow.com/a/43602463
 configurations {
     compile.extendsFrom compileAndCopy
+    compile.extendsFrom compileAndExtract
 }
 
 dependencies {
     compile group: "org.processing", name: "core", version: "${processingVersion}"
     compile group: "org.processing", name: "pde", version: "${processingVersion}"
     compile group: "org.processing", name: "java-mode", version: "${processingVersion}"
 
+    compileAndExtract "org.eclipse.jdt:org.eclipse.jdt.debug:${jdtVersion}"
+
     compileAndCopy "org.gradle:gradle-tooling-api:${toolingVersion}"
     compileAndCopy "org.slf4j:slf4j-api:${slf4jVersion}"
-    compileAndCopy "org.slf4j:slf4j-simple:${slf4jVersion}"
+    compileAndCopy "org.slf4j:slf4j-simple:${slf4jVersion}"    
+
+    compile fileTree(include: ["jdi.jar", "jdimodel.jar"], dir: 'mode')
 }
 
 // This task copies the gradle tooling jar into the mode folder
@@ -34,6 +39,16 @@ sourceSets {
     }
 }
 
+task getjdi(type: Copy) {
+  // This task extracts the jar files inside org.eclipse.jdt.debug, which are
+  // jdi.jar and jdimodel.jar and needed to build the debugger.
+  from(zipTree(configurations.compileAndExtract.files[0])) {
+    include '**/*.jar'
+    exclude 'META-INF'
+  }
+  into "mode"  
+}
+
 task permissions(type:Exec) {
    // This task retrieves the latest list of Android permissions and adds them
    // to the Permissions.java file. The python scripts requries BeautifulSoup
@@ -57,6 +72,8 @@ wrapper.doLast {
 clean.doFirst {
     delete fileTree("mode") {
         include "**/*.jar"
+		exclude "jdi.jar"
+		exclude "jdimodel.jar"
     }
 }