X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile-rcp.mk;h=562f8b61be378e81f116d0a83616ced4bec09599;hb=6ff9fe4752ba5122751d5fc4cf03ce1e6f7123f0;hp=e8009c732d1762768d9a3a0e89b13baf657cd971;hpb=a1a56da10613f30d5108cd60316c57199ba393a6;p=lgpl%2Fargeo-commons.git diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk index e8009c732..562f8b61b 100644 --- a/Makefile-rcp.mk +++ b/Makefile-rcp.mk @@ -1,20 +1,19 @@ include sdk.mk .PHONY: clean all osgi -all: osgi move-rcp +all: osgi 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 + #touch $(BUILD_BASE)/*.rcp/bnd.bnd A2_CATEGORY = org.argeo.cms BUNDLES = \ swt/rcp/org.argeo.swt.specific.rcp \ swt/rcp/org.argeo.cms.swt.rcp \ -swt/rcp/org.argeo.cms.swt.rcp.cli \ swt/rcp/org.argeo.cms.e4.rcp \ A2_OUTPUT = $(SDK_BUILD_BASE)/a2 @@ -27,7 +26,7 @@ org.argeo.tp \ org.argeo.tp.apache \ org.argeo.tp.jetty \ osgi/equinox/org.argeo.tp.eclipse \ -osgi/osgi/org.argeo.tp.osgi \ +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 \