From 5bc4b744c5ba0963765043a061e78892ede5433b Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Mon, 13 Jun 2022 09:47:46 +0200 Subject: [PATCH 1/3] Adds first draft of additional plug-in installation --- build.sh | 10 ++++++++-- packages/additional-packages.list | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 packages/additional-packages.list diff --git a/build.sh b/build.sh index 940555a..bbe1f01 100755 --- a/build.sh +++ b/build.sh @@ -33,7 +33,7 @@ OUTPUT_FILE_PREFIX_LINUX="eclipse-emoflon-linux" OUTPUT_FILE_PREFIX_WINDOWS="eclipse-emoflon-windows" OUTOUT_FILE_PREFIX_MACOS="eclipse-emoflon-macos" MIRROR="https://ftp.fau.de" -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://www.genuitec.com/updates/devstyle/ci/,https://download.eclipse.org/releases/$VERSION,https://www.codetogether.com/updates/ci/" +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://www.genuitec.com/updates/devstyle/ci/,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/" EMOFLON_HEADLESS_SRC="https://api.github.com/repos/eMoflon/emoflon-headless/releases/latest" # Import plug-in: @@ -42,7 +42,7 @@ IMPORT_PLUGIN_FILENAME="com.seeq.eclipse.importprojects_$IMPORT_PLUGIN_VERSION.j IMPORT_PLUGIN_SRC="https://api.github.com/repos/maxkratz/eclipse-import-projects-plugin/releases/tags/v$IMPORT_PLUGIN_VERSION" # Array with the order to install the plugins with. -ORDER_LINUX=("xtext" "plantuml" "hipe" "kermeta" "misc" "emoflon-headless" "emoflon" "theme") +ORDER_LINUX=("xtext" "plantuml" "hipe" "kermeta" "misc" "emoflon-headless" "emoflon" "theme" "additional") # # Configure OS specific details @@ -228,6 +228,12 @@ for p in ${ORDER[@]}; do continue fi + # Check if additional packages must be skipped (for CI builds). + if [[ "$p" = "additional" ]] && [[ $SKIP_THEME -eq 1 ]]; then + log "Skipping additional plug-ins." + continue + fi + # Check if HiPE must be skipped (for hipe-dev builds). if [[ "$p" = "hipe" ]] && [[ $SKIP_HIPE -eq 1 ]]; then log "Skipping plug-in: $p." diff --git a/packages/additional-packages.list b/packages/additional-packages.list new file mode 100644 index 0000000..b513725 --- /dev/null +++ b/packages/additional-packages.list @@ -0,0 +1,3 @@ +org.eclipse.eclemma.feature.feature.group +net.sourceforge.pmd.eclipse.feature.group +net.sf.eclipsecs.feature.group From e4fdb98c5379b1f96bf49729601f2ab8d2cf126a Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Mon, 13 Jun 2022 18:02:55 +0200 Subject: [PATCH 2/3] Adds SpotBugs to additional plug-in list --- build.sh | 2 +- packages/additional-packages.list | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index bbe1f01..891f17b 100755 --- a/build.sh +++ b/build.sh @@ -33,7 +33,7 @@ OUTPUT_FILE_PREFIX_LINUX="eclipse-emoflon-linux" OUTPUT_FILE_PREFIX_WINDOWS="eclipse-emoflon-windows" OUTOUT_FILE_PREFIX_MACOS="eclipse-emoflon-macos" MIRROR="https://ftp.fau.de" -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://www.genuitec.com/updates/devstyle/ci/,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/" +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://www.genuitec.com/updates/devstyle/ci/,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/" EMOFLON_HEADLESS_SRC="https://api.github.com/repos/eMoflon/emoflon-headless/releases/latest" # Import plug-in: diff --git a/packages/additional-packages.list b/packages/additional-packages.list index b513725..7305824 100644 --- a/packages/additional-packages.list +++ b/packages/additional-packages.list @@ -1,3 +1,4 @@ org.eclipse.eclemma.feature.feature.group net.sourceforge.pmd.eclipse.feature.group net.sf.eclipsecs.feature.group +com.github.spotbugs.plugin.eclipse.feature.group From b61931f04b2392ea4305547b8d6c2a91977d31f7 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Mon, 13 Jun 2022 18:09:18 +0200 Subject: [PATCH 3/3] Extends documentation on additional plug-ins --- README.md | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index eceb1ce..cfef9b9 100644 --- a/README.md +++ b/README.md @@ -4,23 +4,31 @@ This repository is used to automatically build an Eclipse [eMoflon](https://github.com/eMoflon/emoflon-ibex) environment. -| Name | OS | eMoflon installed | Dark theme installed | Splash image | Pattern matcher | -|--------------------------|---------|--------------------|----------------------|--------------------|-----------------| -| Eclipse eMoflon user | Linux | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | HiPE | -| Eclipse eMoflon dev | Linux | | :heavy_check_mark: | :heavy_check_mark: | HiPE, *) | -| Eclipse eMoflon user CI | Linux | :heavy_check_mark: | | | HiPE | -| Eclipse eMoflon dev CI | Linux | | | | HiPE, *) | -| Eclipse eMoflon dev HiPE | Linux | | :heavy_check_mark: | :heavy_check_mark: | *) | -| Eclipse eMoflon user | Windows | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | HiPE | -| Eclipse eMoflon dev | Windows | | :heavy_check_mark: | :heavy_check_mark: | HiPE, *) | -| Eclipse eMoflon dev HiPE | Windows | | :heavy_check_mark: | :heavy_check_mark: | *) | -| Eclipse eMoflon user | macOS | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | HiPE | -| Eclipse eMoflon dev | macOS | | :heavy_check_mark: | :heavy_check_mark: | HiPE, *) | -| Eclipse eMoflon dev HiPE | macOS | | :heavy_check_mark: | :heavy_check_mark: | *) | +| Name | OS | eMoflon installed | Dark theme installed | Splash image | Pattern matcher | Additional packages | +|--------------------------|---------|--------------------|----------------------|--------------------|-----------------|---------------------| +| Eclipse eMoflon user | Linux | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | HiPE | :heavy_check_mark: | +| Eclipse eMoflon dev | Linux | | :heavy_check_mark: | :heavy_check_mark: | HiPE, *) | :heavy_check_mark: | +| Eclipse eMoflon user CI | Linux | :heavy_check_mark: | | | HiPE | | +| Eclipse eMoflon dev CI | Linux | | | | HiPE, *) | | +| Eclipse eMoflon dev HiPE | Linux | | :heavy_check_mark: | :heavy_check_mark: | *) | :heavy_check_mark: | +| Eclipse eMoflon user | Windows | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | HiPE | :heavy_check_mark: | +| Eclipse eMoflon dev | Windows | | :heavy_check_mark: | :heavy_check_mark: | HiPE, *) | :heavy_check_mark: | +| Eclipse eMoflon dev HiPE | Windows | | :heavy_check_mark: | :heavy_check_mark: | *) | :heavy_check_mark: | +| Eclipse eMoflon user | macOS | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | HiPE | :heavy_check_mark: | +| Eclipse eMoflon dev | macOS | | :heavy_check_mark: | :heavy_check_mark: | HiPE, *) | :heavy_check_mark: | +| Eclipse eMoflon dev HiPE | macOS | | :heavy_check_mark: | :heavy_check_mark: | *) | :heavy_check_mark: | *) Democles will be installed manually via the [emoflon-dev-workspace](https://github.com/eMoflon/emoflon-ibex#how-to-develop). Furthermore, all pattern matcher integrations for eMoflon (HiPE and Democles) will be installed manually via the [emoflon-dev-workspace](https://github.com/eMoflon/emoflon-ibex#how-to-develop). +**Additional packages** are installed for every non-CI build. +Currently, the list of additional packages includes: +- [EclEmma](https://www.eclemma.org/) +- [PMD](https://pmd.github.io/latest/index.html) +- [Checkstyle](https://checkstyle.org/eclipse-cs/#!/) +- [SpotBugs](https://spotbugs.github.io/https://spotbugs.github.io/) + +Feel free to request others, e.g., via Github issues. ## Usage/Installation