From 353041535c658ea4f936481e97e5acdb7cc167ff Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sat, 22 Oct 2016 09:35:36 -0700
Subject: [PATCH] Distribute shared library .debug files. (#136)

---
 ntcore.gradle  | 8 +++++++-
 wpiutil.gradle | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ntcore.gradle b/ntcore.gradle
index 73d9df30cd..1072a5439f 100644
--- a/ntcore.gradle
+++ b/ntcore.gradle
@@ -52,7 +52,7 @@ def ntcoreSetupModel = { project ->
 }
 
 def ntcoreZipTask = { project ->
-    project.ext.ntcoreZip = project.tasks.create("${project.isArm ? 'arm' : 'native'}NtcoreZip", Zip) {
+    project.ext.ntcoreZip = project.tasks.create("ntcoreZip", Zip) {
         description = 'Creates platform-specific zip of the desktop ntcore libraries.'
         group = 'WPILib'
         destinationDir = project.buildDir
@@ -83,6 +83,12 @@ def ntcoreZipTask = { project ->
                     from(binary.sharedLibraryFile) {
                         into getPlatformPath(binary)
                     }
+                    def debugFile = new File(binary.sharedLibraryFile.absolutePath + ".debug")
+                    if (debugFile.exists()) {
+                        from(debugFile) {
+                            into getPlatformPath(binary)
+                        }
+                    }
                 }
             }
         }
diff --git a/wpiutil.gradle b/wpiutil.gradle
index 2345cd9574..a31d8dbf30 100644
--- a/wpiutil.gradle
+++ b/wpiutil.gradle
@@ -29,7 +29,7 @@ def wpiutilSetupModel = { project ->
 
 
 def wpiutilZipTask = { project ->
-    project.ext.wpiutilZip = project.tasks.create("${project.isArm ? 'arm' : 'native'}WpiutilZip", Zip) {
+    project.ext.wpiutilZip = project.tasks.create("wpiutilZip", Zip) {
         description = 'Creates platform-specific zip of the desktop wpiutil libraries.'
         group = 'WPILib'
         destinationDir = project.buildDir
@@ -52,6 +52,12 @@ def wpiutilZipTask = { project ->
                     from(binary.sharedLibraryFile) {
                         into getPlatformPath(binary)
                     }
+                    def debugFile = new File(binary.sharedLibraryFile.absolutePath + ".debug")
+                    if (debugFile.exists()) {
+                        from(debugFile) {
+                            into getPlatformPath(binary)
+                        }
+                    }
                 }
             }
         }