AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity
2,264 Commits 1 Branch 1 Tag 32 MiB
309ef32ff8
Commit Graph

2264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Manu Evans
b35082ba9b Merge pull request #241 from Blizzard/zip-fix 
fix bug in zip.extract.
 2015-09-03 20:08:17 +10: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
48131e0598 Update unit tests for extension settings change 2015-08-31 22:23:15 +03:00
aleksijuvani
6ed366842c vs2010_vcxproj.lua: change importExtensionSettings to use a call array 2015-08-31 22:22:46 +03:00
aleksijuvani
35e5a3d3a0 Update unit tests for extension targets change 2015-08-31 22:13:41 +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
starkos
b52b731e6a Merge pull request #210 from dcourtois/user_modules_preloading 
added support for preloading user modules
 2015-08-30 11:10:18 -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
Jason Perkins
14525e8161 Changes names in core test suites 2015-08-28 16:16:14 -04:00
Manu Evans
c9731e5435 Merge pull request #233 from LORgames/ssurtees/casingIssuesTestCase 
Added test case to ensure the functionality isn't broken in the future.
 2015-08-27 22:52:28 +10:00
Sam Surtees
773aecbee7 Added test case to ensure the functionality isn't broken in the future. 2015-08-27 22:35:04 +10: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
starkos
f5297d3aef Merge pull request #230 from LORgames/ssurtees/casingIssues 
Fixed options not being added to the list as lowercase
 2015-08-26 16:37:29 -04:00
Sam Surtees
06f928e964 Fixed options not being added to the list as lowercase. Fixes: 216 2015-08-26 21:25:33 +10:00