Skip to content
This repository was archived by the owner on Jan 18, 2022. It is now read-only.

Commit 533e9ec

Browse files
gkassablijamiebrynes7
authored andcommitted
Moving to a new version of worker sdk and new artefacts (#632)
1 parent d1d114e commit 533e9ec

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

spatialos.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "unity_gdk",
33
"project_version": "0.0.1",
4-
"sdk_version": "13.4.0-b7420-e957b-WORKER-SNAPSHOT",
4+
"sdk_version": "13.5.0-b7594-21b3c-WORKER-SNAPSHOT",
55
"dependencies": [
6-
{"name": "standard_library", "version": "13.4.0-b7420-e957b-WORKER-SNAPSHOT"}
6+
{"name": "standard_library", "version": "13.5.0-b7594-21b3c-WORKER-SNAPSHOT"}
77
]
88
}

workers/unity/Packages/com.improbable.gdk.tools/.DownloadCoreSdk/Program.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ private static void Main(string[] args)
2828

2929
var packages = new List<Package>
3030
{
31-
new Package(tempPath, "worker_sdk", "c-dynamic-x86_64-msvc_mt-win32", $"{nativeDependenciesPath}/Windows/x86_64", new List<string> {"include", "worker.lib"}),
32-
new Package(tempPath, "worker_sdk", "c-dynamic-x86_64-gcc_libstdcpp-linux", $"{nativeDependenciesPath}/Linux/x86_64", new List<string> {"include"}),
33-
new Package(tempPath, "worker_sdk", "c-bundle-x86_64-clang_libcpp-macos", $"{nativeDependenciesPath}/OSX", new List<string> {"include"}),
34-
new Package(tempPath, "worker_sdk", "c-static-fullylinked-arm-clang_libcpp-ios", $"{nativeDependenciesPath}/iOS/arm", new List<string> {"include", "libworker_static_fullylinked.a.pic", "worker_static_fullylinked.lib"}, postprocessCallback:PostProcess_iOS_Arm),
35-
new Package(tempPath, "worker_sdk", "c-static-fullylinked-x86_64-clang_libcpp-ios", $"{nativeDependenciesPath}/iOS/x86_64", new List<string> {"include", "libworker_static_fullylinked.a.pic", "worker_static_fullylinked.lib"}, postprocessCallback:PostProcess_iOS_x86_64),
36-
new Package(tempPath, "worker_sdk", "c-dynamic-arm64-clang_libcpp-android", $"{nativeDependenciesPath}/Android/arm64", new List<string> {"include"}),
37-
new Package(tempPath, "worker_sdk", "c-dynamic-armeabi_v7a-clang_libcpp-android", $"{nativeDependenciesPath}/Android/armv7", new List<string> {"include"}),
38-
new Package(tempPath, "worker_sdk", "c-dynamic-x86-android-clang_libcpp-android", $"{nativeDependenciesPath}/Android/x86", new List<string> {"include"}),
31+
new Package(tempPath, "worker_sdk", "core-dynamic-x86_64-win32", $"{nativeDependenciesPath}/Windows/x86_64", new List<string> {"include", "CoreSdkDll.lib"}),
32+
new Package(tempPath, "worker_sdk", "core-dynamic-x86_64-linux", $"{nativeDependenciesPath}/Linux/x86_64", new List<string> {"include"}),
33+
new Package(tempPath, "worker_sdk", "core-bundle-x86_64-macos", $"{nativeDependenciesPath}/OSX", new List<string> {"include"}),
34+
new Package(tempPath, "worker_sdk", "core-static-fullylinked-arm-ios", $"{nativeDependenciesPath}/iOS/arm", new List<string> {"include", "libCoreSdkStatic.a.pic", "CoreSdkStatic.lib"}, postprocessCallback:PostProcess_iOS_Arm),
35+
new Package(tempPath, "worker_sdk", "core-static-fullylinked-x86_64-ios", $"{nativeDependenciesPath}/iOS/x86_64", new List<string> {"include", "libCoreSdkStatic.a.pic", "CoreSdkStatic.lib"}, postprocessCallback:PostProcess_iOS_x86_64),
36+
new Package(tempPath, "worker_sdk", "core-dynamic-arm64-android", $"{nativeDependenciesPath}/Android/arm64", new List<string> {"include"}),
37+
new Package(tempPath, "worker_sdk", "core-dynamic-armeabi_v7a-android", $"{nativeDependenciesPath}/Android/armv7", new List<string> {"include"}),
38+
new Package(tempPath, "worker_sdk", "core-dynamic-x86-android-android", $"{nativeDependenciesPath}/Android/x86", new List<string> {"include"}),
3939
new Package(tempPath, "worker_sdk", "csharp-c-interop", $"{managedDependenciesPath}/Common"),
4040
new Package(tempPath, "worker_sdk", "csharp-c-interop-static", $"{managedDependenciesPath}/iOS"),
4141
new Package(tempPath, "schema", "standard_library", schemaStdLibDir),
@@ -115,15 +115,15 @@ private static void DownloadPackages(IEnumerable<Package> packages, string spati
115115

116116
private static void PostProcess_iOS_Arm(string directoryPath)
117117
{
118-
var originalPath = Path.Combine(directoryPath, "libworker_static_fullylinked.a");
119-
var destinationPath = Path.Combine(directoryPath, "libworker_static_fullylinked_arm.a");
118+
var originalPath = Path.Combine(directoryPath, "libCoreSdkStatic.a");
119+
var destinationPath = Path.Combine(directoryPath, "libCoreSdkStatic_arm.a");
120120
File.Move(originalPath, destinationPath);
121121
}
122122

123123
private static void PostProcess_iOS_x86_64(string directoryPath)
124124
{
125-
var originalPath = Path.Combine(directoryPath, "libworker_static_fullylinked.a");
126-
var destinationPath = Path.Combine(directoryPath, "libworker_static_fullylinked_x86_64.a");
125+
var originalPath = Path.Combine(directoryPath, "libCoreSdkStatic.a");
126+
var destinationPath = Path.Combine(directoryPath, "libCoreSdkStatic_x86_64.a");
127127
File.Move(originalPath, destinationPath);
128128
}
129129

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
13.4.0-b7420-e957b-WORKER-SNAPSHOT
1+
13.5.0-b7594-21b3c-WORKER-SNAPSHOT

0 commit comments

Comments
 (0)