Skip to content

Commit ce588e9

Browse files
committed
Revert "Merge pull request #144 from eMoflon/hotfix/2025-03-pde-dependencies-bug"
This reverts commit 5cee5af, reversing changes made to d1eee84.
1 parent 5cee5af commit ce588e9

File tree

3 files changed

+3
-24
lines changed

3 files changed

+3
-24
lines changed

build.sh

+3-20
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ OUTPUT_FILE_PREFIX_WINDOWS="eclipse-emoflon-windows"
3535
OUTOUT_FILE_PREFIX_MACOS="eclipse-emoflon-macos"
3636
OUTOUT_FILE_PREFIX_MACOSARM="eclipse-emoflon-macos-arm"
3737
MIRROR="https://ftp.fau.de"
38-
UPDATESITES="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/,https://hallvard.github.io/plantuml/,https://hipe-devops.github.io/HiPE-Updatesite/hipe.updatesite/,https://www.kermeta.org/k2/update,https://emoflon.org/emoflon-ibex-updatesite/snapshot/updatesite/,https://devstyle.codetogether.io/,https://download.eclipse.org/releases/$VERSION,https://www.codetogether.com/updates/ci/,http://update.eclemma.org/,https://pmd.github.io/pmd-eclipse-plugin-p2-site/,https://checkstyle.org/eclipse-cs-update-site/,https://spotbugs.github.io/eclipse/,https://download.eclipse.org/technology/m2e/releases/latest,https://download.eclipse.org/eclipse/updates/4.36-I-builds/"
38+
UPDATESITES="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/,https://hallvard.github.io/plantuml/,https://hipe-devops.github.io/HiPE-Updatesite/hipe.updatesite/,https://www.kermeta.org/k2/update,https://emoflon.org/emoflon-ibex-updatesite/snapshot/updatesite/,https://devstyle.codetogether.io/,https://download.eclipse.org/releases/$VERSION,https://www.codetogether.com/updates/ci/,http://update.eclemma.org/,https://pmd.github.io/pmd-eclipse-plugin-p2-site/,https://checkstyle.org/eclipse-cs-update-site/,https://spotbugs.github.io/eclipse/,https://download.eclipse.org/technology/m2e/releases/latest"
3939
EMOFLON_HEADLESS_SRC="https://api.github.com/repos/eMoflon/emoflon-headless/releases/latest"
4040

4141
# Import plug-in:
@@ -44,7 +44,7 @@ IMPORT_PLUGIN_FILENAME="com.seeq.eclipse.importprojects_$IMPORT_PLUGIN_VERSION.j
4444
IMPORT_PLUGIN_SRC="https://api.github.com/repos/maxkratz/eclipse-import-projects-plugin/releases/tags/v$IMPORT_PLUGIN_VERSION"
4545

4646
# Array with the order to install the plugins with.
47-
ORDER_LINUX=("pde-fix" "xtext" "plantuml" "hipe" "kermeta" "misc" "emoflon-headless" "emoflon" "theme" "additional")
47+
ORDER_LINUX=("xtext" "plantuml" "hipe" "kermeta" "misc" "emoflon-headless" "emoflon" "theme" "additional")
4848

4949
#
5050
# Configure OS specific details
@@ -108,20 +108,6 @@ install_packages () {
108108
-installIU "$(parse_package_list $2)"
109109
}
110110

111-
# Uninstalls a given list of packages from a given update site.
112-
uninstall_packages () {
113-
if [[ "$OS" = "macos" ]] || [[ "$OS" = "macosarm" ]]; then
114-
chmod +x $ECLIPSE_BIN_PATH
115-
fi
116-
117-
echo "$(parse_package_list $2)"
118-
119-
$ECLIPSE_BIN_PATH -nosplash \
120-
-application org.eclipse.equinox.p2.director \
121-
-repository "$1" \
122-
-uninstallIU "$(parse_package_list $2)"
123-
}
124-
125111
# Displays the given input including "=> " on the console.
126112
log () {
127113
echo "=> $1"
@@ -209,7 +195,7 @@ remove_update_sites () {
209195
# First, create a ZIP as "backup"
210196
zip -q -r $UPDATE_SITE_CONFIG_PATH/update-sites.zip $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_ARTIFACT $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_METADATA
211197

212-
rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_ARTIFACT
198+
rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_ARTIFACT
213199
rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_METADATA
214200
}
215201

@@ -261,9 +247,6 @@ fi
261247
# Install global Eclipse settings from config file
262248
install_global_eclipse_settings
263249

264-
log "Remove old version of the PDE."
265-
uninstall_packages "$UPDATESITES" "./packages/pde-remove-packages.list"
266-
267250
log "Install Eclipse plug-ins."
268251
for p in ${ORDER[@]}; do
269252
# Check if eMoflon packages must be skipped (for dev builds).

packages/pde-fix-packages.list

-1
This file was deleted.

packages/pde-remove-packages.list

-3
This file was deleted.

0 commit comments

Comments
 (0)