From afd7fd6484e95660ae5d285e11d6520b18a05a00 Mon Sep 17 00:00:00 2001
From: Mathieu <mbaudier@argeo.org>
Date: Fri, 10 Mar 2023 11:10:59 +0100
Subject: [PATCH] Working debuild for bootstrap

---
 .gitignore                | 2 ++
 bootstrap/Makefile        | 8 ++++----
 bootstrap/sdk/argeo-build | 2 +-
 sdk/argeo-build           | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index e29319b..69cf9d9 100644
--- 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 838046f..cdae8df 100644
--- 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 0719a66..2fcc594 160000
--- 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 abd7ee8..2fcc594 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit abd7ee82834264cddc6bfa4ad8644051cb740f6f
+Subproject commit 2fcc5942da8416113ccda360f3b568991acf567e
-- 
2.30.2