Move all build instructions to a build.sh in the language-specific fo…

…lder

Signed-off-by: Stefan Marr <[email protected]>

.github/workflows/ci.yml

@@ -10,40 +10,40 @@ jobs:
       matrix:
         include:
           - name: Java
-            id:   java
+            id: java
 
           - name: SOM
-            id:   som
+            id: som
 
           - name: Crystal
-            id:   crystal
+            id: crystal
 
           - name: JavaScript
-            id:   js
+            id: js
 
           - name: SOMns
-            id:   somns
+            id: somns
 
           # - name: Pharo
           #   id:   pharo
 
           - name: Squeak 64-bit
-            id:   squeak64
+            id: squeak64
 
           - name: Ruby
-            id:   ruby
+            id: ruby
 
           - name: Lua 5.2
-            id:   lua52
+            id: lua
 
           - name: Python
-            id:   python
+            id: python
 
     name: ${{ matrix.name }}
     steps:
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: "3.11"
 
       - name: Checkout AWFY Repository
         uses: actions/checkout@v3
@@ -87,7 +87,7 @@ jobs:
       - name: Install Lua
         uses: leafo/gh-actions-lua@v10
         with:
-            luaVersion: 5.2
+          luaVersion: 5.2
         if: matrix.id == 'lua52'
 
       - name: Install LuaRocks
@@ -114,12 +114,12 @@ jobs:
 
       - name: Build
         run: |
-          implementations/build-${{ matrix.id }}.sh
+          benchmarks/${{ matrix.id }}/build.sh
 
       - name: ReBench Test Run
         run: |
           rebench test.conf test-${{ matrix.id }}
 
       - name: Style Check
         run: |
-          implementations/build-${{ matrix.id }}.sh style skip-black-for-python
+          benchmarks/${{ matrix.id }}/build.sh style skip-black-for-python

benchmarks/Crystal/build.sh

@@ -1,5 +1,13 @@
 #!/bin/bash
-set -e
-SCRIPT_PATH=`dirname $0`
+set -e # make script fail on first error
+SCRIPT_PATH=$(dirname $0)
+source $SCRIPT_PATH/../script.inc
+
+if [[ "$1" = "style" ]]
+then
+    exit 0
+fi
+
+INFO Build Crystal Benchmarks
 pushd $SCRIPT_PATH
 crystal build --release --no-debug harness.cr

benchmarks/Java/build.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e # make script fail on first error
+SCRIPT_PATH=$(dirname $0)
+source $SCRIPT_PATH/../script.inc
+pushd $SCRIPT_PATH
+
+if [[ "$1" = "style" ]]
+then
+  ant checkstyle-jar && ant checkstyle
+else
+  INFO Build Java Benchmarks
+  ant jar
+fi

benchmarks/JavaScript/build.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e # make script fail on first error
+SCRIPT_PATH=$(dirname $0)
+source $SCRIPT_PATH/../script.inc
+
+INFO Build Node.js Benchmarks
+if [[ "$1" = "style" ]]
+then
+  INFO Check style of JavaScript benchmarks
+  pushd $SCRIPT_PATH
+  npx eslint .
+else
+  exit 0
+fi

benchmarks/Lua/build.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e # make script fail on first error
+SCRIPT_PATH=$(dirname $0)
+source $SCRIPT_PATH/../script.inc
+
+if [[ "$1" = "style" ]]
+then
+  INFO Check style of Lua benchmarks
+  pushd $SCRIPT_PATH
+  luacheck *.lua
+else
+  exit 0
+fi

implementations/build-ruby.sh → benchmarks/Ruby/build.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 set -e # make script fail on first error
-SCRIPT_PATH=`dirname $0`
-source $SCRIPT_PATH/script.inc
+SCRIPT_PATH=$(dirname $0)
+source $SCRIPT_PATH/../script.inc
 
-if [ "$1" = "style" ]
+if [[ "$1" = "style" ]]
 then
   INFO Check style of Ruby benchmarks
-  pushd $SCRIPT_PATH/../benchmarks/Ruby
+  pushd $SCRIPT_PATH
   rubocop
 else
   exit 0

implementations/script.inc → benchmarks/script.inc

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # make SCRIPT_PATH absolute
-pushd `dirname $0` > /dev/null
+pushd $(dirname $0) > /dev/null
 SCRIPT_PATH=`pwd`
 popd > /dev/null
 
@@ -55,7 +55,7 @@ function check_for_tools() {
 function get_pypy() {
   if [ \! -d pypy ]; then
     get_web_getter
-    
+
     INFO Get PyPy Source
     PYPY_VERSION="5.8.0"
     PYPY_DIR="pypy2-v${PYPY_VERSION}-src"
@@ -73,7 +73,7 @@ function get_jdk9ea() {
   JDK_ARCHIVE=jdk-9-ea+96_linux-x64_bin.tar.gz
   JDK_URL=http://www.java.net/download/jdk9/archive/96/binaries/$JDK_ARCHIVE
   JDK_DIR=jdk-9
-  
+
   INFO Get JDK9 Early Access from $JDK_URL
   if [ \! -d "$JDK_DIR" ]; then
     $GET $JDK_URL || $GET $JDK_URL
@@ -109,20 +109,3 @@ function check_for() {
     fi
   fi
 }
-
-function check_for_crystal() {
-  check_for "crystal" "Please see http://crystal-lang.org/docs/installation/index.html" "$1"
-}
-
-function check_for_node() {
-  check_for "node" "Please see https://nodejs.org/en/download/" "$1"
-}
-
-function check_for_graalvm() {
-  if [ ! -x "$SCRIPT_PATH/graalvm/jre/bin/javao" ]
-  then
-    ERR "GraalVM not found."
-    ERR "To run benchmarks on the GraalVM, please see 'implementations/graalvm/README.md'"
-  fi
-}
-

implementations/build-python.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e # make script fail on first error
-SCRIPT_PATH=`dirname $0`
+SCRIPT_PATH=$(dirname $0)
 source $SCRIPT_PATH/script.inc
 
 if [ "$1" = "style" ]

implementations/build-rtrufflesom.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e # make script fail on first error
-SCRIPT_PATH=`dirname $0`
+SCRIPT_PATH=$(dirname $0)
 source $SCRIPT_PATH/script.inc
 source $SCRIPT_PATH/config.inc
 
@@ -15,7 +15,7 @@ else
   make clean
   make -j4 RTruffleSOM-jit RTruffleSOM-no-jit
   popd
-  
+
   load_submodule $SCRIPT_PATH/TruffleSOM-TOM
   pushd $SCRIPT_PATH/TruffleSOM-TOM
   make clean; make