From 74efe5aafeed04250ce6c083cefff3a0bf97bc68 Mon Sep 17 00:00:00 2001
From: Jeremy White <jwhite@codeweavers.com>
Date: Fri, 20 Jul 2018 18:24:48 -0500
Subject: [PATCH] Get halsim_gazebo building again (#1201)

---
 simulation/frc_gazebo_plugins/build.gradle                | 1 +
 simulation/gz_msgs/build.gradle                           | 1 +
 simulation/halsim_gazebo/build.gradle                     | 8 +++++++-
 .../{halsim_gazebo => main/native}/cpp/GazeboAnalogIn.cpp | 0
 .../src/{halsim_gazebo => main/native}/cpp/GazeboDIO.cpp  | 0
 .../{halsim_gazebo => main/native}/cpp/GazeboEncoder.cpp  | 0
 .../src/{halsim_gazebo => main/native}/cpp/GazeboNode.cpp | 0
 .../src/{halsim_gazebo => main/native}/cpp/GazeboPCM.cpp  | 0
 .../src/{halsim_gazebo => main/native}/cpp/GazeboPWM.cpp  | 0
 .../src/{halsim_gazebo => main/native}/cpp/main.cpp       | 0
 .../headers => main/native/include}/GazeboAnalogIn.h      | 0
 .../headers => main/native/include}/GazeboDIO.h           | 0
 .../headers => main/native/include}/GazeboEncoder.h       | 0
 .../headers => main/native/include}/GazeboNode.h          | 0
 .../headers => main/native/include}/GazeboPCM.h           | 0
 .../headers => main/native/include}/GazeboPWM.h           | 0
 .../headers => main/native/include}/HALSimGazebo.h        | 0
 17 files changed, 9 insertions(+), 1 deletion(-)
 rename simulation/halsim_gazebo/src/{halsim_gazebo => main/native}/cpp/GazeboAnalogIn.cpp (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo => main/native}/cpp/GazeboDIO.cpp (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo => main/native}/cpp/GazeboEncoder.cpp (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo => main/native}/cpp/GazeboNode.cpp (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo => main/native}/cpp/GazeboPCM.cpp (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo => main/native}/cpp/GazeboPWM.cpp (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo => main/native}/cpp/main.cpp (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo/headers => main/native/include}/GazeboAnalogIn.h (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo/headers => main/native/include}/GazeboDIO.h (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo/headers => main/native/include}/GazeboEncoder.h (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo/headers => main/native/include}/GazeboNode.h (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo/headers => main/native/include}/GazeboPCM.h (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo/headers => main/native/include}/GazeboPWM.h (100%)
 rename simulation/halsim_gazebo/src/{halsim_gazebo/headers => main/native/include}/HALSimGazebo.h (100%)

diff --git a/simulation/frc_gazebo_plugins/build.gradle b/simulation/frc_gazebo_plugins/build.gradle
index e1177efbde..0e1c8094d3 100644
--- a/simulation/frc_gazebo_plugins/build.gradle
+++ b/simulation/frc_gazebo_plugins/build.gradle
@@ -6,6 +6,7 @@ apply plugin: "google-test"
 
 ext.skipAthena = true
 
+apply from: "${rootDir}/shared/config.gradle"
 
 /* If gz_msgs or gazebo is not available, do not attempt a build */
 def gazebo_version = ""
diff --git a/simulation/gz_msgs/build.gradle b/simulation/gz_msgs/build.gradle
index 8163a8cfae..876063f989 100644
--- a/simulation/gz_msgs/build.gradle
+++ b/simulation/gz_msgs/build.gradle
@@ -7,6 +7,7 @@ apply plugin: 'edu.wpi.first.NativeUtils'
 
 /* The simulation does not run on real hardware; so we always skip Athena */
 ext.skipAthena = true
+apply from: "${rootDir}/shared/config.gradle"
 
 repositories {
       mavenCentral()
diff --git a/simulation/halsim_gazebo/build.gradle b/simulation/halsim_gazebo/build.gradle
index afe6468f9a..0e410b2deb 100644
--- a/simulation/halsim_gazebo/build.gradle
+++ b/simulation/halsim_gazebo/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'edu.wpi.first.NativeUtils'
 apply plugin: 'cpp'
 
 ext.skipAthena = true
-
+ext.pluginName = 'halsim_gazebo'
 
 /* If gz_msgs or gazebo is not available, do not attempt a build */
 def gazebo_version = ""
@@ -37,9 +37,15 @@ tasks.whenTaskAdded { task ->
     task.onlyIf { !gz_msgs_project.hasProperty('skip_gz_msgs') && !project.hasProperty('skip_frc_plugins') }
 }
 
+apply from: "${rootDir}/shared/plugins/setupBuild.gradle"
+
 model {
     binaries {
         all {
+            if (it instanceof StaticLibraryBinarySpec) {
+                it.buildable = false
+                return
+            }
             linker.args gazebo_linker_args
             cppCompiler.args gazebo_cppflags
             lib project: ":simulation:gz_msgs", library: "gz_msgs", linkage: "static"
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboAnalogIn.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboAnalogIn.cpp
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboAnalogIn.cpp
rename to simulation/halsim_gazebo/src/main/native/cpp/GazeboAnalogIn.cpp
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboDIO.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboDIO.cpp
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboDIO.cpp
rename to simulation/halsim_gazebo/src/main/native/cpp/GazeboDIO.cpp
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboEncoder.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboEncoder.cpp
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboEncoder.cpp
rename to simulation/halsim_gazebo/src/main/native/cpp/GazeboEncoder.cpp
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboNode.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboNode.cpp
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboNode.cpp
rename to simulation/halsim_gazebo/src/main/native/cpp/GazeboNode.cpp
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboPCM.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboPCM.cpp
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboPCM.cpp
rename to simulation/halsim_gazebo/src/main/native/cpp/GazeboPCM.cpp
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboPWM.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboPWM.cpp
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/cpp/GazeboPWM.cpp
rename to simulation/halsim_gazebo/src/main/native/cpp/GazeboPWM.cpp
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/cpp/main.cpp b/simulation/halsim_gazebo/src/main/native/cpp/main.cpp
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/cpp/main.cpp
rename to simulation/halsim_gazebo/src/main/native/cpp/main.cpp
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboAnalogIn.h b/simulation/halsim_gazebo/src/main/native/include/GazeboAnalogIn.h
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboAnalogIn.h
rename to simulation/halsim_gazebo/src/main/native/include/GazeboAnalogIn.h
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboDIO.h b/simulation/halsim_gazebo/src/main/native/include/GazeboDIO.h
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboDIO.h
rename to simulation/halsim_gazebo/src/main/native/include/GazeboDIO.h
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboEncoder.h b/simulation/halsim_gazebo/src/main/native/include/GazeboEncoder.h
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboEncoder.h
rename to simulation/halsim_gazebo/src/main/native/include/GazeboEncoder.h
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboNode.h b/simulation/halsim_gazebo/src/main/native/include/GazeboNode.h
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboNode.h
rename to simulation/halsim_gazebo/src/main/native/include/GazeboNode.h
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboPCM.h b/simulation/halsim_gazebo/src/main/native/include/GazeboPCM.h
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboPCM.h
rename to simulation/halsim_gazebo/src/main/native/include/GazeboPCM.h
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboPWM.h b/simulation/halsim_gazebo/src/main/native/include/GazeboPWM.h
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/headers/GazeboPWM.h
rename to simulation/halsim_gazebo/src/main/native/include/GazeboPWM.h
diff --git a/simulation/halsim_gazebo/src/halsim_gazebo/headers/HALSimGazebo.h b/simulation/halsim_gazebo/src/main/native/include/HALSimGazebo.h
similarity index 100%
rename from simulation/halsim_gazebo/src/halsim_gazebo/headers/HALSimGazebo.h
rename to simulation/halsim_gazebo/src/main/native/include/HALSimGazebo.h