X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile-rcp.mk;h=562f8b61be378e81f116d0a83616ced4bec09599;hb=6ff9fe4752ba5122751d5fc4cf03ce1e6f7123f0;hp=32ecda21e7252fefc5107fac84359df6792b13e8;hpb=ee8f903269128a8c69204609f052318538ce2d06;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
index 32ecda21e..562f8b61b 100644
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -1,32 +1,41 @@
 include sdk.mk
 .PHONY: clean all osgi
 
-all: osgi
+all: osgi 
 
-A2_CATEGORY = org.argeo.cms.eclipse.rcp
+move-rcp: osgi
+	mkdir -p $(A2_OUTPUT)/swt/rcp/$(A2_CATEGORY)
+	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rcp.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rcp/$(A2_CATEGORY)
+	mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rcp.cli.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rcp/$(A2_CATEGORY)
+	#touch $(BUILD_BASE)/*.rcp/bnd.bnd
+
+A2_CATEGORY = org.argeo.cms
 
 BUNDLES = \
-rcp/org.argeo.cms.e4.rcp \
-rcp/org.argeo.cms.ui.rcp \
-rcp/org.argeo.swt.minidesktop \
-rcp/org.argeo.swt.specific.rcp \
+swt/rcp/org.argeo.swt.specific.rcp \
+swt/rcp/org.argeo.cms.swt.rcp \
+swt/rcp/org.argeo.cms.e4.rcp \
 
 A2_OUTPUT = $(SDK_BUILD_BASE)/a2
 A2_BASE = $(A2_OUTPUT)
 
 DEP_CATEGORIES = \
 org.argeo.cms \
+swt/org.argeo.cms \
 org.argeo.tp \
 org.argeo.tp.apache \
 org.argeo.tp.jetty \
-org.argeo.tp.eclipse.equinox \
-org.argeo.tp.eclipse.rcp \
+osgi/equinox/org.argeo.tp.eclipse \
+osgi/api/org.argeo.tp.osgi \
+swt/rcp/org.argeo.tp.swt \
+lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \
+swt/rcp/org.argeo.tp.swt.workbench \
 org.argeo.tp.jcr
 
 
 clean:
 	rm -rf $(BUILD_BASE)
 
-VPATH = .:rcp
+VPATH = .:swt/rcp
 
-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