Separate RAP and RCP builds

diff --git a/Makefile b/Makefile
index f19a0dc4b61f068b55f7d516f1eb2f53264e8a2b..629027674d38fc8c1a101e932799e440ff701e31 100644 (file)
--- 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 (file)
index 0000000..c93fbe9
--- /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 a97a937f82f0b5186ea4752e337f2138ce45e478..25491f518ac61868229d528e368a8ca05bfb4193 100644 (file)
--- 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 $< $@