From f2c5382dc43341a2a33ee48b332595559eaba548 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 20 Sep 2018 13:37:44 +1000 Subject: [PATCH] Use "bootstrap" as part of filename for bootstrap configuration files --- config.linux.toml => bootstrap.linux.toml | 0 config.windows.toml => bootstrap.windows.toml | 0 build.rs | 6 +++--- src/main.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename config.linux.toml => bootstrap.linux.toml (100%) rename config.windows.toml => bootstrap.windows.toml (100%) diff --git a/config.linux.toml b/bootstrap.linux.toml similarity index 100% rename from config.linux.toml rename to bootstrap.linux.toml diff --git a/config.windows.toml b/bootstrap.windows.toml similarity index 100% rename from config.windows.toml rename to bootstrap.windows.toml diff --git a/build.rs b/build.rs index bad8b04..e89676e 100644 --- a/build.rs +++ b/build.rs @@ -79,12 +79,12 @@ fn main() { let os = OS.to_lowercase(); // Find target config - let target_config = PathBuf::from(format!("config.{}.toml", os)); + let target_config = PathBuf::from(format!("bootstrap.{}.toml", os)); if !target_config.exists() { panic!( "There is no config file specified for the platform: {:?}. \ - Create a file named \"config.{}.toml\" in the root directory.", + Create a file named \"bootstrap.{}.toml\" in the root directory.", os, os ); } @@ -103,7 +103,7 @@ fn main() { handle_binary(&config); // Copy for the main build - copy(&target_config, output_dir.join("config.toml")).expect("Unable to copy config file"); + copy(&target_config, output_dir.join("bootstrap.toml")).expect("Unable to copy config file"); // Copy files from static/ to build dir for entry in WalkDir::new("static") { diff --git a/src/main.rs b/src/main.rs index d0e035b..f5b8c9d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -84,7 +84,7 @@ use log::Level; use config::BaseAttributes; -static RAW_CONFIG: &'static str = include_str!(concat!(env!("OUT_DIR"), "/config.toml")); +static RAW_CONFIG: &'static str = include_str!(concat!(env!("OUT_DIR"), "/bootstrap.toml")); #[derive(Deserialize, Debug)] enum CallbackType {