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

diff --git a/Makefile b/Makefile
index ad9590407..df4d52b06 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,29 @@
 include sdk.mk
+.PHONY: clean all osgi
 
-MAKEDIRS = org.argeo.api.uuid
+all: osgi jni
 
-BUILD_BASE=generated
-
-.PHONY: clean all base rcp
-all: base
-	$(foreach dir, $(MAKEDIRS), $(MAKE) -C $(dir);)
-	
-clean:
-	$(foreach dir, $(MAKEDIRS), $(MAKE) -C $(dir) clean;)
+BUNDLE_PREFIX = org.argeo
+A2_CATEGORY = org.argeo
 
+BUNDLES = \
+org.argeo.init \
+org.argeo.util \
+org.argeo.api.uuid \
+org.argeo.api.acr \
+org.argeo.api.cms \
+org.argeo.cms.tp \
+org.argeo.cms \
+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 \
 
-JVM := /usr/lib/jvm/jre-11/bin/java
-ECJ_JAR := /usr/share/java/ecj/ecj.jar
+NATIVE_PROJECTS = \
+org.argeo.api.uuid/jni \
 
-BASE_CLASSPATH=\
+BUILD_CLASSPATH = \
 /usr/share/java/osgi-core/osgi.core.jar:$\
 /usr/share/java/osgi-compendium/osgi.cmpn.jar:$\
 /usr/share/java/ecj/ecj.jar:$\
@@ -26,26 +34,7 @@ BASE_CLASSPATH=\
 /usr/share/java/bcprov.jar:$\
 /usr/share/java/bcpkix.jar:$\
 /usr/share/java/commons-httpclient3.jar:$\
-/usr/share/java/postgresql-jdbc.jar
-
-base: 
-	$(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BASE_CLASSPATH) \
-	$(SDK_SRC_BASE)/org.argeo.api.uuid/src[-d $(SDK_SRC_BASE)/org.argeo.api.uuid/bin] \
-	$(SDK_SRC_BASE)/org.argeo.api.acr/src[-d $(SDK_SRC_BASE)/org.argeo.api.acr/bin] \
-	$(SDK_SRC_BASE)/org.argeo.api.cms/src[-d $(SDK_SRC_BASE)/org.argeo.api.cms/bin] \
-	$(SDK_SRC_BASE)/org.argeo.init/src[-d $(SDK_SRC_BASE)/org.argeo.init/bin] \
-	$(SDK_SRC_BASE)/org.argeo.util/src[-d $(SDK_SRC_BASE)/org.argeo.util/bin] \
-	$(SDK_SRC_BASE)/org.argeo.cms.tp/src[-d $(SDK_SRC_BASE)/org.argeo.cms.tp/bin] \
-	$(SDK_SRC_BASE)/org.argeo.cms/src[-d $(SDK_SRC_BASE)/org.argeo.cms/bin] \
-	$(SDK_SRC_BASE)/org.argeo.cms.pgsql/src[-d $(SDK_SRC_BASE)/org.argeo.cms.pgsql/bin] \
-
-
-RCP_CLASSPATH=$(BASE_CLASSPATH):$\
-$(SDK_SRC_BASE)/org.argeo.api.uuid/bin:$\
-$(SDK_SRC_BASE)/org.argeo.api.acr/bin:$\
-$(SDK_SRC_BASE)/org.argeo.api.cms/bin:$\
-$(SDK_SRC_BASE)/org.argeo.util/bin:$\
-$(SDK_SRC_BASE)/org.argeo.cms/bin:$\
+/usr/share/java/postgresql-jdbc.jar:$\
 /usr/share/java/tomcat-servlet-api.jar:$\
 /usr/share/java/eclipse/equinox.http.jetty.jar:$\
 /usr/lib/java/swt.jar:$\
@@ -56,15 +45,69 @@ $(SDK_SRC_BASE)/org.argeo.cms/bin:$\
 /usr/lib/eclipse/plugins/org.eclipse.jface_3.22.100.v20210304-1735.jar:$\
 /usr/lib/eclipse/plugins/org.eclipse.core.commands_3.9.800.v20210304-1735.jar:$\
 /usr/share/java/eclipse/equinox.common.jar:$\
-/usr/share/java/sac.jar
+/usr/share/java/sac.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')
+#BND_WORKSPACES := $(foreach bundle, $(BUNDLES), ./$(dir $(bundle)))
+BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/%) $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/eclipse/%) $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/rcp/%)
+
+cnf: $(BUILD_WORKSPACE_BNDS)
+
+A2_BUNDLES = $(BUNDLES:%=$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar)
+
+#JAVA_SRCS = $(shell find $(BUNDLE_PREFIX).* -name '*.java')
+JAVA_SRCS = $(foreach bundle, $(BUNDLES), $(shell find $(bundle) -name '*.java'))
+ECJ_SRCS = $(foreach bundle, $(BUNDLES), $(bundle)/src[-d $(BUILD_BASE)/$(bundle)/bin])
+
+osgi: cnf $(A2_BUNDLES)
+
+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)/eclipse/cnf/%.bnd: cnf/%.bnd
+	mkdir -p $(dir $@)
+	cp $< $@
 
+$(SDK_BUILD_BASE)/rcp/cnf/%.bnd: cnf/%.bnd
+	mkdir -p $(dir $@)
+	cp $< $@
 
-rcp: base
-	$(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(RCP_CLASSPATH) \
-	$(SDK_SRC_BASE)/eclipse/org.argeo.cms.servlet/src[-d $(SDK_SRC_BASE)/eclipse/org.argeo.cms.servlet/bin] \
-	$(SDK_SRC_BASE)/rcp/org.argeo.swt.minidesktop/src[-d $(SDK_SRC_BASE)/rcp/org.argeo.swt.minidesktop/bin] \
-	$(SDK_SRC_BASE)/rcp/org.argeo.swt.specific.rcp/src[-d $(SDK_SRC_BASE)/rcp/org.argeo.swt.specific.rcp/bin] \
-	$(SDK_SRC_BASE)/eclipse/org.argeo.cms.swt/src[-d $(SDK_SRC_BASE)/eclipse/org.argeo.cms.swt/bin] \
-	$(SDK_SRC_BASE)/rcp/org.argeo.cms.ui.rcp/src[-d $(SDK_SRC_BASE)/rcp/org.argeo.cms.ui.rcp/bin] \
+$(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
 
+$(BUILD_BASE)/java-compiled : $(JAVA_SRCS)
+	$(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BUILD_CLASSPATH) \
+	$(ECJ_SRCS)
+	touch $@