From 9d078dbf720379c70d9f06339f4aed00b813b511 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 12 Feb 2022 12:42:37 +0100
Subject: [PATCH] Separate RAP and RCP builds

---
 Makefile        | 11 ++++++++++-
 Makefile-rcp.mk | 32 ++++++++++++++++++++++++++++++++
 sdk/osgi.mk     |  2 +-
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 Makefile-rcp.mk

diff --git a/Makefile b/Makefile
index f19a0dc4b..629027674 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ include sdk.mk
 .PHONY: clean all osgi jni
 
 all: osgi jni
+	mkdir -p $(A2_OUTPUT)/$(A2_CATEGORY).rap
+	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/$(A2_CATEGORY).rap
+	touch $(BUILD_BASE)/*.rap/bnd.bnd
 
 A2_CATEGORY = org.argeo.cms
 
@@ -37,7 +40,13 @@ A2_BASE = $(A2_OUTPUT)
 
 VPATH = .:eclipse:rap:jcr
 
-DEP_CATEGORIES = org.argeo.tp org.argeo.tp.apache org.argeo.tp.jetty org.argeo.tp.eclipse.equinox org.argeo.tp.eclipse.rap org.argeo.tp.jcr
+DEP_CATEGORIES = \
+org.argeo.tp \
+org.argeo.tp.apache \
+org.argeo.tp.jetty \
+org.argeo.tp.eclipse.equinox \
+org.argeo.tp.eclipse.rap \
+org.argeo.tp.jcr
 
 jni:
 	$(MAKE) -C jni
diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
new file mode 100644
index 000000000..c93fbe97e
--- /dev/null
+++ b/Makefile-rcp.mk
@@ -0,0 +1,32 @@
+include sdk.mk
+.PHONY: clean all osgi
+
+all: osgi
+
+A2_CATEGORY = org.argeo.cms.rcp
+
+BUNDLES = \
+rcp/org.argeo.cms.e4.rcp \
+rcp/org.argeo.cms.ui.rcp \
+rcp/org.argeo.swt.minidesktop \
+rcp/org.argeo.swt.specific.rcp \
+
+A2_OUTPUT = $(SDK_BUILD_BASE)/a2
+A2_BASE = $(A2_OUTPUT)
+
+DEP_CATEGORIES = \
+org.argeo.cms \
+org.argeo.tp \
+org.argeo.tp.apache \
+org.argeo.tp.jetty \
+org.argeo.tp.eclipse.equinox \
+org.argeo.tp.eclipse.rcp \
+org.argeo.tp.jcr
+
+
+clean:
+	rm -rf $(BUILD_BASE)
+
+VPATH = .:rcp
+
+include  $(SDK_SRC_BASE)/sdk/osgi.mk
\ No newline at end of file
diff --git a/sdk/osgi.mk b/sdk/osgi.mk
index a97a937f8..25491f518 100644
--- a/sdk/osgi.mk
+++ b/sdk/osgi.mk
@@ -35,7 +35,7 @@ $(BUILD_BASE)/cnf/%.bnd: cnf/%.bnd
 	mkdir -p $(dir $@)
 	cp $< $@
 	
-$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%.jar
+$(A2_OUTPUT)/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%.jar
 	mkdir -p $(dir $@)
 	cp $< $@
 
-- 
2.30.2