From 7c17b1060f174ecd7eb33c03ba7ce86c18d12aed Mon Sep 17 00:00:00 2001 From: Mathieu Date: Sat, 11 Mar 2023 07:33:42 +0100 Subject: [PATCH] Use our own versions --- bootstrap/Makefile | 15 +++++++++------ bootstrap/debian/changelog | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/bootstrap/Makefile b/bootstrap/Makefile index 9480df8..9d73663 100644 --- a/bootstrap/Makefile +++ b/bootstrap/Makefile @@ -51,17 +51,20 @@ clean: make -C org.argeo.tp.build clean distclean: - rm -f sdk.mk - rm -rf ./output + $(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 + $(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 + $(RM) -f debian/files + $(RM) -rf $(ECJ_BASE) + $(RM) -rf $(BNDLIB_BASE) + $(RM) -rf org.argeo.tp.build/biz.aQute.bndlib/src bootstrap-prepare-sources: bootstrap-download-sources ## ECJ @@ -119,8 +122,8 @@ bootstrap-prepare-sources: bootstrap-download-sources $(RM) -rf $(BNDLIB_SRC)/aQute/bnd/annotation/spi $(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 + #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 diff --git a/bootstrap/debian/changelog b/bootstrap/debian/changelog index 2dc18f5..826177f 100644 --- a/bootstrap/debian/changelog +++ b/bootstrap/debian/changelog @@ -1,5 +1,5 @@ -argeo-tp-build (4.26.0.0) unstable; urgency=medium +argeo-tp-build (2.3.5~4.26) unstable; urgency=medium - * Initial release + * Initial release based on Eclipse release 4.46 (ECJ 3.32) -- Mathieu Baudier Fri, 10 Mar 2023 08:27:26 +0100 -- 2.30.2