Working debuild for bootstrap

diff --git a/.gitignore b/.gitignore
index e29319b8d6c181dbac508f8e8308a995a303775f..69cf9d9d3ec1f15ac67c167fbdf741841058054a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 sdk.mk
 *.build
+*.buildinfo
+*.changes
 *.dsc
 *.tar
 *.tar.*

diff --git a/bootstrap/Makefile b/bootstrap/Makefile
index 838046f44fe58cdc4f49c2a82f3854efaa61507e..cdae8df4ed93fb158cbf534949be29680ae313fa 100644 (file)
--- a/bootstrap/Makefile
+++ b/bootstrap/Makefile
@@ -37,7 +37,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,8 +45,8 @@ 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
 
 clean-sources:
@@ -72,7 +72,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

diff --git a/bootstrap/sdk/argeo-build b/bootstrap/sdk/argeo-build
index 0719a66beb5a861fe351f176e3f69f385a103bc8..2fcc5942da8416113ccda360f3b568991acf567e 160000 (submodule)
--- a/bootstrap/sdk/argeo-build
+++ b/bootstrap/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 0719a66beb5a861fe351f176e3f69f385a103bc8
+Subproject commit 2fcc5942da8416113ccda360f3b568991acf567e

diff --git a/sdk/argeo-build b/sdk/argeo-build
index abd7ee82834264cddc6bfa4ad8644051cb740f6f..2fcc5942da8416113ccda360f3b568991acf567e 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit abd7ee82834264cddc6bfa4ad8644051cb740f6f
+Subproject commit 2fcc5942da8416113ccda360f3b568991acf567e