Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unbreak bleed on FreeBSD (also backport to prep-1908) #17038

Merged
merged 2 commits into from Sep 12, 2019

Conversation

@jbeich
Copy link
Contributor

commented Sep 2, 2019

Closes #16361 (to avoid merge conflict)

Note, OpenRA/OpenAL-CS#3 and OpenRA/SDL2-CS#3 cannot be included until a new tag with those is created.

Makefile Outdated Show resolved Hide resolved
@pchote pchote added this to the Next Release milestone Sep 2, 2019
@pchote

This comment has been minimized.

Copy link
Member

commented Sep 2, 2019

Thanks! We definitely want this for the stable release too, so added to the milestone.
It will probably be a few days before I can look at the other PRs and test this in detail. Please ping me if I haven't followed up here by the weekend.

Adding the dependencies label so we don't forget to update the fetch-thirdparty-deps scripts before merging.

@pchote

This comment has been minimized.

Copy link
Member

commented Sep 7, 2019

OpenRA/OpenAL-CS#3 and OpenRA/SDL2-CS#3 have been merged. Can you please now update fetch-thirdparty-deps.sh and fetch-thirdparty-deps.ps1 to reference the 20190907 tags?

jbeich added 2 commits Sep 2, 2019
On FreeBSD build fails, so check if `msbuild` exists without arguments.

$ gmake
command: wrong number of arguments
OpenRA requires the 'msbuild -verbosity:m -nologo' tool provided by Mono >= 5.4.
gmake: *** [Makefile:154: core] Error 1

# FreeBSD sh
$ command -v echo ls
command: wrong number of arguments

# dash
$ command -v echo ls
echo

# ksh, bash, zsh
$ command -v echo ls
echo
/bin/ls
- Drop `os` in Eluant config as it's only used on Linux
- Make generic to help BSDs and Solaris
- Update OpenAL-CS and SDL2-CS to get the same

Exception of type `System.DllNotFoundException`: lua51.dll
TypeName=``
  at (wrapper managed-to-native) Eluant.LuaApi.lua_newstate(Eluant.LuaRuntime/LuaAllocator,intptr)
  at Eluant.LuaRuntime..ctor ()
  at Eluant.MemoryConstrainedLuaRuntime..ctor ()
  at OpenRA.Scripting.ScriptContext..ctor (OpenRA.World world, OpenRA.Graphics.WorldRenderer worldRenderer, System.Collections.Generic.IEnumerable`1[T] scripts)
  at OpenRA.Mods.Common.Scripting.LuaScript.OpenRA.Traits.IWorldLoaded.WorldLoaded (OpenRA.World world, OpenRA.Graphics.WorldRenderer worldRenderer)
  at OpenRA.World.LoadComplete (OpenRA.Graphics.WorldRenderer wr)
  at OpenRA.Game.StartGame (System.String mapUID, OpenRA.WorldType type)
  at OpenRA.Game.LoadShellMap ()
  at OpenRA.Mods.Common.LoadScreens.BlankLoadScreen.StartGame (OpenRA.Arguments args)
  at OpenRA.Game.InitializeMod (System.String mod, OpenRA.Arguments args)
  at OpenRA.Game.Initialize (OpenRA.Arguments args)
  at OpenRA.Game.InitializeAndRun (System.String[] args)
  at OpenRA.Program.Main (System.String[] args)
@jbeich

This comment has been minimized.

Copy link
Contributor Author

commented Sep 7, 2019

Done. I've squashed the update into the commit touching dllmap in OpenRA repo to make dllmap change atomic.

$ gmake

$ fgrep linux **/*.config
<empty as intended>

$ diff <(fgrep -l dllmap **/*.config) <(fgrep -l openbsd **/*.config)
--- /tmp/zshiT61H7
+++ /tmp/zsh8PEoPD
@@ -1,4 +1,3 @@
-Eluant.dll.config
 OpenAL-CS.dll.config
 OpenRA.Platforms.Default.dll.config
 OpenRA.Platforms.Default/OpenRA.Platforms.Default.dll.config

$ mono --debug OpenRA.Game.exe Game.Mod=ra
<works fine>
@pchote
pchote approved these changes Sep 7, 2019
Copy link
Member

left a comment

LGTM 👍

Tested a clean recompile and run on macOS, Ubuntu 18.04, Windows 10 without issue.

@pchote pchote added the PR: Needs +2 label Sep 7, 2019
@abcdefg30 abcdefg30 merged commit 4f99982 into OpenRA:bleed Sep 12, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@abcdefg30

This comment has been minimized.

Copy link
Member

commented Sep 12, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.