From bbda2aa651d8b6dc1d8a6072b26df665c0a1d09e Mon Sep 17 00:00:00 2001 From: JOHN Date: Thu, 8 Jun 2017 15:28:12 +0100 Subject: [PATCH] upgraded to SpatialOS 10.4.0 --- spatialos.json | 4 +- workers/gsim/spatialos.gsim.build.json | 61 -------- .../unity/spatialos.unity.client.build.json | 146 ------------------ .../unity/spatialos.unity.worker.build.json | 146 ------------------ 4 files changed, 2 insertions(+), 355 deletions(-) delete mode 100644 workers/gsim/spatialos.gsim.build.json delete mode 100644 workers/unity/spatialos.unity.client.build.json delete mode 100644 workers/unity/spatialos.unity.worker.build.json diff --git a/spatialos.json b/spatialos.json index 3f26f28..bf72b93 100644 --- a/spatialos.json +++ b/spatialos.json @@ -1,8 +1,8 @@ { "name": "your_project_name_here", "project_version": "1.0.0", - "sdk_version": "10.3.3", + "sdk_version": "10.4.0", "dependencies": [ - {"name": "WorkerSdkSchema", "version": "10.3.3"} + {"name": "WorkerSdkSchema", "version": "10.4.0"} ] } diff --git a/workers/gsim/spatialos.gsim.build.json b/workers/gsim/spatialos.gsim.build.json deleted file mode 100644 index 95f3eef..0000000 --- a/workers/gsim/spatialos.gsim.build.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "tasks": [ - { - "name": "Codegen", - "steps": [ - { - "name": "Scala", - "arguments": [ - "process_schema", - "generate", - "--input=../../schema/", - "--repository=../../build/dependencies/schema/", - "--output=generated", - "--language=scala" - ] - } - ] - }, - { - "name": "Build", - "steps": [ - { - "name": "Codegen", - "arguments": [ - "invoke-task", - "Codegen" - ] - }, - { - "name": "scala", - "arguments": [ - "invoke", - "sbt", - "workerPackage" - ] - } - ] - }, - { - "name": "Clean", - "steps": [ - { - "name": "Scala", - "arguments": [ - "invoke", - "sbt", - "clean" - ] - }, - { - "name": "Generated code", - "arguments": [ - "process_schema", - "clean", - "generated" - ] - } - ] - } - ] -} diff --git a/workers/unity/spatialos.unity.client.build.json b/workers/unity/spatialos.unity.client.build.json deleted file mode 100644 index c645be0..0000000 --- a/workers/unity/spatialos.unity.client.build.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "tasks": [ - { - "name": "Codegen", - "steps": [ - { - "name": "Dependencies", - "arguments": [ - "worker_package", - "unpack" - ] - }, - { - "name": "C# standard library", - "arguments": [ - "process_schema", - "generate", - "--cachePath=.spatialos/schema_codegen_cache_std", - "--output=.spatialos/generated/std", - "--language=csharp", - "--input=../../build/dependencies/schema/WorkerSdkSchema" - ] - }, - { - "name": "C#", - "arguments": [ - "process_schema", - "generate", - "--cachePath=.spatialos/schema_codegen_cache_usr", - "--output=.spatialos/generated/usr", - "--language=csharp", - "--input=../../schema", - "--repository=../../build/dependencies/schema" - ] - }, - { - "name": "Json AST standard library", - "arguments": [ - "process_schema", - "generate", - "--cachePath=.spatialos/schema_codegen_cache_json_std", - "--output=.spatialos/json/std", - "--language=ast_json", - "--input=../../build/dependencies/schema/WorkerSdkSchema" - ] - }, - { - "name": "Json AST", - "arguments": [ - "process_schema", - "generate", - "--cachePath=.spatialos/schema_codegen_cache_json_usr", - "--output=.spatialos/json/usr", - "--language=ast_json", - "--input=../../schema", - "--repository=../../build/dependencies/schema" - ] - }, - { - "name": "Unity Code Generation", - "description": "Generates Unity MonoBehaviours, readers and writers from the project schema.", - "arguments": [ - "invoke", - "unity-mono", - ".spatialos/bin/CodeGenerator.exe", - "--", - "--json-dir=.spatialos/json", - "--unity-component-output-dir=Assets/Improbable/Generated/Components", - "--unity-editor-component-output-dir=Assets/Improbable/Editor/Generated/Components", - "--reader-writer-output-dir=.spatialos/generated/readers_writers" - ] - }, - { - "name": "Compile generated scripts", - "description": "Compiles the generated code into a single DLL for Unity to consume. Assumes the location of dependencies based on their location in the spatialos_worker_packages.json", - "arguments": [ - "invoke", - "unity-csharp-compiler", - "--", - "-lib:Assets/Improbable/Sdk/Dll", - "-reference:protobuf-net.dll,Improbable.WorkerSdkCsharp.dll,Improbable.WorkerSdkCsharp.Framework.dll", - "-target:library", - "-debug", - "-unsafe", - "-nowarn:1591", - "-recurse:.spatialos/generated/*.cs", - "-out:Assets/Improbable/Sdk/Dll/Generated.Code.dll", - "-doc:Assets/Improbable/Sdk/Dll/Generated.Code.xml" - ] - } - ] - }, - { - "name": "Build", - "steps": [ - { - "name": "Codegen", - "arguments": [ - "invoke-task", - "Codegen" - ] - }, - { - "name": "UnityClient workers", - "arguments": [ - "invoke", - "unity", - "Improbable.Unity.EditorTools.Build.SimpleBuildSystem.Build", - "+buildWorkerTypes", - "UnityClient" - ] - } - ] - }, - { - "name": "Clean", - "steps": [ - { - "name": "All Unity clients and prefabs", - "arguments": [ - "invoke", - "unity", - "Improbable.Unity.EditorTools.Build.SimpleBuildSystem.Clean", - "--allow_fail" - ] - }, - { - "name": "Dependencies", - "arguments": [ - "worker_package", - "clean" - ] - }, - { - "name": "Generated C# code", - "arguments": [ - "process_schema", - "clean", - ".spatialos", - "Assets/Improbable/Sdk/Dll/Generated.Code.dll" - ] - } - ] - } - ] -} diff --git a/workers/unity/spatialos.unity.worker.build.json b/workers/unity/spatialos.unity.worker.build.json deleted file mode 100644 index 892d88c..0000000 --- a/workers/unity/spatialos.unity.worker.build.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "tasks": [ - { - "name": "Codegen", - "steps": [ - { - "name": "Dependencies", - "arguments": [ - "worker_package", - "unpack" - ] - }, - { - "name": "C# standard library", - "arguments": [ - "process_schema", - "generate", - "--cachePath=.spatialos/schema_codegen_cache_std", - "--output=.spatialos/generated/std", - "--language=csharp", - "--input=../../build/dependencies/schema/WorkerSdkSchema" - ] - }, - { - "name": "C#", - "arguments": [ - "process_schema", - "generate", - "--cachePath=.spatialos/schema_codegen_cache_usr", - "--output=.spatialos/generated/usr", - "--language=csharp", - "--input=../../schema", - "--repository=../../build/dependencies/schema" - ] - }, - { - "name": "Json AST standard library", - "arguments": [ - "process_schema", - "generate", - "--cachePath=.spatialos/schema_codegen_cache_json_std", - "--output=.spatialos/json/std", - "--language=ast_json", - "--input=../../build/dependencies/schema/WorkerSdkSchema" - ] - }, - { - "name": "Json AST", - "arguments": [ - "process_schema", - "generate", - "--cachePath=.spatialos/schema_codegen_cache_json_usr", - "--output=.spatialos/json/usr", - "--language=ast_json", - "--input=../../schema", - "--repository=../../build/dependencies/schema" - ] - }, - { - "name": "Unity Code Generation", - "description": "Generates Unity MonoBehaviours, readers and writers from the project schema.", - "arguments": [ - "invoke", - "unity-mono", - ".spatialos/bin/CodeGenerator.exe", - "--", - "--json-dir=.spatialos/json", - "--unity-component-output-dir=Assets/Improbable/Generated/Components", - "--unity-editor-component-output-dir=Assets/Improbable/Editor/Generated/Components", - "--reader-writer-output-dir=.spatialos/generated/readers_writers" - ] - }, - { - "name": "Compile generated scripts", - "description": "Compiles the generated code into a single DLL for Unity to consume. Assumes the location of dependencies based on their location in the spatialos_worker_packages.json", - "arguments": [ - "invoke", - "unity-csharp-compiler", - "--", - "-lib:Assets/Improbable/Sdk/Dll", - "-reference:protobuf-net.dll,Improbable.WorkerSdkCsharp.dll,Improbable.WorkerSdkCsharp.Framework.dll", - "-target:library", - "-debug", - "-unsafe", - "-nowarn:1591", - "-recurse:.spatialos/generated/*.cs", - "-out:Assets/Improbable/Sdk/Dll/Generated.Code.dll", - "-doc:Assets/Improbable/Sdk/Dll/Generated.Code.xml" - ] - } - ] - }, - { - "name": "Build", - "steps": [ - { - "name": "Codegen", - "arguments": [ - "invoke-task", - "Codegen" - ] - }, - { - "name": "UnityWorker workers", - "arguments": [ - "invoke", - "unity", - "Improbable.Unity.EditorTools.Build.SimpleBuildSystem.Build", - "+buildWorkerTypes", - "UnityWorker" - ] - } - ] - }, - { - "name": "Clean", - "steps": [ - { - "name": "All Unity workers and prefabs", - "arguments": [ - "invoke", - "unity", - "Improbable.Unity.EditorTools.Build.SimpleBuildSystem.Clean", - "--allow_fail" - ] - }, - { - "name": "Dependencies", - "arguments": [ - "worker_package", - "clean" - ] - }, - { - "name": "Generated C# code", - "arguments": [ - "process_schema", - "clean", - ".spatialos", - "Assets/Improbable/Sdk/Dll/Generated.Code.dll" - ] - } - ] - } - ] -}