Rename jaby_engine_fconv to fileconv

2024-10-09 20:56:24 +02:00
parent e3206352fb
commit f6da5769d6
20 changed files with 86 additions and 86 deletions
--- a/src/Tools/Makefile
+++ b/src/Tools/Makefile
@@ -1,4 +1,4 @@
-PROJECTS = cpp_out jaby_engine_fconv mkoverlay psxcdgen_ex psxreadmap wslpath
+PROJECTS = cpp_out fileconv mkoverlay psxcdgen_ex psxreadmap wslpath
 .PHONY: $(PROJECTS)

 $(foreach var,$(PROJECTS),$(var)):
--- a/src/Tools/Tests/Test.mk
+++ b/src/Tools/Tests/Test.mk
@@ -4,7 +4,7 @@ test_cpp_out: always
 	@echo "Planschbecken" | ./../cpp_out/target/x86_64-unknown-linux-gnu/release/cpp_out --name Dino -o "Test_Planschbecken.cpp"
 	@echo "Planschbecken" | ./../cpp_out/target/x86_64-unknown-linux-gnu/release/cpp_out --name Dino -o "Test_Planschbecken.hpp"

-test_jaby_engine_fconv: always
-#	@./../jaby_engine_fconv/target/x86_64-unknown-linux-musl/release/jaby_engine_fconv -o Test_Planschi.bin Test_PNG.PNG simple-tim full16
-	@./../jaby_engine_fconv/target/x86_64-unknown-linux-gnu/release/jaby_engine_fconv --lz4 -o Test_Planschi.bin ../../Library/ressources/Splash.PNG simple-tim full16
+test_fileconv: always
+#	@./../fileconv/target/x86_64-unknown-linux-musl/release/fileconv -o Test_Planschi.bin Test_PNG.PNG simple-tim full16
+	@./../fileconv/target/x86_64-unknown-linux-gnu/release/fileconv --lz4 -o Test_Planschi.bin ../../Library/ressources/Splash.PNG simple-tim full16
 always: ;
--- a/src/Tools/Tools.code-workspace
+++ b/src/Tools/Tools.code-workspace
@@ -1,73 +1,73 @@
 {
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"settings": {
-		"cargo_task": [
-			"./ all!Unix: All",
-			"cpp_out all!Unix: cpp_out",
-			"jaby_engine_fconv all!Unix: jaby_engine_fconv",
-			"mkoverlay all!Unix: mkoverlay",
-			"psxcdgen_ex all!Unix: psxcdgen_ex",
-			"psxcdread all!Unix: psxcdread",
-			"psxreadmap all!Unix: psxreadmap",
-			"wslpath all!Unix: wslpath",
+    "folders": [
+        {
+            "path": "."
+        }
+    ],
+    "settings": {
+        "cargo_task": [
+            "./ all!Unix: All",
+            "cpp_out all!Unix: cpp_out",
+            "fileconv all!Unix: fileconv",
+            "mkoverlay all!Unix: mkoverlay",
+            "psxcdgen_ex all!Unix: psxcdgen_ex",
+            "psxcdread all!Unix: psxcdread",
+            "psxreadmap all!Unix: psxreadmap",
+            "wslpath all!Unix: wslpath",

-			"./ all-windows!Windows: All",
-			"cpp_out all-windows!Windows: cpp_out",
-			"jaby_engine_fconv all-windows!Windows: jaby_engine_fconv",
-			"mkoverlay all-windows!Windows: mkoverlay",
-			"psxcdgen_ex all-windows!Windows: psxcdgen_ex",
-			"psxcdread all-windows!Windows: psxcdread",
-			"psxreadmap all-windows!Windows: psxreadmap",
-			"wslpath all-windows!Windows: wslpath"
-		]
-	},
-	"tasks": {
-		"version": "2.0.0",
-		"tasks": [
-			{
-				"label": "cargo",
-				"type": "shell",
-				"group": {
-					"kind": "build"
-				},
-				"windows": {
-					"command": "wsl --shell-type login make -C ${input:windows_cargo_task} CARGO_CMD=${input:cargo cmd} BUILD_PROFILE=${input:build cfg}"
-				},
-				"linux":   {
-					"command": "make -C ${input:linux_cargo_task} BUILD_PROFILE=${input:build cfg}"
-				},
-				"problemMatcher": []
-			}
-		],
-		"inputs": [
-			{
-				"id": "windows_cargo_task",
-				"type": "command",
-				"command": "shellCommand.execute",
-				"args": {
-					"command": "powershell",
-					"commandArgs": ["-command", "'${config:cargo_task}'.Replace(',',\"`n\")"],
-					"fieldSeparator": "!"
-				}
-			},
-			{
-				"id": "build cfg",
-				"type": "pickString",
-				"options": ["debug", "release"],
-				"default": "release",
-				"description": "build configuration"
-			},
-			{
-				"id": "cargo cmd",
-				"type":"pickString",
-				"options": ["build", "check", "update", "clean", "run", "tree"],
-				"default": "build",
-				"description": "cargo command to run"
-			}
-		]
-	}
+            "./ all-windows!Windows: All",
+            "cpp_out all-windows!Windows: cpp_out",
+            "fileconv all-windows!Windows: fileconv",
+            "mkoverlay all-windows!Windows: mkoverlay",
+            "psxcdgen_ex all-windows!Windows: psxcdgen_ex",
+            "psxcdread all-windows!Windows: psxcdread",
+            "psxreadmap all-windows!Windows: psxreadmap",
+            "wslpath all-windows!Windows: wslpath"
+        ]
+    },
+    "tasks": {
+        "version": "2.0.0",
+        "tasks": [
+            {
+                "label": "cargo",
+                "type": "shell",
+                "group": {
+                    "kind": "build"
+                },
+                "windows": {
+                    "command": "wsl --shell-type login make -C ${input:windows_cargo_task} CARGO_CMD=${input:cargo cmd} BUILD_PROFILE=${input:build cfg}"
+                },
+                "linux":   {
+                    "command": "make -C ${input:linux_cargo_task} BUILD_PROFILE=${input:build cfg}"
+                },
+                "problemMatcher": []
+            }
+        ],
+        "inputs": [
+            {
+                "id": "windows_cargo_task",
+                "type": "command",
+                "command": "shellCommand.execute",
+                "args": {
+                    "command": "powershell",
+                    "commandArgs": ["-command", "'${config:cargo_task}'.Replace(',',\"`n\")"],
+                    "fieldSeparator": "!"
+                }
+            },
+            {
+                "id": "build cfg",
+                "type": "pickString",
+                "options": ["debug", "release"],
+                "default": "release",
+                "description": "build configuration"
+            },
+            {
+                "id": "cargo cmd",
+                "type":"pickString",
+                "options": ["build", "check", "update", "clean", "run", "tree"],
+                "default": "build",
+                "description": "cargo command to run"
+            }
+        ]
+    }
 }
--- a/src/Tools/jaby_engine_fconv/Cargo.toml
+++ b/src/Tools/jaby_engine_fconv/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "jaby_engine_fconv"
+name = "fileconv"
 version = "0.5.0"
 edition = "2021"

--- a/src/Tools/jaby_engine_fconv/Makefile
+++ b/src/Tools/jaby_engine_fconv/Makefile
@@ -1,6 +1,6 @@
 include ../Common.mk

-ARTIFACT = jaby_engine_fconv
+ARTIFACT = fileconv

 .PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
 $(WINDOWS_ARTIFACT):
--- a/src/Tools/jaby_engine_fconv/src/audio/mod.rs
+++ b/src/Tools/jaby_engine_fconv/src/audio/mod.rs
--- a/src/Tools/jaby_engine_fconv/src/audio/vag/mod.rs
+++ b/src/Tools/jaby_engine_fconv/src/audio/vag/mod.rs
--- a/src/Tools/jaby_engine_fconv/src/audio/xa/mod.rs
+++ b/src/Tools/jaby_engine_fconv/src/audio/xa/mod.rs
--- a/src/Tools/jaby_engine_fconv/src/images/mod.rs
+++ b/src/Tools/jaby_engine_fconv/src/images/mod.rs
--- a/src/Tools/jaby_engine_fconv/src/images/reduced_tim/color_clut.rs
+++ b/src/Tools/jaby_engine_fconv/src/images/reduced_tim/color_clut.rs
--- a/src/Tools/jaby_engine_fconv/src/images/reduced_tim/color_full16.rs
+++ b/src/Tools/jaby_engine_fconv/src/images/reduced_tim/color_full16.rs
--- a/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs
+++ b/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs
--- a/src/Tools/jaby_engine_fconv/src/images/reduced_tim/types.rs
+++ b/src/Tools/jaby_engine_fconv/src/images/reduced_tim/types.rs
--- a/src/Tools/jaby_engine_fconv/src/lib.rs
+++ b/src/Tools/jaby_engine_fconv/src/lib.rs
--- a/src/Tools/jaby_engine_fconv/src/main.rs
+++ b/src/Tools/jaby_engine_fconv/src/main.rs
@@ -1,5 +1,5 @@
 use clap::{Parser, Subcommand};
-use jaby_engine_fconv::{audio::*, images::*, nothing};
+use fileconv::{audio::*, images::*, nothing};
 use std::path::PathBuf;
 use tool_helper::{exit_with_error, print_warning, Error};

--- a/src/Tools/jaby_engine_fconv/src/nothing/mod.rs
+++ b/src/Tools/jaby_engine_fconv/src/nothing/mod.rs