Merge remote-tracking branch 'origin/unstable' into testing

[lgpl/argeo-commons.git] / Makefile

diff --git a/Makefile b/Makefile
index 6e6d5dbb5fd2b5c0e8705f01df05310a18d396e6..49a995426246cbd9dbb053f8b6283a523f5876da 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,15 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi jni
 
-all: osgi jni
+all: osgi jni move-rap
+       $(MAKE) -f Makefile-rcp.mk
 
-BUNDLE_PREFIX = org.argeo
-A2_CATEGORY = org.argeo
+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 \
@@ -12,75 +17,46 @@ org.argeo.util \
 org.argeo.api.uuid \
 org.argeo.api.acr \
 org.argeo.api.cms \
-org.argeo.cms.tp \
 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
 
-NATIVE_PROJECTS = \
-org.argeo.api.uuid/jni \
-
-BUILD_CLASSPATH = \
-/usr/share/java/osgi-core/osgi.core.jar:$\
-/usr/share/java/osgi-compendium/osgi.cmpn.jar:$\
-/usr/share/java/ecj/ecj.jar:$\
-/usr/share/java/aqute-bnd/biz.aQute.bndlib.jar:$\
-/usr/share/java/slf4j/api.jar:$\
-/usr/share/java/commons-io.jar:$\
-/usr/share/java/commons-cli.jar:$\
-/usr/share/java/bcprov.jar:$\
-/usr/share/java/bcpkix.jar:$\
-/usr/share/java/commons-httpclient3.jar:$\
-/usr/share/java/postgresql-jdbc.jar
-
-jni:
-       $(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir);)
-
-# TODO relativize from SDK_SRC_BASE
-BUILD_BASE = $(SDK_BUILD_BASE)
-
-#
-# GENERIC
-#
-JVM := /usr/lib/jvm/jre-11/bin/java
-ECJ_JAR := /usr/share/java/ecj/ecj.jar
-BND_TOOL := /usr/bin/bnd
-
-WORKSPACE_BNDS := $(shell cd $(SDK_SRC_BASE) && find cnf -name '*.bnd')
-BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/%)
+JAVADOC_PACKAGES =  \
+org.argeo.api.uuid \
+org.argeo.api.acr \
+org.argeo.api.cms
 
-cnf: $(BUILD_WORKSPACE_BNDS)
+A2_OUTPUT = $(SDK_BUILD_BASE)/a2
+A2_BASE = $(A2_OUTPUT)
 
-A2_BUNDLES = $(BUNDLES:%=$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar)
+VPATH = .:eclipse:rap:jcr
 
-JAVA_SRCS = $(shell find $(BUNDLE_PREFIX).* -name '*.java')
-ECJ_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src[-d $(BUILD_BASE)/$(shell basename $(bundle))/bin])
+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
 
-osgi: cnf $(A2_BUNDLES)
+jni:
+       $(MAKE) -C jni
 
 clean:
-       rm -rf $(BUILD_BASE)/*-compiled
-       rm -rf $(BUILD_BASE)/{cnf,a2}
-       rm -rf $(BUILD_BASE)/$(BUNDLE_PREFIX).*
-       $(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir) clean;)
-
-# SDK level
-$(SDK_BUILD_BASE)/cnf/%.bnd: cnf/%.bnd
-       mkdir -p $(dir $@)
-       cp $< $@
-
-$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%/bundle.jar
-       mkdir -p $(dir $@)
-       cp $< $@
-
-# Build level
-$(BUILD_BASE)/%/bundle.jar : %/bnd.bnd $(BUILD_BASE)/java-compiled 
-       rsync -r --exclude "*.java" $(dir  $<)src/ $(dir $@)bin
-       rsync -r $(dir  $<)src/ $(dir $@)src
-       if [ -d "$(dir  $<)OSGI-INF" ]; then rsync -r $(dir  $<)OSGI-INF/ $(dir $@)/OSGI-INF; fi
-       cp $< $(dir $@)
-       cd $(dir $@) && $(BND_TOOL) build
-       mv $(dir $@)generated/*.jar $(dir $@)bundle.jar
+       rm -rf $(BUILD_BASE)
+       $(MAKE) -C jni clean
+       $(MAKE) -f Makefile-rcp.mk clean
 
-$(BUILD_BASE)/java-compiled : $(JAVA_SRCS)
-       $(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BUILD_CLASSPATH) \
-       $(ECJ_SRCS)
-       touch $@
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file