X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=3c47984094961b6b4fc85317166a147a4fa6f5d1;hb=395c4c21e5d5a00c589417707a1db117c1cb1126;hp=f19a0dc4b61f068b55f7d516f1eb2f53264e8a2b;hpb=b6c9c86547ad1828606426ad1e6c4470bcfc13a4;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile b/Makefile
index f19a0dc4b..3c4798409 100644
--- 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: osgi
+	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
 
@@ -12,7 +18,10 @@ org.argeo.api.uuid \
 org.argeo.api.acr \
 org.argeo.api.cms \
 org.argeo.cms \
-org.argeo.cms.pgsql \
+org.argeo.cms.sql \
+org.argeo.cms.ssh \
+org.argeo.cms.ux \
+eclipse/org.argeo.ext.equinox.jetty \
 eclipse/org.argeo.cms.servlet \
 eclipse/org.argeo.cms.swt \
 eclipse/org.argeo.cms.e4 \
@@ -37,7 +46,14 @@ 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.rwt \
+org.argeo.tp.eclipse.rap \
+org.argeo.tp.jcr
 
 jni:
 	$(MAKE) -C jni
@@ -45,5 +61,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