commit
ac8ba36246
@ -155,8 +155,8 @@
|
|||||||
end)
|
end)
|
||||||
|
|
||||||
function android.link(cfg, file)
|
function android.link(cfg, file)
|
||||||
-- default the seperator to '/' as that is what is searched for
|
-- default the separator to '/' as that is what is searched for
|
||||||
-- below. Otherwise the function will use target seperator which
|
-- below. Otherwise the function will use target separator which
|
||||||
-- could be '\\' and result in failure to create links.
|
-- could be '\\' and result in failure to create links.
|
||||||
local fname = path.translate(file.relpath, '/')
|
local fname = path.translate(file.relpath, '/')
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Override the GMake action 'onProject' funtion to provide
|
-- Override the GMake action 'onProject' function to provide
|
||||||
-- D knowledge...
|
-- D knowledge...
|
||||||
--
|
--
|
||||||
p.override( gmake, "onProject", function(oldfn, prj)
|
p.override( gmake, "onProject", function(oldfn, prj)
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
function m.dCompiler(cfg)
|
function m.dCompiler(cfg)
|
||||||
local dc = nil
|
local dc = nil
|
||||||
-- TODO: chech for explicit DMD or LDC request?
|
-- TODO: check for explicit DMD or LDC request?
|
||||||
if _OPTIONS.dc then
|
if _OPTIONS.dc then
|
||||||
local dcMap = {
|
local dcMap = {
|
||||||
["dmd"] = "DMD",
|
["dmd"] = "DMD",
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
end
|
end
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Patch the path table to provide knowledge of D file extenstions
|
-- Patch the path table to provide knowledge of D file extensions
|
||||||
--
|
--
|
||||||
function path.isdfile(fname)
|
function path.isdfile(fname)
|
||||||
return path.hasextension(fname, { ".d" })
|
return path.hasextension(fname, { ".d" })
|
||||||
|
@ -139,7 +139,7 @@
|
|||||||
|
|
||||||
--
|
--
|
||||||
-- Rules for file ops based on the shell type. Can't use defines and $@ because
|
-- Rules for file ops based on the shell type. Can't use defines and $@ because
|
||||||
-- it screws up the escaping of spaces and parethesis (anyone know a fix?)
|
-- it screws up the escaping of spaces and parenthesis (anyone know a fix?)
|
||||||
--
|
--
|
||||||
|
|
||||||
function make.mkdir(dirname)
|
function make.mkdir(dirname)
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
end
|
end
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Check addition of library search directores.
|
-- Check addition of library search directories.
|
||||||
--
|
--
|
||||||
|
|
||||||
function suite.checkLibDirs()
|
function suite.checkLibDirs()
|
||||||
|
@ -118,7 +118,7 @@
|
|||||||
|
|
||||||
--
|
--
|
||||||
-- Rules for file ops based on the shell type. Can't use defines and $@ because
|
-- Rules for file ops based on the shell type. Can't use defines and $@ because
|
||||||
-- it screws up the escaping of spaces and parethesis (anyone know a fix?)
|
-- it screws up the escaping of spaces and parenthesis (anyone know a fix?)
|
||||||
--
|
--
|
||||||
|
|
||||||
function gmake2.mkdir(dirname)
|
function gmake2.mkdir(dirname)
|
||||||
|
@ -40,7 +40,7 @@ ALL_LDFLAGS += $(LDFLAGS)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Check addition of library search directores.
|
-- Check addition of library search directories.
|
||||||
--
|
--
|
||||||
|
|
||||||
function suite.checkLibDirs()
|
function suite.checkLibDirs()
|
||||||
|
@ -82,7 +82,7 @@
|
|||||||
format = table.remove(arg, 1)
|
format = table.remove(arg, 1)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- convert nils into something more usefuls
|
-- convert nils into something more useful
|
||||||
for i = 1, #arg do
|
for i = 1, #arg do
|
||||||
if (arg[i] == nil) then
|
if (arg[i] == nil) then
|
||||||
arg[i] = "(nil)"
|
arg[i] = "(nil)"
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Check the configuration type for differenet project kinds.
|
-- Check the configuration type for different project kinds.
|
||||||
--
|
--
|
||||||
|
|
||||||
function suite.configurationType_onConsoleApp()
|
function suite.configurationType_onConsoleApp()
|
||||||
|
@ -112,7 +112,7 @@
|
|||||||
end
|
end
|
||||||
|
|
||||||
--
|
--
|
||||||
-- The objeccts directory is applied, if specified.
|
-- The objects directory is applied, if specified.
|
||||||
--
|
--
|
||||||
|
|
||||||
function suite.intDir_onTargetDir()
|
function suite.intDir_onTargetDir()
|
||||||
|
@ -137,16 +137,16 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
-- Compare a version string that uses semver semantics against a
|
-- Compare a version string that uses semver semantics against a
|
||||||
-- version comparision string. Comparisions take the form of ">=5.0" (5.0 or
|
-- version comparison string. Comparisons take the form of ">=5.0" (5.0 or
|
||||||
-- later), "5.0" (5.0 or later), ">=5.0 <6.0" (5.0 or later but not 6.0 or
|
-- later), "5.0" (5.0 or later), ">=5.0 <6.0" (5.0 or later but not 6.0 or
|
||||||
-- later).
|
-- later).
|
||||||
--
|
--
|
||||||
-- @param version
|
-- @param version
|
||||||
-- The version to be tested.
|
-- The version to be tested.
|
||||||
-- @param checks
|
-- @param checks
|
||||||
-- The comparision string to be evaluated.
|
-- The comparison string to be evaluated.
|
||||||
-- @return
|
-- @return
|
||||||
-- True if the comparisions pass, false if any fail.
|
-- True if the comparisons pass, false if any fail.
|
||||||
---
|
---
|
||||||
|
|
||||||
function p.checkVersion(version, checks)
|
function p.checkVersion(version, checks)
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
-- Set up a place to store the current active objects in each configuration
|
-- Set up a place to store the current active objects in each configuration
|
||||||
-- scope (e.g. wprkspaces, projects, groups, and configurations). This likely
|
-- scope (e.g. workspaces, projects, groups, and configurations). This likely
|
||||||
-- ought to be internal scope, but it is useful for testing.
|
-- ought to be internal scope, but it is useful for testing.
|
||||||
---
|
---
|
||||||
|
|
||||||
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
-- Define a new class of configuration container. A container can receive and
|
-- Define a new class of configuration container. A container can receive and
|
||||||
-- store configuration blocks, which are what hold the individial settings
|
-- store configuration blocks, which are what hold the individual settings
|
||||||
-- from the scripts. A container can also hold one or more kinds of child
|
-- from the scripts. A container can also hold one or more kinds of child
|
||||||
-- containers; a workspace can contain projects, for instance.
|
-- containers; a workspace can contain projects, for instance.
|
||||||
--
|
--
|
||||||
@ -489,7 +489,7 @@
|
|||||||
|
|
||||||
--
|
--
|
||||||
-- Callback for all API functions; everything comes here first, and then
|
-- Callback for all API functions; everything comes here first, and then
|
||||||
-- gets parceled out to the individual set...() functions.
|
-- gets parcelled out to the individual set...() functions.
|
||||||
--
|
--
|
||||||
|
|
||||||
function api.storeField(field, value)
|
function api.storeField(field, value)
|
||||||
|
@ -310,7 +310,7 @@
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- If this is something I can link against, pull out the requested part
|
-- If this is something I can link against, pull out the requested part
|
||||||
-- dont link against my self
|
-- don't link against my self
|
||||||
if item and item ~= cfg then
|
if item and item ~= cfg then
|
||||||
if part == "directory" then
|
if part == "directory" then
|
||||||
item = path.getdirectory(item)
|
item = path.getdirectory(item)
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- fetch the pathVars from the enviroment.
|
-- fetch the pathVars from the environment.
|
||||||
local envMap = e.pathVars or {}
|
local envMap = e.pathVars or {}
|
||||||
|
|
||||||
-- enable access to the global environment
|
-- enable access to the global environment
|
||||||
|
@ -42,7 +42,7 @@
|
|||||||
-- @param fname
|
-- @param fname
|
||||||
-- The name of the directory or file to include. If a directory, will
|
-- The name of the directory or file to include. If a directory, will
|
||||||
-- automatically include the contained premake5.lua or premake4.lua
|
-- automatically include the contained premake5.lua or premake4.lua
|
||||||
-- script at that lcoation.
|
-- script at that location.
|
||||||
---
|
---
|
||||||
|
|
||||||
io._includedFiles = {}
|
io._includedFiles = {}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
-- group.lua
|
-- group.lua
|
||||||
-- A psuedo-configuration container to represent project groups.
|
-- A pseudo-configuration container to represent project groups.
|
||||||
-- Copyright (c) 2014 Jason Perkins and the Premake project
|
-- Copyright (c) 2014 Jason Perkins and the Premake project
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
--
|
--
|
||||||
-- We can't control how people will type in the command line arguments, or how
|
-- We can't control how people will type in the command line arguments, or how
|
||||||
-- project scripts will define their custom options, so case becomes an issue.
|
-- project scripts will define their custom options, so case becomes an issue.
|
||||||
-- To mimimize issues, set up the _OPTIONS table to always use lowercase keys.
|
-- To minimize issues, set up the _OPTIONS table to always use lowercase keys.
|
||||||
--
|
--
|
||||||
|
|
||||||
local _OPTIONS_metatable = {
|
local _OPTIONS_metatable = {
|
||||||
|
@ -742,7 +742,7 @@
|
|||||||
local translateFunction = function(value)
|
local translateFunction = function(value)
|
||||||
local result = path.join(translatedBaseDir, value)
|
local result = path.join(translatedBaseDir, value)
|
||||||
result = os.translateCommandAndPath(result, map)
|
result = os.translateCommandAndPath(result, map)
|
||||||
if value:endswith('/') or value:endswith('\\') or -- if orginal path ends with a slash then ensure the same
|
if value:endswith('/') or value:endswith('\\') or -- if original path ends with a slash then ensure the same
|
||||||
value:endswith('/"') or value:endswith('\\"') then
|
value:endswith('/"') or value:endswith('\\"') then
|
||||||
result = result .. '/'
|
result = result .. '/'
|
||||||
end
|
end
|
||||||
|
@ -712,7 +712,7 @@
|
|||||||
local lowerobj = f.objname:lower()
|
local lowerobj = f.objname:lower()
|
||||||
if not bases[lowerobj] then
|
if not bases[lowerobj] then
|
||||||
-- this is the first appearance of a file that produces this objname
|
-- this is the first appearance of a file that produces this objname
|
||||||
-- intialize the table for any future basename that matches our objname
|
-- initialize the table for any future basename that matches our objname
|
||||||
bases[lowerobj] = {}
|
bases[lowerobj] = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -292,7 +292,7 @@
|
|||||||
end
|
end
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Get the default seperator for path.translate
|
-- Get the default separator for path.translate
|
||||||
--
|
--
|
||||||
|
|
||||||
function path.getDefaultSeparator()
|
function path.getDefaultSeparator()
|
||||||
|
@ -506,7 +506,7 @@
|
|||||||
-- and returns a new (or the same) pairing.
|
-- and returns a new (or the same) pairing.
|
||||||
--
|
--
|
||||||
-- TODO: I think this could be made much simpler by building a string pattern
|
-- TODO: I think this could be made much simpler by building a string pattern
|
||||||
-- like :part1:part2: and then doing string comparisions, instead of trying to
|
-- like :part1:part2: and then doing string comparisons, instead of trying to
|
||||||
-- iterate over variable number of table elements.
|
-- iterate over variable number of table elements.
|
||||||
--
|
--
|
||||||
|
|
||||||
|
@ -522,7 +522,7 @@
|
|||||||
end
|
end
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Filters a table for empty entries. primarly useful for lists of string.
|
-- Filters a table for empty entries. primarily useful for lists of string.
|
||||||
--
|
--
|
||||||
function table.filterempty(dirs)
|
function table.filterempty(dirs)
|
||||||
return table.translate(dirs, function(val)
|
return table.translate(dirs, function(val)
|
||||||
|
@ -84,7 +84,7 @@
|
|||||||
-- Locate a project by name, case insensitive.
|
-- Locate a project by name, case insensitive.
|
||||||
--
|
--
|
||||||
-- @param name
|
-- @param name
|
||||||
-- The name of the projec to find.
|
-- The name of the project to find.
|
||||||
-- @return
|
-- @return
|
||||||
-- The project object, or nil if a matching project could not be found.
|
-- The project object, or nil if a matching project could not be found.
|
||||||
--
|
--
|
||||||
|
@ -149,7 +149,7 @@
|
|||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Name should use "lib and ".a" for Mac static libraries.
|
-- Name should use "lib" and ".a" for Mac static libraries.
|
||||||
--
|
--
|
||||||
|
|
||||||
function suite.nameUsesLib_onMacStaticLib()
|
function suite.nameUsesLib_onMacStaticLib()
|
||||||
|
Loading…
Reference in New Issue
Block a user