From dc142b1688d1163ae5afe93fd39bec0fda62c71a Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 6 Mar 2024 12:33:10 +0100 Subject: [PATCH] Extend available bases --- common.mk | 8 ++++---- src/org/argeo/build/Make.java | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common.mk b/common.mk index 07f2e9d..0328fd5 100644 --- a/common.mk +++ b/common.mk @@ -14,10 +14,6 @@ A2_OUTPUT = $(SDK_BUILD_BASE)/a2 JVM ?= $(JAVA_HOME)/bin/java JAVADOC ?= $(JAVA_HOME)/bin/javadoc -# The following variables have default values which can be overriden -# A2_BASE the space-separated directories where already built a2 categories can be found -A2_BASE ?=$(A2_OUTPUT) /usr/local/share/a2 /usr/share/a2 - # GNU defaults prefix ?= /usr/local datarootdir ?= $(prefix)/share @@ -27,6 +23,10 @@ libdir ?= $(exec_prefix)/lib A2_INSTALL_TARGET ?= $(DESTDIR)$(datarootdir)/a2 A2_NATIVE_INSTALL_TARGET ?= $(DESTDIR)$(libdir)/a2 +# The following variables have default values which can be overriden +# A2_BASE the space-separated directories where already built a2 categories can be found +A2_BASE ?=$(A2_OUTPUT) $(A2_INSTALL_TARGET) $(A2_NATIVE_INSTALL_TARGET) /usr/local/share/a2 /usr/local/lib/a2 /usr/share/a2 /usr/lib/a2 + # OS-speciific KNOWN_ARCHS ?= x86_64 aarch64 TARGET_OS ?= linux diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java index 62ef0b6..b0066ac 100644 --- a/src/org/argeo/build/Make.java +++ b/src/org/argeo/build/Make.java @@ -38,6 +38,7 @@ import java.util.jar.Attributes; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; +import java.util.stream.Collectors; import java.util.zip.Deflater; import org.eclipse.jdt.core.compiler.CompilationProgress; @@ -175,7 +176,8 @@ public class Make { List a2Categories = options.getOrDefault("--dep-categories", new ArrayList<>()); List a2Bases = options.getOrDefault("--a2-bases", new ArrayList<>()); - if (a2Bases.isEmpty() || !a2Bases.contains(a2Output.toString())) { + a2Bases = a2Bases.stream().distinct().collect(Collectors.toList());// remove duplicates + if (a2Bases.isEmpty() || !a2Bases.contains(a2Output.toString())) {// make sure a2 output is available a2Bases.add(a2Output.toString()); } @@ -204,10 +206,9 @@ public class Make { A2Jar current = a2Jars.get(a2Jar.name); if (a2Jar.major > current.major) a2Jars.put(a2Jar.name, a2Jar); - else if (a2Jar.major == current.major // - // if minor equals, we take the last one - && a2Jar.minor >= current.minor) + else if (a2Jar.major == current.major && a2Jar.minor > current.minor) a2Jars.put(a2Jar.name, a2Jar); + // keep if minor equals } else { a2Jars.put(a2Jar.name, a2Jar); } -- 2.30.2