Skip to content

Commit

Permalink
Update submodule, NuGet natives
Browse files Browse the repository at this point in the history
  • Loading branch information
PJB3005 committed Dec 13, 2020
1 parent 31b3982 commit 450e30f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 44 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
root = true
root = true
[*]

charset = utf-8-bom
charset = utf-8

# Indentation and spacing
indent_size = 4
Expand Down
2 changes: 0 additions & 2 deletions Content.Client/Content.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,4 @@
<DependentUpon>OptionsMenu.cs</DependentUpon>
</Compile>
</ItemGroup>
<Import Project="..\RobustToolbox\MSBuild\Robust.Engine.targets" />
<Target Name="ContentAfterBuild" DependsOnTargets="ClientAfterBuild" AfterTargets="Build" />
</Project>
2 changes: 0 additions & 2 deletions Content.IntegrationTests/Content.IntegrationTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,4 @@
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
<ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
</ItemGroup>
<Import Project="..\RobustToolbox\MSBuild\Robust.Engine.targets" />
<Target Name="ContentAfterBuild" DependsOnTargets="ClientAfterBuild" AfterTargets="Build" />
</Project>
2 changes: 1 addition & 1 deletion RobustToolbox
Submodule RobustToolbox updated 33 files
+2 −2 .editorconfig
+3 −0 .gitmodules
+0 −10 MSBuild/Robust.Engine.targets
+21 −1 Robust.Client/GameController.cs
+18 −0 Robust.Client/GameController/GameController.Loader.cs
+5 −4 Robust.Client/GameController/GameController.Standalone.cs
+3 −0 Robust.Client/Interfaces/ResourceManagement/IResourceCache.cs
+7 −0 Robust.Client/Interfaces/UserInterface/IUserInterfaceManager.cs
+55 −0 Robust.Client/ResourceManagement/ResourceCache.LoaderApi.cs
+9 −1 Robust.Client/ResourceManagement/ResourceCache.cs
+7 −5 Robust.Client/Robust.Client.csproj
+51 −2 Robust.Client/UserInterface/Control.cs
+15 −0 Robust.Client/UserInterface/Controls/LayoutContainer.cs
+325 −0 Robust.Client/UserInterface/Controls/MultiselectOptionButton.cs
+48 −25 Robust.Client/UserInterface/Controls/OptionButton.cs
+11 −1 Robust.Client/UserInterface/Controls/Popup.cs
+10 −0 Robust.Client/UserInterface/Controls/PopupContainer.cs
+43 −6 Robust.Client/UserInterface/UserInterfaceManager.cs
+1 −0 Robust.LoaderApi
+22 −3 Robust.Shared/ContentPack/AssemblyTypeChecker.cs
+3 −0 Robust.Shared/ContentPack/IModLoader.cs
+6 −0 Robust.Shared/ContentPack/ModLoader.cs
+7 −18 Robust.Shared/ContentPack/ResourceManager.cs
+3 −0 Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs
+3 −2 Robust.Shared/ProgramShared.cs
+1 −1 Robust.Shared/Reflection/ReflectionManager.cs
+44 −0 Robust.UnitTesting/Client/UserInterface/Controls/MultiselectOptionButtonTest.cs
+0 −1 Robust.UnitTesting/Robust.UnitTesting.csproj
+1 −0 Robust.UnitTesting/RobustIntegrationTest.NetManager.cs
+2 −0 Robust.UnitTesting/TestingModLoader.cs
+13 −0 RobustToolbox.sln
+0 −304 Tools/download_natives.py
+0 −3 Tools/package_client_build.py
7 changes: 7 additions & 0 deletions SpaceStation14.sln
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSerializer", "RobustTool
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Physics", "RobustToolbox\Robust.Physics\Robust.Physics.csproj", "{3BC34700-882F-426B-82BB-56D5708B5E0D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.LoaderApi", "RobustToolbox\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj", "{1FAE651D-29D8-437A-9864-47CE0D180016}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -147,6 +149,10 @@ Global
{3BC34700-882F-426B-82BB-56D5708B5E0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3BC34700-882F-426B-82BB-56D5708B5E0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3BC34700-882F-426B-82BB-56D5708B5E0D}.Release|Any CPU.Build.0 = Release|Any CPU
{1FAE651D-29D8-437A-9864-47CE0D180016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1FAE651D-29D8-437A-9864-47CE0D180016}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1FAE651D-29D8-437A-9864-47CE0D180016}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1FAE651D-29D8-437A-9864-47CE0D180016}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -165,6 +171,7 @@ Global
{DDD55F86-0406-42E5-8443-93EDC6BB2D75} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
{7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
{3BC34700-882F-426B-82BB-56D5708B5E0D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
{1FAE651D-29D8-437A-9864-47CE0D180016} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A}
Expand Down
37 changes: 0 additions & 37 deletions Tools/package_release_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,34 +59,6 @@ def __getattr__(self, name):
"Fonts",
}

WINDOWS_NATIVES = {
"freetype6.dll",
"openal32.dll",
"swnfd.dll",
"glfw3.dll",
"fluidsynth.dll",
"libglib-2.0-0.dll",
"libgobject-2.0-0.dll",
"libgthread-2.0-0.dll",
"libinstpatch-2.dll",
"libintl-8.dll",
"libsndfile-1.dll",
"libEGL.dll",
"libGLESv2.dll"
}

LINUX_NATIVES = {
"libglfw.so.3",
"libswnfd.so",
"libopenal.so.1"
}

MAC_NATIVES = {
"libglfw.3.dylib",
"libswnfd.dylib",
"libfreetype.6.dylib"
}

# Assembly names to copy from content.
# PDBs are included if available, .dll/.pdb appended automatically.
SERVER_CONTENT_ASSEMBLIES = [
Expand Down Expand Up @@ -191,7 +163,6 @@ def build_windows(skip_build: bool) -> None:
compression=zipfile.ZIP_DEFLATED)

copy_dir_into_zip(p("RobustToolbox", "bin", "Client", "win-x64", "publish"), "", client_zip)
copy_client_natives(WINDOWS_NATIVES, client_zip, "")
copy_resources("Resources", client_zip, server=False)
copy_content_assemblies(p("Resources", "Assemblies"), client_zip, server=False)
# Cool we're done.
Expand Down Expand Up @@ -231,7 +202,6 @@ def build_macos(skip_build: bool) -> None:
contents = p("Space Station 14.app", "Contents", "Resources")
copy_dir_into_zip(p("BuildFiles", "Mac", "Space Station 14.app"), "Space Station 14.app", client_zip)
copy_dir_into_zip(p("RobustToolbox", "bin", "Client", "osx-x64", "publish"), contents, client_zip)
copy_client_natives(MAC_NATIVES, client_zip, contents)
copy_resources(p(contents, "Resources"), client_zip, server=False)
copy_content_assemblies(p(contents, "Resources", "Assemblies"), client_zip, server=False)
client_zip.close()
Expand Down Expand Up @@ -272,7 +242,6 @@ def build_linux(skip_build: bool) -> None:

copy_dir_into_zip(p("RobustToolbox", "bin", "Client", "linux-x64", "publish"), "", client_zip)
copy_resources("Resources", client_zip, server=False)
copy_client_natives(LINUX_NATIVES, client_zip, "")
copy_content_assemblies(p("Resources", "Assemblies"), client_zip, server=False)
# Cool we're done.
client_zip.close()
Expand Down Expand Up @@ -446,11 +415,5 @@ def copy_dir_or_file(src: str, dst: str):
raise IOError("{} is neither file nor directory. Can't copy.".format(src))


def copy_client_natives(fileNames: List[str], zipf: zipfile.ZipFile, zipPath: str):
for fileName in fileNames:
zipf.write(p("RobustToolbox", "bin", "Client", fileName), p(zipPath, fileName))
print(f"writing native {fileName}")


if __name__ == '__main__':
main()

0 comments on commit 450e30f

Please sign in to comment.