From 9b8347a1b4faa52a717f607b95a4ec8613407834 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 23 May 2023 11:19:18 +0200 Subject: [PATCH] Fix osgi-install --- osgi.mk | 3 ++- src/org/argeo/build/Make.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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); -- 2.30.2