fix gradle scripts, update readme

README.md

@@ -1,31 +1,38 @@
-## JADX  [![Build Status](https://buildhive.cloudbees.com/job/skylot/job/jadx/badge/icon)](https://buildhive.cloudbees.com/job/skylot/job/jadx/)
+## JADX 
 **jadx** - Dex to Java decompiler
 
-Command line tool for produce Java sources from Android Dex and Jar files
+Command line and GUI tools for produce Java source code from Android Dex files
+
+Note: jadx-gui now in experimental stage
+
 
 ### Downloads
 Latest version available at 
-[github](https://github.com/skylot/jadx/releases),
+[github](https://github.com/skylot/jadx/releases) or 
 [sourceforge](http://sourceforge.net/projects/jadx/files/) 
-or
-[bintray](http://bintray.com/pkg/show/general/skylot/jadx/jadx-cli)
 
-### Build
+
+### Build [![Build Status](https://buildhive.cloudbees.com/job/skylot/job/jadx/badge/icon)](https://buildhive.cloudbees.com/job/skylot/job/jadx/)
 
     git clone https://github.com/skylot/jadx.git
     cd jadx
-    ./gradlew build
+    ./gradlew clean build pack
     
 (on Windows, use `gradlew.bat` instead of `./gradlew`)
 
-Scripts for run jadx will be placed in `build/install/jadx/bin`
-and also packed to `build/distributions/jadx-<version>.zip`
+Scripts for run jadx will be placed in `build/jadx/bin`
+and also packed to `build/jadx-<version>.zip`
+
 
 ### Run
 Run **jadx** on itself:
 
-    cd build/install/jadx/
-    bin/jadx -d out lib/jadx-*.jar
+    cd build/jadx/
+    bin/jadx-cli -d out lib/jadx-core-*.jar
+or
+
+    bin/jadx-gui lib/jadx-core-*.jar
+
 
 ### Usage
 ```

build.gradle

@@ -10,6 +10,8 @@ subprojects {
     sourceCompatibility = 1.6
     targetCompatibility = 1.6
 
+    version = jadxVersion
+
     jar {
         version = jadxVersion
     }
@@ -19,7 +21,6 @@ subprojects {
     }
 
     dependencies {
-        compile 'com.google.android.tools:dx:1.7'
         compile 'org.slf4j:slf4j-api:1.7.5'
         compile 'ch.qos.logback:logback-classic:1.0.13'
         testCompile 'junit:junit:4.11'
@@ -30,6 +31,23 @@ subprojects {
     }
 }
 
+task copyArtifacts (type: Sync, dependsOn: ["jadx-cli:installApp", "jadx-gui:installApp"]) {
+    destinationDir file("$buildDir/jadx")
+    ['jadx-cli', 'jadx-gui'].each {
+        from tasks.getByPath(":${it}:installApp").destinationDir
+    }
+}
+
+task pack (type: Zip, dependsOn: copyArtifacts) {
+    destinationDir buildDir
+    archiveName "jadx-${jadxVersion}.zip"
+    from copyArtifacts.destinationDir
+}
+
+task clean(type: Delete) {
+  delete buildDir
+}
+
 task wrapper(type: Wrapper) {
     gradleVersion = '1.6'
 }

jadx-cli/build.gradle

@@ -22,7 +22,7 @@ startScripts {
 
 applicationDistribution.with {
     into('') {
-        from '.'
+        from '../.'
         include 'README.md'
         include 'NOTICE'
     }

jadx-gui/build.gradle

@@ -23,7 +23,7 @@ startScripts {
 
 applicationDistribution.with {
     into('') {
-        from '.'
+        from '../'
         include 'README.md'
         include 'NOTICE'
     }

jadx-samples/build.gradle

@@ -9,7 +9,6 @@ dependencies {
 }
 
 sourceSets {
-    samples
     //TODO don't add to eclipse classpath
     samplesJadx {
         java {
@@ -19,14 +18,14 @@ sourceSets {
     }
 }
 
-task samplesRun(type: JavaExec, dependsOn: compileSamplesJava) {  
-    classpath = sourceSets.samples.output
+task samplesRun(type: JavaExec, dependsOn: compileJava) {  
+    classpath = sourceSets.main.output
     main = mainSamplesClass  
 }
 
 task samplesJar(type: Jar, dependsOn: samplesRun) {
     baseName = 'samples'
-    from sourceSets.samples.output
+    from sourceSets.main.output
 }
 
 task samplesJadxCreate(type: JavaExec, dependsOn: [compileJava, samplesJar]) {  

settings.gradle

@@ -1 +1 @@
-include 'jadx-core', 'jadx-cli', 'jadx-gui', 'jadx-samples'
+include 'jadx-core', 'jadx-samples', 'jadx-cli', 'jadx-gui'