Update rust versions

src/Tools/Common.mk

@@ -14,13 +14,22 @@ define cp_artifact
 endef
 
 define cargo_windows_default
+	$(if $(findstring upgrade,$(CARGO_CMD)),	
+	cargo $(CARGO_CMD) --$(BUILD_PROFILE),
+
 	cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(WINDOWS_TARGET)
 	$(call cp_artifact,$(WINDOWS_ARTIFACT), ../../../bin/$(ARTIFACT).exe)
+	)
 endef
 
 define cargo_unix_default
+	$(if $(findstring upgrade,$(CARGO_CMD)),	
+	cargo $(CARGO_CMD) --$(BUILD_PROFILE),
+
 	cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(UNIX_TARGET)
 	$(call cp_artifact,$(UNIX_ARTIFACT), ../../../bin/$(ARTIFACT))
+	)
 endef
 
+# Run `cargo install cargo-edit --locked`to support upgrade
 # Windows build requires "rustup target add x86_64-pc-windows-gnu" and "sudo apt-get install mingw-w64"

src/Tools/Makefile

@@ -1,3 +1,4 @@
+SUPPORT_PROJECTS = cdtypes tool_helper
 PROJECTS         = cpp_out psxfileconv mkoverlay psxcdgen_ex psxreadmap wslpath
 .PHONY: $(PROJECTS)
 

src/Tools/Tools.code-workspace

@@ -66,14 +66,14 @@
             {
                 "id": "build cfg",
                 "type": "pickString",
-                "options": ["debug", "release"],
+                "options": ["debug", "release", "compatible", "incompatible"],
                 "default": "release",
                 "description": "build configuration"
             },
             {
                 "id": "cargo cmd",
                 "type":"pickString",
-                "options": ["build", "check", "update", "clean", "run", "tree"],
+                "options": ["build", "check", "update", "upgrade", "clean", "run", "tree"],
                 "default": "build",
                 "description": "cargo command to run"
             }

src/Tools/cdtypes/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cdtypes"
-version = "0.7.2"
+version = "1.0.0"
 edition = "2021"
 
 [profile.release]
@@ -8,5 +8,5 @@ panic = "abort"
 
 [dependencies]
 byteorder   = "1.5.0"
-chrono      = "0.4.31"
+chrono      = "0.4.39"
-paste       = "1.0.14"
+paste       = "1.0.15"

src/Tools/cdtypes/Makefile

@@ -0,0 +1,13 @@
+include ../Common.mk
+
+ARTIFACT = cdtypes
+
+.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
+$(WINDOWS_ARTIFACT):
+	$(call cargo_windows_default)
+
+$(UNIX_ARTIFACT):
+	$(call cargo_unix_default)
+
+all-windows: $(WINDOWS_ARTIFACT)
+all: $(UNIX_ARTIFACT)

src/Tools/cpp_out/Cargo.toml

@@ -7,5 +7,5 @@ edition = "2021"
 panic = "abort"
 
 [dependencies]
-clap        = {version = "4.4.11", features = ["derive"]}
+clap        = {version = "4.5.23", features = ["derive"]}
 tool_helper = {path = "../tool_helper"}

src/Tools/mkoverlay/Cargo.toml

@@ -7,6 +7,6 @@ edition = "2021"
 panic = "abort"
 
 [dependencies]
-clap        = {version = "4.4.11", features = ["derive"]}
+clap        = {version = "4.5.23", features = ["derive"]}
-serde_json  = "1.0.108"
+serde_json  = "1.0.134"
 tool_helper = {path = "../tool_helper"}

src/Tools/psxcdgen_ex/Cargo.toml

@@ -8,10 +8,10 @@ panic = "abort"
 
 [dependencies]
 cdtypes     = {path = "../cdtypes"}
-clap        = {version = "4.4.11", features = ["derive"]}
+clap        = {version = "4.5.23", features = ["derive"]}
-colored     = "2.1.0"
+colored     = "2.2.0"
 hound       = "3.5.1"
 no-comment  = "0.0.3"
-paste       = "1.0.14"
+paste       = "1.0.15"
 roxmltree   = "0.19.0"
 tool_helper = {path = "../tool_helper"}

src/Tools/psxfileconv/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "psxfileconv"
-version = "0.9.0"
+version = "1.0.0"
 edition = "2021"
 
 [profile.release]
@@ -28,11 +28,11 @@ symphonia-vorbis = ["symphonia", "symphonia/vorbis"]
 [dependencies]
 bitflags    = "2.6.0"
 cdtypes     = {path = "../cdtypes"}
-clap        = {version = "4.4.11", features = ["derive"]}
+clap        = {version = "4.5.23", features = ["derive"]}
-image       = "0.24.7"
+image       = "0.24.9"
 hound       = "3.5.1"
-paste       = "1.0.14"
+paste       = "1.0.15"
-png         = "0.17.10"
+png         = "0.17.16"
 rubato      = "0.16.1"
 symphonia   = {version = "0.5.4", optional = true, default-features = false}
 tool_helper = {path = "../tool_helper"}

src/Tools/psxreadmap/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 panic = "abort"
 
 [dependencies]
-clap        = {version = "4.4.11", features = ["derive"]}
+clap        = {version = "4.5.23", features = ["derive"]}
 crossterm   = "0.27.0"
 ratatui     = "0.25.0"
 readmap     = {version = "*", path = "readmap"}

src/Tools/tool_helper/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tool_helper"
-version = "0.9.8"
+version = "1.0.0"
 edition = "2021"
 
 [profile.release]
@@ -9,9 +9,9 @@ panic = "abort"
 [dependencies]
 byteorder  = "1.5.0"
 cdtypes    = {path = "../cdtypes"}
-colored    = "2.0.4"
+colored    = "2.2.0"
 envmnt     = "0.10.4"
 hound      = "3.5.1"
-lz4        = "1.24.0"
+lz4        = "1.28.0"
-paste      = "1.0.14"
+paste      = "1.0.15"
 wslpath    = {path = "../wslpath"}

src/Tools/tool_helper/Makefile

@@ -0,0 +1,13 @@
+include ../Common.mk
+
+ARTIFACT = tool_helper
+
+.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
+$(WINDOWS_ARTIFACT):
+	$(call cargo_windows_default)
+
+$(UNIX_ARTIFACT):
+	$(call cargo_unix_default)
+
+all-windows: $(WINDOWS_ARTIFACT)
+all: $(UNIX_ARTIFACT)

src/Tools/wslpath/Cargo.toml

@@ -7,4 +7,4 @@ edition = "2021"
 panic = "abort"
 
 [dependencies]
-clap = {version = "4.4.7", features = ["derive"]}
+clap = {version = "4.5.23", features = ["derive"]}