X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=599b85de81e5bac77752d252dc5324ed6dcae53b;hb=6648f2e8438e06ea62343a9796107c580efe326b;hp=d6bda7804bdc61f1076b9a960f1ba72186770191;hpb=1b8b4c8443356a7a4adc632f391daa8c0ded8053;p=gpl%2Fargeo-slc.git

diff --git a/Makefile b/Makefile
index d6bda7804..599b85de8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,17 @@
 include sdk.mk
 .PHONY: clean all osgi
 
-all: osgi
+all: osgi distribution
 
 BUNDLE_PREFIX = org.argeo
-A2_CATEGORY = org.argeo
+A2_CATEGORY = org.argeo.slc
 
 BUNDLES = \
 org.argeo.slc.api \
-org.argeo.slc.build \
+org.argeo.slc.factory \
+ext/org.argeo.ext.slf4j
 
-BUILD_CLASSPATH = \
+BUILD_CLASSPATH_FEDORA = \
 /usr/share/java/osgi-core/osgi.core.jar:$\
 /usr/share/java/osgi-compendium/osgi.cmpn.jar:$\
 /usr/share/java/ecj/ecj.jar:$\
@@ -20,20 +21,40 @@ BUILD_CLASSPATH = \
 /usr/share/java/commons-cli.jar:$\
 /usr/share/java/commons-exec.jar:$\
 
+BUILD_CLASSPATH = \
+/usr/share/java/osgi.core.jar:$\
+/usr/share/java/osgi.cmpn.jar:$\
+/usr/share/java/ecj.jar:$\
+/usr/share/java/bndlib.jar:$\
+/usr/share/java/slf4j-api.jar:$\
+/usr/share/java/commons-io.jar:$\
+/usr/share/java/commons-cli.jar:$\
+/usr/share/java/commons-exec.jar:$\
+
+DISTRIBUTION_CLASSPATH = \
+$(SDK_BUILD_BASE)/a2/org.argeo.slc/org.argeo.slc.api.$(MAJOR).$(MINOR).jar:$\
+$(SDK_BUILD_BASE)/a2/org.argeo.slc/org.argeo.slc.factory.$(MAJOR).$(MINOR).jar:$\
+/usr/share/java/bndlib.jar:$\
+/usr/share/java/slf4j-api.jar
+
 # TODO relativize from SDK_SRC_BASE
 BUILD_BASE = $(SDK_BUILD_BASE)
 
+distribution: osgi
+	$(JVM) -cp $(DISTRIBUTION_CLASSPATH) tp/Make.java
+
+
 #
 # 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
+JVM := /usr/bin/java
+JAVADOC := /usr/bin/javadoc
+ECJ_JAR := /usr/share/java/ecj.jar
 BND_TOOL := /usr/bin/bnd
 
-WORKSPACE_BNDS := $(shell cd $(SDK_SRC_BASE) && find cnf -name '*.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)/%)
+BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/%) $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/ext/%)
 
 cnf: $(BUILD_WORKSPACE_BNDS)
 
@@ -44,22 +65,25 @@ 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)
+	mkdir -p $(SDK_BUILD_BASE)/a2/org.argeo.tp
+	mv $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/ext/org.argeo.ext.slf4j.$(MAJOR).$(MINOR).jar $(SDK_BUILD_BASE)/a2/org.argeo.tp
+	rmdir $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/ext
 
 clean:
 	rm -rf $(BUILD_BASE)/*-compiled
-	rm -rf $(BUILD_BASE)/{cnf,a2}
+	rm -rf $(BUILD_BASE)/cnf
+	rm -rf $(BUILD_BASE)/a2
 	rm -rf $(BUILD_BASE)/$(BUNDLE_PREFIX).* 
+	rm -rf $(BUILD_BASE)/ext
+	rm -rf $(BUILD_BASE)/build
+	rm -rf $(BUILD_BASE)/deb
 
 # 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
+$(SDK_BUILD_BASE)/ext/cnf/%.bnd: cnf/%.bnd
 	mkdir -p $(dir $@)
 	cp $< $@
 
@@ -69,6 +93,7 @@ $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%/bu
 
 # Build level
 $(BUILD_BASE)/%/bundle.jar : %/bnd.bnd $(BUILD_BASE)/java-compiled 
+	mkdir -p $(dir $@)
 	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
@@ -77,7 +102,7 @@ $(BUILD_BASE)/%/bundle.jar : %/bnd.bnd $(BUILD_BASE)/java-compiled
 	mv $(dir $@)generated/*.jar $(dir $@)bundle.jar
 
 $(BUILD_BASE)/java-compiled : $(JAVA_SRCS)
-	$(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BUILD_CLASSPATH) \
+	$(JVM) -cp $(ECJ_JAR) org.eclipse.jdt.internal.compiler.batch.Main -11 -nowarn -time -cp $(BUILD_CLASSPATH) \
 	$(ECJ_SRCS)
 	touch $@