Skip to content

Commit add045c

Browse files
UnityAlexUnityAlex
authored
Merge pull request #128 from Unity-Technologies/build-cleanup
Unity Build Cleanup
2 parents 8e4d254 + d2935a5 commit add045c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1506
-516
lines changed

‎.yamato/build_linux_x64_debug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variables:
1111
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-linux-x64.7z
1212

1313
commands:
14-
- ./.yamato/scripts/build_linux.sh Debug
14+
- ./.yamato/scripts/build_yamato.sh --config=Debug
1515

1616
artifacts:
1717
7z-archives:

‎.yamato/build_linux_x64_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variables:
1111
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-linux-x64.7z
1212

1313
commands:
14-
- ./.yamato/scripts/build_linux.sh Release
14+
- ./.yamato/scripts/build_yamato.sh --config=Release
1515

1616
artifacts:
1717
7z-archives:

‎.yamato/build_osx_arm64_debug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variables:
1111
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-osx-arm64.7z
1212

1313
commands:
14-
- ./.yamato/scripts/build_osx.sh arm64 Debug
14+
- ./.yamato/scripts/build_yamato.sh --arch=arm64 --config=Debug
1515

1616
artifacts:
1717
7z-archives:

‎.yamato/build_osx_arm64_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variables:
1111
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-osx-arm64.7z
1212

1313
commands:
14-
- ./.yamato/scripts/build_osx.sh arm64 Release
14+
- ./.yamato/scripts/build_yamato.sh --arch=arm64 --config=Release
1515

1616
artifacts:
1717
7z-archives:

‎.yamato/build_osx_x64_debug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variables:
1111
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-osx-x64.7z
1212

1313
commands:
14-
- ./.yamato/scripts/build_osx.sh x64 Debug
14+
- ./.yamato/scripts/build_yamato.sh --arch=x64 --config=Debug
1515

1616
artifacts:
1717
7z-archives:

‎.yamato/build_osx_x64_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variables:
1111
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-osx-x64.7z
1212

1313
commands:
14-
- ./.yamato/scripts/build_osx.sh x64 Release
14+
- ./.yamato/scripts/build_yamato.sh --arch=x64 --config=Release
1515

1616
artifacts:
1717
7z-archives:

‎.yamato/build_windows_x64_debug.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@ name: Build Windows x64 Debug
44

55
agent:
66
type: Unity::VM
7-
image: burst/burst-base:1.0.8-1195360
7+
image: platform-foundation/coreclr-windows:v0.0.1-1276296
88
flavor: b1.xlarge
99

1010
variables:
1111
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x64.7z
1212

1313
commands:
14-
- .yamato/scripts/build_windows.cmd x64 Debug
15-
- powershell .yamato\scripts\download_7z.ps1
16-
- copy LICENSE.md artifacts\bin\microsoft.netcore.app.runtime.win-x64\Debug\runtimes\win-x64
17-
- artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Debug\runtimes\win-x64\*
14+
- .yamato/scripts/build_yamato.cmd --arch=x64 --config=Debug
1815

1916
artifacts:
2017
7z-archives:

‎.yamato/build_windows_x64_release.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@ name: Build Windows x64 Release
44

55
agent:
66
type: Unity::VM
7-
image: burst/burst-base:1.0.8-1195360
7+
image: platform-foundation/coreclr-windows:v0.0.1-1276296
88
flavor: b1.xlarge
99

1010
variables:
1111
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x64.7z
1212

1313
commands:
14-
- .yamato/scripts/build_windows.cmd x64 Release
15-
- powershell .yamato\scripts\download_7z.ps1
16-
- copy LICENSE.md artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64
17-
- artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64\*
14+
- .yamato/scripts/build_yamato.cmd --arch=x64 --config=Release
1815

1916
artifacts:
2017
7z-archives:

‎.yamato/build_windows_x86_debug.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@ name: Build Windows x86 Debug
44

55
agent:
66
type: Unity::VM
7-
image: burst/burst-base:1.0.8-1195360
7+
image: platform-foundation/coreclr-windows:v0.0.1-1276296
88
flavor: b1.xlarge
99

1010
variables:
1111
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x86.7z
1212

1313
commands:
14-
- .yamato/scripts/build_windows.cmd x86 Debug
15-
- powershell .yamato\scripts\download_7z.ps1
16-
- copy LICENSE.md artifacts\bin\microsoft.netcore.app.runtime.win-x86\Debug\runtimes\win-x86
17-
- artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x86\Debug\runtimes\win-x86\*
14+
- .yamato/scripts/build_yamato.cmd --arch=x86 --config=Debug
1815

1916
artifacts:
2017
7z-archives:

‎.yamato/build_windows_x86_release.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@ name: Build Windows x86 Release
44

55
agent:
66
type: Unity::VM
7-
image: burst/burst-base:1.0.8-1195360
7+
image: platform-foundation/coreclr-windows:v0.0.1-1276296
88
flavor: b1.xlarge
99

1010
variables:
1111
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x86.7z
1212

1313
commands:
14-
- .yamato/scripts/build_windows.cmd x86 Release
15-
- powershell .yamato\scripts\download_7z.ps1
16-
- copy LICENSE.md artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86
17-
- artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86\*
14+
- .yamato/scripts/build_yamato.cmd --arch=x86 --config=Release
1815

1916
artifacts:
2017
7z-archives:

‎.yamato/scripts/build_linux.sh

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎.yamato/scripts/build_osx.sh

Lines changed: 0 additions & 95 deletions
This file was deleted.

‎.yamato/scripts/build_windows.cmd

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎.yamato/scripts/build_yamato.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@echo off
2+
3+
%~dp0../../dotnet.cmd run --project %~dp0../../unity/CITools/BuildDriver/BuildDriver.csproj -- %*

‎.yamato/scripts/build_yamato.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
3+
BASEDIR=$(dirname $0)
4+
$BASEDIR/../../dotnet.sh run --project $BASEDIR/../../unity/CITools/BuildDriver/BuildDriver.csproj -- "$@"

0 commit comments

Comments
 (0)