Use new build mechanism

[lgpl/argeo-commons.git] / Makefile

diff --git a/Makefile b/Makefile
index 7129324bef247949a6fe97f5310dfb50838516b7..0a6d791f77159394b332fa29a7b1c6a8a981340b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,20 @@
 include sdk.mk
-.PHONY: clean all osgi jni
+.PHONY: clean all osgi jni move-swt move-rap
 
-all: osgi jni move-rap
-       $(MAKE) -f Makefile-rcp.mk
+all: osgi jni
+       $(MAKE) -f Makefile-rcp.mk all
 
-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
+move-rap: move-swt
+       #mkdir -p $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
+       #mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
+       #mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/*.rap.cli.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/rap/$(A2_CATEGORY)
+       #touch $(BUILD_BASE)/*.rap/bnd.bnd
+
+move-swt: osgi
+       #mkdir -p $(A2_OUTPUT)/swt/$(A2_CATEGORY)
+       #mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.swt.minidesktop.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
+       #mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.cms.swt.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
+       #mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.cms.e4.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
 
 A2_CATEGORY = org.argeo.cms
 
@@ -34,7 +41,7 @@ swt/rap/org.argeo.cms.swt.rap \
 swt/rap/org.argeo.cms.swt.rap.cli \
 swt/rap/org.argeo.cms.e4.rap \
 jcr/org.argeo.cms.jcr \
-jcr/org.argeo.cms.ui \
+jcr/org.argeo.cms.jcr.ui \
 
 JAVADOC_BUNDLES =  \
 org.argeo.api.uuid \
@@ -50,16 +57,20 @@ A2_OUTPUT = $(SDK_BUILD_BASE)/a2
 A2_BASE = $(A2_OUTPUT)
 
 VPATH = .:jcr:swt:swt/rap
+#vpath %.$(MAJOR).$(MINOR).jar .:jcr/$(A2_CATEGORY):swt/$(A2_CATEGORY):swt/rap/$(A2_CATEGORY)
 
 DEP_CATEGORIES = \
 org.argeo.tp \
 org.argeo.tp.apache \
 org.argeo.tp.jetty \
-org.argeo.tp.eclipse \
 osgi/api/org.argeo.tp.osgi \
+osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
 swt/rap/org.argeo.tp.swt.workbench \
-org.argeo.tp.jcr
+org.argeo.tp.jcr \
+$(A2_CATEGORY) \
+swt/$(A2_CATEGORY) \
+swt/rap/$(A2_CATEGORY) \
 
 jni:
        $(MAKE) -C jni