Page MenuHomeWildfire Games

Cleanup of NASM
ClosedPublic

Authored by Itms on Jan 26 2017, 1:14 AM.

Details

Summary

NASM has been unused for ages (rP9891) and we still have legacy code lines in our premake scripts. We also carry an unused binary for Windows.

Test Plan

Check there are no side effects on premake.

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

Itms created this revision.Jan 26 2017, 1:14 AM
Itms added a child revision: D72: Migrate to premake5.
leper requested changes to this revision.Jan 26 2017, 1:53 AM

There are still remnants of the nasm support left in the following files (added in r9829, and possibly untouched during the premake updates (apart from creating a diff of the customizations and applying that on top of the new code)):
build/premake/premake4/src/actions/vstudio/vs2010_vcxproxj.lua
build/premake/premake4/src/actions/make/make_cpp.lua
build/premake/premake4/src/actions/vstudio/_vstudio.lua
build/premake/premake4/src/base/api.lua
Afterwards you should regenerate the following file:
build/premake/premake4/src/host/scripts.c

Apart from that it does build fine (which is what everyone would suspect given that we don't use it anywhere).

This revision now requires changes to proceed.Jan 26 2017, 1:53 AM
Vulcan added a subscriber: Vulcan.Jan 26 2017, 3:27 AM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running debug tests...
Running cxxtest tests (302 tests)..............................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/250/ for more details.

Itms added a comment.Jan 26 2017, 9:30 PM
In D97#3300, @leper wrote:

There are still remnants of the nasm support left in the following files [...]

Ah yes I know, I thought it was not really useful to spend time un-patching premake4 since we will never make it match upstream but we will move to premake5 (not patched this time) instead.

I don't see any benefit in removing the functionality we added in premake4, it's not even a hack. Do you have strong feelings on the matter?

leper accepted this revision.Jan 28 2017, 1:22 AM

Do you have strong feelings on the matter?

It would seem to be more complete, but not really.

This revision is now accepted and ready to land.Jan 28 2017, 1:22 AM
This revision was automatically updated to reflect the committed changes.