Commit Graph

2940 Commits

Author SHA1 Message Date
Tom van Dijck
0a442f78ca A few fixes from our Blizzard Fork. 2017-06-13 14:46:49 -07:00
Tom van Dijck
6907f6785c Merge pull request #718 from Blizzard/add-notset-characterset
Adding support for NotSet characterset in VS2010+ (#79)
2017-06-13 14:25:13 -07:00
Tom van Dijck
9d4fa01146 Merge pull request #617 from Blizzard/fix-rules-xml
fix switch/separator in rules_xml
2017-06-13 14:24:52 -07:00
Tom van Dijck
3016d51e28 Add --insecure option for SSL curl requests. 2017-06-13 13:37:21 -07:00
Tom van Dijck
21631dd0e9 Adding tests, and fixing a few typos. 2017-06-13 12:11:54 -07:00
Tom van Dijck
d7b6f77abc fix switch/separator in rules_xml 2017-06-13 11:59:05 -07:00
Tom van Dijck
34bb100e75 Merge pull request #781 from Blizzard/criteria-tables
Allow filters to be written as tables:
2017-06-13 11:48:28 -07:00
Tom van Dijck
ef5828404c ASCII instead of NotSet, and add more tests. 2017-06-13 11:46:35 -07:00
Jacob Repp
cc107a4da4 Adding support for NotSet characterset in VS2010+ (#79) 2017-06-13 11:34:58 -07:00
Tom van Dijck
b66994d7d0 Merge pull request #802 from aleksijuvani/suppress-mkdir-warning
Suppress mkdir warning on Windows if the folder already exists
2017-06-13 11:20:10 -07:00
Tom van Dijck
230efba691 Adding gmake2 module 2017-06-13 09:51:58 -07:00
Tom van Dijck
80c7ed3099 [core] Add utility methods for rule and table. 2017-06-13 08:56:06 -07:00
Tom van Dijck
6841eb1752 [core] Allow filters to be written as:
```lua
filter {
    files  = { "**.c" },
    system = "windows"
}
```
2017-06-13 08:39:47 -07:00
Tom van Dijck
6437cfddd9 Merge pull request #788 from Blizzard/os-tags
Provide a way to 'tag' systems, and filter on those tags.
2017-06-13 08:32:42 -07:00
Tom van Dijck
bbae65fc0c Merge pull request #798 from noresources/fix-pch-gmake
create object directory before generating precompiled header
2017-06-13 08:31:41 -07:00
Aleksi Juvani
51a77ad34c Suppress mkdir warning on Windows if folder exists 2017-06-13 16:00:10 +03:00
Rick Appleton
382778c317 Added unittest for Xcode group support. 2017-06-08 13:47:50 +02:00
Rick Appleton
79d1c6f429 Groups in XCode workspace working. 2017-06-07 09:26:45 +02:00
Renaud Guillard
c926aa2dd1 update tests to reflect pch generation rule changes 2017-06-02 20:44:48 +02:00
Renaud Guillard
325edfcb6f create object directory before generating precompiled header 2017-06-01 19:06:21 +02:00
Tom van Dijck
1cddb0dffa Merge pull request #787 from DrLynix/compare-files-function
os.comparefiles function
2017-05-25 08:47:14 -07:00
Tom van Dijck
838c256686 Merge pull request #779 from noresources/findheader
add os.findheader()
2017-05-25 08:46:15 -07:00
Tom van Dijck
235d364756 Merge pull request #785 from DrLynix/unicode-file-operations-win32
Unicode file functions for Windows
2017-05-25 08:44:19 -07:00
Tom van Dijck
c5c3cd5b2c Merge pull request #776 from Blizzard/dialect-language
[core] Use 'cdialect' and 'cppdialect' instead of 'language'.
2017-05-25 08:43:53 -07:00
Tom van Dijck
0ec61b41c6 Merge pull request #771 from Blizzard/compileAs-API
[core] Use 'compileAs' API
2017-05-25 08:43:35 -07:00
Tom van Dijck
4a872d6990 Merge pull request #789 from Blizzard/tags-api
Add 'tags' filter api.
2017-05-25 08:41:56 -07:00
Tom van Dijck
5df2b3d90a Merge pull request #790 from Blizzard/fix-test-api
[self-test] fix nil dereference crash in test.isequal
2017-05-23 14:06:13 -07:00
Tom van Dijck
ff9114c031 [self-test] fix nil dereference crash in test.isequal 2017-05-19 14:56:08 -07:00
Tom van Dijck
f4516a8e67 [core] Add 'tags' filter. 2017-05-19 14:52:53 -07:00
Tom van Dijck
70e00883f8 Provide a way to 'tag' systems, and filter on those tags. 2017-05-19 14:50:47 -07:00
Lynix
0d420febaf os.comparefiles: return nil + error message if any of the file couldn't be opened 2017-05-18 21:34:23 +02:00
Jérôme Leclercq
eb6f591b9b Merge branch 'master' into compare-files-function 2017-05-18 21:20:55 +02:00
Jérôme Leclercq
b79d32ea0e Merge branch 'master' into unicode-file-operations-win32 2017-05-18 21:20:18 +02:00
Lynix
076f6a615a Add os.comparefiles function 2017-05-18 21:16:51 +02:00
Lynix
17cef1f509 Make os.stat unicode-aware 2017-05-18 20:30:53 +02:00
Lynix
97282c31b5 Fix io.open unicode override 2017-05-18 20:30:42 +02:00
Tom van Dijck
34aaff9c66 Merge pull request #786 from DrLynix/embed-typo
Fix typo in embed.lua
2017-05-17 15:04:07 -07:00
Lynix
b14af470fa Fix typo 2017-05-17 23:21:15 +02:00
Lynix
b2a6f1e09c Make os.writefile_ifnotequal unicode aware on Windows 2017-05-14 16:06:18 +02:00
Lynix
c9faaf334e Override existing file functions with unicode ones on Windows 2017-05-14 15:25:21 +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
Renaud Guillard
38bbf60993 test: disable os.findheader() on windows 2017-05-13 23:01:25 +02:00
Renaud Guillard
9eba1e7fb6 add os.findheader() 2017-05-06 00:00:51 +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
Tom van Dijck
7af2817869 [core] Use 'cdialect' and 'cppdialect' instead of 'language'. 2017-05-03 17:05:11 -07:00
Tom van Dijck
85b3e28de1 [core] Use 'compileAs' API 2017-05-02 14:09:06 -07: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