Refactor LC3 Compiler Build (#68)

* lc3 compiler build script

* fix build script

* updated lc3-compiler build script

* Fix names

---------

Co-authored-by: Xavier Routh <[email protected]>

Author: xavierrouth

.github/workflows/build.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        image: ['misc', 'rocm', 'compcert', 'rust-cg-gcc', 'rust-linux', 'iwyu']
+        image: ['misc', 'rocm', 'compcert', 'rust-cg-gcc', 'rust-linux', 'iwyu', 'lc3']
     steps:
     - name: Docker Setup Buildx
       uses: docker/setup-buildx-action@v2

Dockerfile.lc3

@@ -0,0 +1,24 @@
+FROM ubuntu:20.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN dpkg --add-architecture i386
+RUN apt update -y -q && apt upgrade -y -q && apt update -y -q && \
+    apt install -y -q \
+    build-essential \
+    bison \
+    curl \
+    flex \
+    git \
+    libc6-dev-i386 \
+    libc6-dev:i386 \
+    make \
+    patchelf \
+    xz-utils
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+RUN mkdir -p /root
+COPY lc3 /root/
+COPY common.sh /root/
+
+WORKDIR /root

misc/build-lc3.sh renamed to lc3/build.sh

@@ -2,6 +2,8 @@
 
 set -ex
 source common.sh
+export PATH="$PATH":"$HOME"/.cargo/bin
+source $HOME/.cargo/env
 
 VERSION=$1
 if [[ "${VERSION}" = "trunk" ]]; then
@@ -11,7 +13,7 @@ else
     BRANCH=V${VERSION}
 fi
 
-URL=https://github.com/xavierrouth/C-LC3-Compiler
+URL=https://github.com/xavierrouth/lc3-compiler
 
 FULLNAME=C-LC3-Compiler-${VERSION}.tar.xz
 OUTPUT=$2/${FULLNAME}
@@ -22,15 +24,13 @@ LAST_REVISION="${3:-}"
 initialise "${REVISION}" "${OUTPUT}" "${LAST_REVISION}"
 
 PREFIX=$(pwd)/prefix
-DIR=$(pwd)/C-LC3-Compiler
-BUILD=${DIR}/build
+DIR=$(pwd)/lc3-compiler
+BUILD=${DIR}/target/release
 
-git clone --recurse-submodules --depth 1 -b "${BRANCH}" "${URL}" "${DIR}"
+git clone --depth 1 -b "${BRANCH}" "${URL}" "${DIR}"
 
-mkdir "${BUILD}"
-cd "${BUILD}"
-cmake ..
-make
+cd $DIR
+cargo build --release
 mkdir -p "${PREFIX}"
 
 cp "${BUILD}/lc3-compile" "${PREFIX}"