Move generated files to more consistent locations

Gold856 · Sep 17, 2024 · 6746ed0 · 6746ed0
1 parent cea8684
commit 6746ed0
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 3 deletions.
diff --git 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/...ibj2/command/button/commandhid.java.jinja → .../generate/main/java/commandhid.java.jinja b/...ibj2/command/button/commandhid.java.jinja → .../generate/main/java/commandhid.java.jinja
diff --git 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
@@ -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 → ...ibj/src/generate/main/java/hid.java.jinja b/wpilibj/src/generate/hid.java.jinja → ...ibj/src/generate/main/java/hid.java.jinja
diff --git a/wpilibj/src/generate/hidsim.java.jinja → .../src/generate/main/java/hidsim.java.jinja b/wpilibj/src/generate/hidsim.java.jinja → .../src/generate/main/java/hidsim.java.jinja
diff --git a/.../generate/pwm_motor_controller.java.jinja → ...main/java/pwm_motor_controller.java.jinja b/.../generate/pwm_motor_controller.java.jinja → ...main/java/pwm_motor_controller.java.jinja