From b8d43e9efa11507a9906d47d926c55ae0079b9d7 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Mon, 7 Nov 2022 16:37:12 +0100 Subject: [PATCH 1/2] Adds tutorial projects to ws + fixes desktop file formatting --- prov.sh | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/prov.sh b/prov.sh index eba3a41..221cd5e 100644 --- a/prov.sh +++ b/prov.sh @@ -4,8 +4,12 @@ # Config # +# Eclipse build to use for provisioning ECLIPSE_ARCHIVE=eclipse-emoflon-linux-user +# If true, add tutorial projects to the default Eclipse workspace +TUTORIAL_PROJECTS=true + set -e START_PWD=$PWD @@ -65,8 +69,7 @@ rm -f $ECLIPSE_ARCHIVE.zip # Create desktop launchers mkdir -p /home/vagrant/Desktop touch /home/vagrant/Desktop/emoflon-app.desktop -printf " -[Desktop Entry] +printf "[Desktop Entry] Version=1.0 Name=eMoflon::IBeX Eclipse Comment=Use eMoflon::IBeX Eclipse @@ -80,8 +83,7 @@ StartupNotify=true " > /home/vagrant/Desktop/emoflon-app.desktop touch /home/vagrant/Desktop/emoflon-website.desktop -printf " -[Desktop Entry] +printf "[Desktop Entry] Encoding=UTF-8 Name=eMoflon::IBeX Website Type=Link @@ -90,8 +92,7 @@ Icon=web-browser " > /home/vagrant/Desktop/emoflon-website.desktop touch /home/vagrant/Desktop/emoflon-tutorial.desktop -printf " -[Desktop Entry] +printf "[Desktop Entry] Encoding=UTF-8 Name=eMoflon::IBeX Tutorial Type=Link @@ -100,8 +101,7 @@ Icon=web-browser " > /home/vagrant/Desktop/emoflon-tutorial.desktop touch /home/vagrant/Desktop/emoflon-tests.desktop -printf " -[Desktop Entry] +printf "[Desktop Entry] Encoding=UTF-8 Name=eMoflon::IBeX Test Suite Type=Link @@ -122,4 +122,15 @@ sudo apt-get remove -yq \ sudo apt-get autoremove -yq sudo apt-get clean cache +# Setup tutorial workspace if configured +if [ "$TUTORIAL_PROJECTS" = true ]; then + log "Download and import eMoflon::IBeX tutorial projects into workspace." + WS=/home/vagrant/eclipse-workspace + rm -rf $WS && mkdir -p $WS/git + cd /$WS/git + git clone https://github.com/eMoflon/emoflon-ibex-tutorial.git + cd /home/vagrant/eclipse-apps/eclipse + ./eclipse -noSplash -consoleLog -data $WS -application com.seeq.eclipse.importprojects.headlessimport -importProject $WS/git/emoflon-ibex-tutorial +fi + log "Finished provisioning." From bb7c0f5cf1bdf088f6a98cdce0c479a692107a32 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Mon, 7 Nov 2022 16:40:29 +0100 Subject: [PATCH 2/2] Adds notice to README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a6ac9f3..1ba58d3 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ This repository is used to automatically build an [eMoflon](https://emoflon.org) - The default configuration for this VM image consists 8GB of RAM and 2 vCPU cores. You need at least 8GB to run the full [eMoflon::IBeX test suite](https://github.com/eMoflon/emoflon-ibex-tests). If your PC only has 8GB of RAM available, reduce the RAM capacity of the VM within VirtualBox - It is recommend to change the settings to at least 4 vCPU cores. +- The default Eclipse workspace (`home/vagrant/eclipse-workspace`) contains the [eMoflon::IBeX tutorial projects](https://github.com/eMoflon/emoflon-ibex-tutorial). ## Runner requirements