X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=85473c29cb1291d9f86b35075d9326b0ebfb8941;hb=6457e820f3379a9f26986338f4364c40889b51b6;hp=df4d52b06a1e6723b561fe3298183fd48e9375c6;hpb=488a81a97e62271ebe6a41a9f5656cc6540ff180;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile b/Makefile
index df4d52b06..85473c29c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi jni
 
-all: osgi jni
+all: osgi 
 
 BUNDLE_PREFIX = org.argeo
 A2_CATEGORY = org.argeo
@@ -12,17 +12,14 @@ 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 \
 rcp/org.argeo.swt.minidesktop \
 rcp/org.argeo.swt.specific.rcp \
 eclipse/org.argeo.cms.swt \
 rcp/org.argeo.cms.ui.rcp \
 
-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:$\
@@ -47,9 +44,19 @@ BUILD_CLASSPATH = \
 /usr/share/java/eclipse/equinox.common.jar:$\
 /usr/share/java/sac.jar:$\
 
+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
+
 
 jni:
-	$(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir);)
+	$(MAKE) -C jni
 
 # TODO relativize from SDK_SRC_BASE
 BUILD_BASE = $(SDK_BUILD_BASE)
@@ -58,6 +65,7 @@ BUILD_BASE = $(SDK_BUILD_BASE)
 # GENERIC
 #
 JVM := /usr/lib/jvm/jre-11/bin/java
+JAVADOC := /usr/lib/jvm/jre-11/bin/javadoc
 ECJ_JAR := /usr/share/java/ecj/ecj.jar
 BND_TOOL := /usr/bin/bnd
 
@@ -73,13 +81,18 @@ A2_BUNDLES = $(BUNDLES:%=$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR)
 JAVA_SRCS = $(foreach bundle, $(BUNDLES), $(shell find $(bundle) -name '*.java'))
 ECJ_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src[-d $(BUILD_BASE)/$(bundle)/bin])
 
+JAVADOC_SRCS = $(foreach bundle, $(JAVADOC_BUNDLES),$(bundle)/src)
+
 osgi: cnf $(A2_BUNDLES)
 
+javadoc: $(BUILD_BASE)/java-compiled
+	$(JAVADOC) -d $(SDK_BUILD_BASE)/api --source-path $(subst $(space),$(pathsep),$(strip $(JAVADOC_SRCS))) -subpackages $(JAVADOC_PACKAGES)
+
 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;)
+	rm -rf $(BUILD_BASE)/$(BUNDLE_PREFIX).* $(BUILD_BASE)/eclipse $(BUILD_BASE)/rcp
+	$(MAKE) -C jni clean
 
 # SDK level
 $(SDK_BUILD_BASE)/cnf/%.bnd: cnf/%.bnd
@@ -111,3 +124,10 @@ $(BUILD_BASE)/java-compiled : $(JAVA_SRCS)
 	$(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BUILD_CLASSPATH) \
 	$(ECJ_SRCS)
 	touch $@
+	
+null  :=
+space := $(null) #
+pathsep := :
+
+#WITH_LIST    := $(subst $(space),$(pathsep),$(strip $(WITH_LIST)))
+