mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
handle '@' version specifiers in services
this is necessary because we're going to have two versions of sha2 in the system for a while.
This commit is contained in:
parent
eb6a9069bd
commit
958f39f870
1 changed files with 18 additions and 5 deletions
|
|
@ -324,23 +324,32 @@ impl Builder {
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add just one service
|
/// Add just one service. Services can only be local.
|
||||||
pub fn add_service<'a>(&'a mut self, service_spec: &str, xip: bool) -> &'a mut Builder {
|
pub fn add_service<'a>(&'a mut self, service_spec: &str, xip: bool) -> &'a mut Builder {
|
||||||
|
let spec = CrateSpec::Local(service_spec.to_owned(), xip);
|
||||||
|
self.services.push(spec);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add just one service. This one, if it contains the `@` specifier, will be interpreted as a crates.io
|
||||||
|
/// domiciled service
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub fn add_remote_service<'a>(&'a mut self, service_spec: &str, xip: bool) -> &'a mut Builder {
|
||||||
let mut spec: CrateSpec = service_spec.into();
|
let mut spec: CrateSpec = service_spec.into();
|
||||||
spec.set_xip(xip);
|
spec.set_xip(xip);
|
||||||
self.services.push(spec);
|
self.services.push(spec);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add a list of services
|
/// Add a list of services. Services can only be local.
|
||||||
pub fn add_services<'a>(&'a mut self, service_list: &Vec<String>) -> &'a mut Builder {
|
pub fn add_services<'a>(&'a mut self, service_list: &Vec<String>) -> &'a mut Builder {
|
||||||
for service in service_list {
|
for service in service_list {
|
||||||
self.services.push(service.as_str().into());
|
self.services.push(CrateSpec::Local(service.to_string(), false));
|
||||||
}
|
}
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add just one app
|
/// Add just one app. Apps can be remote or downloaded externally.
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub fn add_app<'a>(&'a mut self, app_spec: &str, xip: bool) -> &'a mut Builder {
|
pub fn add_app<'a>(&'a mut self, app_spec: &str, xip: bool) -> &'a mut Builder {
|
||||||
let mut spec: CrateSpec = app_spec.into();
|
let mut spec: CrateSpec = app_spec.into();
|
||||||
|
|
@ -349,7 +358,7 @@ impl Builder {
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add a list of apps
|
/// Add a list of apps. Apps can be remote or downloaded externally.
|
||||||
pub fn add_apps<'a>(&'a mut self, app_list: &Vec<String>) -> &'a mut Builder {
|
pub fn add_apps<'a>(&'a mut self, app_list: &Vec<String>) -> &'a mut Builder {
|
||||||
for app in app_list {
|
for app in app_list {
|
||||||
self.apps.push(app.as_str().into());
|
self.apps.push(app.as_str().into());
|
||||||
|
|
@ -916,11 +925,15 @@ impl Builder {
|
||||||
|
|
||||||
for i in init {
|
for i in init {
|
||||||
args.push("--init");
|
args.push("--init");
|
||||||
|
// strip '@' version specifiers out of the package names, if they exist.
|
||||||
|
let i = if i.contains("@") { i.split("@").next().unwrap() } else { i };
|
||||||
args.push(i);
|
args.push(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
for i in inif {
|
for i in inif {
|
||||||
args.push("--inif");
|
args.push("--inif");
|
||||||
|
// strip '@' version specifiers out of the package names, if they exist.
|
||||||
|
let i = if i.contains("@") { i.split("@").next().unwrap() } else { i };
|
||||||
args.push(i);
|
args.push(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue