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

Merge branch 'master' into ssurtees/releaseInfoBadges

Browse Source
This commit is contained in:
J. Perkins 2018-03-26 12:30:05 -04:00 committed by GitHub
commit 7864c0b974
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -968,10 +968,6 @@
targetextension ".xyz" targetextension ".xyz"
prepare() prepare()
xcode.XCBuildConfiguration_Target(tr, tr.products.children[1], tr.configs[1]) xcode.XCBuildConfiguration_Target(tr, tr.products.children[1], tr.configs[1])
--ms removed for now
--EXECUTABLE_EXTENSION = xyz;
test.capture [[ test.capture [[
[libMyProject.xyz:Debug] /* Debug */ = { [libMyProject.xyz:Debug] /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -979,6 +975,7 @@
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CONFIGURATION_BUILD_DIR = bin/Debug; CONFIGURATION_BUILD_DIR = bin/Debug;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
EXECUTABLE_EXTENSION = xyz;
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;

13
modules/xcode/xcode_common.lua
View File

@ -431,9 +431,10 @@
-- is this the product node, describing the output target? -- is this the product node, describing the output target?
if node.kind == "product" then if node.kind == "product" then
local name = iif(tr.project.kind ~= "ConsoleApp", node.name, node.cfg.buildtarget.prefix .. node.cfg.buildtarget.basename)
settings[node.id] = function(level) settings[node.id] = function(level)
_p(level,'%s /* %s */ = {isa = PBXFileReference; explicitFileType = %s; includeInIndex = 0; name = %s; path = %s; sourceTree = BUILT_PRODUCTS_DIR; };', _p(level,'%s /* %s */ = {isa = PBXFileReference; explicitFileType = %s; includeInIndex = 0; name = %s; path = %s; sourceTree = BUILT_PRODUCTS_DIR; };',
node.id, node.name, xcode.gettargettype(node), stringifySetting(node.name), stringifySetting(path.getname(node.cfg.buildtarget.bundlename ~= "" and node.cfg.buildtarget.bundlename or node.cfg.buildtarget.relpath))) node.id, node.name, xcode.gettargettype(node), stringifySetting(name), stringifySetting(path.getname(node.cfg.buildtarget.bundlename ~= "" and node.cfg.buildtarget.bundlename or node.cfg.buildtarget.relpath)))
end end
-- is this a project dependency? -- is this a project dependency?
elseif node.parent.parent == tr.projects then elseif node.parent.parent == tr.projects then
@ -892,11 +893,15 @@
settings['EXECUTABLE_PREFIX'] = cfg.buildtarget.prefix settings['EXECUTABLE_PREFIX'] = cfg.buildtarget.prefix
end end
--[[if cfg.targetextension then if cfg.kind ~= "ConsoleApp" and cfg.targetextension then
local ext = cfg.targetextension local ext = cfg.targetextension
ext = iif(ext:startswith('.'), ext:sub(2), ext) ext = iif(ext:startswith('.'), ext:sub(2), ext)
settings['EXECUTABLE_EXTENSION'] = ext if cfg.kind == "WindowedApp" and ext ~= "app" then
end]] settings['WRAPPER_EXTENSION'] = ext
elseif (cfg.kind == "StaticLib" and ext ~= "a") or (cfg.kind == "SharedLib" and ext ~= "dylib") then
settings['EXECUTABLE_EXTENSION'] = ext
end
end
local outdir = path.getrelative(tr.project.location, path.getdirectory(cfg.buildtarget.relpath)) local outdir = path.getrelative(tr.project.location, path.getdirectory(cfg.buildtarget.relpath))
if outdir ~= "." then if outdir ~= "." then

3
src/_premake_init.lua
View File

@ -1713,6 +1713,9 @@
-- Add variations for other Posix-like systems. -- Add variations for other Posix-like systems.
filter { "system:MacOSX", "kind:WindowedApp" }
targetextension ".app"
filter { "system:MacOSX", "kind:SharedLib" } filter { "system:MacOSX", "kind:SharedLib" }
targetextension ".dylib" targetextension ".dylib"

2
src/base/config.lua
View File

@ -49,7 +49,7 @@
local bundlepath = "" local bundlepath = ""
if cfg.system == p.MACOSX and kind == p.WINDOWEDAPP then if cfg.system == p.MACOSX and kind == p.WINDOWEDAPP then
bundlename = basename .. ".app" bundlename = basename .. extension
bundlepath = path.join(bundlename, "Contents/MacOS") bundlepath = path.join(bundlename, "Contents/MacOS")
end end