Skip to content

Commit 5a7cb8e

Browse files
committed
[I/Y-Build] Assemble Equinox launcher archives utilizing an product
This reduces the use of the 'base-builder' Eclipse installation by one and enables the removal of the ANT script that assembled Equinox launcher archives before.
1 parent 534d2c8 commit 5a7cb8e

5 files changed

Lines changed: 32 additions & 103 deletions

File tree

JenkinsJobs/Builds/build.jenkinsfile

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -480,18 +480,23 @@ pipeline {
480480
done
481481

482482
# Build Equinox Launcher archives
483-
pushd $CJE_ROOT
484-
mkdir -p $ECLIPSE_BUILDER_DIR/equinox/$TMP_DIR
485-
$BASE_BUILDER_ECLIPSE_EXE \
486-
-application org.eclipse.ant.core.antRunner \
487-
-buildfile ${ECLIPSE_BUILDER_DIR}/equinox/buildConfigs/equinox-launchers/build.xml \
488-
-data $CJE_ROOT/$TMP_DIR/workspace-publishEquinox \
489-
-DbuildId=$BUILD_ID \
490-
-DbuildRepo=$PLATFORM_REPO_DIR \
491-
-DequinoxPostingDirectory=${EQUINOX_DROP_DIR} \
492-
-Dequinox.build.configs=$ECLIPSE_BUILDER_DIR/equinox/buildConfigs \
493-
-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
494-
-v
483+
pushd ${PRODUCTS_DIR}/equinox-launcher/target
484+
for launcher in products/equinox-launcher/*/*/*; do
485+
if [[ "${launcher}" =~ /equinox-launcher/([^/]+)/([^/]+)/([^/]+)$ ]]; then
486+
os="${BASH_REMATCH[1]}"
487+
if [[ ${os} == 'macosx' ]]; then installDir='Eclipse.app/Contents/Eclipse'; else installDir='eclipse'; fi
488+
mkdir -p "${launcher}/${installDir}/binary/"
489+
cp repository/binary/org.eclipse.equinox.executable_root.${BASH_REMATCH[2]}.${os}.${BASH_REMATCH[3]}_* "${launcher}/${installDir}/binary/"
490+
archivePath="${EQUINOX_DROP_DIR}/${BUILD_ID}/launchers-${os}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}.${BUILD_ID}"
491+
pushd "${launcher}/${installDir}"
492+
if [[ ${os} == 'win32' ]]; then
493+
zip -r "${archivePath}.zip" binary/ features/ plugins/
494+
else
495+
tar -czf "${archivePath}.tar.gz" binary/ features/ plugins/
496+
fi
497+
popd
498+
fi
499+
done
495500
popd
496501

497502
java \

eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml

Lines changed: 0 additions & 91 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Maven/Tycho pom model adjustments, see https://github.com/eclipse-tycho/tycho/wiki/Tycho-Pomless
2+
pom.model.property.product.id = equinox-launcher
3+
pom.model.property.product.rootFolder = eclipse
4+
pom.model.property.product.rootFolder.macosx = Eclipse.app
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?pde version="3.5"?>
3+
4+
<product uid="equinox-launcher" version="4.40.0.qualifier" type="mixed" includeLaunchers="false" autoIncludeRequirements="true">
5+
6+
<features>
7+
<feature id="org.eclipse.equinox.executable"/>
8+
</features>
9+
10+
</product>

products/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<modules>
3131
<module>eclipse-platform</module>
3232
<module>eclipse-sdk</module>
33+
<module>equinox-launcher</module>
3334
<module>equinox-starterkit</module>
3435
<module>eclipse-junit-tests</module>
3536
<module>equinox-sdk</module>

0 commit comments

Comments
 (0)