reworked the way you pass args

CurtinFRC · Mar 9, 2024 · 8307048 · 8307048
1 parent f64234d
commit 8307048
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 56 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,14 @@
+import org.gradle.api.InvalidUserDataException
+
 plugins {
     id "cpp"
     id "google-test-test-suite"
     id "edu.wpi.first.GradleRIO" version "2024.2.1"
 }
 
+def debug = project.hasProperty("debug");
+def release = project.hasProperty("release");
+
 // Define my targets (RoboRIO) and artifacts (deployable files)
 // This is added by GradleRIO's backing project DeployUtils.
 deploy {
@@ -65,27 +70,20 @@ model {
             }
 
 	    binaries.all {
-        if (!project.hasProperty("opt")) {
-          def opt;
-          if (opt == null) {
-            opt = "release"
-          }
-
-          if (!opt == "release") {
-            cppCompiler.define "DEBUG"
-          } else {
-            cppCompiler.define "RELEASE"
-          }
-        } else {
-          if (opt == null) {
-            opt = "release"
-          }
-
-          if (!opt == "release") {
-            cppCompiler.define "DEBUG"
-          } else {
-            cppCompiler.define "RELEASE"
-          }
+        if (release && debug) {
+          throw new InvalidUserDataException("Cannot be both release and debug project");
+        }
+
+        if(!release && !debug) {
+          cppCompiler.define("RELEASE");
+        }
+
+        if(release) {
+          cppCompiler.define("RELEASE");
+        }
+
+        if (debug) {
+          cppCompiler.define("DEBUG");
         }
 
 	    	lib project: ':wombat', library: 'Wombat', linkage: 'static'
@@ -116,28 +114,21 @@ model {
             }
 
 	binaries.all {
-      if (!project.hasProperty("opt")) {
-        def opt;
-        if (opt == null) {
-          opt = "release"
+        if (release && debug) {
+          throw new InvalidUserDataException("Cannot be both release and debug project");
         }
 
-        if (!opt == "release") {
-          cppCompiler.define "DEBUG"
-        } else {
-          cppCompiler.define "RELEASE"
+        if(!release && !debug) {
+          cppCompiler.define("RELEASE");
         }
-      } else {
-        if (opt == null) {
-          opt = "release"
+
+        if(release) {
+          cppCompiler.define("RELEASE");
         }
 
-        if (!opt == "release") {
-          cppCompiler.define "DEBUG"
-        } else {
-          cppCompiler.define "RELEASE"
+        if (debug) {
+          cppCompiler.define("DEBUG");
         }
-      }
 
 	    lib project: ':wombat', library: 'Wombat', linkage: 'static'
 	}

diff --git a/wombat/build.gradle b/wombat/build.gradle
@@ -1,9 +1,13 @@
 import edu.wpi.first.toolchain.NativePlatforms
+import org.gradle.api.InvalidUserDataException
 
 apply plugin: 'cpp'
 apply plugin: 'google-test-test-suite'
 apply plugin: 'edu.wpi.first.GradleRIO'
 
+def debug = project.hasProperty("debug");
+def release = project.hasProperty("release");
+
 model {
   components {
     Wombat(NativeLibrarySpec) {
@@ -24,27 +28,20 @@ model {
       }
 
       binaries.all {
-        if (!project.hasProperty("opt")) {
-          def opt;
-          if (opt == null) {
-            opt = "release"
-          }
+        if (release && debug) {
+          throw new InvalidUserDataException("Cannot be both release and debug project");
+        }
 
-          if (!opt == "release") {
-            cppCompiler.define "DEBUG"
-          } else {
-            cppCompiler.define "RELEASE"
-          }
-        } else {
-          if (opt == null) {
-            opt = "release"
-          }
+        if(!release && !debug) {
+          cppCompiler.define("RELEASE");
+        }
 
-          if (!opt == "release") {
-            cppCompiler.define "DEBUG"
-          } else {
-            cppCompiler.define "RELEASE"
-          }
+        if(release) {
+          cppCompiler.define("RELEASE");
+        }
+
+        if (debug) {
+          cppCompiler.define("DEBUG");
         }
 
         if (it.targetPlatform.name == "linuxathena")