AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity
2,189 Commits 1 Branch 1 Tag 32 MiB
816cc1a878
Commit Graph

2189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom van Dijck
811ac304d4 fix m.additionalUsingDirectories 2015-10-05 09:21:26 -07:00
Tom van Dijck
48c41dcb59 Merge pull request #288 from Blizzard/fix-bug-appendextension 
fix bug in appendExtension.
 2015-10-05 09:17:51 -07:00
Tom van Dijck
5c3504c7a7 add workspace.getrelative(sln, filename) 2015-10-05 09:17:39 -07:00
Tom van Dijck
8467be1612 fix bug in appendExtension. 2015-10-05 09:16:08 -07:00
Sami Kankaristo
c71562f072 Add test for gmake Utility projects 2015-10-03 12:06:39 +03:00
Sami Kankaristo
77efd0bab3 Add basic support for the 'Utility' kind in gmake 2015-10-01 05:34:49 +03:00
starkos
991561c600 Merge pull request #246 from Blizzard/fix-dependencies 
Fix project dependencies.
 2015-09-28 18:04:55 -04:00
starkos
e734bf6195 Merge pull request #284 from LORgames/ssurtees/configurationActions 
Added configuration actions array to allow easy extension of actions
 2015-09-28 11:49:16 -04:00
Sam Surtees
d99cba2f07 Converted vs2005 project configuration platforms to use call arrays. 2015-09-28 22:23:24 +10:00
Manu Evans
b7e27fbc25 Merge pull request #272 from Euclideon/custom_files_first 
Changed dependency order for ${CUSTOMFILES}
 2015-09-27 13:59:08 +10:00
Manu Evans
f035d0a68c Merge pull request #273 from Euclideon/link_grouping 
Group sibling libs for GCC/Clang
 2015-09-24 08:59:19 +10:00
starkos
e3c800eb0a Merge pull request #247 from Blizzard/support-framework-folders 
support framework folders in gcc/clang
 2015-09-21 19:38:19 -04:00
starkos
9c76d29b8c Merge pull request #244 from Blizzard/lua-no-deprecated-api-use 
Don't use deprecated LUA API's
 2015-09-21 19:28:34 -04:00
Tom van Dijck
cf9b366ee7 path.wildcards -> C 2015-09-17 09:10:11 -07:00
starkos
847fc633ac Merge pull request #242 from Blizzard/fix-path-join 
Recognize more situations where '..' should not be trimmed.
 2015-09-16 18:40:49 -04:00
Jason Perkins
2f2babde59 Merge branch 'LORgames-ssurtees/fixedEmptyProjectBug' 2015-09-16 18:35:55 -04:00
Jason Perkins
d623e47d2a Merge branch 'ssurtees/fixedEmptyProjectBug' of https://github.com/LORgames/premake-core into LORgames-ssurtees/fixedEmptyProjectBug 
# Conflicts:
#	tests/actions/vstudio/vc2010/test_platform_toolset.lua
 2015-09-16 18:35:25 -04:00
starkos
ae6a9ce579 Merge pull request #271 from starkos/rollback-263 
Revert "Switch 'require' to use xpcall for error handling."
 2015-09-16 18:00:59 -04:00
Sam Surtees
01dfaf611c Added tests and file type testing helper function 2015-09-16 22:31:40 +10:00
Manu Evans
4c11977bd3 Fixed the tests. 2015-09-16 15:56:57 +10:00
Manu Evans
74d53e366d ${CUSTOMFILES} is often used to produce dependencies for the build, so it needs to be first. 2015-09-16 15:17:55 +10:00
Manu Evans
fb09112fc4 Wrap sibling dependencies in --start-group, --end-group (for GCC and Clang) 2015-09-16 15:17:39 +10:00
Jason Perkins
fd6e80aba5 Revert "Switch 'require' to use xpcall for error handling." 
This reverts commit 6aad3ef432.
 2015-09-15 18:50:13 -04:00
starkos
158a80c696 Merge pull request #239 from Blizzard/improve-determinism 
improve determinism
 2015-09-15 18:30:23 -04:00
Sam Surtees
0c497da65e Empty projects no longer ignore platform toolset when there are no "cpp" files present. Fixes #93 2015-09-15 21:03:25 +10:00
starkos
d3d3d9e0a5 Merge pull request #263 from tritao/xpcall 
Switch 'require' to use xpcall for error handling.
 2015-09-12 14:37:17 -04:00
starkos
fcb06adcf4 Merge pull request #259 from starkos/rollback-162 
Roll back pull request #162
 2015-09-10 15:03:23 -04:00
Tom van Dijck
cc6cf72d60 Fix bug in recursive calls to detoken. 2015-09-10 10:13:30 -07:00
triton
6aad3ef432 Switch 'require' to use xpcall for error handling. 
In particular, this gives the original stack trace where an error actually occurred.
 2015-09-10 03:18:48 +01:00
triton
53040c7989 Enable SSL on HTTP libcurl for Windows. 2015-09-10 03:07:19 +01:00
triton
8b4e026057 Fixed HTTP only compilation define to actually work. 2015-09-10 03:07:19 +01:00
triton
5952d054e5 Rename "framework" to "dotnetframework". 
"framework" is a very generic term and hard to tell what it's actually about.

Keeps "framework" around for backwards compatibility.
 2015-09-10 02:58:52 +01:00
starkos
113112b721 Merge pull request #184 from Blizzard/local-queries 
Local queries
 2015-09-09 15:13:03 -04:00
starkos
b5ee3ac021 Merge pull request #169 from TurkeyMan/llvm_toolset 
Support LLVM platform toolset for MSC; Clang in Visual Studio.
 2015-09-09 15:06:53 -04:00
Jason Perkins
5cd081cf65 Roll back pull request #162 
As discussed in the conversion on the request, and on issue #151.
 2015-09-09 14:22:43 -04:00
Tom van Dijck
40c8127679 Merge pull request #2 from Bekenn/fix-path-join-tests 
Added tests for path.join
 2015-09-08 12:17:32 -07:00
James Touton
d26944a64e Added tests for complex joins with .. components. 2015-09-05 17:40:50 -07:00
James Touton
047cea2213 Removed redundant check. 2015-09-05 16:54:10 -07:00
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
Jason Perkins
b4703a52ac Update core modules to reflect recent test framework solution symbol renaming 2015-09-05 10:28:35 -04:00
starkos
560e86dcd3 Merge pull request #254 from starkos/restore-test-createsolution 
Put back test.createsolution() function
 2015-09-04 16:25:10 -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
741bd5524e Put back test.createsolution() function 
Restore `test.createsolution()` alongside the new `test.createWorkspace()`. The former creates a workspace with the name "MySolution", which will pass all tests using the old name, while the latter creates a workspace named "MyWorkspace" for consistency.
 2015-09-04 15:40:12 -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
starkos
b2f11fd3e3 Merge pull request #252 from starkos/even-more-workspace-renames 
Update core modules to reflect recent test framework solution symbol renaming
 2015-09-04 11:14:34 -04:00
Jason Perkins
1312a586e3 Update core modules to reflect recent test framework solution symbol renaming 2015-09-04 11:09:49 -04:00
starkos
2d325bda81 Merge pull request #250 from starkos/even-more-workspace-renames 
Even more workspace renames
 2015-09-04 11:03:28 -04:00
Jason Perkins
aa88ddab96 Rename "MySolution" to "MyWorkspace" across tests 2015-09-03 18:03:39 -04:00
Jason Perkins
c3d2e226a3 Rename solution to workspace in test suites 2015-09-03 18:03:39 -04:00
Jason Perkins
e4db08ef8a Rename solution test folders to workspace 2015-09-03 18:03:39 -04:00