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

diff --git a/Makefile b/Makefile
index 599b85de8..ff9eec9dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,114 +1,32 @@
 include sdk.mk
 .PHONY: clean all osgi
 
-all: osgi distribution
+all: osgi
 
-BUNDLE_PREFIX = org.argeo
 A2_CATEGORY = org.argeo.slc
 
 BUNDLES = \
 org.argeo.slc.api \
 org.argeo.slc.factory \
-ext/org.argeo.ext.slf4j
+org.argeo.slc.runtime \
 
-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:$\
-/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/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/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') 
-#BND_WORKSPACES := $(foreach bundle, $(BUNDLES), ./$(dir $(bundle)))
-BUILD_WORKSPACE_BNDS := $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/%) $(WORKSPACE_BNDS:%=$(SDK_BUILD_BASE)/ext/%)
-
-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)
-	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
-	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)/ext/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 
-	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
-	cp $< $(dir $@)
-	cd $(dir $@) && $(BND_TOOL) build
-	mv $(dir $@)generated/*.jar $(dir $@)bundle.jar
-
-$(BUILD_BASE)/java-compiled : $(JAVA_SRCS)
-	$(JVM) -cp $(ECJ_JAR) org.eclipse.jdt.internal.compiler.batch.Main -11 -nowarn -time -cp $(BUILD_CLASSPATH) \
-	$(ECJ_SRCS)
-	touch $@
-	
-null  :=
-space := $(null) #
-pathsep := :
-
-#WITH_LIST    := $(subst $(space),$(pathsep),$(strip $(WITH_LIST)))
-	
+	rm -rf $(BUILD_BASE)
+
+A2_OUTPUT = $(SDK_BUILD_BASE)/a2
+A2_BASE = $(A2_OUTPUT)
+
+DEP_CATEGORIES = \
+org.argeo.tp \
+org.argeo.tp.sdk \
+org.argeo.tp.apache \
+org.argeo.tp.jetty \
+org.argeo.tp.eclipse.equinox \
+org.argeo.tp.eclipse.rap \
+org.argeo.tp.jcr \
+org.argeo.tp.formats \
+org.argeo.tp.gis \
+org.argeo.cms \
+
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file