From 6a495a2cdc7bd6e3bae632f118f0a78225742c57 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 12 Mar 2022 11:46:04 +0100 Subject: [PATCH] Build TP ext with a separate Makefile --- Makefile | 9 +-------- Makefile-ext.mk | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 Makefile-ext.mk diff --git a/Makefile b/Makefile index eec35df13..13a56686b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ include sdk.mk .PHONY: clean all osgi -all: osgi move-ext +all: osgi A2_CATEGORY = org.argeo.slc @@ -9,7 +9,6 @@ BUNDLES = \ org.argeo.slc.api \ org.argeo.slc.factory \ org.argeo.slc.runtime \ -ext/org.argeo.ext.slf4j \ BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap @@ -28,11 +27,6 @@ bootstrap : org.argeo.slc.api/src[-d $(BOOTSTRAP_BASE)/org.argeo.slc.api/bin] \ org.argeo.slc.factory/src[-d $(BOOTSTRAP_BASE)/org.argeo.slc.factory/bin] \ -move-ext: osgi - mkdir -p $(SDK_BUILD_BASE)/a2/org.argeo.tp - cp $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.argeo.ext.slf4j.$(MAJOR).$(MINOR).jar $(SDK_BUILD_BASE)/a2/org.argeo.tp -# mv $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.argeo.ext.equinox.jetty.$(MAJOR).$(MINOR).jar $(SDK_BUILD_BASE)/a2/org.argeo.tp.eclipse.equinox - clean: rm -rf $(BUILD_BASE) rm -rf $(BOOTSTRAP_BASE) @@ -40,7 +34,6 @@ clean: A2_OUTPUT = $(SDK_BUILD_BASE)/a2 A2_BASE = $(A2_OUTPUT) -VPATH = .:ext DEP_CATEGORIES = org.argeo.tp org.argeo.tp.apache org.argeo.tp.sdk org.argeo.tp.jcr include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file diff --git a/Makefile-ext.mk b/Makefile-ext.mk new file mode 100644 index 000000000..11868d49f --- /dev/null +++ b/Makefile-ext.mk @@ -0,0 +1,20 @@ +include sdk.mk +.PHONY: clean all osgi + +all: osgi + +A2_CATEGORY = org.argeo.tp + +BUNDLES = \ +ext/org.argeo.ext.slf4j \ + +clean: + rm -rf $(BUILD_BASE) + +A2_OUTPUT = $(SDK_BUILD_BASE)/a2 +A2_BASE = $(A2_OUTPUT) + +VPATH = .:ext +DEP_CATEGORIES = org.argeo.tp + +include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file -- 2.30.2