X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=49a995426246cbd9dbb053f8b6283a523f5876da;hb=a929fb8039cfec511d9bdce55255e709c5af1fd4;hp=d57f2a7e6d40f67137af708eb83a0ae61cc4f9e2;hpb=e80536ca309c45ffeba49c8c3e3e698ba6910203;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile b/Makefile
index d57f2a7e6..49a995426 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,62 @@
-MAKEDIRS = org.argeo.api.uuid
+include sdk.mk
+.PHONY: clean all osgi jni
+
+all: osgi jni move-rap
+	$(MAKE) -f Makefile-rcp.mk
+
+move-rap:
+	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
+
+A2_CATEGORY = org.argeo.cms
+
+BUNDLES = \
+org.argeo.init \
+org.argeo.util \
+org.argeo.api.uuid \
+org.argeo.api.acr \
+org.argeo.api.cms \
+org.argeo.cms \
+org.argeo.cms.pgsql \
+eclipse/org.argeo.cms.servlet \
+eclipse/org.argeo.cms.swt \
+eclipse/org.argeo.cms.e4 \
+rap/org.argeo.cms.ui.rap \
+rap/org.argeo.swt.specific.rap \
+rap/org.argeo.cms.e4.rap \
+jcr/org.argeo.cms.jcr \
+jcr/org.argeo.cms.ui \
+
+JAVADOC_BUNDLES =  \
+org.argeo.api.uuid \
+org.argeo.api.acr \
+org.argeo.api.cms
+
+JAVADOC_PACKAGES =  \
+org.argeo.api.uuid \
+org.argeo.api.acr \
+org.argeo.api.cms
+
+A2_OUTPUT = $(SDK_BUILD_BASE)/a2
+A2_BASE = $(A2_OUTPUT)
+
+VPATH = .:eclipse:rap:jcr
+
+DEP_CATEGORIES = \
+org.argeo.tp \
+org.argeo.tp.apache \
+org.argeo.tp.jetty \
+org.argeo.tp.eclipse.equinox \
+org.argeo.tp.eclipse.rap \
+org.argeo.tp.jcr
+
+jni:
+	$(MAKE) -C jni
 
-.PHONY: clean all
-all:
-	$(foreach dir, $(MAKEDIRS), $(MAKE) -C $(dir);)
-	
 clean:
-	$(foreach dir, $(MAKEDIRS), $(MAKE) -C $(dir) clean;)
+	rm -rf $(BUILD_BASE)
+	$(MAKE) -C jni clean
+	$(MAKE) -f Makefile-rcp.mk clean
 
-include sdk.mk 
\ No newline at end of file
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file