From ed8bb438de0c16c0b88f71e7044d2e93472ef8ce Mon Sep 17 00:00:00 2001 From: Mathieu Date: Fri, 10 Mar 2023 11:46:45 +0100 Subject: [PATCH] Improve bootstrap build --- bootstrap/Makefile | 6 +++++- bootstrap/debian/rules | 6 +++++- bootstrap/org.argeo.tp.build/Makefile | 2 -- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bootstrap/Makefile b/bootstrap/Makefile index cdae8df..8f987c5 100644 --- a/bootstrap/Makefile +++ b/bootstrap/Makefile @@ -52,6 +52,7 @@ clean: clean-sources: $(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 @@ -107,7 +108,10 @@ bootstrap-prepare-sources: bootstrap-download-sources # clean up BNDLIB $(RM) -rf $(BNDLIB_SRC)/aQute/bnd/annotation/spi - $(RM) -rf $(BNDLIB_SRC)/aQute/bnd/junit + $(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 bootstrap-download-sources: $(SOURCE_ARCHIVES) diff --git a/bootstrap/debian/rules b/bootstrap/debian/rules index 2338cfd..82a0f75 100755 --- a/bootstrap/debian/rules +++ b/bootstrap/debian/rules @@ -1,6 +1,10 @@ #!/usr/bin/make -f -JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 +LC_ALL := C.UTF-8 +export LC_ALL + +JAVA_HOME := /usr/lib/jvm/java-17-openj9-amd64 +export JAVA_HOME %: dh $@ diff --git a/bootstrap/org.argeo.tp.build/Makefile b/bootstrap/org.argeo.tp.build/Makefile index 65116fd..dcecaea 100644 --- a/bootstrap/org.argeo.tp.build/Makefile +++ b/bootstrap/org.argeo.tp.build/Makefile @@ -11,9 +11,7 @@ all: osgi osgi: cp -r ../ecj/OSGI-OPT/src org.eclipse.jdt.core.compiler.batch - cp -r ../bndlib/OSGI-OPT/src biz.aQute.bndlib - cp -rv ../../rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/* biz.aQute.bndlib/src $(ARGEO_MAKE) all --category $(A2_CATEGORY) --bundles org.eclipse.jdt.core.compiler.batch biz.aQute.bndlib -- 2.30.2