Commit Graph

1784 Commits

Author SHA1 Message Date
starkos
458911fe8d Merge pull request #253 from starkos/use-aliases
Use new premake.alias() call instead of direct variable assignment in API functions
2015-09-05 19:19:24 -04:00
starkos
552c08749c Merge pull request #249 from Blizzard/fix-scope
fix scope of ignoredefaultlibraries API.
2015-09-04 16:20:08 -04:00
Jason Perkins
925874e2da Use the new premake.alias() call instead of direct variable assignment in API functions
This allows premake.override() to work with both the aliased and canonical names.
2015-09-04 11:25:43 -04:00
Tom van Dijck
22516da035 fix scope of ignoredefaultlibraries API. 2015-09-03 14:49:33 -07:00
Tom van Dijck
ba4c0f7344 support framework folders in gcc/clang 2015-09-03 13:33:43 -07:00
Tom van Dijck
25045787e0 fix project dependencies. 2015-09-03 13:31:26 -07:00
starkos
b5b85fd766 Merge pull request #232 from aleksijuvani/master
vs2010_vcxproj.lua: add onImportExtensionTargets
2015-09-03 14:21:39 -04:00
Tom van Dijck
66b2febb3e Don't use deprecated LUA API's 2015-09-02 14:01:10 -07:00
James Touton
14ae03c659 Recognize more situations where '..' should not be trimmed. 2015-09-01 17:08:46 -07:00
Tom van Dijck
116b30eae5 fix bug in zip.extract. 2015-09-01 17:04:28 -07:00
Tom van Dijck
66358a2880 improve determinism 2015-09-01 16:59:33 -07:00
Manu Evans
28ebe8fce7 string.explode() gains 'maxTokens' argument. 2015-09-01 22:46:10 +10:00
aleksijuvani
6ed366842c vs2010_vcxproj.lua: change importExtensionSettings to use a call array 2015-08-31 22:22:46 +03:00
aleksijuvani
1f82a77b7b vs2010_vcxproj.lua: change importExtensionTargets to use a call array
Allows us to create new extension targets in overrides without
breaking rule generation.
2015-08-31 21:58:23 +03:00
starkos
aeca0bb3fd Merge pull request #228 from LORgames/ssurtees/multipleWorkspacesFix
Fixed a bug when including (includeexternal) the same project in multiple workspaces
2015-08-30 11:11:16 -04:00
starkos
ba3e30f510 Merge pull request #234 from starkos/more-workspace-renames
More workspace renames
2015-08-30 11:10:34 -04:00
Sam Surtees
23d2c04e2b Fixed a bug when including the same project in multiple workspaces, when using the includeexternal API. Based on discussion in #122 2015-08-30 22:17:00 +10:00
starkos
d2290fc742 Merge pull request #231 from LORgames/ssurtees/windowsCopyFix
Windows copy function no longer uses /E when used on a file
2015-08-28 16:19:24 -04:00
Sam Surtees
0f3972c914 Windows copy function no longer uses /E when used on a file
* Added some basic tests to ensure combinations work
* Fixes: #124
2015-08-27 20:44:14 +10:00
Sam Surtees
06f928e964 Fixed options not being added to the list as lowercase. Fixes: 216 2015-08-26 21:25:33 +10:00
starkos
b44a08ee55 Merge pull request #229 from LORgames/ssurtees/commentFix
Fixed comment for premake.filename
2015-08-25 16:56:59 -04:00
starkos
703ff8ec54 Merge pull request #225 from LORgames/ssurtees/ignoreDefaultLibraries
Added ignoreDefaultLibraries API for Visual Studio 2010+ projects.
2015-08-25 16:52:47 -04:00
Sam Surtees
0026eac920 Fixed comment for premake.filename. Fixes #134 2015-08-26 00:56:48 +10:00
Sam Surtees
5d6d05c31d Added ignoreDefaultLibraries API for Visual Studio 2010+ projects. 2015-08-25 20:33:46 +10:00
Jason Perkins
04a7170d6c Finish solution to workspace renames in core code 2015-08-24 17:08:09 -04:00
Jason Perkins
d57699204d Rename make_solution.lua to make_workspace.lua 2015-08-24 16:48:07 -04:00
Jason Perkins
1dd9e9fae2 Fix output deltas caused by recent file buffering additions
- Restore trailing EOL sequences to Visual Studio projects and solutions
- Fix UTF8 BOM marker on VC 2010 projects
2015-08-24 16:08:17 -04:00
Tom van Dijck
3afc21546f Allow querying values without combining values from parent configs. 2015-08-24 08:44:09 -07:00
Sam Surtees
b5ccf23105 The links API, for visual studio, no longer appends .lib if an extension already exists. Fixes #87 2015-08-24 23:51:48 +10:00
starkos
355d2e3f3c Merge pull request #218 from starkos/fix-cs-platforms
Fix handling of arbitrary platform names in Visual Studio C# projects
2015-08-23 15:37:17 -04:00
starkos
bdf11d1f33 Merge pull request #215 from starkos/more-workspace-renames
Rename container class from solution to workspace and propagate changes
2015-08-23 15:37:02 -04:00
Jason Perkins
8bfaef3e8f Merge branch 'buffered-io' of https://github.com/Blizzard/premake-core into Blizzard-buffered-io 2015-08-23 15:18:50 -04:00
James Touton
14d94bf319 Reworked filename pattern matching to allow for more complex patterns. 2015-08-23 14:50:44 -04:00
Jason Perkins
007b8a2385 Fix handling of arbitrary platform names in Visual Studio C# projects 2015-08-20 15:34:23 -04:00
StiX
3cea1dce35 Merge branch 'master' into PathNormalizationFix 2015-08-20 21:30:30 +02:00
Jason Perkins
7bde8ca73b Update to next dev version 2015-08-18 16:49:18 -04:00
Jason Perkins
b88d1ca601 Updated support files for 5.0-alpha5 release 2015-08-18 16:05:47 -04:00
Tom van Dijck
ef8d818c62 fix bug in make_cpp.lua 2015-08-17 07:39:11 -07:00
Jason Perkins
6376421172 Rename container class from solution to workspace and propagate changes 2015-08-13 19:11:36 -04:00
starkos
97fc2a0a38 Merge pull request #207 from starkos/more-workspace-renaming
More workspace renaming
2015-08-13 18:43:31 -04:00
Jason Perkins
d1ea0e81b1 More easy sln to wks renames 2015-08-12 14:56:06 -04:00
Jason Perkins
bf3e68287c More easy solution to workspace renames 2015-08-12 14:53:12 -04:00
StiX
16dded0499 Fixed path.normalize 2015-08-12 00:21:23 +02:00
Jason Perkins
1eb38c9fc1 Rename solution to workspace in oven and validation code 2015-08-11 16:31:17 -04:00
Jason Perkins
1d4fdc8980 If an action contains no valid language or kind lists, assume everything is supported
This makes it easier to write and maintain small utility or reporting actions that don't actually care about project kinds of languages. If you really don't want your action to support any kinds or languages (which would be weird, but okay) you can do:

```lua
valid_languages = {}
valid_kinds = {}
```
2015-08-10 13:19:33 -04:00
Jason Perkins
3d778a7151 Rename solution to workspace in global.lua and propagate changes 2015-08-10 13:05:26 -04:00
starkos
30dbdb5b15 Merge pull request #183 from Blizzard/bake-solution-config
Fully bake solution configs.
2015-08-09 17:55:56 -04:00
starkos
8fc81d978b Merge pull request #182 from Blizzard/file-queries
File queries
2015-08-04 14:57:06 -04:00
starkos
d8782c076a Merge pull request #162 from leeonix/master
rename .pdb file name as targetname.
2015-08-04 12:09:07 -04:00
Manu Evans
25bb49e4d5 Merge pull request #191 from Lusito/feature/pathjoinfix
fix for path.join problem when both string start with a "..", a unit …
2015-08-04 01:46:10 +10:00
Manu Evans
04a7cd1546 Silence warnings about arguments unknown to Clang, fixed a mistake 2015-08-02 12:34:28 +10:00
Manu Evans
eab093302c Support LLVM platform toolset for MSC; Clang in Visual Studio. 2015-08-02 12:34:27 +10:00
Manu Evans
046da71a28 Merge pull request #188 from moomalade/outputof
Chomp newlines in os.outputof()
2015-08-02 10:52:29 +10:00
Lusito
15ceabac48 fix for path.join problem when both string start with a "..", a unit test has been added 2015-08-01 21:10:02 +02:00
Tim Wharton
5ec37965a2 Improve module loadfile() error messages
Have the module package loader return the loadfile() error for file system modules,
and report the error from the calling script, rather than globals.lua.

This give marginally better errors when require()'ing modules with syntax errors.
The error will appear in the package loader list with the correct call site.

     Error: /Users/blah/premake5.lua:7: module 'wee' not found:
         no field package.preload['wee']
         load error /Users/blah/modules/wee/wee.lua:3: '=' expected near '<eof>'
	 ....
2015-08-01 04:10:15 +01:00
Tim Wharton
f8091ee53d Chomp newlines in os.outputof()
Fixes #45
2015-08-01 02:59:07 +01:00
leeonix
dd8c5f1818 Merge remote-tracking branch 'premake-src/master' 2015-08-01 09:21:57 +08:00
leeonix
ccd1790324 add cfg.debugformat ~= "c7" condition. 2015-08-01 09:17:00 +08:00
leeonix
829a76060a add cfg.debugformat ~= "c7" condition. 2015-08-01 09:15:38 +08:00
starkos
2d5fbbc7c9 Merge pull request #175 from TurkeyMan/gmake_arrays
Updated gmake actions to use function arrays
2015-07-31 17:58:29 -04:00
starkos
eaaaecf274 Merge pull request #156 from Blizzard/http-download-fixes
fix http.download
2015-07-31 17:43:55 -04:00
Jason Perkins
aa31909d1d Fix Windows build errors introduced by zip.extract() commit 2015-07-31 16:50:36 -04:00
starkos
6f2d3b9f18 Merge pull request #155 from Blizzard/unzip
add zip.extract(src, dst) method.
2015-07-31 16:31:17 -04:00
starkos
236dd35f62 Merge pull request #145 from Meoo/master
Fix #39, working tokens and wildcards in the same path
2015-07-31 16:08:43 -04:00
Tom van Dijck
21f4046793 Buffered I/O, and only write generated file if it changed. 2015-07-31 09:28:51 -07:00
Tom van Dijck
6223513122 Fully bake solution configs. 2015-07-30 18:27:59 -07:00
Tom van Dijck
aee6c98586 Allow calling code to save and restore a filter 2015-07-30 18:11:13 -07:00
Tom van Dijck
32885d1673 Files can now be queried for configuration properties. 2015-07-30 18:11:00 -07:00
Manu Evans
96848b28f1 Merge pull request #180 from starkos/rename-solution-to-workspace
Begin renaming solution to workspace
2015-07-31 09:31:38 +10:00
starkos
8ee9529315 Merge pull request #161 from Blizzard/entrypoint-api
add 'entrypoint' API.
2015-07-30 18:54:57 -04:00
starkos
50d89a1c00 Merge pull request #168 from TurkeyMan/more_sse
Added some missing SSE versions that I've wanted a few times
2015-07-30 15:49:17 -04:00
Jason Perkins
9926ba7738 Add workspace symbol ("wks") to token expansion environments
This lets you replace a token like "%{sln.name}" with "%{wks.name}". The "sln" is still supported.
2015-07-30 15:39:26 -04:00
Jason Perkins
91220c7d71 Replace "wrk" with "wks" 2015-07-30 15:30:41 -04:00
Jason Perkins
a82466c6f4 Rename solution.lua to workspace.lua and change names internally 2015-07-29 15:45:27 -04:00
Jason Perkins
f5e27d1e6d Change action callbacks from "solution" to "workspace" 2015-07-29 15:40:20 -04:00
starkos
1b2f19fa87 Merge pull request #177 from TurkeyMan/gcc_prefix
Fixed GCC prefix, which was all messed up somehow
2015-07-28 19:47:47 -04:00
Jason Perkins
2db9ed2061 Change solution() to workspace() with minimum changes 2015-07-28 19:08:28 -04:00
Jason Perkins
e84cc11412 Add ability to safely alias function names without breaking overrides
Introduces new calls premake.alias() and premake.resolveAlias()
2015-07-28 17:20:13 -04:00
Manu Evans
c4a70b0af3 Fixed GCC prefix, which was all messed up somehow 2015-07-28 22:27:58 +10:00
Tom van Dijck
b9402b0e67 add 'entrypoint' API. 2015-07-27 10:30:51 -07:00
Manu Evans
bade299f6b Updated gmake actions to use function arrays
- Updated gmake action in the D module aswell
2015-07-27 23:14:32 +10:00
Manu Evans
2706449670 Merge pull request #172 from starkos/fix-project-type-validation
Move project language and kind checks to validation.lua
2015-07-27 20:44:03 +10:00
Jason Perkins
bfc67b5c51 Add capture support to UTF8 BOM output
If `io.utf8()` is called while running unit tests, it would be output directly to the console since there is no active file output while testing. Replace call with premake.utf8() as a companion to premake.w() and ignore while capturing to prevent this spurious output.
2015-07-27 20:14:48 +10:00
Jason Perkins
e4f2dd7639 Move project language and kind checks to validation.lua
These validation checks were added to oven.lua by a previous commit. Move them over to validation.lua with the rest of the validation logic.
2015-07-26 18:31:08 -04:00
Manu Evans
fa02da93c6 Updated extensions to modern style, added a heap of tests 2015-07-26 23:53:24 +10:00
Manu Evans
da385c897b Added some missing SSE versions that I've wanted a few times. 2015-07-25 15:11:57 +10:00
leeonix
ac5dd3cfce if flags has Symbols. change .pdb file name. 2015-07-22 13:10:22 +08:00
leeonix
c90fe7a064 rename .pdb file name as $(TargetName). 2015-07-22 12:47:11 +08:00
Manu Evans
1c27cca3f2 Merge pull request #131 from tbasnoopy/localdebuggertype
allow changing of local debugger type
2015-07-20 20:36:00 +10:00
starkos
a2d7160bb7 Merge pull request #153 from Blizzard/added-table-functions
Add table.insertsorted, table.unique, table.filter and table.insertkeyed
2015-07-19 14:22:15 -04:00
starkos
a66aae1057 Merge pull request #152 from Blizzard/detoken-fix
fix bug in detoken.
2015-07-19 14:21:44 -04:00
starkos
072c4581b9 Merge pull request #81 from Blizzard/validate_options
add validation of valid_kinds and valid_languages
2015-07-19 13:54:52 -04:00
leeonix
f5931345c3 rename .pdb file name as targetname. 2015-07-19 03:45:15 +08:00
Jason Perkins
d2452f23e9 Use m.element() consistently; precursor to enabling more per-file configuration settings 2015-07-15 16:52:57 -04:00
Jason Perkins
d7525cf1d9 Replace "premake." with "p." consistently 2015-07-15 16:52:56 -04:00
Jason Perkins
de7b6e001d Code cleanup; finish converting to new indentation-aware output APIs 2015-07-15 16:52:56 -04:00
Jason Perkins
6be595f126 Consolidate file handling in VC 2010 exporter 2015-07-15 16:52:56 -04:00
Jason Perkins
f94c5aee15 Convert custom build files export to call array 2015-07-15 16:52:56 -04:00
Jason Perkins
59644e42fb Convert VC 2010 file configurations export to call array; bit of cleanup 2015-07-15 16:52:56 -04:00
Jason Perkins
b323613cdf Enable rules for later version of Visual Studio 2015-07-15 12:20:06 -04:00