Fix osgi-install
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 23 May 2023 09:19:18 +0000 (11:19 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 23 May 2023 09:19:18 +0000 (11:19 +0200)
osgi.mk
src/org/argeo/build/Make.java

diff --git a/osgi.mk b/osgi.mk
index 40946d5d660ac3a34e4b0ad3aae03f95bafed7cd..17b7c013e073d64c5712496d52076b392d6fa0ca 100644 (file)
--- 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
index 7eda0ab4490c6135147ee594aa32c73407343cbd..741500602766d264d6d63272e84c4075daf5c50b 100644 (file)
@@ -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);