From: Mathieu Baudier Date: Tue, 23 May 2023 09:19:18 +0000 (+0200) Subject: Fix osgi-install X-Git-Tag: v2.3.6~10 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=9b8347a1b4faa52a717f607b95a4ec8613407834;p=cc0%2Fargeo-build.git Fix osgi-install --- diff --git a/osgi.mk b/osgi.mk index 40946d5..17b7c01 100644 --- a/osgi.mk +++ b/osgi.mk @@ -76,9 +76,10 @@ endif clean-manifests : @rm -rf $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF); +osgi-install: BUNDLES_TO_BUILD = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-build,, $?)) osgi-install: $(ARGEO_MAKE) \ - install --category $(A2_CATEGORY) --bundles $(subst $(A2_CATEGORY)/,,$*) \ + install --category $(A2_CATEGORY) --bundles $(BUNDLES_TO_BUILD) \ --target $(DESTDIR)$(A2_INSTALL_TARGET) # Javadoc generation diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java index 7eda0ab..7415006 100644 --- a/src/org/argeo/build/Make.java +++ b/src/org/argeo/build/Make.java @@ -320,7 +320,7 @@ public class Make { if (targetDirs.size() != 1) throw new IllegalArgumentException("One and only one --target must be specified"); Path targetA2 = Paths.get(targetDirs.get(0)); - logger.log(INFO, "Intsalling to " + targetA2 + " ms"); + logger.log(INFO, "Installing to " + targetA2); final String branch; Path branchMk = sdkSrcBase.resolve(BRANCH_MK);