Update Argeo Build

[gpl/argeo-tp.git] / bootstrap / Makefile

diff --git a/bootstrap/Makefile b/bootstrap/Makefile
index 838046f44fe58cdc4f49c2a82f3854efaa61507e..9480df89a6645925524772db86680426e46d7bec 100644 (file)
--- a/bootstrap/Makefile
+++ b/bootstrap/Makefile
@@ -9,6 +9,7 @@ OSGI_ANNOTATION_VERSION=7.0.0
 SLF4J_VERSION=1.7.36
 
 ORIGIN_BASE=$(HOME)/.cache/argeo/build/origin
+SDK_BUILD_BASE ?= ./output
 BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
 
 ECJ_BASE=./ecj
@@ -37,7 +38,7 @@ ecj-build:
        # build
        $(JAVA_HOME)/bin/javac -d $(ECJ_BASE) -source 17 -target 17 -Xlint:none @$(BOOTSTRAP_BASE)/ecj.todo
        
-bndlib-build:
+bndlib-build: ecj-build
        $(JAVA_HOME)/bin/java -cp $(ECJ_BASE) org.eclipse.jdt.internal.compiler.batch.Main -nowarn \
                -source 17 -target 17 \
                $(BNDLIB_SRC) \
@@ -45,13 +46,22 @@ bndlib-build:
 
 clean:
        $(RM) -rf $(BOOTSTRAP_BASE)
-       cd $(ECJ_BASE) && find . -name "*.class" -type f -exec rm -f {} \;
-       cd $(BNDLIB_BASE) && find . -name "*.class" -type f -exec rm -f {} \;
+       find $(ECJ_BASE) -name "*.class" -type f -exec rm -f {} \;
+       find $(BNDLIB_BASE) -name "*.class" -type f -exec rm -f {} \;
        make -C org.argeo.tp.build clean
 
+distclean:
+       rm -f sdk.mk
+       rm -rf ./output
+
 clean-sources:
        $(RM) -rf $(ECJ_BASE)
        $(RM) -rf $(BNDLIB_BASE)
+       rm -rf org.argeo.tp.build/biz.aQute.bndlib/src
+       
+deb-source: distclean clean-sources bootstrap-prepare-sources
+       debuild --no-sign -S
+       rm -f debian/files
 
 bootstrap-prepare-sources: bootstrap-download-sources
        ## ECJ
@@ -72,7 +82,7 @@ bootstrap-prepare-sources: bootstrap-download-sources
        cp -r $(ECJ_BASE)/org $(ECJ_SRC)
        # remove java sources
        cd $(ECJ_BASE) && find org -name "*.java" -type f -exec rm -f {} \;
-       cd $(ECJ_BASE) && find org -name "*.html -type f -exec rm -f {} \;
+       cd $(ECJ_BASE) && find org -name "*.html" -type f -exec rm -f {} \;
        
        ## BNDLIB
        # copy sources
@@ -107,7 +117,13 @@ bootstrap-prepare-sources: bootstrap-download-sources
 
        # clean up BNDLIB
        $(RM) -rf $(BNDLIB_SRC)/aQute/bnd/annotation/spi
-       $(RM) -rf $(BNDLIB_SRC)/aQute/bnd/junit 
+       $(RM) -rf $(BNDLIB_SRC)/aQute/bnd/junit
+
+       mkdir -p org.argeo.tp.build/biz.aQute.bndlib/src
+       cp -r ../rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/* org.argeo.tp.build/biz.aQute.bndlib/src
+       
+       # make sure directory is clean
+       $(RM) -rf ./output
 
 bootstrap-download-sources: $(SOURCE_ARCHIVES)