Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions JenkinsJobs/Builds/build.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -480,18 +480,23 @@ pipeline {
done

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

java \
Expand Down

This file was deleted.

4 changes: 4 additions & 0 deletions products/equinox-launcher/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Maven/Tycho pom model adjustments, see https://github.com/eclipse-tycho/tycho/wiki/Tycho-Pomless
pom.model.property.product.id = equinox-launcher
pom.model.property.product.rootFolder = eclipse
pom.model.property.product.rootFolder.macosx = Eclipse.app
10 changes: 10 additions & 0 deletions products/equinox-launcher/equinox-sdk.product
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product uid="equinox-launcher" version="4.40.0.qualifier" type="mixed" includeLaunchers="false" autoIncludeRequirements="true">

<features>
<feature id="org.eclipse.equinox.executable"/>
</features>

</product>
1 change: 1 addition & 0 deletions products/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<modules>
<module>eclipse-platform</module>
<module>eclipse-sdk</module>
<module>equinox-launcher</module>
<module>equinox-starterkit</module>
<module>eclipse-junit-tests</module>
<module>equinox-sdk</module>
Expand Down
Loading