Merge remote-tracking branch 'origin/unstable' into testing

[lgpl/argeo-commons.git] / Makefile

diff --git a/Makefile b/Makefile
index f19a0dc4b61f068b55f7d516f1eb2f53264e8a2b..49a995426246cbd9dbb053f8b6283a523f5876da 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,13 @@
 include sdk.mk
 .PHONY: clean all osgi jni
 
-all: osgi jni
+all: osgi jni move-rap
+       $(MAKE) -f Makefile-rcp.mk
+
+move-rap:
+       mkdir -p $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap
+       mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/$(A2_CATEGORY).eclipse.rap
+       touch $(BUILD_BASE)/*.rap/bnd.bnd
 
 A2_CATEGORY = org.argeo.cms
 
@@ -37,7 +43,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
@@ -45,5 +57,6 @@ jni:
 clean:
        rm -rf $(BUILD_BASE)
        $(MAKE) -C jni clean
+       $(MAKE) -f Makefile-rcp.mk clean
 
-include  $(SDK_SRC_BASE)/sdk/osgi.mk
\ No newline at end of file
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file