From b1dadc4dcbc571599e4d355f6a4bae5a07ba5892 Mon Sep 17 00:00:00 2001
From: Mathieu <mbaudier@argeo.org>
Date: Fri, 10 Mar 2023 12:00:57 +0100
Subject: [PATCH] Improve bootstrap build

---
 bootstrap/Makefile                                    | 8 ++++++++
 bootstrap/branch.mk                                   | 1 -
 bootstrap/org.argeo.tp.build/biz.aQute.bndlib/bnd.bnd | 2 +-
 bootstrap/sdk/branches/unstable.bnd                   | 0
 sdk/argeo-build                                       | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)
 delete mode 100644 bootstrap/branch.mk
 delete mode 100644 bootstrap/sdk/branches/unstable.bnd

diff --git a/bootstrap/Makefile b/bootstrap/Makefile
index 8f987c5..99b2d02 100644
--- 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
@@ -49,6 +50,10 @@ clean:
 	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)
@@ -112,6 +117,9 @@ bootstrap-prepare-sources: bootstrap-download-sources
 
 	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)
 
diff --git a/bootstrap/branch.mk b/bootstrap/branch.mk
deleted file mode 100644
index afde0f8..0000000
--- a/bootstrap/branch.mk
+++ /dev/null
@@ -1 +0,0 @@
-BRANCH=unstable
\ No newline at end of file
diff --git a/bootstrap/org.argeo.tp.build/biz.aQute.bndlib/bnd.bnd b/bootstrap/org.argeo.tp.build/biz.aQute.bndlib/bnd.bnd
index f8284c1..d12bab7 100644
--- a/bootstrap/org.argeo.tp.build/biz.aQute.bndlib/bnd.bnd
+++ b/bootstrap/org.argeo.tp.build/biz.aQute.bndlib/bnd.bnd
@@ -4,4 +4,4 @@ micro: 0
 qualifier:
 
 Bundle-License: EPL-2.0
-Export-Package: aQute.*
\ No newline at end of file
+Export-Package: biz.aQute.*
\ No newline at end of file
diff --git a/bootstrap/sdk/branches/unstable.bnd b/bootstrap/sdk/branches/unstable.bnd
deleted file mode 100644
index e69de29..0000000
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 2fcc594..d99c3c1 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 2fcc5942da8416113ccda360f3b568991acf567e
+Subproject commit d99c3c1e21b923f9a52fad75dd1e163c8dc553d1
-- 
2.30.2