Stabilize vs and vsxmake project generation #2959 #2971
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mode isn't sorted/stable. |
|
I know, it still in progress |
try it again |
|
Modes still aren't stable. -- get target ordered rules
function _instance:orderules()
local rules = self._RULES
local orderules = self._ORDERULES
if orderules == nil and rules then
orderules = {}
local rulerefs = {}
for _, r in pairs(rules) do
instance_deps.sort_deps(rules, orderules, rulerefs, r)
end
self._ORDERULES = orderules
end
return orderules
end=> for _, r in table.orderpairs(rules) dowith this change applied I still however get an unstable generation on run envs: it seems pkgs:orderkeys() doesn't work well, I added a log in core/project/target.lua (on ligne 983 in target:pkgsenvs) for _, dep in ipairs(self:orderdeps()) do
print("dep: " .. dep:name())
for _, pkgname in ipairs(table.wrap(dep:get("packages", {interface = true}))) do
local pkg = dep:pkg(pkgname)
if pkg then
pkgs:insert(pkg)
end
end
end
for _, pkg in pkgs:orderkeys() do
print("pkg:name() = " .. pkg:name())and I get this: to my understanding this is because function hashset_impl:orderkeys()
local orderkeys = table.keys(self._DATA)
table.sort(orderkeys, function (a, b)
if a == hashset._NIL then
a = math.inf
end
if b == hashset._NIL then
b = math.inf
end
if type(a) == "table" then
a = tostring(a)
end
if type(b) == "table" then
b = tostring(b)
end
print(a, b)
return a < b
end)sorts two maybe it could take a functor by parameter on how to sort them function hashset_impl:orderkeys(sort)
local orderkeys = table.keys(self._DATA)
table.sort(orderkeys, sort or function (a, b)for _, pkg in pkgs:orderkeys(function (a, b) return a:name() < b:name() end) door maybe using target metatable and __lt metamethod |
|
try it again. |
|
I tested vsxmake multiple times and it seems to be stable now. However vs generator isn't: looks like a few |
done, try it again. |
|
looks good for .sln, however .vcxproj file list isn't stable, adding for sourcefile, sourceinfo in table.orderpairs(sourceinfos) doin function _make_source_files(vcxprojfile, vsinfo, target)(vs201x_vcxproj.lua) with this, it seems good and ready to be merged 👍 |
|
I have improved it, try it again? |
|
seems stable now, thanks 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#2959