Tom van Dijck
66362c08c0
Merge pull request #931 from CreativeAssembly/master
...
Added synchronous and C-Throw to VS projects.
2017-10-19 08:44:11 -07:00
PJ O Halloran
83c9cc03f5
Added extra information for Windows platform when copyfile fails.
2017-10-18 22:32:01 +01:00
J Guy Davidson
26558d1597
Merge branch 'master' into master
2017-10-18 08:16:41 +01:00
Tom van Dijck
378c074424
Merge pull request #927 from Blizzard/test-detoken-bug
...
bug fix for recursive token expansion
2017-10-17 08:38:13 -07:00
Guy Davidson
270cbc0365
Completed exception handling
...
Added synchronous and C-Throw to VS projects.
2017-10-17 12:27:09 +01:00
Tom van Dijck
bf8f711425
bug fix for recursive token expansion
...
added test in gmake2.
2017-10-16 16:38:32 -07:00
jmears
cfff6870bf
Add Visual Studio ARM64 support. I verified that this actually works with ARM64 Visual Studio.
2017-10-13 09:13:54 -07:00
jmears
f1b9aecab3
lua_error is a noreturn function.
2017-10-12 16:11:06 -07:00
jmears
a0ef053b08
Unused parameter warning fix.
2017-10-12 16:10:54 -07:00
Tom van Dijck
450822fe1d
Fix subtle bug in table.translate
...
```
ipairs stops enumerating as soon as it cannot find the next index.
If you make a the following table:
{'a', nil, 'b', 'c'}
ipairs will stop enumerating after 'a',
while #tbl will tell you there is 4 elements.
```
2017-10-09 10:38:46 -07:00
R. Blaine Whittle
116b1c2c80
for vs2017 and up nuget is now handled by msbuild instead of premake
...
via the new PackageReference nodes.
The upsides here are
1) the MS package downloading and validation is much faster than the premake version
2) since the config is in the project file instead of packages.config which means
multiple nuget projects can sit in the same folder.
Fixed nuget code to only use PackageReference on .net projects,
and moved validation code into the module where it belongs.
2017-10-09 10:38:01 -07:00
R. Blaine Whittle
3cdaed431e
code style fixes for review of deferred join
2017-10-04 09:53:00 -07:00
R. Blaine Whittle
b88d4eff3e
[core] path:join can now be deferred for those paths that execute lua
...
prior to this change, paths that begin with ${ } were sometimes assumed to
be either absolute or relative. new functions have been added in order
to reduce the number of systems that can break.
new functions are
path:absolutetype -> similair to isabsolute but can return an unknown or maybe result
path:deferredjoin -> similair to path:join but creates a string for unknown absolute
paths which we except to be generated at bake time
path:hasdeferredjoin -> predicate to determine if a path needs to be evaled for
a deferred join
path:resolvedeferredjoin -> resolves a deferredjoin path to an actual path
this is to be called after any %{} replacements occur.
right now all api path types use the deferredjoin code path and
detoken, solution:makerelative and project:makerelative have been updated
to use resolvedeferredjoin.
unit tests have been created to test the four new path functions.
added unit tests
2017-10-04 09:53:00 -07:00
Mike Aversa
dd3221dff6
Fix for build failure in interop projects (/mt with /clr not supported)
2017-10-03 09:53:54 -07:00
R. Blaine Whittle
a95e083c39
small refactor of translateCommandsAndPaths to make it easier
...
to change behavor of single paths via premake.override
2017-10-03 09:53:34 -07:00
Jason Perkins
fba33053af
Merge branch 'master' into ssurtees/ios
2017-09-04 11:32:39 -04:00
Victor Peter Rouven Müller
3da6eb439a
Fix F# project generation ( #887 )
...
* Fix missing project import
* F# files must be marked as compile too
2017-09-03 08:51:50 -07:00
Tom van Dijck
f2f739d79c
Fsharp support ( #879 )
...
* Generate fsproj for F# projects.
* store the order of the original file list.
* fixes based on review.
* I guess this was supposed to be moved.
2017-08-30 11:35:42 -07:00
Sam Surtees
98a14ff624
Added basic iOS support to XCode4
2017-08-31 02:56:41 +10:00
Samuel Surtees
a12423f7dc
Merge pull request #882 from Blizzard/filter-host
...
Allow filtering on host.
2017-08-29 22:31:30 +10:00
Tom van Dijck
d2bfb1595f
Allow filtering on host.
...
for example:
```lua
filter { 'host:windows' }
postbuildcommand { 'robocopy *.dll c:\dlls' }
```
2017-08-28 16:58:23 -07:00
Tom van Dijck
b8df7985e8
Allow tokens to start with a ! to disable making paths relative.
2017-08-28 16:03:06 -07:00
adamkay
a0902594c1
Add lua error handling to curlProgressCallback ( #875 )
...
* add error reporting to curlProgressCallback
* Refactor lua error handling
* Fix doc in os_compile.c
* Fix João's name
Visual Studio messed up the encoding I guess..
* Fixed error_handler_index calculation
error_handler_index is no longer valid after pcall. use positive index
2017-08-28 08:31:50 -07:00
Tom van Dijck
1b8bb77d96
Update lua_auxlib.c
...
fix minor typo.
2017-08-18 10:49:37 -07:00
Jason Perkins
c501f53a04
Fix error reporting for missing core scripts ( #876 )
2017-08-18 10:48:12 -07:00
Tom van Dijck
82f04b8b1d
Merge pull request #866 from Blizzard/fix-istarget-ishost
...
fix os.istarget and os.ishost to use the systemTags table as well.
2017-08-10 08:25:32 -07:00
Tom van Dijck
3fad4dd0d3
Merge pull request #867 from Blizzard/fix-path-translate
...
Fix path translate
2017-08-10 08:25:11 -07:00
Tom van Dijck
4a500dbb7d
Fix prj.system bug in oven.
2017-08-08 12:49:38 -07:00
Tom van Dijck
cf45d30f5b
call "path.getDefaultSeparator" allowing it to be overridden.
2017-08-07 17:51:15 -07:00
Tom van Dijck
d1af0157a0
fix os.istarget and os.ishost to use the systemTags table as well.
2017-08-07 10:20:53 -07:00
Tom van Dijck
dce5e604dc
Merge pull request #861 from Blizzard/binary-embed
...
Allow embedding of binary resources.
2017-08-07 09:26:32 -07:00
Tom van Dijck
18b9383d98
Merge pull request #862 from Blizzard/minor-optimization-oven
...
small optimization in oven.
2017-08-07 08:49:50 -07:00
Tom van Dijck
076b9565bc
Merge pull request #863 from Blizzard/bug-api-addallowed
...
fix for duplicate 'allowed'.
2017-08-07 08:48:36 -07:00
Tom van Dijck
7b3b2fa31b
move tags into globally accesible table, so we don't have to overload the getSystemTags method all over the place.
2017-08-04 09:27:05 -07:00
Tom van Dijck
f232a1e829
fix for duplicate 'allowed'.
2017-08-04 09:25:44 -07:00
Tom van Dijck
d4b8c34e63
small optimization in oven.
2017-08-04 09:24:41 -07:00
Tom van Dijck
9f33db3ba7
Allow embedding of binary resources.
2017-08-04 09:22:57 -07:00
Tom van Dijck
74819eb945
Merge pull request #854 from Blizzard/high-warning
...
[core] Add High as a new warning level
2017-08-01 11:09:40 -07:00
Tom van Dijck
d4dd8dd585
Merge pull request #857 from Blizzard/fix-action-override-targetos
...
Fix action override targetos
2017-08-01 11:03:17 -07:00
Tom van Dijck
f3f738370c
Merge pull request #856 from Blizzard/fix-get-relative-windows
...
Fix path_getrelative for Windows
2017-08-01 11:02:32 -07:00
Tom van Dijck
4fc5827496
Fix --os overriding the target OS.
2017-08-01 10:00:29 -07:00
SungUn Park
1d6d4e17ce
Fix path_getrelative for Windows
...
Windows now performs case insensitive comparison for strings.
2017-08-01 09:59:11 -07:00
Patrick Doane
e49b404d73
[core] Add High as a new warning level
...
Maps to /W4 on VS and -Wall for gcc/clang removing -Wextra
2017-08-01 09:56:00 -07:00
Tom van Dijck
36f835f313
Proof of concept for binary modules.
2017-07-04 19:19:23 -07:00
Tom van Dijck
fea573561c
Merge pull request #834 from Blizzard/native-module-code
...
Allow modules to register C code too.
2017-06-23 14:25:14 -07:00
Tom van Dijck
d2b8a2183c
Fix bug in 'action.isConfigurable' not checking for onWorkspace.
2017-06-21 17:35:36 -07:00
Tom van Dijck
b4c4c4e614
Allow modules to register C code too.
...
only works for embedded modules.
2017-06-21 13:30:38 -07:00
Tom van Dijck
6752ea16e4
Added option to create bundle and frameworks on macOS.
2017-06-21 09:53:56 -07:00
Tom van Dijck
f7a5098d59
Merge pull request #833 from Blizzard/fix-empty-rules
...
Fix empty rules.
2017-06-21 09:37:17 -07:00
Tom van Dijck
9ad28d038a
Merge pull request #832 from Blizzard/fix-compiler-warnings
...
Fix a few compiler warnings
2017-06-21 09:36:58 -07:00