diff --git a/JenkinsJobs/Builds/build.jenkinsfile b/JenkinsJobs/Builds/build.jenkinsfile index f1df68866c2..ea4c8c78477 100644 --- a/JenkinsJobs/Builds/build.jenkinsfile +++ b/JenkinsJobs/Builds/build.jenkinsfile @@ -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 \ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml deleted file mode 100644 index eceec2232c5..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/products/equinox-launcher/build.properties b/products/equinox-launcher/build.properties new file mode 100644 index 00000000000..9978d0ec908 --- /dev/null +++ b/products/equinox-launcher/build.properties @@ -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 diff --git a/products/equinox-launcher/equinox-sdk.product b/products/equinox-launcher/equinox-sdk.product new file mode 100644 index 00000000000..184b94f37ae --- /dev/null +++ b/products/equinox-launcher/equinox-sdk.product @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/products/pom.xml b/products/pom.xml index b202383386e..1c4979344f2 100644 --- a/products/pom.xml +++ b/products/pom.xml @@ -30,6 +30,7 @@ eclipse-platform eclipse-sdk + equinox-launcher equinox-starterkit eclipse-junit-tests equinox-sdk