Improve bootstrap build

diff --git a/bootstrap/Makefile b/bootstrap/Makefile
index cdae8df4ed93fb158cbf534949be29680ae313fa..8f987c56d8cec2bf443cad3af282a1c68d9906fc 100644 (file)
--- 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 2338cfd00db64553bc318478af324feb35605626..82a0f75942a55f679f949fd8e521bfc26db955dd 100755 (executable)
--- 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 65116fddf17d7396488895146482d44aaadfdde2..dcecaeadca17f90fd30c05ccc25e89884a3adceb 100644 (file)
--- 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