From 52b9fa49c0345b24a64738806237720ea4532aa7 Mon Sep 17 00:00:00 2001
From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Thu, 16 Nov 2023 09:48:53 -0600
Subject: [PATCH] more build changes

---
 .github/workflows/onyx-build.yml |  4 ++--
 build.sh                         | 10 +++++++++-
 compiler/build.sh                |  4 ++--
 settings.sh                      |  1 +
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/onyx-build.yml b/.github/workflows/onyx-build.yml
index 5294337a..cb1ec272 100644
--- a/.github/workflows/onyx-build.yml
+++ b/.github/workflows/onyx-build.yml
@@ -23,11 +23,11 @@ jobs:
       matrix:
         include:
           - build: linux-amd64
-            os: ubuntu-20.04
+            os: ubuntu-latest
             runtime_library: ovmwasm
             artifact_name: 'onyx-linux-ovm-amd64'
           - build: linux-amd64
-            os: ubuntu-20.04
+            os: ubuntu-latest
             runtime_library: ':libwasmer.a'
             artifact_name: 'onyx-linux-wasmer-amd64'
           - build: windows-amd64
diff --git a/build.sh b/build.sh
index e38c6e40..85db1bbb 100755
--- a/build.sh
+++ b/build.sh
@@ -36,7 +36,7 @@ package_all() {
     cp ./scripts/onyx-pkg.onyx "$DIST_DIR/tools"
     cp ./scripts/default.json "$DIST_DIR/tools/pkg_templates"
 
-    echo "Installing runtime library '$ONYX_RUNTIME_LIBRARY'"
+    echo "Installing runtime library"
     mkdir -p "$DIST_DIR/lib"
     mkdir -p "$DIST_DIR/include"
 
@@ -46,11 +46,19 @@ package_all() {
 
     cp -r "tests" "$DIST_DIR/"
     cp -r "examples" "$DIST_DIR/"
+
+    mkdir -p "$DIST_DIR/misc"
+    cp misc/onyx-linux.sublime-build "$DIST_DIR/misc"
+    cp misc/onyx-windows.sublime-build "$DIST_DIR/misc"
+    cp misc/onyx-mode.el "$DIST_DIR/misc"
+    cp misc/onyx.sublime-syntax "$DIST_DIR/misc"
+    cp misc/vscode/onyx-0.1.8.vsix "$DIST_DIR/misc"
 }
 
 install_all() {
     package_all
 
+    echo "Installing to $ONYX_INSTALL_DIR"
     mkdir -p "$ONYX_INSTALL_DIR"
     cp -r "$DIST_DIR/." "$ONYX_INSTALL_DIR"
 }
diff --git a/compiler/build.sh b/compiler/build.sh
index fe530a48..90035a1d 100755
--- a/compiler/build.sh
+++ b/compiler/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-C_FILES="onyx astnodes builtins checker clone doc entities errors lex parser symres types utils wasm_emit"
+C_FILES="onyx astnodes builtins checker clone doc entities errors lex parser symres types utils wasm_emit "
 LIBS="-L$ONYX_LIBRARY_DIR -lpthread -ldl -lm"
 INCLUDES="-I./include -I../shared/include -I../shared/include/dyncall"
 
@@ -14,7 +14,7 @@ fi
 
 if [ ! -z ${ONYX_RUNTIME_LIBRARY+x} ]; then
     FLAGS="$FLAGS -DENABLE_RUN_WITH_WASMER"
-    C_FILES="$C_FILES wasm_runtime "
+    C_FILES="${C_FILES}wasm_runtime "
     LIBS="$LIBS -l$ONYX_RUNTIME_LIBRARY"
 fi
 
diff --git a/settings.sh b/settings.sh
index b9afc986..7f194012 100644
--- a/settings.sh
+++ b/settings.sh
@@ -10,6 +10,7 @@ export ONYX_RUNTIME_LIBRARY="ovmwasm"
 
 export ONYX_INCLUDE_DIR="$(pwd)/shared/include"
 export ONYX_LIBRARY_DIR="$(pwd)/shared/lib/linux_$ONYX_ARCH/lib"
+# export ONYX_LIBRARY_DIR="$(wasmer config --libdir)"
 
 # Enable Dynamic call
 export ONYX_USE_DYNCALL=1
-- 
2.25.1