Differential D3168

[SM78] API changes
ClosedPublic
Actions

Authored by wraitii on Nov 30 2020, 11:09 AM.

Tags

None

Subscribers

Restricted Owners Package

Details

Reviewers: None
Commits: rP24333: [SM78 2/2] Update to Spidermonkey 78 APIs
Trac Tickets: #5861

Summary

API changes for SM78.

See https://github.com/wraitii/0ad/tree/sm78

Need to clean this up.

Test Plan

Compile.

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.Nov 30 2020, 11:09 AM

wraitii added a parent revision: D3167: [SM78] build system changes.

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

builderr-debug-macos.txt
In file included from ../../../source/network/NetClientTurnManager.cpp:20:
In file included from ../../../source/network/NetClientTurnManager.h:21:
In file included from ../../../source/simulation2/system/TurnManager.h:22:
In file included from ../../../source/simulation2/helpers/SimulationCommand.h:21:
../../../source/scriptinterface/ScriptTypes.h:62:10: fatal error: In file included from ../../../source/network/NetHost.cpp:23:
'jspubtd.h' file not found
In file included from #include "jspubtd.h"
../../../source/network/NetMessage.h:         ^~~~~~~~~~~
26:
In file included from ../../../source/network/NetMessages.h:27:
../../../source/scriptinterface/ScriptTypes.h:62:10: fatal error: 'jspubtd.h' file not found
#include "jspubtd.h"
         ^~~~~~~~~~~
In file included from ../../../source/network/NetFileTransfer.cpp:23:
In file included from ../../../source/network/NetMessage.h:26:
In file included from ../../../source/network/NetMessages.h:27:
../../../source/scriptinterface/ScriptTypes.h:62:10: fatal error: 'jspubtd.h' file not found
#include "jspubtd.h"
         ^~~~~~~~~~~
In file included from ../../../source/network/NetClient.cpp:20:
In file included from ../../../source/network/NetClient.h:24:
In file included from ../../../source/scriptinterface/ScriptInterface.h:25:
../../../source/scriptinterface/ScriptTypes.h:62:10: fatal error: 'jspubtd.h' file not found
#include "jspubtd.h"
         ^~~~~~~~~~~
1 error generated.
1 error generated.
make[1]: *** [obj/network_Debug/NetFileTransfer.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make[1]: *** [obj/network_Debug/NetHost.o] Error 1
1 error generated.
make[1]: *** [obj/network_Debug/NetClientTurnManager.o] Error 1
1 error generated.
make[1]: *** [obj/network_Debug/NetClient.o] Error 1
make: *** [network] Error 2

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

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

builderr-debug-gcc7.txt
In file included from ../../../source/scriptinterface/ScriptContext.h:22,
                 from ../../../source/network/NetServer.cpp:35:
../../../source/scriptinterface/ScriptExtraHeaders.h:64:10: fatal error: js/Array.h: No such file or directory
 #include "js/Array.h"
          ^~~~~~~~~~~~
compilation terminated.
make[1]: *** [network.make:163: obj/network_Debug/NetServer.o] Error 1
make: *** [Makefile:77: network] Error 2

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

Update to HEAD

Owners added a subscriber: Restricted Owners Package.Dec 4 2020, 9:14 AM

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

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

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

builderr-debug-gcc7.txt
In file included from ../../../source/scriptinterface/ScriptContext.h:22,
                 from ../../../source/network/NetServer.cpp:35:
../../../source/scriptinterface/ScriptExtraHeaders.h:64:10: fatal error: js/Array.h: No such file or directory
 #include "js/Array.h"
          ^~~~~~~~~~~~
compilation terminated.
make[1]: *** [network.make:163: obj/network_Debug/NetServer.o] Error 1
make: *** [Makefile:77: network] Error 2

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

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

builderr-debug-macos.txt
In file included from ../../../source/network/NetServer.cpp:35:
In file included from ../../../source/scriptinterface/ScriptContext.h:22:
../../../source/scriptinterface/ScriptExtraHeaders.h:64:10: fatal error: 'js/Array.h' file not found
#include "js/Array.h"
         ^~~~~~~~~~~~
1 error generated.
make[1]: *** [obj/network_Debug/NetServer.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [network] Error 2

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

Harbormaster completed remote builds in B14130: Diff 14381.Dec 4 2020, 10:32 AM

wraitii requested review of this revision.Dec 4 2020, 10:32 AM

Stan added a subscriber: Stan.Dec 4 2020, 10:42 AM

Stan added inline comments.

source/gui/Scripting/JSInterface_GUIProxy_impl.h
180 ↗	(On Diff #14381)	Can we reduce the duplication between set and delete somehow?
source/ps/scripting/JSInterface_VFS.cpp
27 ↗	(On Diff #14381)	Wrong order;
source/scriptinterface/ScriptExtraHeaders.h
64 ↗	(On Diff #14381)	Order is a bit weird

Compiles, runs.
Tried:

Local MP with PetraAI. (Rejoining.)
Tests.
Loading a map in Atlas.

This revision was not accepted when it landed; it landed in state Needs Review.Dec 6 2020, 3:03 PM

This revision was landed with ongoing or failed builds.

Closed by commit rP24333: [SM78 2/2] Update to Spidermonkey 78 APIs (authored by wraitii). · Explain Why

This revision was automatically updated to reflect the committed changes.

wraitii added a commit: rP24333: [SM78 2/2] Update to Spidermonkey 78 APIs.

Revision Contents
Changeset List

Path

Size

ps/

trunk/

source/

graphics/

MapGenerator.cpp

2 lines

gui/

4 lines

ObjectTypes/

CHotkeyPicker.cpp

2 lines

Scripting/

JSInterface_GUIManager.cpp

4 lines

JSInterface_GUIProxy.h

2 lines

JSInterface_GUIProxy_impl.h

28 lines

tests/

test_GuiManager.h

2 lines

lobby/

4 lines

network/

scripting/

JSInterface_Network.cpp

2 lines

ps/

4 lines

VisualReplay.cpp

13 lines

scripting/

JSInterface_Game.cpp

2 lines

JSInterface_SavedGame.cpp

6 lines

JSInterface_VFS.cpp

3 lines

scriptinterface/

ScriptContext.cpp

14 lines

ScriptConversions.h

6 lines

ScriptExceptions.cpp

2 lines

ScriptExtraHeaders.h

7 lines

ScriptInterface.h

4 lines

ScriptInterface.cpp

20 lines

ScriptStats.cpp

8 lines

tests/

test_ScriptInterface.h

6 lines

simulation2/

Simulation2.cpp

5 lines

components/

CCmpAIManager.cpp

12 lines

ICmpAIManager.cpp

5 lines

scripting/

EngineScriptConversions.cpp

8 lines

JSInterface_Simulation.cpp

6 lines

serialization/

BinarySerializer.cpp

6 lines

StdDeserializer.cpp

2 lines

system/

TurnManager.cpp

2 lines

Diff 14422

ps/trunk/source/graphics/MapGenerator.cpp

Loading...

ps/trunk/source/gui/GUIManager.cpp

Loading...

ps/trunk/source/gui/ObjectTypes/CHotkeyPicker.cpp

Loading...

ps/trunk/source/gui/Scripting/JSInterface_GUIManager.cpp

Loading...

ps/trunk/source/gui/Scripting/JSInterface_GUIProxy.h

Loading...

ps/trunk/source/gui/Scripting/JSInterface_GUIProxy_impl.h

Loading...

ps/trunk/source/gui/tests/test_GuiManager.h

Loading...

ps/trunk/source/lobby/XmppClient.cpp

Loading...

ps/trunk/source/network/scripting/JSInterface_Network.cpp

Loading...

ps/trunk/source/ps/ModIo.cpp

Loading...

ps/trunk/source/ps/VisualReplay.cpp

Loading...

ps/trunk/source/ps/scripting/JSInterface_Game.cpp

Loading...

ps/trunk/source/ps/scripting/JSInterface_SavedGame.cpp

Loading...

ps/trunk/source/ps/scripting/JSInterface_VFS.cpp

Loading...

ps/trunk/source/scriptinterface/ScriptContext.cpp

Loading...

ps/trunk/source/scriptinterface/ScriptConversions.h

Loading...

ps/trunk/source/scriptinterface/ScriptExceptions.cpp

Loading...

ps/trunk/source/scriptinterface/ScriptExtraHeaders.h

Loading...

ps/trunk/source/scriptinterface/ScriptInterface.h

Loading...

ps/trunk/source/scriptinterface/ScriptInterface.cpp

Loading...

ps/trunk/source/scriptinterface/ScriptStats.cpp

Loading...

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

Loading...

ps/trunk/source/simulation2/Simulation2.cpp

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

ps/trunk/source/simulation2/system/TurnManager.cpp

Loading...