thirdpartymirrors/N64Recomp
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64Recomp.git synced 2026-04-28 04:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 62be274af7 into 81213c1831

Browse source
This commit is contained in:
Ben 2026-02-17 16:12:57 +00:00 • committed by GitHub
commit f4c3e42261
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
RecompModTool/main.cpp
View file

@ -1007,14 +1007,15 @@ N64Recomp::Context build_mod_context(const N64Recomp::Context& input_context, bo
return ret; return ret;
} }
bool create_mod_zip(const std::filesystem::path& output_dir, const ModConfig& config) { bool create_mod_zip(const std::filesystem::path& output_dir, const ModConfig& config, bool store_only) {
std::filesystem::path output_path = output_dir / (config.inputs.mod_filename + ".nrm"); std::filesystem::path output_path = output_dir / (config.inputs.mod_filename + ".nrm");
#ifdef _WIN32 #ifdef _WIN32
std::filesystem::path temp_zip_path = output_path; std::filesystem::path temp_zip_path = output_path;
temp_zip_path.replace_extension(".zip"); temp_zip_path.replace_extension(".zip");
std::string command_string = fmt::format("powershell -command Compress-Archive -Force -CompressionLevel Optimal -DestinationPath '{}' -Path '{}','{}','{}'", std::string compression_level = store_only ? "NoCompression" : "Optimal";
temp_zip_path.string(), (output_dir / symbol_filename).string(), (output_dir / binary_filename).string(), (output_dir / manifest_filename).string()); std::string command_string = fmt::format("powershell -command Compress-Archive -Force -CompressionLevel {} -DestinationPath '{}' -Path '{}','{}','{}'",
compression_level, temp_zip_path.string(), (output_dir / symbol_filename).string(), (output_dir / binary_filename).string(), (output_dir / manifest_filename).string());
for (const auto& cur_file : config.inputs.additional_files) { for (const auto& cur_file : config.inputs.additional_files) {
command_string += fmt::format(",'{}'", cur_file.string()); command_string += fmt::format(",'{}'", cur_file.string());
@ -1069,7 +1070,7 @@ bool create_mod_zip(const std::filesystem::path& output_dir, const ModConfig& co
add_arg("zip"); // The program name (argv[0]). add_arg("zip"); // The program name (argv[0]).
add_arg("-q"); // Quiet mode. add_arg("-q"); // Quiet mode.
add_arg("-9"); // Maximum compression level. add_arg(store_only ? "-0" : "-9"); // Store only or maximum compression level.
add_arg("-MM"); // Error if any files aren't found. add_arg("-MM"); // Error if any files aren't found.
add_arg("-j"); // Junk the paths (store just as the provided filename). add_arg("-j"); // Junk the paths (store just as the provided filename).
add_arg("-T"); // Test zip integrity. add_arg("-T"); // Test zip integrity.
@ -1126,13 +1127,28 @@ bool create_mod_zip(const std::filesystem::path& output_dir, const ModConfig& co
} }
int main(int argc, const char** argv) { int main(int argc, const char** argv) {
if (argc != 3) { bool store_only = false;
fmt::print("Usage: {} [mod toml] [output folder]\n", argv[0]); int positional_start = 1;
// Parse optional flags.
for (int i = 1; i < argc; i++) {
std::string_view arg{argv[i]};
if (arg == "--store-only") {
store_only = true;
positional_start = i + 1;
}
else {
break;
}
}
if (argc - positional_start != 2) {
fmt::print("Usage: {} [--store-only] [mod toml] [output folder]\n", argv[0]);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
bool config_good; bool config_good;
std::filesystem::path output_dir{ argv[2] }; std::filesystem::path output_dir{ argv[positional_start + 1] };
if (!std::filesystem::exists(output_dir)) { if (!std::filesystem::exists(output_dir)) {
fmt::print(stderr, "Specified output folder does not exist!\n"); fmt::print(stderr, "Specified output folder does not exist!\n");
@ -1144,10 +1160,10 @@ int main(int argc, const char** argv) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
ModConfig config = parse_mod_config(argv[1], config_good); ModConfig config = parse_mod_config(argv[positional_start], config_good);
if (!config_good) { if (!config_good) {
fmt::print(stderr, "Failed to read mod config file: {}\n", argv[1]); fmt::print(stderr, "Failed to read mod config file: {}\n", argv[positional_start]);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -1239,7 +1255,7 @@ int main(int argc, const char** argv) {
write_manifest(output_manifest_path, config.manifest); write_manifest(output_manifest_path, config.manifest);
// Create the zip. // Create the zip.
if (!create_mod_zip(output_dir, config)) { if (!create_mod_zip(output_dir, config, store_only)) {
fmt::print(stderr, "Failed to create mod file.\n"); fmt::print(stderr, "Failed to create mod file.\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }