From f0a1955fd75bc16bd6afc590f77f69ab26149811 Mon Sep 17 00:00:00 2001
From: Gold856 <117957790+Gold856@users.noreply.github.com>
Date: Wed, 25 Sep 2024 01:13:49 -0400
Subject: [PATCH] Move generated files to more consistent locations (#6906)

Java templates always go under src/generate/main/java. JSON files go to src/generate.
---
 wpilibNewCommands/generate_hids.py                              | 2 +-
 .../first/wpilibj2/command/button => }/commandhid.java.jinja    | 0
 wpilibj/generate_hids.py                                        | 2 +-
 wpilibj/generate_pwm_motor_controllers.py                       | 2 +-
 wpilibj/src/generate/{ => main/java}/hid.java.jinja             | 0
 wpilibj/src/generate/{ => main/java}/hidsim.java.jinja          | 0
 .../generate/{ => main/java}/pwm_motor_controller.java.jinja    | 0
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename wpilibNewCommands/src/generate/main/java/{edu/wpi/first/wpilibj2/command/button => }/commandhid.java.jinja (100%)
 rename wpilibj/src/generate/{ => main/java}/hid.java.jinja (100%)
 rename wpilibj/src/generate/{ => main/java}/hidsim.java.jinja (100%)
 rename wpilibj/src/generate/{ => main/java}/pwm_motor_controller.java.jinja (100%)

diff --git a/wpilibNewCommands/generate_hids.py b/wpilibNewCommands/generate_hids.py
index 5fc027d5a8..8f6a5932d3 100755
--- a/wpilibNewCommands/generate_hids.py
+++ b/wpilibNewCommands/generate_hids.py
@@ -24,7 +24,7 @@ def generate_hids(output_directory: Path, template_directory: Path, schema_file:
     # Java files
     java_subdirectory = "main/java/edu/wpi/first/wpilibj2/command/button"
     env = Environment(
-        loader=FileSystemLoader(template_directory / java_subdirectory),
+        loader=FileSystemLoader(template_directory / "main/java"),
         autoescape=False,
         keep_trailing_newline=True,
     )
diff --git a/wpilibNewCommands/src/generate/main/java/edu/wpi/first/wpilibj2/command/button/commandhid.java.jinja b/wpilibNewCommands/src/generate/main/java/commandhid.java.jinja
similarity index 100%
rename from wpilibNewCommands/src/generate/main/java/edu/wpi/first/wpilibj2/command/button/commandhid.java.jinja
rename to wpilibNewCommands/src/generate/main/java/commandhid.java.jinja
diff --git a/wpilibj/generate_hids.py b/wpilibj/generate_hids.py
index 56d47af266..3f1ab48f31 100755
--- a/wpilibj/generate_hids.py
+++ b/wpilibj/generate_hids.py
@@ -23,7 +23,7 @@ def generate_hids(output_directory: Path, template_directory: Path):
 
     # Java files
     env = Environment(
-        loader=FileSystemLoader(template_directory),
+        loader=FileSystemLoader(template_directory / "main/java"),
         autoescape=False,
         keep_trailing_newline=True,
     )
diff --git a/wpilibj/generate_pwm_motor_controllers.py b/wpilibj/generate_pwm_motor_controllers.py
index 1c1be7201f..650f0aba29 100755
--- a/wpilibj/generate_pwm_motor_controllers.py
+++ b/wpilibj/generate_pwm_motor_controllers.py
@@ -27,7 +27,7 @@ def generate_pwm_motor_controllers(output_root, template_root):
         controllers = json.load(f)
 
     env = Environment(
-        loader=FileSystemLoader(str(template_root)),
+        loader=FileSystemLoader(str(template_root / "main/java")),
         autoescape=False,
         keep_trailing_newline=True,
     )
diff --git a/wpilibj/src/generate/hid.java.jinja b/wpilibj/src/generate/main/java/hid.java.jinja
similarity index 100%
rename from wpilibj/src/generate/hid.java.jinja
rename to wpilibj/src/generate/main/java/hid.java.jinja
diff --git a/wpilibj/src/generate/hidsim.java.jinja b/wpilibj/src/generate/main/java/hidsim.java.jinja
similarity index 100%
rename from wpilibj/src/generate/hidsim.java.jinja
rename to wpilibj/src/generate/main/java/hidsim.java.jinja
diff --git a/wpilibj/src/generate/pwm_motor_controller.java.jinja b/wpilibj/src/generate/main/java/pwm_motor_controller.java.jinja
similarity index 100%
rename from wpilibj/src/generate/pwm_motor_controller.java.jinja
rename to wpilibj/src/generate/main/java/pwm_motor_controller.java.jinja