X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=bootstrap%2Forg.argeo.tp.build%2FMakefile;h=65116fddf17d7396488895146482d44aaadfdde2;hb=6b24bc29f1bea600516f4a5fbd15d1acca31dada;hp=be38fd2ae331841bd1036d395a50975f1f449341;hpb=0301f5aa84ea0661efa22f83a5f94eac62eac7b9;p=gpl%2Fargeo-tp.git diff --git a/bootstrap/org.argeo.tp.build/Makefile b/bootstrap/org.argeo.tp.build/Makefile index be38fd2..65116fd 100644 --- a/bootstrap/org.argeo.tp.build/Makefile +++ b/bootstrap/org.argeo.tp.build/Makefile @@ -1,20 +1,20 @@ -include ../../sdk.mk -include ../../common.mk - .PHONY: clean all osgi A2_OUTPUT := $(SDK_BUILD_BASE)/a2 JVM ?= $(JAVA_HOME)/bin/java -ARGEO_MAKE := $(JVM) -cp $(BOOTSTRAP_BASE)/ecj:$(BOOTSTRAP_BASE)/bndlib:$(BND_CLASSPATH) $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Make.java +ARGEO_MAKE := $(JVM) -cp ../ecj:../bndlib ../sdk/argeo-build/src/org/argeo/build/Make.java A2_CATEGORY = org.argeo.tp.build all: osgi osgi: - cp -r $(BOOTSTRAP_BASE)/ecj/OSGI-OPT/src org.eclipse.jdt.core.compiler.batch - cp -r $(BOOTSTRAP_BASE)/bndlib/OSGI-OPT/src biz.aQute.bndlib + cp -r ../ecj/OSGI-OPT/src org.eclipse.jdt.core.compiler.batch + + cp -r ../bndlib/OSGI-OPT/src biz.aQute.bndlib + cp -rv ../../rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/* biz.aQute.bndlib/src + $(ARGEO_MAKE) all --category $(A2_CATEGORY) --bundles org.eclipse.jdt.core.compiler.batch biz.aQute.bndlib clean: