Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,21 @@ jobs:
./daslang _dasroot_/dastest/dastest.das -- --color --test ../tests || ./daslang _dasroot_/dastest/dastest.das -- --color --isolated-mode --timeout 1200 --test ../tests
;;
esac
- name: "Install binaries"
if: ${{ matrix.cmake_preset }} == "Release"
shell: bash
run: |
mkdir daslang_install
mkdir artifacts
cmake --install ./build --prefix ./daslang_install
7z a artifacts/daslang-${{ matrix.target }}${{ matrix.architecture }}.zip ./daslang_install
-name: "Create release"
if: github.event.action == 'published
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: artifacts/daslang-${{ matrix.target }}${{ matrix.architecture }}.zip
asset_name: daslang-${{ matrix.target }}${{ matrix.architecture }}.zip
asset_content_type: application/zip
10 changes: 3 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -959,12 +959,12 @@ if (NOT ${DAS_TOOLS_DISABLED})
ADD_DEPENDENCIES(${target_name} ${library_name} libDaScriptTest ${DAS_MODULES_LIBS})
SETUP_CPP11(${target_name})
SETUP_LTO(${target_name})
INSTALL(TARGETS ${target_name}
RUNTIME DESTINATION ${DAS_INSTALL_BINDIR}
)
ENDMACRO()

SETUP_COMPILER_BINARY(daslang libDaScriptStage0)
INSTALL(TARGETS daslang
RUNTIME DESTINATION ${DAS_INSTALL_BINDIR}
)
set_property(TARGET daslang PROPERTY GENERATED TRUE)
SETUP_COMPILER_BINARY(daslang-dev libDaScript)

Expand All @@ -981,10 +981,6 @@ if (NOT ${DAS_TOOLS_DISABLED})
SETUP_CPP11(das-fmt)
SETUP_LTO(das-fmt)

INSTALL(TARGETS das-fmt
RUNTIME DESTINATION ${DAS_INSTALL_BINDIR}
)

#IF(APPLE)
# add_executable(daslangOsx MACOSX_BUNDLE ${DAS_DASCRIPT_MAIN_SRC})
# TARGET_LINK_LIBRARIES(daslangOsx libDaScript libDaScriptTest Threads::Threads ${DAS_MODULES_LIBS})
Expand Down