Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: context provides/provides_unique #639

Merged
merged 2 commits into from
Feb 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ struct YamlContext {
env: Option<Env>,
selects: Option<Vec<String>>,
disables: Option<Vec<String>>,
provides: Option<Vec<String>>,
provides_unique: Option<Vec<String>>,
rules: Option<Vec<YamlRule>>,
var_options: Option<im::HashMap<String, MergeOption>>,
tasks: Option<HashMap<String, YamlTask>>,
Expand Down Expand Up @@ -550,6 +552,8 @@ pub fn load(
// This holds:
// - selects
// - disables
// - provides
// - provides_unique
// TODO:
// - env (in global env)
// - rules
Expand All @@ -576,6 +580,23 @@ pub fn load(
module.conflicts = Some(disables.clone());
}

if let Some(provides) = context.provides.as_ref() {
module.provides = Some(provides.clone());
}

if let Some(provides_unique) = context.provides_unique.as_ref() {
if let Some(provides) = module.provides.as_mut() {
provides.extend(provides_unique.iter().cloned());
} else {
module.provides = Some(provides_unique.clone());
}
if let Some(conflicts) = module.conflicts.as_mut() {
conflicts.extend(provides_unique.iter().cloned());
} else {
module.conflicts = Some(provides_unique.clone());
}
}

// make context module depend on its parent's context module
if !is_default {
module
Expand Down
5 changes: 5 additions & 0 deletions src/tests/47_context_provides/app.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include <stdio.h>

int main(int argc, char *argv[]) {
printf("Hello Laze!\n");
}
50 changes: 50 additions & 0 deletions src/tests/47_context_provides/build_expected/build-global.ninja
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
builddir = build
build ALWAYS: phony
rule CC_6858609285403819907
command = echo ${in} > ${out}
description = CC

build build/objects/app.12070292612711521013.o: $
CC_6858609285403819907 $
app.c

rule LINK_5506617845631750009
command = cat ${in} > ${out}
description = LINK

build build/context1/app1/app1.elf: $
LINK_5506617845631750009 $
build/objects/app.12070292612711521013.o

build build/context2/app2/app2.elf: $
LINK_5506617845631750009 $
build/objects/app.12070292612711521013.o

build build/context2/app12/app12.elf: $
LINK_5506617845631750009 $
build/objects/app.12070292612711521013.o

build build/context12/app1/app1.elf: $
LINK_5506617845631750009 $
build/objects/app.12070292612711521013.o

build build/context12/app2/app2.elf: $
LINK_5506617845631750009 $
build/objects/app.12070292612711521013.o

build build/context12/app12/app12.elf: $
LINK_5506617845631750009 $
build/objects/app.12070292612711521013.o

build build/context21/app1/app1.elf: $
LINK_5506617845631750009 $
build/objects/app.12070292612711521013.o

build build/context21/app2/app2.elf: $
LINK_5506617845631750009 $
build/objects/app.12070292612711521013.o

build build/context21/app12/app12.elf: $
LINK_5506617845631750009 $
build/objects/app.12070292612711521013.o

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app.c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app.c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app.c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app.c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app.c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app.c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app.c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app.c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app.c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app.c
61 changes: 61 additions & 0 deletions src/tests/47_context_provides/laze-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
builders:
- name: default
rules:
- name: CC
in: "c"
out: "o"
cmd: "echo ${VAR} ${in} > ${out}"
- name: LINK
in: "o"
cmd: "cat ${in} > ${out}"
env:
bindir: build/${builder}/${app}

- name: context1
parent: default
provides:
- provided_by_context1

- name: context2
parent: default
provides:
- provided_by_context2

- name: context11
parent: context1
provides_unique:
- provided_by_context1

- name: context12
parent: context1
provides_unique:
- provided_by_context2

- name: context21
parent: context2
provides_unique:
- provided_by_context1

- name: context22
parent: context2
provides_unique:
- provided_by_context2

apps:
- name: app1
sources:
- app.c
selects:
- provided_by_context1

- name: app2
sources:
- app.c
selects:
- provided_by_context2

- name: app12
sources:
- app.c
selects:
- provided_by_context2
Empty file.
13 changes: 13 additions & 0 deletions src/tests/47_context_provides/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh

. ../test-common.sh

cleanup
build
clean_temp_files

diff_build_dir

echo TEST_OK

cleanup
Loading