diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | build.rs | 10 | ||||
| -rw-r--r-- | deploy.ps1 | 2 | ||||
| -rw-r--r-- | src/cmd/cmd_system.rs | 2 | ||||
| -rw-r--r-- | templates/_renderers.rs.template (renamed from templates/renderer_list.rs.template) | 0 | ||||
| -rw-r--r-- | templates/compile_info.rs.template (renamed from templates/compile_info.rs) | 0 | ||||
| -rw-r--r-- | templates/setup_jv_cli.iss.template (renamed from templates/setup_jv_cli.iss) | 0 |
7 files changed, 8 insertions, 9 deletions
@@ -23,5 +23,4 @@ # Generated from templates /src/data/compile_info.rs /setup/windows/setup_jv_cli.iss -/src/cmd/cmds/_registry.rs -/src/cmd/renderers/renderer_list.rs +_*.rs @@ -2,17 +2,17 @@ use std::env; use std::path::PathBuf; use std::process::Command; +const COMPILE_INFO_RS_TEMPLATE: &str = "./templates/compile_info.rs.template"; const COMPILE_INFO_RS: &str = "./src/data/compile_info.rs"; -const COMPILE_INFO_RS_TEMPLATE: &str = "./templates/compile_info.rs"; +const SETUP_JV_CLI_ISS_TEMPLATE: &str = "./templates/setup_jv_cli.iss.template"; const SETUP_JV_CLI_ISS: &str = "./setup/windows/setup_jv_cli.iss"; -const SETUP_JV_CLI_ISS_TEMPLATE: &str = "./templates/setup_jv_cli.iss"; -const REGISTRY_RS: &str = "./src/cmd/cmds/_registry.rs"; const REGISTRY_RS_TEMPLATE: &str = "./templates/_registry.rs.template"; +const REGISTRY_RS: &str = "./src/cmd/cmds/_registry.rs"; -const RENDERER_LIST_TEMPLATE: &str = "./templates/renderer_list.rs.template"; -const RENDERER_LIST: &str = "./src/cmd/renderers/renderer_list.rs"; +const RENDERER_LIST_TEMPLATE: &str = "./templates/_renderers.rs.template"; +const RENDERER_LIST: &str = "./src/cmd/renderers/_renderers.rs"; const REGISTRY_TOML: &str = "./.cargo/registry.toml"; @@ -29,7 +29,7 @@ if ($LASTEXITCODE -ne 0) { # Build succeeded # Export if (cargo run --manifest-path tools/build_helper/Cargo.toml --bin exporter) { - Copy-Item -Path templates\compile_info.rs -Destination src\data\compile_info.rs -Force + Copy-Item -Path templates\compile_info.rs.template -Destination src\data\compile_info.rs -Force ISCC /Q .\setup\windows\setup_jv_cli.iss } } diff --git a/src/cmd/cmd_system.rs b/src/cmd/cmd_system.rs index 9696947..09daf5a 100644 --- a/src/cmd/cmd_system.rs +++ b/src/cmd/cmd_system.rs @@ -35,7 +35,7 @@ where { async move { let renderer_str = renderer.as_str(); - include!("renderers/renderer_list.rs") + include!("renderers/_renderers.rs") } } diff --git a/templates/renderer_list.rs.template b/templates/_renderers.rs.template index 37f0f1b..37f0f1b 100644 --- a/templates/renderer_list.rs.template +++ b/templates/_renderers.rs.template diff --git a/templates/compile_info.rs b/templates/compile_info.rs.template index b65055b..b65055b 100644 --- a/templates/compile_info.rs +++ b/templates/compile_info.rs.template diff --git a/templates/setup_jv_cli.iss b/templates/setup_jv_cli.iss.template index 15a0fbc..15a0fbc 100644 --- a/templates/setup_jv_cli.iss +++ b/templates/setup_jv_cli.iss.template |