From 8fb73969b7b2d11d69c1380c599adafea493e1cf Mon Sep 17 00:00:00 2001
From: Eric Salemi <eric.salemi@gmail.com>
Date: Fri, 5 Jun 2020 16:30:25 +0200
Subject: [PATCH] Add distribution files

---
 .gitignore                       |  7 +++----
 base/build.gradle                |  3 ++-
 bin/proguard.bat                 |  2 +-
 bin/proguard.sh                  |  2 +-
 bin/{gui.bat => proguardgui.bat} |  2 +-
 bin/{gui.sh => proguardgui.sh}   |  2 +-
 bin/retrace.bat                  |  2 +-
 bin/retrace.sh                   |  2 +-
 build.gradle                     | 35 ++++++++++++++++++++++++++++++++
 gui/build.gradle                 |  3 ++-
 retrace/build.gradle             |  3 ++-
 11 files changed, 50 insertions(+), 13 deletions(-)
 rename bin/{gui.bat => proguardgui.bat} (87%)
 rename bin/{gui.sh => proguardgui.sh} (89%)

diff --git a/.gitignore b/.gitignore
index dfe87b41..a96814fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
+.gradle
 .hg/**
 .hgtags
-build
-base/build
-.gradle
 .idea
+build
 local.properties
-
+/lib/
\ No newline at end of file
diff --git a/base/build.gradle b/base/build.gradle
index 5d4a430b..352bf3d5 100644
--- a/base/build.gradle
+++ b/base/build.gradle
@@ -32,7 +32,8 @@ dependencies {
 }
 
 task fatJar(type: ShadowJar) {
-    archiveFileName.set('base-fat.jar')
+    destinationDirectory.set(file("$rootDir/lib"))
+    archiveFileName.set('proguard.jar')
     from sourceSets.main.output
     configurations = [project.configurations.runtime]
     manifest {
diff --git a/bin/proguard.bat b/bin/proguard.bat
index 1b781f92..daf2c1a3 100644
--- a/bin/proguard.bat
+++ b/bin/proguard.bat
@@ -11,4 +11,4 @@ IF EXIST "%PROGUARD_HOME%" GOTO home
 SET PROGUARD_HOME=%~dp0\..
 :home
 
-java -jar "%PROGUARD_HOME%\base\build\libs\base-fat.jar" %*
+java -jar "%PROGUARD_HOME%\lib\proguard.jar" %*
diff --git a/bin/proguard.sh b/bin/proguard.sh
index e0f8ece5..3ee60ed7 100755
--- a/bin/proguard.sh
+++ b/bin/proguard.sh
@@ -21,4 +21,4 @@ fi
 
 PROGUARD_HOME=`dirname "$PROGUARD"`/..
 
-java -jar "$PROGUARD_HOME/base/build/libs/base-fat.jar" "$@"
+java -jar "$PROGUARD_HOME/lib/proguard.jar" "$@"
diff --git a/bin/gui.bat b/bin/proguardgui.bat
similarity index 87%
rename from bin/gui.bat
rename to bin/proguardgui.bat
index f99e0f3f..c328f5b1 100644
--- a/bin/gui.bat
+++ b/bin/proguardgui.bat
@@ -11,4 +11,4 @@ IF EXIST "%PROGUARD_HOME%" GOTO home
 SET PROGUARD_HOME=%~dp0\..
 :home
 
-java -jar "%PROGUARD_HOME%\gui\build\libs\gui-fat.jar" %*
+java -jar "%PROGUARD_HOME%\lib\proguardgui.jar" %*
diff --git a/bin/gui.sh b/bin/proguardgui.sh
similarity index 89%
rename from bin/gui.sh
rename to bin/proguardgui.sh
index 492eaafe..aba7f622 100755
--- a/bin/gui.sh
+++ b/bin/proguardgui.sh
@@ -24,4 +24,4 @@ PROGUARD_HOME=`dirname "$PROGUARD"`/..
 # On Linux, Java 1.6.0_24 and higher hang when starting the GUI:
 #   http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7027598
 # We're using the -D option as a workaround.
-java -DsuppressSwingDropSupport=true -jar "$PROGUARD_HOME/gui/build/libs/gui-fat.jar" "$@"
+java -DsuppressSwingDropSupport=true -jar "$PROGUARD_HOME/lib/proguardgui.jar" "$@"
diff --git a/bin/retrace.bat b/bin/retrace.bat
index 77ffd933..ae16ddec 100644
--- a/bin/retrace.bat
+++ b/bin/retrace.bat
@@ -11,4 +11,4 @@ IF EXIST "%PROGUARD_HOME%" GOTO home
 SET PROGUARD_HOME=%~dp0\..
 :home
 
-java -jar "%PROGUARD_HOME%\retrace\build\libs\retrace-fat.jar" %*
+java -jar "%PROGUARD_HOME%\lib\retrace.jar" %*
diff --git a/bin/retrace.sh b/bin/retrace.sh
index 9f54cd16..2f274de9 100755
--- a/bin/retrace.sh
+++ b/bin/retrace.sh
@@ -21,4 +21,4 @@ fi
 
 PROGUARD_HOME=`dirname "$PROGUARD"`/..
 
-java -jar "$PROGUARD_HOME/retrace/build/libs/retrace-fat.jar" "$@"
+java -jar "$PROGUARD_HOME/lib/retrace.jar" "$@"
diff --git a/build.gradle b/build.gradle
index b8022ee5..1754d4d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,5 @@
 plugins {
+    id 'distribution'
     id 'maven-publish'
     id 'signing'
 }
@@ -119,3 +120,37 @@ publishing {
         }
     }
 }
+
+distributions {
+    main {
+        distributionBaseName.set('proguard')
+        contents {
+            into('lib') {
+                from tasks.getByPath(':base:fatJar').outputs
+                from tasks.getByPath(':gui:fatJar').outputs
+                from tasks.getByPath(':retrace:fatJar').outputs
+            }
+            into('docs') {
+                from('docs/md') {
+                    includeEmptyDirs = false
+                    include '**/*.md'
+                }
+            }
+            from(rootDir) {
+                include 'bin/'
+                include 'examples/'
+                include 'LICENSE'
+                include 'LICENSE_exception.md'
+            }
+        }
+    }
+}
+
+distTar {
+    compression = Compression.GZIP
+    archiveExtension.set('tar.gz')
+}
+
+clean {
+    delete file("$rootDir/lib")
+}
\ No newline at end of file
diff --git a/gui/build.gradle b/gui/build.gradle
index 0531c0c4..a01ef3fd 100644
--- a/gui/build.gradle
+++ b/gui/build.gradle
@@ -33,7 +33,8 @@ dependencies {
 }
 
 task fatJar(type: ShadowJar) {
-    archiveFileName.set('gui-fat.jar')
+    destinationDirectory.set(file("$rootDir/lib"))
+    archiveFileName.set('proguardgui.jar')
     from sourceSets.main.output
     configurations = [project.configurations.runtime]
     manifest {
diff --git a/retrace/build.gradle b/retrace/build.gradle
index 63796872..af1147b4 100644
--- a/retrace/build.gradle
+++ b/retrace/build.gradle
@@ -32,7 +32,8 @@ dependencies {
 }
 
 task fatJar(type: ShadowJar) {
-    archiveFileName.set('retrace-fat.jar')
+    destinationDirectory.set(file("$rootDir/lib"))
+    archiveFileName.set('retrace.jar')
     from sourceSets.main.output
     configurations = [project.configurations.runtime]
     manifest {