Skip to content

Commit 3750a1d

Browse files
committed
Merge remote-tracking branch 'ibex/main'
2 parents c8fd234 + 649b89e commit 3750a1d

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

Diff for: build.sh

+13-1
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,19 @@ remove_update_sites () {
195195
# First, create a ZIP as "backup"
196196
zip -q -r $UPDATE_SITE_CONFIG_PATH/update-sites.zip $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_ARTIFACT $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_METADATA
197197

198-
rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_ARTIFACT
198+
rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_ARTIFACT
199199
rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_METADATA
200200
}
201201

202+
# Patches the PDE JAR file to fix a bug with spaces in paths.
203+
# https://github.com/eclipse-pde/eclipse.pde/pull/1709
204+
patch_pde_jar () {
205+
log "Patching PDE JAR."
206+
PDE_JAR_FILE="org.eclipse.pde.core_3.20.100.v20250211-2032.jar"
207+
# Remove original JAR file
208+
rm -f $ECLIPSE_BASE_PATH/plugins/$PDE_JAR_FILE
209+
cp ./patches/$PDE_JAR_FILE $ECLIPSE_BASE_PATH/plugins/$PDE_JAR_FILE
210+
}
202211

203212
#
204213
# Script
@@ -297,6 +306,9 @@ else
297306
chmod +x splash.sh && ./splash.sh deploy $VERSION $ECLIPSE_BASE_PATH
298307
fi
299308

309+
# Deploy PDE JAR file path
310+
patch_pde_jar
311+
300312
log "Clean-up old archives and create new archive."
301313
rm -f ./$OUTPUT_FILE
302314
zip -q -r $OUTPUT_FILE eclipse
1.48 MB
Binary file not shown.

0 commit comments

Comments
 (0)