From 10687d9708ff0884f5d97ddbc14126c54c6cbc74 Mon Sep 17 00:00:00 2001 From: jvelilla Date: Thu, 27 Aug 2020 16:06:30 -0300 Subject: [PATCH 1/4] Added work in progress configutration for Eiffel. --- languages/eiffel.toml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 languages/eiffel.toml diff --git a/languages/eiffel.toml b/languages/eiffel.toml new file mode 100644 index 00000000..a887bbb3 --- /dev/null +++ b/languages/eiffel.toml @@ -0,0 +1,42 @@ +name = "Eiffel" +entrypoint = "APPLICATION.e" +extensions = [ + "e" + ] + +setup = [ +] + +[compile] +command = [ + "ec", + "-clean" + "-finalize" +] + +[run] +command = [ + ./example +] + +[tests] + + [tests.hello] + code = """ + class APPLICATION + + create + make + + feature {NONE} -- Initialization + + make + do + print ("Hello World") + end + """ + output = "Hello World" + +[languageServer] +command = [ +] From 3ee4bc28e7a1b4f24b56eb94bb8464d5f3af974f Mon Sep 17 00:00:00 2001 From: jvelilla Date: Thu, 27 Aug 2020 16:23:38 -0300 Subject: [PATCH 2/4] Updated TOML file for Eiffel (WIP) --- languages/eiffel.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/eiffel.toml b/languages/eiffel.toml index a887bbb3..7ced558a 100644 --- a/languages/eiffel.toml +++ b/languages/eiffel.toml @@ -10,13 +10,13 @@ setup = [ [compile] command = [ "ec", - "-clean" + "-clean", "-finalize" ] [run] command = [ - ./example + "./example" ] [tests] From b8afd6c4a70483d25f0eda496c8bb031e6b0c52d Mon Sep 17 00:00:00 2001 From: jvelilla Date: Wed, 23 Sep 2020 12:52:58 -0300 Subject: [PATCH 3/4] Updated Eiffel configuration file. --- languages/eiffel.toml | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/languages/eiffel.toml b/languages/eiffel.toml index 7ced558a..97669e1c 100644 --- a/languages/eiffel.toml +++ b/languages/eiffel.toml @@ -1,22 +1,51 @@ -name = "Eiffel" -entrypoint = "APPLICATION.e" +name = "eiffel" +entrypoint = "application.e" extensions = [ "e" ] + +packages = [ + "pkg-config" +] + +#setup = [ +# "curl -sSL http://downloads.sourceforge.net/eiffelstudio/Eiffel_20.05_rev_104521-linux-x86-64.tar.bz2 | tar -x -p -s --bzip2", +# "export current_dir=$PWD ; echo current_dir=$current_dir ; cd ..", +# "export ISE_EIFFEL=/Eiffel_20.05", +# "export ISE_PLATFORM=linux-x86-64", +# "export PATH=$PATH:$ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin:$PATH:$ISE_EIFFEL/tools/spec/$ISE_PLATFORM/bin" +#] + setup = [ + "cd /opt/", + "curl -fsSL https://www.eiffel.org/setup/install.sh -o eiffelstudio.sh", + "bash eiffelstudio.sh > eiffel.rc", + "echo 'export ISE_EIFFEL=/opt/Eiffel_20.05' >> /opt/homes/default/.bashrc", + "echo 'export ISE_PLATFORM=linux-x86-64' >> /opt/homes/default/.bashrc", + "echo 'export PATH=$PATH:$ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin:$PATH:$ISE_EIFFEL/tools/spec/$ISE_PLATFORM/bin' >> /opt/homes/default/.bashrc" +] + +runtimeSetup = [ + "source /home/runner/.bashrc" +] + +versionCommand = [ + "ecb", + "-version" ] [compile] command = [ - "ec", + "ecb", + "application.e", "-clean", "-finalize" ] [run] command = [ - "./example" + "./EIFGENs/application/F_code/application" ] [tests] @@ -37,6 +66,3 @@ command = [ """ output = "Hello World" -[languageServer] -command = [ -] From b044e233e816de6aa3dec73dcb10626cc0413f28 Mon Sep 17 00:00:00 2001 From: jvelilla Date: Wed, 4 Nov 2020 18:19:50 -0300 Subject: [PATCH 4/4] Updated Eiffel.tom configuration. --- languages/eiffel.toml | 55 +++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/languages/eiffel.toml b/languages/eiffel.toml index 97669e1c..776b561c 100644 --- a/languages/eiffel.toml +++ b/languages/eiffel.toml @@ -4,43 +4,47 @@ extensions = [ "e" ] -packages = [ - "pkg-config" -] - -#setup = [ -# "curl -sSL http://downloads.sourceforge.net/eiffelstudio/Eiffel_20.05_rev_104521-linux-x86-64.tar.bz2 | tar -x -p -s --bzip2", -# "export current_dir=$PWD ; echo current_dir=$current_dir ; cd ..", -# "export ISE_EIFFEL=/Eiffel_20.05", -# "export ISE_PLATFORM=linux-x86-64", -# "export PATH=$PATH:$ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin:$PATH:$ISE_EIFFEL/tools/spec/$ISE_PLATFORM/bin" -#] - setup = [ - "cd /opt/", - "curl -fsSL https://www.eiffel.org/setup/install.sh -o eiffelstudio.sh", - "bash eiffelstudio.sh > eiffel.rc", - "echo 'export ISE_EIFFEL=/opt/Eiffel_20.05' >> /opt/homes/default/.bashrc", - "echo 'export ISE_PLATFORM=linux-x86-64' >> /opt/homes/default/.bashrc", - "echo 'export PATH=$PATH:$ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin:$PATH:$ISE_EIFFEL/tools/spec/$ISE_PLATFORM/bin' >> /opt/homes/default/.bashrc" + ''' + apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates curl \ + bzip2 \ + gcc make \ + libxtst-dev \ + libgtk2.0-dev \ + libssl-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + cd /usr/local && curl -sSL https://www.eiffel.org/setup/install.sh | bash -s -- --channel latest --install-dir /usr/local/eiffel + ''' ] + runtimeSetup = [ - "source /home/runner/.bashrc" + '''echo '' > /home/runner/application.ecf ''' + ] versionCommand = [ - "ecb", - "-version" + "ISE_EIFFEL=/usr/local/eiffel", + "ISE_PLATFORM=linux-x86-64", + "ISE_LIBRARY=$ISE_EIFFEL", + "PATH=$PATH:$ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin:$ISE_EIFFEL/tools/spec/$ISE_PLATFORM/bin:$ISE_EIFFEL/library/gobo/spec/$ISE_PLATFORM/bin:$ISE_EIFFEL/esbuilder/spec/$ISE_PLATFORM/bin", + "ecb", + "-version" ] [compile] command = [ - "ecb", - "application.e", - "-clean", - "-finalize" + "ISE_EIFFEL=/usr/local/eiffel", + "ISE_PLATFORM=linux-x86-64", + "ISE_LIBRARY=$ISE_EIFFEL", + "PATH=$PATH:$ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin:$ISE_EIFFEL/tools/spec/$ISE_PLATFORM/bin:$ISE_EIFFEL/library/gobo/spec/$ISE_PLATFORM/bin:$ISE_EIFFEL/esbuilder/spec/$ISE_PLATFORM/bin", + "ecb", + "application.e", + "-clean", + "-finalize" ] [run] @@ -63,6 +67,7 @@ command = [ do print ("Hello World") end + end """ output = "Hello World"