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

Removed duplication .pinfo files

Browse Source
This commit is contained in:
starkos 2009-09-02 22:18:49 +00:00
parent d9d7b89726
commit ba4da127bf
6 changed files with 186 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions/xcode/_xcode.lua
View File

@ -13,7 +13,7 @@
description = "Apple Xcode 3 (experimental)",
os = "macosx",
valid_kinds = { "ConsoleApp" },
valid_kinds = { "ConsoleApp", "WindowedApp" },
valid_languages = { "C", "C++" },

149
src/actions/xcode/xcode_pbxproj.lua
View File

@ -38,14 +38,18 @@
prjnode.frameworks = tree.insert(prjnode, tree.new("Frameworks"))
prjnode.frameworks.stageid = xcode.newid()
-- first pass over the tree to handle resource files like MainMenu.xib. If present,
-- create a new project-level group named "Resources" to contain the files, and
-- virtual groups to contain each language variant. I'm converting how these files
-- are stored on disk (English.lproj/MainMenu.xib) to how they are shown in Xcode
-- (Resources/MainMenu.xib/English).
-- first pass over the tree to handle resource files. Localized files create a new
-- virtual group under resources, with a list of the languages encountered. Other
-- resources are simply moved into the resources group.
tree.traverse(prjnode, {
onleaf = function(node)
-- only look at resources
if xcode.getfilecategory(node.name) ~= "Resources" then return end
-- don't process the resources group (which I'm building)
if node.parent == prjnode.resources then return end
if xcode.islocalized(node) then
-- create a virtual group for this file and add each language under it
if not prjnode.resources.children[node.name] then
local group = tree.new(node.name)
group.languages = { }
@ -54,6 +58,11 @@
end
local lang = path.getbasename(node.parent.name)
prjnode.resources.children[node.name].languages[lang] = node
else
-- remove it from the files area
tree.remove(node)
-- add it to the resources area
tree.insert(prjnode.resources, node)
end
end
})
@ -100,7 +109,7 @@
table.insert(ctx.targets, {
prjnode = prjnode,
kind = cfg.kind,
name = prjnode.project.name .. path.getextension(cfg.buildtarget.name),
name = cfg.buildtarget.root,
id = xcode.newid(),
fileid = xcode.newid(),
sourcesid = xcode.newid()
@ -149,13 +158,15 @@
function xcode.getfilecategory(fname)
local categories = {
[".c" ] = "Sources",
[".cc" ] = "Sources",
[".cpp" ] = "Sources",
[".cxx" ] = "Sources",
[".c" ] = "Sources",
[".cc" ] = "Sources",
[".cpp" ] = "Sources",
[".cxx" ] = "Sources",
[".framework"] = "Frameworks",
[".m" ] = "Sources",
[".xib" ] = "Resources",
[".lproj"] = "Resources",
[".m" ] = "Sources",
[".plist"] = "Resources",
[".xib" ] = "Resources",
}
return categories[path.getextension(fname)]
end
@ -172,18 +183,19 @@
function xcode.getfiletype(fname)
local types = {
[".c" ] = "sourcecode.c.c",
[".cc" ] = "sourcecode.cpp.cpp",
[".cpp" ] = "sourcecode.cpp.cpp",
[".css" ] = "text.css",
[".cxx" ] = "sourcecode.cpp.cpp",
[".c" ] = "sourcecode.c.c",
[".cc" ] = "sourcecode.cpp.cpp",
[".cpp" ] = "sourcecode.cpp.cpp",
[".css" ] = "text.css",
[".cxx" ] = "sourcecode.cpp.cpp",
[".framework"] = "wrapper.framework",
[".gif" ] = "image.gif",
[".h" ] = "sourcecode.c.h",
[".html"] = "text.html",
[".lua" ] = "sourcecode.lua",
[".m" ] = "sourcecode.c.objc",
[".xib" ] = "file.xib",
[".gif" ] = "image.gif",
[".h" ] = "sourcecode.c.h",
[".html" ] = "text.html",
[".lua" ] = "sourcecode.lua",
[".m" ] = "sourcecode.c.objc",
[".plist"] = "text.plist.xml",
[".xib" ] = "file.xib",
}
return types[path.getextension(fname)] or "text"
end
@ -201,6 +213,7 @@
function xcode.getproducttype(kind)
local types = {
ConsoleApp = "com.apple.product-type.tool",
WindowedApp = "com.apple.product-type.application",
}
return types[kind]
end
@ -218,11 +231,31 @@
function xcode.gettargettype(kind)
local types = {
ConsoleApp = "compiled.mach-o.executable",
WindowedApp = "wrapper.application",
}
return types[kind]
end
--
-- Returns true if a file is "buildable" and should go in the build section.
--
function xcode.isbuildable(node)
if not node.buildid then
return false
end
if xcode.islocalized(node) then
return false
end
local x = path.getextension(node.name)
if x == ".plist" then
return false
end
return true
end
--
-- Returns true if a node represents a localized file.
--
@ -313,8 +346,7 @@
_p('/* Begin PBXBuildFile section */')
tree.traverse(ctx.root, {
onleaf = function(node)
if node.buildid then
if xcode.islocalized(node) then return end
if xcode.isbuildable(node) then
_p(2,'%s /* %s in %s */ = {isa = PBXBuildFile; fileRef = %s /* %s */; };',
node.buildid, node.name, xcode.getfilecategory(node.name), node.id, node.name)
end
@ -352,7 +384,7 @@
end
})
for _, target in ipairs(ctx.targets) do
_p(2,'%s /* %s */ = {isa = PBXFileReference; explicitFileType = "%s"; includeInIndex = 0; path = %s; sourceTree = BUILT_PRODUCTS_DIR; };',
_p(2,'%s /* %s */ = {isa = PBXFileReference; explicitFileType = %s; includeInIndex = 0; path = %s; sourceTree = BUILT_PRODUCTS_DIR; };',
target.fileid, target.name, xcode.gettargettype(target.kind), target.name)
end
_p('/* End PBXFileReference section */')
@ -379,6 +411,27 @@
end
function xcode.PBXProject(ctx)
_p('/* Begin PBXProject section */')
_p(2,'08FB7793FE84155DC02AAC07 /* Project object */ = {')
_p(3,'isa = PBXProject;')
_p(3,'buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "%s" */;', ctx.prjroot.name)
_p(3,'compatibilityVersion = "Xcode 3.1";')
_p(3,'hasScannedForEncodings = 1;')
_p(3,'mainGroup = %s /* %s */;', ctx.prjroot.id, ctx.prjroot.name)
_p(3,'projectDirPath = "";')
_p(3,'projectRoot = "";')
_p(3,'targets = (')
for _, target in ipairs(ctx.targets) do
_p(4,'%s /* %s */,', target.id, target.name)
end
_p(3,');')
_p(2,'};')
_p('/* End PBXProject section */')
_p('')
end
function xcode.PBXGroup(ctx)
_p('/* Begin PBXGroup section */')
@ -391,7 +444,8 @@
_p(3,'isa = PBXGroup;')
_p(3,'children = (')
for _, child in ipairs(node.children) do
if not xcode.islocalized(child) then
-- if not xcode.islocalized(child) then
if xcode.getfilecategory(child.name) ~= "Resources" or node == ctx.prjroot.resources then
_p(4,'%s /* %s */,', child.id, child.name)
end
end
@ -415,16 +469,18 @@
for _, prjnode in ipairs(ctx.root.children) do
if prjnode.resources then
for _, node in ipairs(prjnode.resources.children) do
_p(2,'%s /* %s */ = {', node.id, node.name)
_p(3,'isa = PBXVariantGroup;')
_p(3,'children = (')
for lang, file in pairs(node.languages) do
_p(4,'%s /* %s */,', file.id, lang)
if node.languages then
_p(2,'%s /* %s */ = {', node.id, node.name)
_p(3,'isa = PBXVariantGroup;')
_p(3,'children = (')
for lang, file in pairs(node.languages) do
_p(4,'%s /* %s */,', file.id, lang)
end
_p(3,');')
_p(3,'name = %s;', node.name)
_p(3,'sourceTree = "<group>";')
_p(2,'};')
end
_p(3,');')
_p(3,'name = %s;', node.name)
_p(3,'sourceTree = "<group>";')
_p(2,'};')
end
end
end
@ -483,25 +539,8 @@
_p('/* End PBXNativeTarget section */')
_p('')
_p('/* Begin PBXProject section */')
_p(2,'08FB7793FE84155DC02AAC07 /* Project object */ = {')
_p(3,'isa = PBXProject;')
_p(3,'buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "%s" */;', ctx.prjroot.name)
_p(3,'compatibilityVersion = "Xcode 3.1";')
_p(3,'hasScannedForEncodings = 1;')
_p(3,'mainGroup = %s /* %s */;', ctx.prjroot.id, ctx.prjroot.name)
_p(3,'projectDirPath = "";')
_p(3,'projectRoot = "";')
_p(3,'targets = (')
for _, target in ipairs(ctx.targets) do
_p(4,'%s /* %s */,', target.id, target.name)
end
_p(3,');')
_p(2,'};')
_p('/* End PBXProject section */')
_p('')
xcode.PBXProject(ctx)
_p('/* Begin PBXResourcesBuildPhase section */')
for _, target in ipairs(ctx.targets) do
_p(2,'%s /* Resources */ = {', target.prjnode.resources.stageid)

6
src/base/project.lua
View File

@ -432,6 +432,7 @@
-- basename - the target with no directory or file extension
-- name - the target name and extension, with no directory
-- directory - relative path to the target, with no file name
-- root - the root target, primarily for Mac OS X (MyProject.app, etc.)
-- fullpath - directory, name, and extension
--
@ -456,6 +457,7 @@
local field = iif(direction == "build", "target", "implib")
local name = cfg[field.."name"] or cfg.targetname or cfg.project.name
local dir = cfg[field.."dir"] or cfg.targetdir or path.getrelative(cfg.location, cfg.basedir)
local root = name
local prefix = ""
local suffix = ""
@ -469,7 +471,8 @@
end
elseif namestyle == "posix" then
if kind == "WindowedApp" and system == "macosx" then
dir = path.join(dir, name .. ".app/Contents/MacOS")
root = name .. ".app"
dir = path.join(dir, root .. "/Contents/MacOS")
elseif kind == "SharedLib" then
prefix = "lib"
suffix = iif(system == "macosx", ".dylib", ".so")
@ -494,6 +497,7 @@
result.basename = name
result.name = prefix .. name .. suffix
result.directory = dir
result.root = root
result.fullpath = path.join(result.directory, result.name)
if pathstyle == "windows" then

26
src/base/tree.lua
View File

@ -89,6 +89,23 @@
end
--
-- Remove a node from a tree.
--
-- @param node
-- The node to remove.
--
function premake.tree.remove(node)
local children = node.parent.children
for i = 1, #children do
if children[i] == node then
table.remove(children, i)
end
end
end
--
-- Traverse a tree.
--
@ -109,6 +126,7 @@
local donode, dochildren
donode = function(node, fn, depth)
if node.isremoved then return end
if fn.onnode then fn.onnode(node, depth) end
if #node.children > 0 then
if fn.onbranch then fn.onbranch(node, depth) end
@ -119,8 +137,14 @@
end
dochildren = function(parent, fn, depth)
for _, node in ipairs(parent.children) do
-- this goofy iterator allows nodes to be removed during the traversal
local i = 1
while i <= #parent.children do
local node = parent.children[i]
donode(node, fn, depth)
if node == parent.children[i] then
i = i + 1
end
end
end

35
tests/actions/test_xcode.lua
View File

@ -85,7 +85,7 @@
function T.xcode3.PBXBuildFile_ListsBuildableSources()
files {
"source.h", "source.c", "source.cpp",
"source.h", "source.c", "source.cpp", "Info.plist",
}
prepare()
xcode.PBXBuildFile(ctx)
@ -144,16 +144,28 @@
-- PBXFileReference section tests
--
function T.xcode3.PBXFileReference_ListsTarget()
function T.xcode3.PBXFileReference_ListsConsoleTarget()
prepare()
xcode.PBXFileReference(ctx)
test.capture [[
/* Begin PBXFileReference section */
000000000000 /* MyProject */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MyProject; sourceTree = BUILT_PRODUCTS_DIR; };
000000000000 /* MyProject */ = {isa = PBXFileReference; explicitFileType = compiled.mach-o.executable; includeInIndex = 0; path = MyProject; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
]]
end
function T.xcode3.PBXFileReference_ListsWindowedTarget()
kind "WindowedApp"
prepare()
xcode.PBXFileReference(ctx)
test.capture [[
/* Begin PBXFileReference section */
000000000000 /* MyProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MyProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
]]
end
function T.xcode3.PBXFileReference_ListSourceTypesCorrectly()
files {
@ -210,6 +222,19 @@
]]
end
function T.xcode3.PBXFileReference_ListPListCorrectly()
files { "Info.plist" }
prepare()
xcode.PBXFileReference(ctx)
test.capture [[
/* Begin PBXFileReference section */
000000000000 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = "<group>"; };
000000000000 /* MyProject */ = {isa = PBXFileReference; explicitFileType = compiled.mach-o.executable; includeInIndex = 0; path = MyProject; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
]]
end
--
@ -327,7 +352,7 @@
function T.xcode3.PBXGroup_CreatesResourceSubgroup()
files { "English.lproj/MainMenu.xib", "French.lproj/MainMenu.xib" }
files { "English.lproj/MainMenu.xib", "French.lproj/MainMenu.xib", "Info.plist" }
prepare()
xcode.PBXGroup(ctx)
test.capture [[
@ -345,6 +370,7 @@
isa = PBXGroup;
children = (
000000000000 /* MainMenu.xib */,
000000000000 /* Info.plist */,
);
name = Resources;
sourceTree = "<group>";
@ -379,4 +405,3 @@
/* End PBXVariantGroup section */
]]
end

32
tests/base/test_tree.lua
View File

@ -83,4 +83,34 @@
test.isequal("Child", tree.getlocalpath(c))
end
--
-- Tests for tree.remove()
--
function T.tree.Remove_RemovesNodes()
local n1 = tree.add(tr, "1")
local n2 = tree.add(tr, "2")
local n3 = tree.add(tr, "3")
tree.remove(n2)
local r = ""
for _, n in ipairs(tr.children) do r = r .. n.name end
test.isequal("13", r)
end
function T.tree.Remove_WorksInTraversal()
tree.add(tr, "Root/1")
tree.add(tr, "Root/2")
tree.add(tr, "Root/3")
local r = ""
tree.traverse(tr, {
onleaf = function(node)
r = r .. node.name
tree.remove(node)
end
})
test.isequal("123", r)
test.isequal(0, #tr.children[1])
end