X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=f10ffaa1e093ad9ce681366696532d53bdc89776;hb=a5b15e7329191247646c7c9a26c1d765677b392e;hp=3f4dc3c67b3f0f3509d435cf5753ce7d0c7833d0;hpb=440389217546979193b60acdf973a40abac50747;p=lgpl%2Fargeo-commons.git

diff --git a/Makefile b/Makefile
index 3f4dc3c67..f10ffaa1e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,12 @@
 include sdk.mk
-.PHONY: clean all build-base build-rcp
-#.PRECIOUS: $(SDK_BUILD_BASE)/%/bundle.jar
+.PHONY: clean all osgi
 
 all: osgi jni
 
-OLD_BASE_BUNDLES := \
-$(SDK_BUILD_BASE)/org.argeo.init.$(MAJOR).$(MINOR).jar \
-$(SDK_BUILD_BASE)/org.argeo.util.$(MAJOR).$(MINOR).jar \
-$(SDK_BUILD_BASE)/org.argeo.api.uuid.$(MAJOR).$(MINOR).jar \
-$(SDK_BUILD_BASE)/org.argeo.api.acr.$(MAJOR).$(MINOR).jar \
-$(SDK_BUILD_BASE)/org.argeo.api.cms.$(MAJOR).$(MINOR).jar \
-$(SDK_BUILD_BASE)/org.argeo.cms.tp.$(MAJOR).$(MINOR).jar \
-$(SDK_BUILD_BASE)/org.argeo.cms.$(MAJOR).$(MINOR).jar \
- 
-BASE_BUNDLES := \
+BUNDLE_PREFIX = org.argeo
+A2_CATEGORY = org.argeo
+
+BUNDLES = \
 org.argeo.init \
 org.argeo.util \
 org.argeo.api.uuid \
@@ -21,66 +14,17 @@ org.argeo.api.acr \
 org.argeo.api.cms \
 org.argeo.cms.tp \
 org.argeo.cms \
- 
-NATIVE_PROJECTS = org.argeo.api.uuid/jni
-
-A2_BASE_BUNDLES := $(BASE_BUNDLES:%=$(SDK_BUILD_BASE)/a2/org.argeo/%.$(MAJOR).$(MINOR).jar)
-
-
-osgi : $(A2_BASE_BUNDLES)
-
-jni:
-	$(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir);)
-	
-clean:
-	rm -rf $(SDK_BUILD_BASE)/*-compiled
-	rm -rf $(SDK_BUILD_BASE)/{cnf,a2}
-	rm -rf $(SDK_BUILD_BASE)/org.argeo.*
-	$(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir) clean;)
-
-JVM := /usr/lib/jvm/jre-11/bin/java
-ECJ_JAR := /usr/share/java/ecj/ecj.jar
-BND_TOOL := /usr/bin/bnd
-
-WORKSPACE_BNDS := $(shell find cnf -name '*.bnd')
-BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/%)
-
-JAVA_SRCS := $(shell find cnf -name '*.java')
-
+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 \
 
-INTERMEDIATE_BASE_BUNDLES := $(BASE_BUNDLES:%=$(SDK_BUILD_BASE)/%/bundle.jar)
+NATIVE_PROJECTS = \
+org.argeo.api.uuid/jni \
 
-#bnd-workspace : $(BUILD_WORKSPACE_BNDS)
-
-$(SDK_BUILD_BASE)/a2/org.argeo/%.$(MAJOR).$(MINOR).jar : $(SDK_BUILD_BASE)/%/bundle.jar
-	mkdir -p $(dir $@)
-	cp $< $@
-
-
-$(A2_BASE_BUNDLES) : $(BUILD_WORKSPACE_BNDS) $(INTERMEDIATE_BASE_BUNDLES)
-#$(BUILD_WORKSPACE_BNDS)  : $(WORKSPACE_BNDS)
-
-$(SDK_BUILD_BASE)/%/bundle.jar : $(SDK_BUILD_BASE)/%/bnd.bnd $(SDK_BUILD_BASE)/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
-#	cat $(dir $@)/generated/*.jar > $(dir $@)/bundle.jar
-#	rm -rf $(dir $@)/generated
-
-
-$(SDK_BUILD_BASE)/cnf/%.bnd: $(SDK_SRC_BASE)/cnf/%.bnd
-	mkdir -p $(dir $@)
-	cp $< $@
-
-$(SDK_BUILD_BASE)/%.bnd: $(SDK_SRC_BASE)/%.bnd
-	mkdir -p $(dir $@)
-	cp $< $@
-
-
-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:$\
@@ -91,27 +35,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
-
-$(SDK_BUILD_BASE)/base-java-compiled : $(JAVA_SRCS)
-	$(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BASE_CLASSPATH) \
-	$(SDK_SRC_BASE)/org.argeo.api.uuid/src[-d $(SDK_BUILD_BASE)/org.argeo.api.uuid/bin] \
-	$(SDK_SRC_BASE)/org.argeo.api.acr/src[-d $(SDK_BUILD_BASE)/org.argeo.api.acr/bin] \
-	$(SDK_SRC_BASE)/org.argeo.api.cms/src[-d $(SDK_BUILD_BASE)/org.argeo.api.cms/bin] \
-	$(SDK_SRC_BASE)/org.argeo.init/src[-d $(SDK_BUILD_BASE)/org.argeo.init/bin] \
-	$(SDK_SRC_BASE)/org.argeo.util/src[-d $(SDK_BUILD_BASE)/org.argeo.util/bin] \
-	$(SDK_SRC_BASE)/org.argeo.cms.tp/src[-d $(SDK_BUILD_BASE)/org.argeo.cms.tp/bin] \
-	$(SDK_SRC_BASE)/org.argeo.cms/src[-d $(SDK_BUILD_BASE)/org.argeo.cms/bin] \
-	$(SDK_SRC_BASE)/org.argeo.cms.pgsql/src[-d $(SDK_BUILD_BASE)/org.argeo.cms.pgsql/bin] \
-	
-	touch $@
-
-RCP_CLASSPATH=$(BASE_CLASSPATH):$\
-$(SDK_BUILD_BASE)/org.argeo.api.uuid/bin:$\
-$(SDK_BUILD_BASE)/org.argeo.api.acr/bin:$\
-$(SDK_BUILD_BASE)/org.argeo.api.cms/bin:$\
-$(SDK_BUILD_BASE)/org.argeo.util/bin:$\
-$(SDK_BUILD_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:$\
@@ -122,31 +46,69 @@ $(SDK_BUILD_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:$\
 
 
-build-rcp: build-base
-	$(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(RCP_CLASSPATH) \
-	$(SDK_SRC_BASE)/eclipse/org.argeo.cms.servlet/src[-d $(SDK_BUILD_BASE)/eclipse/org.argeo.cms.servlet/bin] \
-	$(SDK_SRC_BASE)/rcp/org.argeo.swt.minidesktop/src[-d $(SDK_BUILD_BASE)/rcp/org.argeo.swt.minidesktop/bin] \
-	$(SDK_SRC_BASE)/rcp/org.argeo.swt.specific.rcp/src[-d $(SDK_BUILD_BASE)/rcp/org.argeo.swt.specific.rcp/bin] \
-	$(SDK_SRC_BASE)/eclipse/org.argeo.cms.swt/src[-d $(SDK_BUILD_BASE)/eclipse/org.argeo.cms.swt/bin] \
-	$(SDK_SRC_BASE)/rcp/org.argeo.cms.ui.rcp/src[-d $(SDK_BUILD_BASE)/rcp/org.argeo.cms.ui.rcp/bin] \
+jni:
+	$(foreach dir, $(NATIVE_PROJECTS), $(MAKE) -C $(dir);)
 
-#base-java-sources : $(shell find org.argeo.* -name '*.java') 
+# TODO relativize from SDK_SRC_BASE
+BUILD_BASE = $(SDK_BUILD_BASE)
 
-#base-java-classes : $(shell find org.argeo.* -name '*.class') 
+#
+# GENERIC
+#
+JVM := /usr/lib/jvm/jre-11/bin/java
+ECJ_JAR := /usr/share/java/ecj/ecj.jar
+BND_TOOL := /usr/bin/bnd
 
-# each dir depends on its package directories
-#$(SDK_SRC_BASE)/% : $(shell  find */src -type f  | sed "s%/[^/]*$%%" | sort -u)
+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/%)
 
-# non empty package dirs
-#$(SDK_SRC_BASE)/*/src/% : $(shell  grep --no-filename ^import '%/*.java' | sed 's/import //g' | sed 's/static //g' | sed 's/\.[A-Za-z0-9_]*;//' | sed 's/\.[A-Z].*//'  | sort |  uniq)
+cnf: $(BUILD_WORKSPACE_BNDS)
 
-# convert dir to package
-#$(shell find %/src -mindepth 1 -type d -printf '%P\n' | sed "s/\//\./g")
+A2_BUNDLES = $(BUNDLES:%=$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar)
 
-# all packages
-# grep --no-filename ^import src/org/argeo/api/uuid/*.java | sed "s/import //g" | sed "s/static //g" | sed "s/\.[A-Za-z0-9_]*;//" | sed "s/\.[A-Z].*//"  | sort |  uniq
+#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).* $(BUILD_BASE)/eclipse $(BUILD_BASE)/rcp
+	$(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 $< $@
+
+$(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 $@