Adapt packaged config

[lgpl/argeo-commons.git] / Makefile-rcp.mk

diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
index 8b96683fc389da57f1eda4e0e39664630f3b748e..f09721089c19e71d068d7417b6c9b81ee2f3e325 100644 (file)
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -1,12 +1,17 @@
 include sdk.mk
 .PHONY: clean all osgi
 
-all: osgi
+all: osgi move-rcp
 
-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 \
@@ -31,6 +36,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