From aa665b9263e7e8e9629ffa7e092573440ce5bafb Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 11 Mar 2023 13:48:57 +0100
Subject: [PATCH] Adapt to changes in Argeo Build

---
 bootstrap/sdk/argeo-build          | 2 +-
 repackage/Makefile                 | 5 ++---
 sdk/argeo-build                    | 2 +-
 sdk/output-argeo-tp-minimal.target | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap/sdk/argeo-build b/bootstrap/sdk/argeo-build
index 894c01e..e2f2807 160000
--- a/bootstrap/sdk/argeo-build
+++ b/bootstrap/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 894c01e1f5a19107646e7ac870425de67423cfdd
+Subproject commit e2f2807d031e85076b392441e8648ea8d95b7fbb
diff --git a/repackage/Makefile b/repackage/Makefile
index 3b9f86a..eb92d8a 100644
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -41,9 +41,8 @@ all: $(BUILD_BASE)/repackaged
 
 $(BUILD_BASE)/repackaged : CATEGORIES_TO_REPACKAGE = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-repackage,, $?))
 $(BUILD_BASE)/repackaged : $(TODOS_REPACKAGE)
-	#$(JVM) -cp \
-	# $(BOOTSTRAP_BASE)/bndlib.jar:$(BOOTSTRAP_BASE)/slf4j-api.jar 
-	$(JVM) -cp $(A2_OUTPUT)/org.argeo.tp.build/biz.aQute.bndlib.5.3.jar \
+	# TODO make it more configurable / centralise in Argeo Build
+	$(JVM) -cp $(A2_OUTPUT)/org.argeo.tp.log/org.argeo.tp.syslogger.2.3.jar:$(A2_OUTPUT)/org.argeo.tp.build/biz.aQute.bndlib.5.3.jar \
 	 $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Repackage.java $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE)
 	touch $(BUILD_BASE)/repackaged
 
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 894c01e..e2f2807 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 894c01e1f5a19107646e7ac870425de67423cfdd
+Subproject commit e2f2807d031e85076b392441e8648ea8d95b7fbb
diff --git a/sdk/output-argeo-tp-minimal.target b/sdk/output-argeo-tp-minimal.target
index 5ef8c13..aebc112 100644
--- a/sdk/output-argeo-tp-minimal.target
+++ b/sdk/output-argeo-tp-minimal.target
@@ -3,6 +3,7 @@
 <target name="argeo-tp-minimal">
 	<locations>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
+		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.log" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.crypto" type="Directory"/>
-- 
2.30.2