From 2631ce0b2ca11f49187586c435b4b063d990c1f4 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Wed, 2 Nov 2022 13:55:10 +0100 Subject: [PATCH 1/2] Renames this repo to include "IBeX" --- README.md | 12 ++++++------ build.sh | 2 +- emoflon-update.sh | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 02750d8..16dfb35 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# emoflon-eclipse-build +# eMoflon::IBeX Eclipse Build -[![Build Eclipse eMoflon](https://github.com/eMoflon/emoflon-eclipse-build/actions/workflows/ci.yml/badge.svg?branch=main&event=push)](https://github.com/eMoflon/emoflon-eclipse-build/actions/workflows/ci.yml) +[![Build Eclipse eMoflon::IBeX](https://github.com/eMoflon/emoflon-ibex-eclipse-build/actions/workflows/ci.yml/badge.svg?branch=main&event=push)](https://github.com/eMoflon/emoflon-ibex-eclipse-build/actions/workflows/ci.yml) -This repository is used to automatically build an Eclipse [eMoflon](https://github.com/eMoflon/emoflon-ibex) environment. +This repository is used to automatically build an Eclipse [eMoflon::IBeX](https://github.com/eMoflon/emoflon-ibex) environment. | Name | OS | eMoflon installed | Dark theme installed | Splash image | Pattern matcher | Additional packages | |--------------------------|---------|--------------------|----------------------|--------------------|-----------------|---------------------| @@ -19,7 +19,7 @@ This repository is used to automatically build an Eclipse [eMoflon](https://gith | 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). +Furthermore, all pattern matcher integrations for eMoflon::IBeX (HiPE and Democles) will be installed manually via the [emoflon-ibex-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: @@ -34,11 +34,11 @@ Feel free to request others, e.g., via Github issues. ## Usage/Installation Quick installation using curl and bash: -`$ FOLDER="$HOME/eclipse-apps/emt"; mkdir -p $FOLDER && cd $FOLDER && curl https://raw.githubusercontent.com/eMoflon/emoflon-eclipse-build/main/emoflon-update.sh | bash -s -- $FOLDER` +`$ FOLDER="$HOME/eclipse-apps/emt"; mkdir -p $FOLDER && cd $FOLDER && curl https://raw.githubusercontent.com/eMoflon/emoflon-ibex-eclipse-build/main/emoflon-update.sh | bash -s -- $FOLDER` ### Normal installation -**The latest release can be found [here](https://github.com/eMoflon/emoflon-eclipse-build/releases/latest).** +**The latest release can be found [here](https://github.com/eMoflon/emoflon-ibex-eclipse-build/releases/latest).** Download an archive for the version you are looking for from the release page and extract it. ### Updating diff --git a/build.sh b/build.sh index 73dcb40..0dec5b3 100755 --- a/build.sh +++ b/build.sh @@ -132,7 +132,7 @@ setup_emoflon_headless_local_updatesite () { # Append local folder to path (has to be absolute and, therefore, dynamic) if [[ ! -z ${GITHUB_WORKSPACE} ]] && [[ "$OS" = "windows" ]]; then log "Using a Github-hosted runner on Windows." - UPDATESITES+=",file:/D:/a/emoflon-eclipse-build/emoflon-eclipse-build/tmp/emoflon-headless/" + UPDATESITES+=",file:/D:/a/emoflon-ibex-eclipse-build/emoflon-ibex-eclipse-build/tmp/emoflon-headless/" elif [[ "$OS" = "linux" ]]; then log "Using a runner on Linux." UPDATESITES+=",file://$PWD/tmp/emoflon-headless/" diff --git a/emoflon-update.sh b/emoflon-update.sh index 924f251..44a8207 100644 --- a/emoflon-update.sh +++ b/emoflon-update.sh @@ -7,7 +7,7 @@ ECLIPSE_ARCHIVE=eclipse-emoflon-windows-dev # Name of the archive to download FORCE_DOWNLOAD=0 # 1 = force download of new archive TARGET_DIR=$1 # Target directory -API_URL="https://api.github.com/repos/eMoflon/emoflon-eclipse-build/releases/latest" +API_URL="https://api.github.com/repos/eMoflon/emoflon-ibex-eclipse-build/releases/latest" set -e START_PWD=$PWD @@ -39,7 +39,7 @@ if [[ ! -f "./$ECLIPSE_ARCHIVE.zip" ]] || [[ "$FORCE_DOWNLOAD" = "1" ]]; then | grep "\"name\"\: \"v" \ | cut -d : -f 2,3 \ | tr -d \" |tr -d ,) - log "Downloading latest eMoflon Eclipse archive from Github.\nRelease:$TAG" + log "Downloading latest eMoflon::IBeX Eclipse archive from Github.\nRelease:$TAG" curl -s $API_URL \ | grep "$ECLIPSE_ARCHIVE.*zip" \ | cut -d : -f 2,3 \ From 9ab7413bb6fdf11e4b952733b743cf548b0fe2e7 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Mon, 7 Nov 2022 16:49:29 +0100 Subject: [PATCH 2/2] Adds build-specific emoflon.properties to build script --- build.sh | 8 ++++++- ...flon.properties => emoflon_dev.properties} | 22 +++++++++---------- resources/emoflon_user.properties | 14 ++++++++++++ 3 files changed, 32 insertions(+), 12 deletions(-) rename resources/{emoflon.properties => emoflon_dev.properties} (97%) create mode 100644 resources/emoflon_user.properties diff --git a/build.sh b/build.sh index 0dec5b3..1173964 100755 --- a/build.sh +++ b/build.sh @@ -166,7 +166,13 @@ install_eclipse_import_projects () { # Install custom global configuration install_global_eclipse_settings () { log "Install global Eclipse settings." - cp ./resources/emoflon.properties $ECLIPSE_BASE_PATH + if [[ "$MODE" = "user" ]]; then + cp ./resources/emoflon_user.properties $ECLIPSE_BASE_PATH/emoflon.properties + elif [[ "$MODE" = "dev" ]] || [[ "$MODE" = "hipedev" ]]; then + cp ./resources/emoflon_dev.properties $ECLIPSE_BASE_PATH/emoflon.properties + else + log "Mode argument invalid."; exit 1 ; + fi echo "-Declipse.pluginCustomization=emoflon.properties" >> $ECLIPSE_BASE_PATH/eclipse.ini } diff --git a/resources/emoflon.properties b/resources/emoflon_dev.properties similarity index 97% rename from resources/emoflon.properties rename to resources/emoflon_dev.properties index 3ffa660..476e833 100644 --- a/resources/emoflon.properties +++ b/resources/emoflon_dev.properties @@ -1,11 +1,11 @@ -# -# This file can be used to set global settings for the eMoflon-Eclipses. -# -# Set default encoding to UTF-8 -org.eclipse.core.resources/encoding=UTF-8 -# -# Set default Git location to workspace related path -org.eclipse.egit.core/core_defaultRepositoryDir=${workspace_loc}/git -# -# Disable console log output limitation -org.eclipse.debug.ui/Console.limitConsoleOutput=false +# +# This file can be used to set global settings for the eMoflon-Eclipses. +# +# Set default encoding to UTF-8 +org.eclipse.core.resources/encoding=UTF-8 +# +# Set default Git location to workspace related path +org.eclipse.egit.core/core_defaultRepositoryDir=${workspace_loc}/git +# +# Disable console log output limitation +org.eclipse.debug.ui/Console.limitConsoleOutput=false diff --git a/resources/emoflon_user.properties b/resources/emoflon_user.properties new file mode 100644 index 0000000..9be04e2 --- /dev/null +++ b/resources/emoflon_user.properties @@ -0,0 +1,14 @@ +# +# This file can be used to set global settings for the eMoflon-Eclipses. +# +# Set default encoding to UTF-8 +org.eclipse.core.resources/encoding=UTF-8 +# +# Set default Git location to workspace related path +org.eclipse.egit.core/core_defaultRepositoryDir=${workspace_loc}/git +# +# Disable console log output limitation +org.eclipse.debug.ui/Console.limitConsoleOutput=false +# +# Set default perspective to eMoflon +org.eclipse.ui/defaultPerspectiveId=org.moflon.ide.ui.MoflonPerspective