AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1253 from ratzlaff/xcode_newid_determinism

Browse Source 
Xcode newid determinism
This commit is contained in:
Samuel Surtees 2019-03-17 23:07:51 +10:00 committed by GitHub
commit 8ea5bafee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 334 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
modules/xcode/tests/test_xcode4_project.lua
View File

@ -10,35 +10,6 @@
local xcode = p.modules.xcode local xcode = p.modules.xcode
--
-- Replacement for xcode.newid(). Creates a synthetic ID based on the node name,
-- its intended usage (file ID, build ID, etc.) and its place in the tree. This
-- makes it easier to tell if the right ID is being used in the right places.
--
xcode.used_ids = {}
local old_idfn = xcode.newid
xcode.newid = function(node, usage)
local name = node
if usage then
name = name .. ":" .. usage
end
if xcode.used_ids[name] then
local count = xcode.used_ids[name] + 1
xcode.used_ids[name] = count
name = name .. "(" .. count .. ")"
else
xcode.used_ids[name] = 1
end
return "[" .. name .. "]"
end
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- Setup/Teardown -- Setup/Teardown
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
@ -53,7 +24,6 @@
_TARGET_OS = "macosx" _TARGET_OS = "macosx"
p.action.set('xcode4') p.action.set('xcode4')
io.eol = "\n" io.eol = "\n"
xcode.used_ids = { } -- reset the list of generated IDs
wks = test.createWorkspace() wks = test.createWorkspace()
end end
@ -69,15 +39,15 @@
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
local function print_id(...) local function print_id(...)
_p("%s - %s", xcode.newid(...), old_idfn(...)) _p("%s", xcode.newid(...))
end end
function suite.IDGeneratorIsDeterministic() function suite.IDGeneratorIsDeterministic()
print_id("project", "Debug") print_id("project", "Debug")
print_id("project", "Release") print_id("project", "Release")
test.capture [[ test.capture [[
[project:Debug] - B266956655B21E987082EBA6 B266956655B21E987082EBA6
[project:Release] - DAC961207F1BFED291544760 DAC961207F1BFED291544760
]] ]]
end end
@ -85,8 +55,8 @@
print_id("project", "Debug", "file") print_id("project", "Debug", "file")
print_id("project", "Debug", "hello") print_id("project", "Debug", "hello")
test.capture [[ test.capture [[
[project:Debug] - 47C6E72E5ED982604EF57D6E 47C6E72E5ED982604EF57D6E
[project:Debug(2)] - 8DCA12C2873014347ACB7102 8DCA12C2873014347ACB7102
]] ]]
end end
@ -95,9 +65,9 @@
print_id("project", "Release", "file") print_id("project", "Release", "file")
print_id("project", "Release", "file") print_id("project", "Release", "file")
test.capture [[ test.capture [[
[project:Release] - 022ECCE82854FC9A8F5BF328 022ECCE82854FC9A8F5BF328
[project:Release(2)] - 022ECCE82854FC9A8F5BF328 022ECCE82854FC9A8F5BF328
[project:Release(3)] - 022ECCE82854FC9A8F5BF328 022ECCE82854FC9A8F5BF328
]] ]]
end end
@ -105,8 +75,8 @@
print_id("a", "b", "c", "d", "e", "f") print_id("a", "b", "c", "d", "e", "f")
print_id("abcdef") print_id("abcdef")
test.capture [[ test.capture [[
[a:b] - 63AEF3DD89D5238FF0DC1A1D 63AEF3DD89D5238FF0DC1A1D
[abcdef] - 9F1AF6957CC5F947506A7CD5 9F1AF6957CC5F947506A7CD5
]] ]]
end end
@ -119,7 +89,7 @@
prepare() prepare()
xcode.XCBuildConfiguration_Project(tr, tr.configs[1]) xcode.XCBuildConfiguration_Project(tr, tr.configs[1])
test.capture [[ test.capture [[
[MyProject:Debug(2)] /* Debug */ = { A14350AC4595EE5E57CE36EC /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";

95
modules/xcode/tests/test_xcode_dependencies.lua
View File

@ -25,7 +25,6 @@
function suite.setup() function suite.setup()
_TARGET_OS = "macosx" _TARGET_OS = "macosx"
p.action.set('xcode4') p.action.set('xcode4')
xcode.used_ids = { } -- reset the list of generated IDs
wks, prj = test.createWorkspace() wks, prj = test.createWorkspace()
links { "MyProject2" } links { "MyProject2" }
@ -54,7 +53,7 @@
xcode.PBXBuildFile(tr) xcode.PBXBuildFile(tr)
test.capture [[ test.capture [[
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
[libMyProject2-d.a:build] /* libMyProject2-d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = [libMyProject2-d.a] /* libMyProject2-d.a */; }; 5931FBCA4D31453CD21C5A0A /* libMyProject2-d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CCB6C53210CA9664049C1B72 /* libMyProject2-d.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
]] ]]
end end
@ -65,7 +64,7 @@
xcode.PBXBuildFile(tr) xcode.PBXBuildFile(tr)
test.capture [[ test.capture [[
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
[libMyProject2-d.dylib:build] /* libMyProject2-d.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = [libMyProject2-d.dylib] /* libMyProject2-d.dylib */; }; 1BC538B0FA67D422AF49D6F0 /* libMyProject2-d.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107168B810144BEA4A68FEF8 /* libMyProject2-d.dylib */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
]] ]]
end end
@ -80,18 +79,18 @@
xcode.PBXContainerItemProxy(tr) xcode.PBXContainerItemProxy(tr)
test.capture [[ test.capture [[
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
[MyProject2.xcodeproj:prodprox] /* PBXContainerItemProxy */ = { 17DF877139AB34A376605DB1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = [MyProject2.xcodeproj] /* MyProject2.xcodeproj */; containerPortal = CBD893DEB01F9C10340CCA1E /* MyProject2.xcodeproj */;
proxyType = 2; proxyType = 2;
remoteGlobalIDString = [libMyProject2-d.a:product]; remoteGlobalIDString = E052136F28C2F7A16D61C9AF;
remoteInfo = "libMyProject2-d.a"; remoteInfo = "libMyProject2-d.a";
}; };
[MyProject2.xcodeproj:targprox] /* PBXContainerItemProxy */ = { 6A19FA0A8BE5A73CC89AD04A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = [MyProject2.xcodeproj] /* MyProject2.xcodeproj */; containerPortal = CBD893DEB01F9C10340CCA1E /* MyProject2.xcodeproj */;
proxyType = 1; proxyType = 1;
remoteGlobalIDString = [libMyProject2-d.a:target]; remoteGlobalIDString = DA5DB975C549DF670D2FA7B5;
remoteInfo = "libMyProject2-d.a"; remoteInfo = "libMyProject2-d.a";
}; };
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
@ -108,8 +107,8 @@
xcode.PBXFileReference(tr) xcode.PBXFileReference(tr)
test.capture [[ test.capture [[
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
[MyProject2.xcodeproj] /* libMyProject2-d.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "MyProject2.xcodeproj"; path = MyProject2.xcodeproj; sourceTree = SOURCE_ROOT; }; 19A5C4E61D1697189E833B26 /* MyProject */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = MyProject; path = MyProject; sourceTree = BUILT_PRODUCTS_DIR; };
[MyProject:product] /* MyProject */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = MyProject; path = MyProject; sourceTree = BUILT_PRODUCTS_DIR; }; CBD893DEB01F9C10340CCA1E /* libMyProject2-d.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "MyProject2.xcodeproj"; path = MyProject2.xcodeproj; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */ /* End PBXFileReference section */
]] ]]
end end
@ -121,8 +120,8 @@
xcode.PBXFileReference(tr) xcode.PBXFileReference(tr)
test.capture [[ test.capture [[
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
[MyProject2.xcodeproj] /* libMyProject2-d.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "MyProject2.xcodeproj"; path = ../MyProject2.xcodeproj; sourceTree = SOURCE_ROOT; }; 149CF6C96C0269BB1E108509 /* libMyProject2-d.a */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "MyProject2.xcodeproj"; path = ../MyProject2.xcodeproj; sourceTree = SOURCE_ROOT; };
[MyProject:product] /* MyProject */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = MyProject; path = MyProject; sourceTree = BUILT_PRODUCTS_DIR; }; 19A5C4E61D1697189E833B26 /* MyProject */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = MyProject; path = MyProject; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */ /* End PBXFileReference section */
]] ]]
end end
@ -137,11 +136,11 @@
xcode.PBXFrameworksBuildPhase(tr) xcode.PBXFrameworksBuildPhase(tr)
test.capture [[ test.capture [[
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
[MyProject:fxs] /* Frameworks */ = { 9FDD37564328C0885DF98D96 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
[libMyProject2-d.a:build] /* libMyProject2-d.a in Frameworks */, 5931FBCA4D31453CD21C5A0A /* libMyProject2-d.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -155,11 +154,11 @@
xcode.PBXFrameworksBuildPhase(tr) xcode.PBXFrameworksBuildPhase(tr)
test.capture [[ test.capture [[
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
[MyProject:fxs] /* Frameworks */ = { 9FDD37564328C0885DF98D96 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
[libMyProject2-d.dylib:build] /* libMyProject2-d.dylib in Frameworks */, 1BC538B0FA67D422AF49D6F0 /* libMyProject2-d.dylib in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -176,37 +175,37 @@
xcode.PBXGroup(tr) xcode.PBXGroup(tr)
test.capture [[ test.capture [[
/* Begin PBXGroup section */ /* Begin PBXGroup section */
[MyProject2.xcodeproj:prodgrp] /* Products */ = { 12F5A37D963B00EFBF8281BD /* MyProject */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
[libMyProject2-d.a] /* libMyProject2-d.a */, A6C936B49B3FADE6EA134CF4 /* Products */,
); 9D968EAA920D05DCE0E0A4EA /* Projects */,
name = Products;
sourceTree = "<group>";
};
[MyProject] /* MyProject */ = {
isa = PBXGroup;
children = (
[Products] /* Products */,
[Projects] /* Projects */,
); );
name = MyProject; name = MyProject;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
[Products] /* Products */ = { 9D968EAA920D05DCE0E0A4EA /* Projects */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
[MyProject:product] /* MyProject */, CBD893DEB01F9C10340CCA1E /* MyProject2.xcodeproj */,
);
name = Projects;
sourceTree = "<group>";
};
A6C936B49B3FADE6EA134CF4 /* Products */ = {
isa = PBXGroup;
children = (
19A5C4E61D1697189E833B26 /* MyProject */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
[Projects] /* Projects */ = { C7F36A91F7853983D29278D1 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
[MyProject2.xcodeproj] /* MyProject2.xcodeproj */, CCB6C53210CA9664049C1B72 /* libMyProject2-d.a */,
); );
name = Projects; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
/* End PBXGroup section */ /* End PBXGroup section */
@ -223,23 +222,23 @@
xcode.PBXNativeTarget(tr) xcode.PBXNativeTarget(tr)
test.capture [[ test.capture [[
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
[MyProject:target] /* MyProject */ = { 48B5980C775BEBFED09D464C /* MyProject */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = [MyProject:cfg] /* Build configuration list for PBXNativeTarget "MyProject" */; buildConfigurationList = 8E187FB5316408E74C34D5F5 /* Build configuration list for PBXNativeTarget "MyProject" */;
buildPhases = ( buildPhases = (
[MyProject:rez] /* Resources */, 0FC4B7F6B3104128CDE10E36 /* Resources */,
[MyProject:src] /* Sources */, 7971D14D1CBD5A7F378E278D /* Sources */,
[MyProject:fxs] /* Frameworks */, 9FDD37564328C0885DF98D96 /* Frameworks */,
); );
buildRules = ( buildRules = (
); );
dependencies = ( dependencies = (
[MyProject2.xcodeproj:targdep] /* PBXTargetDependency */, B5ABA79AE53D768CC04AB5DA /* PBXTargetDependency */,
); );
name = MyProject; name = MyProject;
productInstallPath = "$(HOME)/bin"; productInstallPath = "$(HOME)/bin";
productName = MyProject; productName = MyProject;
productReference = [MyProject:product] /* MyProject */; productReference = 19A5C4E61D1697189E833B26 /* MyProject */;
productType = "com.apple.product-type.tool"; productType = "com.apple.product-type.tool";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
@ -261,17 +260,17 @@
buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "MyProject" */; buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "MyProject" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
hasScannedForEncodings = 1; hasScannedForEncodings = 1;
mainGroup = [MyProject] /* MyProject */; mainGroup = 12F5A37D963B00EFBF8281BD /* MyProject */;
projectDirPath = ""; projectDirPath = "";
projectReferences = ( projectReferences = (
{ {
ProductGroup = [MyProject2.xcodeproj:prodgrp] /* Products */; ProductGroup = C7F36A91F7853983D29278D1 /* Products */;
ProjectRef = [MyProject2.xcodeproj] /* MyProject2.xcodeproj */; ProjectRef = CBD893DEB01F9C10340CCA1E /* MyProject2.xcodeproj */;
}, },
); );
projectRoot = ""; projectRoot = "";
targets = ( targets = (
[MyProject:target] /* MyProject */, 48B5980C775BEBFED09D464C /* MyProject */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
@ -288,11 +287,11 @@
xcode.PBXReferenceProxy(tr) xcode.PBXReferenceProxy(tr)
test.capture [[ test.capture [[
/* Begin PBXReferenceProxy section */ /* Begin PBXReferenceProxy section */
[libMyProject2-d.a] /* libMyProject2-d.a */ = { CCB6C53210CA9664049C1B72 /* libMyProject2-d.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
path = "libMyProject2-d.a"; path = "libMyProject2-d.a";
remoteRef = [MyProject2.xcodeproj:prodprox] /* PBXContainerItemProxy */; remoteRef = 17DF877139AB34A376605DB1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
/* End PBXReferenceProxy section */ /* End PBXReferenceProxy section */
@ -309,10 +308,10 @@
xcode.PBXTargetDependency(tr) xcode.PBXTargetDependency(tr)
test.capture [[ test.capture [[
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
[MyProject2.xcodeproj:targdep] /* PBXTargetDependency */ = { B5ABA79AE53D768CC04AB5DA /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
name = "libMyProject2-d.a"; name = "libMyProject2-d.a";
targetProxy = [MyProject2.xcodeproj:targprox] /* PBXContainerItemProxy */; targetProxy = 6A19FA0A8BE5A73CC89AD04A /* PBXContainerItemProxy */;
}; };
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
]] ]]

526
modules/xcode/tests/test_xcode_project.lua
View File

File diff suppressed because it is too large Load Diff

10
modules/xcode/xcode_project.lua
View File

@ -135,8 +135,12 @@
-- Final setup -- Final setup
tree.traverse(tr, { tree.traverse(tr, {
onnode = function(node) onnode = function(node)
local nodePath
if node.path then
nodePath = path.getrelative(tr.project.location, node.path)
end
-- assign IDs to every node in the tree -- assign IDs to every node in the tree
node.id = xcode.newid(node.name, nil, node.path) node.id = xcode.newid(node.name, nil, nodePath)
node.isResource = xcode.isItemResource(prj, node) node.isResource = xcode.isItemResource(prj, node)
@ -146,7 +150,7 @@
local filecfg = fileconfig.getconfig(node, cfg) local filecfg = fileconfig.getconfig(node, cfg)
if fileconfig.hasCustomBuildRule(filecfg) then if fileconfig.hasCustomBuildRule(filecfg) then
if not node.buildcommandid then if not node.buildcommandid then
node.buildcommandid = xcode.newid(node.name, "buildcommand", node.path) node.buildcommandid = xcode.newid(node.name, "buildcommand", nodePath)
end end
end end
end end
@ -154,7 +158,7 @@
-- assign build IDs to buildable files -- assign build IDs to buildable files
if xcode.getbuildcategory(node) and not node.excludefrombuild and not xcode.mustExcludeFromTarget(node, tr.project) then if xcode.getbuildcategory(node) and not node.excludefrombuild and not xcode.mustExcludeFromTarget(node, tr.project) then
node.buildid = xcode.newid(node.name, "build", node.path) node.buildid = xcode.newid(node.name, "build", nodePath)
end end
-- remember key files that are needed elsewhere -- remember key files that are needed elsewhere