X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile-rcp.mk;h=7f1ed9ee21dd6f52ad897bbe0bf23d34d81e2da2;hb=8b501248755eb795bd46a5d5c9e0709c0253c42a;hp=8b96683fc389da57f1eda4e0e39664630f3b748e;hpb=7b242851c0094d13cbaca5b68261ad92c873a59f;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
index 8b96683fc..7f1ed9ee2 100644
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -1,12 +1,17 @@
 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.swt.minidesktop \
 swt/rcp/org.argeo.swt.specific.rcp \
 swt/rcp/org.argeo.cms.swt.rcp \
 swt/rcp/org.argeo.cms.swt.rcp.cli \
@@ -17,11 +22,12 @@ 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 \
-osgi/osgi/org.argeo.tp.osgi \
+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 \
@@ -31,6 +37,6 @@ org.argeo.tp.jcr
 clean:
 	rm -rf $(BUILD_BASE)
 
-VPATH = .:rcp:swt/rcp
+VPATH = .:swt/rcp
 
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file