Remove bootstrap

diff --git a/bootstrap/.gitignore b/bootstrap/.gitignore
deleted file mode 100644 (file)
index 9a4df6c..0000000
--- a/bootstrap/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/ecj/
-/bndlib/
-/output/

diff --git a/bootstrap/Makefile b/bootstrap/Makefile
deleted file mode 100644 (file)
index 0fabae3..0000000
--- a/bootstrap/Makefile
+++ /dev/null
@@ -1,159 +0,0 @@
--include sdk.mk
-
-ECJ_VERSION=4.26
-
-BND_VERSION=5.3.0
-OSGI_CORE_VERSION=7.0.0
-OSGI_CMPN_VERSION=7.0.0
-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
-ECJ_SRC=$(ECJ_BASE)/OSGI-OPT/src
-
-BNDLIB_BASE=./bndlib
-BNDLIB_SRC=$(BNDLIB_BASE)/OSGI-OPT/src
-
-OSGI_BASE=$(BOOTSTRAP_BASE)/osgi
-
-SOURCE_ARCHIVES=\
-$(ORIGIN_BASE)/ecjsrc-$(ECJ_VERSION).jar \
-$(ORIGIN_BASE)/org.osgi/osgi.core-$(OSGI_CORE_VERSION)-sources.jar \
-$(ORIGIN_BASE)/org.osgi/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar \
-$(ORIGIN_BASE)/org.osgi/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar \
-$(ORIGIN_BASE)/org.slf4j/slf4j-api-$(SLF4J_VERSION)-sources.jar \
-$(ORIGIN_BASE)/bnd-$(BND_VERSION).tar.gz
-
-all: ecj-build bndlib-build    
-       make -C org.argeo.tp.build all
-
-ecj-build:
-       mkdir -p $(BOOTSTRAP_BASE)
-       # list sources
-       find $(ECJ_BASE)/OSGI-OPT/src | grep "\.java" > $(BOOTSTRAP_BASE)/ecj.todo
-       # build
-       $(JAVA_HOME)/bin/javac -d $(ECJ_BASE) -source 17 -target 17 -Xlint:none @$(BOOTSTRAP_BASE)/ecj.todo
-       
-bndlib-build: ecj-build
-       $(JAVA_HOME)/bin/java -cp $(ECJ_BASE) org.eclipse.jdt.internal.compiler.batch.Main -nowarn \
-               -source 17 -target 17 \
-               $(BNDLIB_SRC) \
-               -d $(BNDLIB_BASE)
-
-clean:
-       $(RM) -rf $(BOOTSTRAP_BASE)
-       find $(ECJ_BASE) -name "*.class" -type f -exec rm -f {} \;
-       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)
-       $(RM) -rf org.argeo.tp.build/biz.aQute.bndlib/src
-       $(RM) -rf org.argeo.tp.build/org.eclipse.jdt.core.compiler.batch/src
-       
-deb-source: distclean clean-sources bootstrap-prepare-sources
-       debuild --no-sign -S
-       $(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
-       mkdir -p $(ECJ_BASE)
-       cd $(ECJ_BASE) && jar -xf $(ORIGIN_BASE)/ecjsrc-$(ECJ_VERSION).jar
-       # remove ant-dependent class
-       $(RM) $(ECJ_BASE)/org/eclipse/jdt/core/JDTCompilerAdapter.java
-       # clean up
-       $(RM) $(ECJ_BASE)/*.jar
-       $(RM) $(ECJ_BASE)/build.xml
-       $(RM) $(ECJ_BASE)/ecj.1
-       $(RM) -rf $(ECJ_BASE)/scripts
-       # TODO: keep the service files
-       $(RM) -rf  $(ECJ_BASE)/META-INF
-
-       # copy sources and resources
-       mkdir -p $(ECJ_SRC)
-       cp -r $(ECJ_BASE)/org $(ECJ_SRC)
-       # remove java sources
-       cd $(ECJ_BASE) && find org -name "*.java" -type f -exec rm -f {} \;
-       cd $(ECJ_BASE) && find org -name "*.html" -type f -exec rm -f {} \;
-       
-       ## BNDLIB
-       # copy sources
-       mkdir -p $(BOOTSTRAP_BASE)
-       cd $(BOOTSTRAP_BASE) && tar -xzf $(ORIGIN_BASE)/bnd-$(BND_VERSION).tar.gz
-       mkdir -p $(BNDLIB_SRC)
-       cp -r $(BOOTSTRAP_BASE)/bnd-$(BND_VERSION).REL/aQute.libg/src/* $(BNDLIB_SRC)
-       cp -r $(BOOTSTRAP_BASE)/bnd-$(BND_VERSION).REL/biz.aQute.bndlib/src/* $(BNDLIB_SRC)
-       cp -r $(BOOTSTRAP_BASE)/bnd-$(BND_VERSION).REL/biz.aQute.bnd.annotation/src/* $(BNDLIB_SRC)     
-       $(RM) -rf $(BOOTSTRAP_BASE)/bnd-$(BND_VERSION).REL
-
-       # OSGi
-       mkdir -p $(OSGI_BASE)
-       cd $(OSGI_BASE) && jar -xf $(ORIGIN_BASE)/org.osgi/osgi.core-$(OSGI_CORE_VERSION)-sources.jar
-       cd $(OSGI_BASE) && jar -xf $(ORIGIN_BASE)/org.osgi/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar
-       cd $(OSGI_BASE) && jar -xf $(ORIGIN_BASE)/org.osgi/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar
-       
-       mkdir -p $(BNDLIB_SRC)/org/osgi/service
-       cp -r $(OSGI_BASE)/org/osgi/annotation $(BNDLIB_SRC)/org/osgi
-       cp -r $(OSGI_BASE)/org/osgi/resource $(BNDLIB_SRC)/org/osgi
-       cp -r $(OSGI_BASE)/org/osgi/framework $(BNDLIB_SRC)/org/osgi
-       cp -r $(OSGI_BASE)/org/osgi/namespace $(BNDLIB_SRC)/org/osgi
-       cp -r $(OSGI_BASE)/org/osgi/util $(BNDLIB_SRC)/org/osgi
-       cp -r $(OSGI_BASE)/org/osgi/dto $(BNDLIB_SRC)/org/osgi
-       cp -r $(OSGI_BASE)/org/osgi/service/repository $(BNDLIB_SRC)/org/osgi/service
-       cp -r $(OSGI_BASE)/org/osgi/service/log $(BNDLIB_SRC)/org/osgi/service
-
-       # SLF4J
-       cd $(BNDLIB_SRC) && jar -xf $(ORIGIN_BASE)/org.slf4j/slf4j-api-$(SLF4J_VERSION)-sources.jar
-       $(RM) -rf $(BNDLIB_SRC)/META-INF
-       cp -rv ../rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/* $(BNDLIB_SRC)
-
-       # clean up BNDLIB
-       $(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
-       
-       # make sure directory is clean
-       $(RM) -rf ./output
-
-bootstrap-download-sources: $(SOURCE_ARCHIVES)
-
-$(ORIGIN_BASE)/ecjsrc-$(ECJ_VERSION).jar:
-       mkdir -p $(ORIGIN_BASE)
-       wget -c -O $(ORIGIN_BASE)/ecjsrc-$(ECJ_VERSION).jar https://ftp-stud.hs-esslingen.de/Mirrors/eclipse/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-$(ECJ_VERSION).jar
-       
-$(ORIGIN_BASE)/bnd-$(BND_VERSION).tar.gz:
-       mkdir -p $(ORIGIN_BASE)
-       wget -c -O $(ORIGIN_BASE)/bnd-$(BND_VERSION).tar.gz https://github.com/bndtools/bnd/archive/refs/tags/$(BND_VERSION).REL.tar.gz
-
-$(ORIGIN_BASE)/org.osgi/osgi.core-$(OSGI_CORE_VERSION)-sources.jar:
-       mkdir -p $(ORIGIN_BASE)/org.osgi
-       wget -c -O $(ORIGIN_BASE)/org.osgi/osgi.core-$(OSGI_CORE_VERSION)-sources.jar https://repo1.maven.org/maven2/org/osgi/osgi.core/$(OSGI_CORE_VERSION)/osgi.core-$(OSGI_CORE_VERSION)-sources.jar
-
-$(ORIGIN_BASE)/org.osgi/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar:
-       mkdir -p $(ORIGIN_BASE)/org.osgi
-       wget -c -O $(ORIGIN_BASE)/org.osgi/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar https://repo1.maven.org/maven2/org/osgi/osgi.cmpn/$(OSGI_CMPN_VERSION)/osgi.cmpn-$(OSGI_CMPN_VERSION)-sources.jar
-
-$(ORIGIN_BASE)/org.osgi/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar:
-       mkdir -p $(ORIGIN_BASE)/org.osgi
-       wget -c -O $(ORIGIN_BASE)/org.osgi/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar https://repo1.maven.org/maven2/org/osgi/osgi.annotation/$(OSGI_ANNOTATION_VERSION)/osgi.annotation-$(OSGI_ANNOTATION_VERSION)-sources.jar
-
-$(ORIGIN_BASE)/org.slf4j/slf4j-api-$(SLF4J_VERSION)-sources.jar:
-       mkdir -p $(ORIGIN_BASE)/org.slf4j
-       wget -c -O $(ORIGIN_BASE)/org.slf4j/slf4j-api-$(SLF4J_VERSION)-sources.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/$(SLF4J_VERSION)/slf4j-api-$(SLF4J_VERSION)-sources.jar
-
-
-       

diff --git a/bootstrap/configure b/bootstrap/configure
deleted file mode 100755 (executable)
index 47f7d96..0000000
--- a/bootstrap/configure
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Source are located where this script is
-SDK_SRC_BASE="$(cd "$(dirname "$0")"; pwd -P)"
-
-# Source the configure script
-. $SDK_SRC_BASE/sdk/argeo-build/configure

diff --git a/bootstrap/debian/argeo-tp-build-source.install b/bootstrap/debian/argeo-tp-build-source.install
deleted file mode 100644 (file)
index 060177d..0000000
--- a/bootstrap/debian/argeo-tp-build-source.install
+++ /dev/null
@@ -1 +0,0 @@
-output/a2.src/org.argeo.tp.build/*.src.jar     /usr/share/a2/org.argeo.tp.build
\ No newline at end of file

diff --git a/bootstrap/debian/argeo-tp-build.install b/bootstrap/debian/argeo-tp-build.install
deleted file mode 100644 (file)
index bd038cb..0000000
--- a/bootstrap/debian/argeo-tp-build.install
+++ /dev/null
@@ -1 +0,0 @@
-output/a2/org.argeo.tp.build/*.jar     /usr/share/a2/org.argeo.tp.build
\ No newline at end of file

diff --git a/bootstrap/debian/changelog b/bootstrap/debian/changelog
deleted file mode 100644 (file)
index 826177f..0000000
--- a/bootstrap/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-argeo-tp-build (2.3.5~4.26) unstable; urgency=medium
-
-  * Initial release based on Eclipse release 4.46 (ECJ 3.32)
-
- -- Mathieu Baudier <mbaudier@argeo.org>  Fri, 10 Mar 2023 08:27:26 +0100

diff --git a/bootstrap/debian/control b/bootstrap/debian/control
deleted file mode 100644 (file)
index 170c989..0000000
--- a/bootstrap/debian/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: argeo-tp-build
-Section: unknown
-Priority: optional
-Maintainer: Mathieu Baudier <mbaudier@argeo.org>
-Build-Depends: debhelper-compat (= 13), openjdk-17-jdk
-Standards-Version: 4.5.1
-Rules-Requires-Root: no
-
-Package: argeo-tp-build
-Architecture: all
-Depends: ${misc:Depends}
-Description: Argeo Build third party libraries
- Eclipse ECJ compiler and BND library.
-
-Package: argeo-tp-build-source
-Architecture: all
-Depends: ${misc:Depends}
-Description: Argeo Build third party libraries source files
- Eclipse ECJ compiler and BND library.

diff --git a/bootstrap/debian/copyright b/bootstrap/debian/copyright
deleted file mode 100644 (file)
index 13bb2ba..0000000
--- a/bootstrap/debian/copyright
+++ /dev/null
@@ -1,4 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-
-Files: *
-License: EPL-2.0

diff --git a/bootstrap/debian/rules b/bootstrap/debian/rules
deleted file mode 100755 (executable)
index c93fd86..0000000
--- a/bootstrap/debian/rules
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-
-LC_ALL := C.UTF-8
-export LC_ALL
-
-JAVA_HOME := /usr/lib/jvm/java-17-openjdk-amd64
-export JAVA_HOME
-
-# do not include sources in the jar files
-export BUILD_SOURCE_BUNDLES:=true
-
-%:
-       dh $@

diff --git a/bootstrap/debian/source/format b/bootstrap/debian/source/format
deleted file mode 100644 (file)
index 89ae9db..0000000
--- a/bootstrap/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (native)

diff --git a/bootstrap/org.argeo.tp.build/Makefile b/bootstrap/org.argeo.tp.build/Makefile
deleted file mode 100644 (file)
index dcecaea..0000000
--- a/bootstrap/org.argeo.tp.build/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-.PHONY: clean all osgi
-
-A2_OUTPUT := $(SDK_BUILD_BASE)/a2
-JVM ?= $(JAVA_HOME)/bin/java
-
-ARGEO_MAKE := $(JVM) -cp  ../ecj:../bndlib ../sdk/argeo-build/src/org/argeo/build/Make.java
-
-A2_CATEGORY = org.argeo.tp.build
-
-all: osgi
-
-osgi:
-       cp -r ../ecj/OSGI-OPT/src org.eclipse.jdt.core.compiler.batch
-       cp -r ../bndlib/OSGI-OPT/src biz.aQute.bndlib
-
-       $(ARGEO_MAKE) all --category $(A2_CATEGORY) --bundles org.eclipse.jdt.core.compiler.batch biz.aQute.bndlib
-
-clean:
-       $(RM) -rf org.eclipse.jdt.core.compiler.batch/src
-       $(RM) -rf biz.aQute.bndlib/src
\ No newline at end of file

diff --git a/bootstrap/org.argeo.tp.build/biz.aQute.bndlib/.gitignore b/bootstrap/org.argeo.tp.build/biz.aQute.bndlib/.gitignore
deleted file mode 100644 (file)
index 668266f..0000000
--- a/bootstrap/org.argeo.tp.build/biz.aQute.bndlib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/src/
-/bin/
\ 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
deleted file mode 100644 (file)
index 80405f4..0000000
--- a/bootstrap/org.argeo.tp.build/biz.aQute.bndlib/bnd.bnd
+++ /dev/null
@@ -1,7 +0,0 @@
-major: 5
-minor: 3
-micro: 0
-qualifier:
-
-Bundle-License: EPL-2.0
-Export-Package: aQute.*

diff --git a/bootstrap/org.argeo.tp.build/org.eclipse.jdt.core.compiler.batch/.gitignore b/bootstrap/org.argeo.tp.build/org.eclipse.jdt.core.compiler.batch/.gitignore
deleted file mode 100644 (file)
index 668266f..0000000
--- a/bootstrap/org.argeo.tp.build/org.eclipse.jdt.core.compiler.batch/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/src/
-/bin/
\ No newline at end of file

diff --git a/bootstrap/org.argeo.tp.build/org.eclipse.jdt.core.compiler.batch/bnd.bnd b/bootstrap/org.argeo.tp.build/org.eclipse.jdt.core.compiler.batch/bnd.bnd
deleted file mode 100644 (file)
index df348b0..0000000
--- a/bootstrap/org.argeo.tp.build/org.eclipse.jdt.core.compiler.batch/bnd.bnd
+++ /dev/null
@@ -1,8 +0,0 @@
-major: 3
-minor: 32
-micro: 0
-qualifier:
-
-Bundle-License: EPL-2.0
-Main-Class: org.eclipse.jdt.internal.compiler.batch.Main
-Export-Package: org.eclipse.jdt.*, !*.internal.*
\ No newline at end of file