Page MenuHomeWildfire Games
Differential D3912

Replace ScriptInterface::Call* with new ScriptFunction functions
ClosedPublic
Actions

Authored by wraitii on May 1 2021, 10:03 AM.

Details

Reviewers
None
Commits
rP25354: Replace ScriptInterface::Call* with new ScriptFunction functions
Summary

Finishes work started in rP24969.
This removes the boost-supported function wrappers entirely, in favour of pure-templated code in FunctionWrapper.h
The Call* functions were already heavily templated, so there is nothing really new here. I just use tag dispatch to reduce the number of overloads slightly.

The new functions do not need the script interface, only the script request.

Test Plan

Compile on all platforms. Run a game

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

wraitii created this revision.May 1 2021, 10:03 AM
Vulcan added a comment.May 1 2021, 10:09 AM

Build failure - The Moirai have given mortals hearts that can endure.

Debug: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

     8>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\network\NetMessageSim.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\Simulation2.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpAIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpAIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\ps\Game.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\engine.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\ps\GameSetup\GameSetup.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\engine.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\ps\GameSetup\HWDetect.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\engine.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpCommandQueue.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpFogging.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpGarrisonHolder.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpPlayerManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\gui\GUIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpTerritoryDecayManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpTurretHolder.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpUnitMotion.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\simulation2\helpers\render.cpp(115): warning C4701: potentially uninitialized local variable 'cy' used [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\scripting\ScriptComponent.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\BinarySerializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\HashSerializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\StdDeserializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\StdDeserializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\StdSerializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\system\ComponentManagerSerialization.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
     4>MSVCRTD.lib(initializers.obj) : warning LNK4098: defaultlib 'msvcrt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\pyrogenesis.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptconversions.h(64): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptConversions.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptconversions.h(47): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptConversions.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptconversions.h(89): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptConversions.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptconversions.h(94): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptConversions.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptinterface.h(78): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptInterface.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptinterface.h(100): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptInterface.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptinterface.h(157): error C2039: 'CallFunctionVoid': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptInterface.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptinterface.h(160): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptInterface.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptinterface.h(166): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptInterface.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptinterface.h(191): error C2039: 'CallFunctionVoid': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptInterface.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptinterface.h(194): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptInterface.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\tests\test_scriptinterface.h(200): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptInterface.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\simulation2\tests\test_serializer.h(336): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\simulation2\tests\test_Serializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\simulation2\tests\test_serializer.h(870): error C2039: 'CallFunction': is not a member of 'ScriptInterface' (compiling source file ..\..\..\source\simulation2\tests\test_Serializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/5190/display/redirect

Vulcan added a comment.May 1 2021, 10:13 AM

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
make[1]: *** No rule to make target `/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../source/scriptinterface/NativeWrapperDefns.h', needed by `obj/network_Debug/NetClient.o'.  Stop.
make[1]: *** Waiting for unfinished jobs....
make: *** [network] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/4097/display/redirect

Vulcan added a comment.May 1 2021, 10:47 AM

Build was aborted.

builderr-debug-gcc7.txt
make[1]: *** [test.make:602: obj/test_Debug/test_vfs_real_path.o] Terminated
make: *** [Makefile:197: test] Terminated

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/5806/display/redirect

Harbormaster completed remote builds in B16979: Diff 17304.May 1 2021, 10:47 AM
wraitii requested review of this revision.May 1 2021, 10:47 AM
wraitii updated this revision to Diff 17306.May 1 2021, 10:51 AM

Forgetting about the tests is a lifestyle 8)

Vulcan added a comment.May 1 2021, 10:52 AM

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
make[1]: *** No rule to make target `/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../source/scriptinterface/NativeWrapperDefns.h', needed by `obj/network_Debug/NetClient.o'.  Stop.
make[1]: *** Waiting for unfinished jobs....
make: *** [network] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/4099/display/redirect

Vulcan added a comment.May 1 2021, 11:13 AM

Successful build - Chance fights ever on the side of the prudent.

Debug: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\Simulation2.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpAIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpAIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
     7>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\network\NetMessageSim.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpCommandQueue.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\ps\Game.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\engine.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\ps\GameSetup\GameSetup.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\engine.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\ps\GameSetup\HWDetect.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\engine.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpFogging.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpGarrisonHolder.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpPlayerManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpTerritoryDecayManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpTurretHolder.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpUnitMotion.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\scripting\ScriptComponent.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\BinarySerializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\gui\GUIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\StdDeserializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\StdDeserializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\system\ComponentManagerSerialization.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
     4>MSVCRTD.lib(initializers.obj) : warning LNK4098: defaultlib 'msvcrt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\pyrogenesis.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptInterface.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>MSVCRTD.lib(initializers.obj) : warning LNK4098: defaultlib 'msvcrt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
Release: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\Simulation2.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpAIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpCommandQueue.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\ps\Game.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\engine.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\ps\GameSetup\HWDetect.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\engine.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\ps\GameSetup\GameSetup.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\engine.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpFogging.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpGarrisonHolder.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpPlayerManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    15>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\gui\GUIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpTerritoryDecayManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpTurretHolder.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\ICmpUnitMotion.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\scripting\ScriptComponent.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\StdDeserializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\maths\fixed.h(158): warning C4724: potential mod by 0 [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\scriptinterface\functionwrapper.h(238): warning C4100: 'ret': unreferenced formal parameter (compiling source file ..\..\..\source\scriptinterface\tests\test_ScriptInterface.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/5192/display/redirect

Vulcan added a comment.May 1 2021, 11:45 AM

Successful build - Chance fights ever on the side of the prudent.

builderr-release-gcc7.txt
In file included from ../../../source/pch/atlas/precompiled.h:26:
../../../source/tools/atlas/GameInterface/Messages.h: In function 'void AtlasMessage::fGetTerrainGroupPreviews(AtlasMessage::qGetTerrainGroupPreviews*)':
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]
 struct sTerrainTexturePreview
        ^~~~~~~~~~~~~~~~~~~~~~
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]
 struct sTerrainTexturePreview
        ^~~~~~~~~~~~~~~~~~~~~~
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/5808/display/redirect

Harbormaster completed remote builds in B16981: Diff 17306.May 1 2021, 11:45 AM
wraitii updated this revision to Diff 17315.May 1 2021, 2:35 PM

Fix VS. The mac errs are spurious, merging when green elsewhere.

Vulcan added a comment.May 1 2021, 2:55 PM

Successful build - Chance fights ever on the side of the prudent.

Debug: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpAIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
     9>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\network\NetMessageSim.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\BinarySerializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\StdDeserializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\system\ComponentManagerSerialization.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
     4>MSVCRTD.lib(initializers.obj) : warning LNK4098: defaultlib 'msvcrt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\pyrogenesis.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>MSVCRTD.lib(initializers.obj) : warning LNK4098: defaultlib 'msvcrt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
Release: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

    22>e:\jenkins\workspace\vs2015-differential\source\maths\fixed.h(158): warning C4724: potential mod by 0 [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/5199/display/redirect

Vulcan added a comment.May 1 2021, 3:09 PM

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
make[1]: *** No rule to make target `/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../source/scriptinterface/NativeWrapperDefns.h', needed by `obj/network_Debug/NetClient.o'.  Stop.
make[1]: *** Waiting for unfinished jobs....
make: *** [network] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/4106/display/redirect

Vulcan added a comment.May 1 2021, 3:28 PM

Successful build - Chance fights ever on the side of the prudent.

builderr-release-gcc7.txt
In file included from ../../../source/pch/atlas/precompiled.h:26:
../../../source/tools/atlas/GameInterface/Messages.h: In function 'void AtlasMessage::fGetTerrainGroupPreviews(AtlasMessage::qGetTerrainGroupPreviews*)':
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]
 struct sTerrainTexturePreview
        ^~~~~~~~~~~~~~~~~~~~~~
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]
 struct sTerrainTexturePreview
        ^~~~~~~~~~~~~~~~~~~~~~
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]
../../../source/tools/atlas/GameInterface/Messages.h:315:8: warning: '#'target_mem_ref' not supported by dump_expr#<expression error>' may be used uninitialized in this function [-Wmaybe-uninitialized]

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/5815/display/redirect

Harbormaster completed remote builds in B16991: Diff 17315.May 1 2021, 3:29 PM
This revision was not accepted when it landed; it landed in state Needs Review.May 1 2021, 4:04 PM
This revision was landed with ongoing or failed builds.
Closed by commit rP25354: Replace ScriptInterface::Call* with new ScriptFunction functions (authored by wraitii). · Explain Why
This revision was automatically updated to reflect the committed changes.
wraitii added a commit: rP25354: Replace ScriptInterface::Call* with new ScriptFunction functions.

Revision Contents
Changeset List

PathSize
ps/
trunk/
source/
gui/
11 lines
ps/
3 lines
GameSetup/
3 lines
2 lines
scriptinterface/
93 lines
102 lines
235 lines
33 lines
22 lines
tests/
9 lines
27 lines
simulation2/
9 lines
components/
15 lines
7 lines
scripting/
10 lines
11 lines
serialization/
3 lines
5 lines
5 lines
tests/
5 lines

Diff 17319

View Options

ps/trunk/source/gui/GUIManager.cpp

Loading...
View Options

ps/trunk/source/ps/Game.cpp

Loading...
View Options

ps/trunk/source/ps/GameSetup/GameSetup.cpp

Loading...
View Options

ps/trunk/source/ps/GameSetup/HWDetect.cpp

Loading...
View Options

ps/trunk/source/scriptinterface/FunctionWrapper.h

Loading...
View Options

ps/trunk/source/scriptinterface/NativeWrapperDecls.h

Loading...
View Options

ps/trunk/source/scriptinterface/NativeWrapperDefns.h

Loading...
View Options

ps/trunk/source/scriptinterface/ScriptInterface.h

Loading...
View Options

ps/trunk/source/scriptinterface/ScriptInterface.cpp

Loading...
View Options

ps/trunk/source/scriptinterface/tests/test_ScriptConversions.h

Loading...
View Options

ps/trunk/source/scriptinterface/tests/test_ScriptInterface.h

Loading...
View Options

ps/trunk/source/simulation2/Simulation2.cpp

Loading...
View Options

ps/trunk/source/simulation2/components/CCmpAIManager.cpp

Loading...
View Options

ps/trunk/source/simulation2/components/CCmpCommandQueue.cpp

Loading...
View Options

ps/trunk/source/simulation2/scripting/ScriptComponent.h

Loading...
View Options

ps/trunk/source/simulation2/scripting/ScriptComponent.cpp

Loading...
View Options

ps/trunk/source/simulation2/serialization/BinarySerializer.cpp

Loading...
View Options

ps/trunk/source/simulation2/serialization/DebugSerializer.cpp

Loading...
View Options

ps/trunk/source/simulation2/serialization/StdDeserializer.cpp

Loading...
View Options

ps/trunk/source/simulation2/tests/test_Serializer.h

Loading...
Wildfire Games · Phabricator