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: 15 additions & 3 deletions .yamato/build_and_test_linux_x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,20 @@ agent:
flavor: b1.large

commands:
- ./build.sh -subset clr+libs+libs.tests -test -a x64 -c release -ci -ninja
- ./build.sh -subset host+packs -a x64 -c release
- mkdir artifacts
- curl https://public-stevedore.unity3d.com/r/public/7za-linux-x64/e6c75fb7ffda_e6a295cdcae3f74d315361883cf53f75141be2e739c020035f414a449d4876af.zip --output artifacts/7za-linux-x64.zip
- unzip artifacts/7za-linux-x64.zip -d artifacts/7za-linux-x64
- |
cd unity/unitygc
mkdir release
cd release
cmake -DCMAKE_BUILD_TYPE=Release ..
cmake --build .
- ./build.sh -subset clr+libs+libs -a x64 -c release -ci -ninja
- cp unity/unitygc/release/libunitygc.so artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/runtimes/linux-x64/native
- artifacts/7za-linux-x64/7za a artifacts/unity/dotnet-runtime-unity-linux-x64.7z ./artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/runtimes/linux-x64
# build/run tests
- ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja
- command: ./src/tests/build.sh x64 release ci
retries: 1
- ./src/tests/run.sh x64 release
Expand All @@ -23,4 +35,4 @@ triggers:
artifacts:
linux64:
paths:
- artifacts/packages/Release/Shipping/dotnet-runtime-7.0.0-dev-linux-x64.tar.gz
- artifacts/unity/dotnet-runtime-unity-linux-x64.7z
18 changes: 15 additions & 3 deletions .yamato/build_and_test_osx_x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,20 @@ agent:
flavor: m1.mac

commands:
- LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset clr+libs+libs.tests -test -a x64 -c release -ci -ninja
- ./build.sh -subset host+packs -a x64 -c release
- mkdir artifacts
- curl https://public-stevedore.unity3d.com/r/public/7za-mac-x64/e6c75fb7ffda_5bd76652986a0e3756d1cfd7e84ce056a9e1dbfc5f70f0514a001f724c0fbad2.zip --output artifacts/7za-mac-x64.zip
- unzip artifacts/7za-mac-x64.zip -d artifacts/7za-mac-x64
- |
cd unity/unitygc
mkdir release
cd release
cmake -DCMAKE_BUILD_TYPE=Release ..
cmake --build .
- LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset clr+libs -a x64 -c release -ci -ninja
- cp unity/unitygc/release/libunitygc.dylib artifacts/bin/microsoft.netcore.app.runtime.osx-x64/Release/runtimes/osx-x64/native
- artifacts/7za-mac-x64/7za a artifacts/unity/dotnet-runtime-unity-osx-x64.7z ./artifacts/bin/microsoft.netcore.app.runtime.osx-x64/Release/runtimes/osx-x64
# build/run tests
- LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja
- ./src/tests/build.sh x64 release ci
- ./src/tests/run.sh x64 release
- ./build.sh clr.paltests
Expand All @@ -22,4 +34,4 @@ triggers:
artifacts:
osx64:
paths:
- artifacts/packages/Release/Shipping/dotnet-runtime-7.0.0-dev-osx-x64.tar.gz
- artifacts/unity/dotnet-runtime-unity-osx-x64.7z
14 changes: 11 additions & 3 deletions .yamato/build_windows_x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,16 @@ agent:
flavor: b1.xlarge

commands:
- build.cmd -subset clr+libs+libs.tests -test -a x64 -c release -ci
- build.cmd -subset host+packs -a x64 -c release
- |
cd unity\unitygc
cmake .
cmake --build . --config Release
- build.cmd -subset clr+libs -a x64 -c release -ci
- copy unity\unitygc\Release\unitygc.dll artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64\native
- powershell .yamato\scripts\download_7z.ps1
- artifacts\7za-win-x64\7za.exe a artifacts\unity\dotnet-runtime-unity-win-x64.7z .\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64
# build/run tests
- build.cmd libs.tests -test -a x64 -c release -ci
- src\tests\build.cmd x64 release ci
- src\tests\run.cmd x64 release

Expand All @@ -20,4 +28,4 @@ triggers:
artifacts:
win64:
paths:
- artifacts\packages\Release\Shipping\dotnet-runtime-7.0.0-dev-win-x64.zip
- artifacts\unity\dotnet-runtime-unity-win-x64.7z
6 changes: 6 additions & 0 deletions .yamato/scripts/download_7z.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$artifacts = 'artifacts'
$7z_zip = Join-Path -Path $artifacts -ChildPath '7za-win-x64.zip'
$7z_folder = Join-Path -Path $artifacts -ChildPath '7za-win-x64'
$client = new-object System.Net.WebClient
$client.DownloadFile("https://public-stevedore.unity3d.com/r/public/7za-win-x64/38c5b39be2e8_a333cfccb708c88459b3812eb2597ca486ec9b416172543ca3ef8e5cd5f80984.zip",$7z_zip)
Expand-Archive -Path $7z_zip -DestinationPath $7z_folder
26 changes: 26 additions & 0 deletions unity/unitygc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
project(unitygc)

set(CMAKE_INCLUDE_CURRENT_DIR ON)

include_directories(../../src/coreclr/gc)
include_directories(../../src/coreclr/gc/env)
include_directories(../../src/coreclr/inc)
include_directories(../../src/native)

set(GC_SOURCES
unitygc.cpp)

if(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
set (GC_LINK_LIBRARIES
${STATIC_MT_CRT_LIB}
${STATIC_MT_VCRT_LIB}
kernel32.lib
advapi32.lib)
add_definitions(-DTARGET_WINDOWS)
else()
set (GC_LINK_LIBRARIES)
endif(${CMAKE_SYSTEM_NAME} STREQUAL Windows)

add_library(unitygc SHARED ${GC_SOURCES})
target_link_libraries(unitygc ${GC_LINK_LIBRARIES})
#install_clr(TARGETS unitygc DESTINATIONS . COMPONENT runtime)
Loading