Commit Graph

2746 Commits

Author SHA1 Message Date
Lynix
b14af470fa Fix typo 2017-05-17 23:21:15 +02:00
Lynix
e823797864 Merge remote-tracking branch 'refs/remotes/premake/master' 2017-05-14 14:20:48 +02:00
Lynix
57d6e06a2f Merge remote-tracking branch 'refs/remotes/premake/master' 2017-05-14 14:11:16 +02:00
Tom van Dijck
863b89625f Merge pull request #769 from Blizzard/cmdpath-token
[core] new cmd path decorations with %[] syntax
2017-05-04 10:28:19 -07:00
Tom van Dijck
6475e2a307 Merge pull request #778 from LORgames/ssurtees/vs200xNoPCH
Added support at the file level for the NoPCH flag in VS200x projects
2017-05-04 10:14:00 -07:00
Sam Surtees
43824fa22c Added support at the file level for the NoPCH flag in VS200x projects 2017-05-05 02:20:45 +10:00
Samuel Surtees
347c9c418d Merge pull request #768 from Blizzard/fix-vstudio
[core] Fix Visual Studio ExecutablePath settings.
2017-05-03 02:35:55 +10:00
Tom van Dijck
289e880b38 Add tests for ExecutablePath. 2017-05-02 09:15:42 -07:00
Tom van Dijck
f1d461f3a5 Add test for multiple tokens. 2017-05-02 09:09:38 -07:00
Tom van Dijck
b6385ce89e Merge pull request #772 from Blizzard/fix-default-entrypoint
[core] Don't set default entrypoint, rely on visual studio default.
2017-05-02 08:20:19 -07:00
Tom van Dijck
fcb76a1c91 [core] Don't set default entrypoint, rely on visual studio default. 2017-05-01 14:33:32 -07:00
R. Blaine Whittle
bce3f2c4ed [core] new cmd path decorations with %[] syntax
this is for marking cmd options as paths relative to the
projects base dir. decorated paths can use tokens / macros
decorated paths are wrapped with "".  Final slashes are
honored. Slashes are platform specific.

Note that the working dir for custom cmd is undefined as
the current working dir will be different between xcode (wks.location)
and visual studio / make (prj.location.)  Changing the CWD isn't
a good default behavior (for reasons.)  This leads to prior
use of premake requiring alot of string concating / function calls
for path translations which make the cmd line difficult to read and maintain.
With path decorations, one can just make those relative paths with %[]
and everything should work.
2017-05-01 12:18:52 -07:00
Tom van Dijck
0c1d4e10ae [core] Fix Visual Studio ExecutablePath settings. 2017-05-01 12:02:11 -07:00
Tom van Dijck
b9fcad8102 Merge pull request #763 from Blizzard/colors
[core] Print warnings in purple
2017-05-01 10:46:46 -07:00
Tom van Dijck
ee0b66acf4 add 'term.warningColor' and some other useful term tools. 2017-05-01 09:14:31 -07:00
Tom van Dijck
6e175f026a [core] Print warnings in purple 2017-05-01 08:56:54 -07:00
Tom van Dijck
206c53610f Merge pull request #764 from Blizzard/filelineinfo
[core] get file/line information on deprecated API's.
2017-05-01 08:54:29 -07:00
Tom van Dijck
2c74dbee95 [core] get file/line information on deprecated API's. 2017-04-27 16:22:37 -07:00
Tom van Dijck
127fe78e14 Merge pull request #760 from Blizzard/add-arm-support-vs
Adding ARM support for Visual Studio.
2017-04-27 13:55:43 -07:00
Tom van Dijck
60071441a9 Merge pull request #761 from LORgames/ssurtees/rulesPropFix
Removed echo off in VS rules prop generator
2017-04-27 08:22:30 -07:00
Sam Surtees
43da317fe8 Removed echo off in VS rules prop generator 2017-04-28 00:48:21 +10:00
Tom van Dijck
1e648f5515 [core] Adding ARM support for Visual Studio. 2017-04-26 15:59:59 -07:00
Tom van Dijck
6cc2514737 Merge pull request #758 from LORgames/ssurtees/whitespaceCleanup
Cleaned up inconsistencies in whitespace
2017-04-25 11:54:42 -07:00
Sam Surtees
b251234b27 Cleaned up inconsistencies in whitespace 2017-04-26 03:40:43 +10:00
Tom van Dijck
091d96583e Merge pull request #757 from LORgames/ssurtees/consistency
Increased consistency of p. usage
2017-04-25 09:32:30 -07:00
Sam Surtees
fa3328440e Increased consistency of p. usage 2017-04-25 16:41:30 +10:00
Samuel Surtees
43c5e0a4ae Merge pull request #745 from LORgames/ssurtees/codeliteStartProjectFix
Fixed issue with using startproject API in CodeLite
2017-04-25 15:09:21 +10:00
Tom van Dijck
694f934693 Merge pull request #755 from Blizzard/fix-supported-languages
Add 'supports_language' callback to action
2017-04-24 13:54:53 -07:00
Tom van Dijck
da3835dd94 Merge pull request #756 from Blizzard/fix-path-translate
Fix a call to deprecated os.get()
2017-04-24 13:54:30 -07:00
Tom van Dijck
8827098d30 Fix a call to deprecated os.get() 2017-04-24 13:53:49 -07:00
Tom van Dijck
473b2f1e36 Merge pull request #734 from aleksijuvani/nuget-fixes
NuGet fixes
2017-04-24 13:43:41 -07:00
Tom van Dijck
292cb7d7b8 Merge pull request #739 from Blizzard/refactor-_OS
Refactor _OS, os.get() & os.is()
2017-04-24 13:43:18 -07:00
Tom van Dijck
6d471ecc2a Add 'supports_language' callback to action to validate languages now that we have multiple dialects 2017-04-24 13:37:28 -07:00
Tom van Dijck
b3ad14a51c current -> host. 2017-04-24 13:01:31 -07:00
Tom van Dijck
5f589ad5a6 replaced:
os.get() -> os.target()
os.is() -> os.istarget()
_OS -> _TARGET_OS

added:
os.current()
os.iscurrent()
2017-04-24 13:01:31 -07:00
Tom van Dijck
88d37b17c6 Merge branch 'master' into nuget-fixes 2017-04-24 12:59:41 -07:00
Tom van Dijck
97856fe923 Merge pull request #738 from aleksijuvani/curl-update
Update curl to 7.53.1
2017-04-24 12:58:34 -07:00
Tom van Dijck
53d83dffbe Merge pull request #746 from LORgames/ssurtees/vs2010EscapeFixes
Fixed erroneous escape usages in VS2010+
2017-04-24 12:52:19 -07:00
Tom van Dijck
a664715834 Merge pull request #752 from LORgames/ssurtees/VS2012Fixes
Fixed various issues with compiling with VS2012
2017-04-24 12:51:53 -07:00
Tom van Dijck
faa4af1ecd Merge pull request #753 from LORgames/ssurtees/httpProxy
Added proxy URL to http options
2017-04-24 12:50:07 -07:00
Tom van Dijck
477f426d2e Merge pull request #754 from LORgames/ssurtees/gmakeFix
Fixed issue with the OBJDIR value not being escaped
2017-04-24 12:49:51 -07:00
Jason Perkins
f474f51979 Merge branch 'master' into ssurtees/vs2010EscapeFixes 2017-04-24 14:46:06 -04:00
Jason Perkins
8da25c2a56 Merge pull request #751 from LORgames/ssurtees/compileAsFix
CompileAs element handles C++ now
2017-04-24 14:41:53 -04:00
Jason Perkins
5a85b73f9f Merge branch 'master' into ssurtees/codeliteStartProjectFix 2017-04-24 14:38:09 -04:00
Jason Perkins
b2414be6e4 Merge branch 'master' into ssurtees/vs2010EscapeFixes 2017-04-24 14:37:52 -04:00
Sam Surtees
9c09a7142f Fixed issue with the OBJDIR value not being escaped 2017-04-25 02:33:52 +10:00
Sam Surtees
8ac4955b22 Fixed various issues with compiling with VS2012 2017-04-25 02:06:34 +10:00
Sam Surtees
25de4e419e Added proxy URL to http options 2017-04-25 01:51:04 +10:00
Sam Surtees
5b688cac93 CompileAs element handles C++ now
- Added tests
2017-04-24 00:42:48 +10:00
Jason Perkins
74b2f4680e Merge pull request #749 from LORgames/ssurtees/updatePackaging
Updated packaging script
2017-04-20 15:12:56 -04:00