Commit Graph

2448 Commits

Author SHA1 Message Date
Ben Ratzlaff
172a96b9cd Merge branch 'master' of https://github.com/premake/premake-core 2016-05-08 20:23:26 -07:00
paskal
1227d5c620 Fixed testing of filtering. 2016-05-08 01:35:06 +02:00
paskal
c44e7c4ed6 Removed filter toolset patch prints 2016-05-08 01:35:06 +02:00
Ben Ratzlaff
da5682a630 Added xcode workspace directories to the ignore list 2016-05-05 22:41:34 -07:00
Samuel Surtees
4b2a3f3eac Merge pull request #489 from Blizzard/io-read-write
add 'io.writefile' and 'io.readfile' shortcut methods.
2016-05-05 20:40:17 +10:00
Tom van Dijck
48aea04b94 add 'io.writefile' and 'io.readfile' shortcut methods. 2016-05-04 16:10:10 -07:00
Jason Perkins
7859391d33 Merge pull request #486 from ThomasKugler/DependsUponXsd
Set DependsUpon to xsd files.
2016-05-03 11:48:01 -04:00
paskal
be9f5c079e Merge commit 'bf94b638f36f996b1ad208cf5fbb564890650704' of https://github.com/tritao/premake-core 2016-05-03 11:03:47 +02:00
Samuel Surtees
ef03d2a475 Merge pull request #487 from Blizzard/gmake-fixes
Gmake fixes
2016-05-03 18:38:35 +10:00
Samuel Surtees
2e97574003 Merge pull request #488 from starkos/fix-rule-xml-utf8
Fix casing on Visual Studio rule XML encoding entity
2016-05-03 18:36:45 +10:00
Tom van Dijck
43547450dd Fix precompiled header file lookup in gmake backend. 2016-05-02 16:55:50 -07:00
Jason Perkins
df7adbfe50 Fix casing on Visual Studio rule XML encoding entity 2016-05-02 19:30:45 -04:00
Tom van Dijck
1dbc1ea784 properly escape defines. 2016-05-02 13:57:12 -07:00
Thomas Kugler
f967bf3932 Set DependsUpon to xsd files.
Related tp #416.
2016-04-27 11:08:02 +02:00
Tom van Dijck
921be76b06 Merge pull request #485 from premake/update-changes
Fill in a partial list of changes since the previous beta
2016-04-25 15:04:44 -07:00
Jason Perkins
94428eb58d Fill in a partial list of changes since the previous beta 2016-04-25 17:40:01 -04:00
Tom van Dijck
7450dd133b Update Readme.md
Update the readme.md to point to new jenkins server for windows build.
I moved away from an Azure virtual machine onto a dedicated 8-core blade through delimiter.com
2016-04-24 11:41:08 -07:00
Samuel Surtees
84dc6b6857 Merge pull request #481 from starkos/update-codelite
Update to latest version of the CodeLite module
2016-04-22 09:27:17 +10:00
Jason Perkins
72865a4961 Update to latest version of the CodeLite module 2016-04-21 19:17:00 -04:00
Manu Evans
7ffa114e91 Merge pull request #474 from aleksijuvani/fix-clang-optimize-debug
Fix optimize "Debug" for Clang
2016-04-15 22:42:19 +10:00
aleksijuvani
66344e8e43 Update CodeLite submodule to fix unit tests 2016-04-15 15:30:18 +03:00
aleksijuvani
8337746645 Fix optimize 'Debug' for clang
The compiler flag '-Og' isn't valid for clang, so just turn
optimizations off when 'Debug' is specified.
2016-04-15 15:30:18 +03:00
Samuel Surtees
d0dbe3274c Merge pull request #478 from TurkeyMan/codelite_path_fix
Fixed CodeLite path separator problem.
2016-04-15 21:46:30 +10:00
Manu Evans
612c4feefc Fixed CodeLite path separator problem. 2016-04-15 21:34:07 +10:00
Samuel Surtees
5373584834 Merge pull request #475 from starkos/fix-no-nuget-packages
Only output NuGet project element if packages were listed by the project
2016-04-14 19:16:41 +10:00
Jason Perkins
10b83b950f Only output NuGet project element if packages were listed by the project 2016-04-13 18:55:44 -04:00
Jason Perkins
bef18b7664 Merge pull request #450 from LORgames/ssurtees/targetPlatformVersionAPI
Added targetplatformversion API
2016-04-13 12:15:25 -04:00
Sam Surtees
5059099a5b Added systemversion API. Fixes #315 2016-04-12 21:10:23 +10:00
Jason Perkins
870d21f382 Merge pull request #471 from Blizzard/optimize-copy-merge-filters
optimize copyFilters/mergeFilters
2016-04-12 06:25:36 -04:00
Jason Perkins
9aa3cf7e96 Merge pull request #472 from Blizzard/nuget-stability-fix
We want the packages table to be in the order we specified.
2016-04-11 18:09:59 -04:00
Tom van Dijck
c7bdab688e We want the packages table to be in the order we specified. 2016-04-11 13:13:53 -07:00
Tom van Dijck
29f588fdc9 optimize copyFilters/mergeFilters 2016-04-11 11:52:12 -07:00
Jason Perkins
002e65d428 Merge pull request #453 from aleksijuvani/nuget-in-vs-exporter
Add NuGet support to the Visual Studio exporter
2016-04-11 13:30:49 -04:00
Jason Perkins
4f9bfa17c1 Merge pull request #464 from Blizzard/file-categories-refactor
File categories refactor
2016-04-11 13:29:50 -04:00
Samuel Surtees
5d87c07523 Merge pull request #463 from neico/change-to-filter
migrated "configuration" to "filter"
2016-04-11 23:49:07 +10:00
Tom van Dijck
da89636575 Test for .asm file support in visual studio action. 2016-04-07 12:52:58 -07:00
Tom van Dijck
cf1b44018c refactor file categorization in vcxproj backend.
and add Masm support.
2016-04-07 12:52:58 -07:00
Jason Perkins
eb4741d6b1 Merge pull request #469 from Blizzard/call-array-fix
fix bug when callArray gets called with nil.
2016-04-07 15:34:15 -04:00
Jason Perkins
7eae56f139 Merge pull request #468 from Blizzard/table-fix 2016-04-07 15:33:03 -04:00
Tom van Dijck
16d55d603d fix bug when callArray gets called with nil. 2016-04-07 12:19:51 -07:00
Darryl Despie
8f95eaaba9 table fixes 2016-04-07 12:19:12 -07:00
Tom van Dijck
4f3a554a0c Merge pull request #467 from Blizzard/tostring-fix
table.tostring should displays the metatable.
2016-04-07 10:11:28 -07:00
Tom van Dijck
3c4fca16f2 Merge pull request #466 from Blizzard/deepclone-fix
table.deepclone should clone the metatable too.
2016-04-07 10:09:35 -07:00
aleksijuvani
3ff1501d81 Add .NET 4.6 to vstudio.frameworkVersions 2016-04-07 15:46:13 +03:00
aleksijuvani
c6a089374b Simplify cs2005.identifyFrameworkVersions 2016-04-07 15:46:12 +03:00
aleksijuvani
da625cf3f8 Match vstudio.frameworkVersions to dotnetframework API 2016-04-07 15:46:12 +03:00
Tom van Dijck
3232fd9cff table.tostring should displays the metatable. 2016-04-06 16:18:42 -07:00
Tom van Dijck
17620edaf8 table.deepclone should clone the metatable too. 2016-04-06 16:17:52 -07:00
neico
f83a1aea7e migrated "configuration" to "filter", resolves #462 2016-04-07 01:01:22 +02:00
Jason Perkins
65df2ffbeb Merge pull request #459 from NickCaplinger/patch-1
Update README to fix broken links
2016-03-30 07:54:33 -04:00