diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d7372fd..17dda2f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,7 +10,7 @@ jobs: build: strategy: matrix: - os: [windows-2022] + os: [windows-2022, macos-13] runs-on: ${{ matrix.os }} steps: - uses: secondlife/action-autobuild@v3 diff --git a/autobuild.xml b/autobuild.xml index e76b8a9..252c50e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -69,6 +69,25 @@ name windows + darwin + + configurations + + default + + default + true + name + default + + + manifest + + lib + + name + darwin + source_directory lua diff --git a/build-cmd.sh b/build-cmd.sh index b197f90..5ebbbe7 100644 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -30,7 +30,17 @@ source_environment_tempfile="$stage/source_environment.sh" LUAU_VERSION="0.609" build=${AUTOBUILD_BUILD_ID:=0} +mkdir -p "$stage/include/luau" +mkdir -p "$stage/lib/release" + pushd "$top/luau" + pushd "VM/include" + cp -v lua.h luaconf.h lualib.h "$stage/include/luau/" + popd + pushd "Compiler/include" + cp -v luacode.h "$stage/include/luau/" + popd + case "$AUTOBUILD_PLATFORM" in windows*) set -o igncr @@ -43,23 +53,26 @@ pushd "$top/luau" cmake --build . -- /p:Configuration=Release cmake --build . --target Luau.Repl.CLI -- /p:Configuration=Release - mkdir -p "$stage/include/luau" - mkdir -p "$stage/lib/release" mkdir -p "$stage/bin" - pushd "VM/include" - cp -v lua.h luaconf.h lualib.h "$stage/include/luau/" - popd - pushd "Compiler/include" - cp -v luacode.h "$stage/include/luau/" - popd - cp -v "Release/isocline.lib" "$stage/lib/release/" + cp -v "Release/Luau.Ast.lib" "$stage/lib/release/" cp -v "Release/Luau.CodeGen.lib" "$stage/lib/release/" cp -v "Release/Luau.Compiler.lib" "$stage/lib/release/" cp -v "Release/Luau.Config.lib" "$stage/lib/release/" + cp -v "Release/Luau.VM.lib" "$stage/lib/release/" cp -v Release/luau.exe "$stage/bin/" ;; + darwin*) + cmake . -DCMAKE_INSTALL_PREFIX:STRING="${stage}" + cmake --build . --target Luau.Repl.CLI + + cp -v "libLuau.Ast.a" "$stage/lib/release" + cp -v "libLuau.CodeGen.a" "$stage/lib/release" + cp -v "libLuau.Compiler.a" "$stage/lib/release" + cp -v "libLuau.Config.a" "$stage/lib/release" + cp -v "libLuau.VM.a" "$stage/lib/release" + ;; esac popd