From 74400ba0b338c5dc47f5e12de7cc34d4dd1405a2 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Fri, 10 Mar 2023 12:15:33 +0100 Subject: [PATCH] Remove legacy bootstrap --- legacy/bootstrap/ant/build.sh | 28 ------------ .../ant/org.apache.ant-skipTestJars.patch | 12 ------ legacy/org.argeo.tp/biz.aQute.bnd/build.sh | 20 --------- .../MANIFEST.MF | 28 ------------ .../build.sh | 43 ------------------- 5 files changed, 131 deletions(-) delete mode 100755 legacy/bootstrap/ant/build.sh delete mode 100644 legacy/bootstrap/ant/org.apache.ant-skipTestJars.patch delete mode 100755 legacy/org.argeo.tp/biz.aQute.bnd/build.sh delete mode 100644 legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF delete mode 100755 legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh diff --git a/legacy/bootstrap/ant/build.sh b/legacy/bootstrap/ant/build.sh deleted file mode 100755 index 771016f..0000000 --- a/legacy/bootstrap/ant/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -source ../../../bin/argeo-builder -argeo_builder_variables $PWD - -VERSION=1.8.4 - -SOURCE_FILE=/ant/source/apache-ant-$VERSION-src.tar.gz -SOURCE_FILENAME=${SOURCE_FILE##*/} -SRC_DIR=$BUILD_DIR/src -CLASSES_DIR=$BUILD_DIR/classes - -echo Download sources -argeo_builder_download_apache $SOURCE_FILE - -echo Untar sources -reset_dir $BUILD_DIR -(cd $BUILD_DIR && tar -xzf $SOURCE_DIR/$SOURCE_FILENAME) -mv $BUILD_DIR/apache-ant-* $BUILD_DIR/apache-ant - -echo Patch -(cd $BUILD_DIR/apache-ant && patch < $ARTIFACT_DIR/org.apache.ant-skipTestJars.patch) - -echo Build bootstrap -(cd $BUILD_DIR/apache-ant && sh build.sh jars) - -push_to_cache $BUILD_DIR/apache-ant/build/lib/ant.jar -push_to_cache $BUILD_DIR/apache-ant/build/lib/ant-launcher.jar diff --git a/legacy/bootstrap/ant/org.apache.ant-skipTestJars.patch b/legacy/bootstrap/ant/org.apache.ant-skipTestJars.patch deleted file mode 100644 index 5d16574..0000000 --- a/legacy/bootstrap/ant/org.apache.ant-skipTestJars.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- build.xml.orig 2012-05-22 06:25:21.000000000 +0200 -+++ build.xml 2013-01-30 07:36:35.990006411 +0100 -@@ -884,7 +884,7 @@ - =================================================================== - --> - - - - diff --git a/legacy/org.argeo.tp/biz.aQute.bnd/build.sh b/legacy/org.argeo.tp/biz.aQute.bnd/build.sh deleted file mode 100755 index 39a01a7..0000000 --- a/legacy/org.argeo.tp/biz.aQute.bnd/build.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -source ../../../bin/argeo-builder -argeo_builder_variables $PWD - -VERSION=2.0.0 - -echo Checkout -[ -d $SOURCE_DIR ] && echo git pull || mkdir -p $SOURCE_DIR; (cd $SOURCE_DIR && git clone git://github.com/bndtools/bnd.git .); -#mkdir -p $SOURCE_DIR - - -echo Build -reset_dir $BUILD_DIR -(cd $BUILD_DIR && git clone file://$SOURCE_DIR .) -(cd $BUILD_DIR && run_ant dist) - -push_to_cache $BUILD_DIR/dist/bundles/biz.aQute.bnd/biz.aQute.bnd-$VERSION.jar -push_to_cache $BUILD_DIR/dist/bundles/biz.aQute.bndlib/biz.aQute.bndlib-$VERSION.jar - diff --git a/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF b/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF deleted file mode 100644 index 0981fae..0000000 --- a/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF +++ /dev/null @@ -1,28 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: org.eclipse.jdt.internal.compiler.batch.Main -Bundle-ManifestVersion: 2 -Bundle-Name: Eclipse Compiler for Java(TM) -Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch -Bundle-Version: $BUNDLE_VERSION -Bundle-ClassPath: . -Bundle-Vendor: Eclipse.org -Export-Package: org.eclipse.jdt.core, - org.eclipse.jdt.core.compiler, - org.eclipse.jdt.internal.antadapter;x-internal:=true, - org.eclipse.jdt.internal.compiler;x-internal:=true, - org.eclipse.jdt.internal.compiler.apt.dispatch;x-internal:=true, - org.eclipse.jdt.internal.compiler.apt.model;x-internal:=true, - org.eclipse.jdt.internal.compiler.apt.util;x-internal:=true, - org.eclipse.jdt.internal.compiler.ast;x-internal:=true, - org.eclipse.jdt.internal.compiler.batch;x-internal:=true, - org.eclipse.jdt.internal.compiler.classfmt;x-internal:=true, - org.eclipse.jdt.internal.compiler.codegen;x-internal:=true, - org.eclipse.jdt.internal.compiler.env;x-internal:=true, - org.eclipse.jdt.internal.compiler.flow;x-internal:=true, - org.eclipse.jdt.internal.compiler.impl;x-internal:=true, - org.eclipse.jdt.internal.compiler.lookup;x-internal:=true, - org.eclipse.jdt.internal.compiler.parser;x-internal:=true, - org.eclipse.jdt.internal.compiler.parser.diagnose;x-internal:=true, - org.eclipse.jdt.internal.compiler.problem;x-internal:=true, - org.eclipse.jdt.internal.compiler.util;x-internal:=true, - org.eclipse.jdt.internal.compiler.tool;x-internal:=true diff --git a/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh b/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh deleted file mode 100755 index de70d08..0000000 --- a/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -source ../../../bin/argeo-builder -argeo_builder_variables $PWD - -SOURCE_FILE=/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar -SOURCE_FILENAME=${SOURCE_FILE##*/} -SRC_DIR=$BUILD_DIR/src -CLASSES_DIR=$BUILD_DIR/classes - -BUNDLE_VERSION=3.8.2 - -# TODO make javac choice more configurable -JAVAC=$JAVA_HOME/bin/javac -JAR=$JAVA_HOME/bin/jar - -JAVAC_OPTS="-nowarn -source 1.6 -target 1.6 -classpath $CACHE_BASE/bootstrap/ant.jar" - -echo Download sources -argeo_builder_download_eclipse $SOURCE_FILE - -echo Unjar sources -reset_dir $SRC_DIR -(cd $SRC_DIR && $JAR -xvf $SOURCE_DIR/$SOURCE_FILENAME) - -echo Compile -reset_dir $CLASSES_DIR -$JAVAC $JAVAC_OPTS -d $CLASSES_DIR $(find $SRC_DIR/org/* | grep .java) 2>&1 | tee $BUILD_DIR/build.log - -echo Copy additional files -(cd $SRC_DIR && cp --parents $(find . | grep .rsc) $CLASSES_DIR) -(cd $SRC_DIR && cp --parents $(find . | grep .properties) $CLASSES_DIR) -(cd $SRC_DIR && cp --parents $(find . | grep .props) $CLASSES_DIR) -mkdir $CLASSES_DIR/META-INF -cp -r $SRC_DIR/META-INF/services $CLASSES_DIR/META-INF - -echo Generate MANIFEST.MF -MANIFEST_FILE=$ARTIFACT_DIR/MANIFEST.MF - -CACHE_JAR_FILE=${ARTIFACT_DIR/specs/cache}_$BUNDLE_VERSION.jar -echo Create jar file $CACHE_JAR_FILE -mkdir -p $(dirname $CACHE_JAR_FILE) -$JAR -cfm $CACHE_JAR_FILE $MANIFEST_FILE -C $CLASSES_DIR . -- 2.30.2