Sun, 30 Nov 2025 13:16:01 +0100
fix that only vars with args were included in makefile
| src/main/java/de/unixwork/uwproj/Project.java | file | annotate | diff | comparison | revisions |
--- a/src/main/java/de/unixwork/uwproj/Project.java Sun Nov 30 12:59:19 2025 +0100 +++ b/src/main/java/de/unixwork/uwproj/Project.java Sun Nov 30 13:16:01 2025 +0100 @@ -12,7 +12,6 @@ private final List<Feature> features = new LinkedList<>(); private final List<Config> configList = new LinkedList<>(); - private final Set<String> configOptions = new HashSet<>(); private final List<ConfigVar> vars = new LinkedList<>(); private final Set<String> lang = new HashSet<>(); @@ -48,14 +47,15 @@ targets.stream().filter(Target::wantsAllDependencies) .forEach(t -> t.replaceAllDependencies(namedDependencies.keySet())); - // collect and de-duplicate config options - configList.forEach(config -> { + // collect and de-duplicate config variables + final Set<String> varsKnown = new HashSet<>(); + configList.forEach(config -> config.getVars().forEach(configVar -> { - if (configOptions.add(configVar.getArg())) { + if (varsKnown.add(configVar.getVarName())) { vars.add(configVar); } - }); - }); + }) + ); } public List<NamedDependency> getNamedDependencies() {