Use new build mechanism

diff --git a/Makefile b/Makefile
index b04cee3063a22ef02d4bff17b7f9006269d61ae8..0a6d791f77159394b332fa29a7b1c6a8a981340b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,20 @@
 include sdk.mk
 .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: 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
+       #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)
+       #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
 
@@ -57,6 +57,7 @@ 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 \
@@ -66,7 +67,10 @@ 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

diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
index e8009c732d1762768d9a3a0e89b13baf657cd971..7f1ed9ee21dd6f52ad897bbe0bf23d34d81e2da2 100644 (file)
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -1,13 +1,13 @@
 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
 
@@ -27,7 +27,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 \

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 0d5780a1346ab30294998a894fe8b63d1de9f5d6..3dc9a223f1177b4eb34ccac1e96a354d4dd8ee25 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 0d5780a1346ab30294998a894fe8b63d1de9f5d6
+Subproject commit 3dc9a223f1177b4eb34ccac1e96a354d4dd8ee25