Commit Graph

2713 Commits

Author SHA1 Message Date
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
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
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
Sam Surtees
438949a7a1 Updated packaging script
- Find all occurrences of files wanting to be deleted rather than assuming locations
- Added vs2017 and bsd to project file generation
2017-04-21 02:37:31 +10:00
Jason Perkins
42bfc2244d Merge pull request #748 from LORgames/ssurtees/osTranslateCommands
os.translateCommands now supports multiple tokens
2017-04-19 14:05:31 -04:00
Jason Perkins
a840df4642 Merge branch 'master' into ssurtees/osTranslateCommands 2017-04-19 14:00:47 -04:00
Jason Perkins
97c36f8d2e Merge pull request #747 from LORgames/ssurtees/bootstrapCleanup
Bootstrap makefile now cleans up previous builds before building
2017-04-19 13:58:36 -04:00
Sam Surtees
537392428d os.translateCommands now supports multiple tokens 2017-04-20 02:05:39 +10:00
Sam Surtees
713df1c9f3 Bootstrap makefile now cleans up previous builds before building 2017-04-20 01:17:42 +10:00
Sam Surtees
dfee2c0184 Fixed erroneous escape usages in VS2010+
- Added tests for sensible escape usage locations (defines, not undefines or warnings)
2017-04-18 01:13:56 +10:00
Samuel Surtees
39367d6c57 Merge pull request #742 from LORgames/ssurtees/bsd
Added BSD support
2017-04-15 12:45:02 +10:00
Jason Perkins
3a5d065f46 Merge pull request #740 from LORgames/ssurtees/deprecateWinMainFlag
Properly deprecate WinMain flag
2017-04-14 10:36:06 -04:00
Jason Perkins
54ab932971 Merge branch 'master' into ssurtees/bsd 2017-04-14 10:24:40 -04:00
Aleksi Juvani
067db7a659 Warn about NuGet package dependencies 2017-04-14 13:42:37 +03:00
Aleksi Juvani
cf82b2cf22 Fix not all versions of NuGet packages being found
If a package has a lot of versions, the NuGet API returns multiple
"pages" of results, but we only looked at the first "page". This
happened with the "NLog" package for example.
2017-04-14 13:42:36 +03:00
Aleksi Juvani
368ef42976 Respect copylocal for NuGet packages 2017-04-14 13:42:35 +03:00
Aleksi Juvani
87f527c1df Validate NuGet package strings 2017-04-14 13:42:34 +03:00
Aleksi Juvani
8286a7b9b6 Add nugetsource API for custom package sources
Non-gallery sources (such as NuGet.Server) are currently unsupported due
to API limitations.
2017-04-14 13:42:33 +03:00
Aleksi Juvani
52b21eefdb Raise an error if trying to use NuGet without Curl 2017-04-14 13:42:32 +03:00
Aleksi Juvani
34eb9c691a Fix certain NuGet API error messages 2017-04-14 13:42:31 +03:00
Aleksi Juvani
df6c1f4aab Add test for multiple assemblies in C# NuGet packages 2017-04-14 13:42:30 +03:00
Aleksi Juvani
3bdf746fcc Fix C# NuGet tests 2017-04-14 13:42:29 +03:00
Aleksi Juvani
bd3c542d63 Fetch NuGet API data on demand, not all at once 2017-04-14 13:42:26 +03:00
Aleksi Juvani
c57477229c Fix NuGet assembly references in C# projects
For C# projects, we need to get the assembly paths from the NuGet API,
instead of assuming that the package only contains one assembly with the
same name as the package.
2017-04-14 13:40:20 +03:00
Aleksi Juvani
bb992e6576 Validate NuGet package versions with the NuGet API 2017-04-14 13:40:12 +03:00
Aleksi Juvani
cbcb942e57 Validate NuGet package names with the NuGet API 2017-04-14 13:34:40 +03:00
Aleksi Juvani
39720da733 Raise error on packages.config conflict 2017-04-14 13:34:39 +03:00
Aleksi Juvani
77463534c9 Fix NuGet packages.config files missing from projects 2017-04-14 13:34:39 +03:00
Aleksi Juvani
b2bbf00512 Fix NuGet packages.config generation
This was generated on a per-solution basis when one needed to be
generated for each project.
2017-04-14 13:34:38 +03:00
Sam Surtees
164fadc857 Properly deprecate WinMain flag 2017-04-14 13:09:15 +10:00
Samuel Surtees
21c3c3d290 Merge pull request #743 from industriousone/fix-missing-deprecation-messages
Clean up the deprecated APIs
2017-04-14 12:59:25 +10:00
Jason Perkins
d1f5c333b0 Clean up the deprecated APIs
- Add "Use … instead." messages to any deprecations that did not have one
- Change deprecation date on APIs without a message to current date
- Remove APIs that have been deprecated for more than a year

h/t to @samsinsane for original PR on which this is based (#741)
2017-04-13 15:37:49 -04:00
Sam Surtees
7b55321473 Added BSD support 2017-04-14 03:14:27 +10:00
Samuel Surtees
957287643d Merge pull request #686 from Blizzard/language-api
Refactor language flags to go through the language API.
2017-04-13 21:21:49 +10:00
Tom van Dijck
d285fa68a6 Refactor language flags to go through the language API.
So you can use 'language "C++11"' instead of 'flags { "C++11" }'
2017-04-11 12:43:58 -07:00