Commit Graph

3062 Commits

Author SHA1 Message Date
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
R. Blaine Whittle
e569700eb7 removed a no longer needed make pch race condition fix 2017-10-04 08:56:42 -07:00
R. Blaine Whittle
0f8d5ed4c6 allow per file warning levels for VS2010+ 2017-10-04 08:49:08 -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
Dan Dunham
a3426c33a2 Fix makefile/utility project toolset under vs2015 and vs2017
See: https://github.com/premake/premake-core/issues/480
2017-10-03 09:53:14 -07:00
Samuel Surtees
9510d925ab Merge pull request #902 from Blizzard/fix-vcxproj-manifest
VS fix for projects with multiple manifest files
2017-10-03 18:13:36 +10:00
Tom van Dijck
43684b7dae Merge pull request #897 from hsandt/dialect-xcode
Fix c(pp)dialect generating uppercase C(++)xx for Xcode, replace gnu99 with compiler-default
2017-10-02 11:46:04 -07:00
R. Blaine Whittle
14babc1db3 VS fix for projects with multiple manifest files 2017-10-02 11:16:07 -07:00
huulong
23f4242448 Move c(pp) language standard definitions outside Xcode functions 2017-09-29 21:55:57 +02:00
hsandt
d3d2fbb03d Merge branch 'master' into dialect-xcode 2017-09-20 23:02:30 +02:00
huulong
c9ea228366 Fix c(pp)dialect generating uppercase C(++)xx in Xcode build configuration, replace gnu99 with explicit compiler default 2017-09-20 22:29:41 +02:00
Erian Russell
8e02b419d0 fix disablewarnings (#795) (#896) 2017-09-19 09:13:09 -07:00
Jason Perkins
911cb20d57 Merge pull request #883 from LORgames/ssurtees/ios
Added basic iOS support to XCode4
2017-09-05 13:18:06 -04: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
Samuel Surtees
225bfb0789 Merge pull request #880 from Blizzard/detoken-exl-support
Allow tokens to start with a ! to disable making paths relative.
2017-08-29 22:16: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
Jason Perkins
fa28c63f07 Merge branch 'release-5.0-alpha12' 2017-08-23 11:06:37 -04:00
Jason Perkins
cb6a5363b5 Restore dev version 2017-08-23 11:06:12 -04:00
Jason Perkins
2ebc345462 Fix package.lua os.execute return value checks for Lua 5.3 2017-08-22 10:50:30 -04:00
Jason Perkins
e1af3ed695 Update support files for alpha12 release 2017-08-21 11:44:47 -04: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
Samuel Surtees
5a75b7e488 Merge pull request #872 from starkos/quiet-binmodule-test-output
Rework binmodule example to silence unit test console output
2017-08-11 12:48:34 +10:00
Samuel Surtees
852043b461 Merge pull request #874 from starkos/disable-macos-findheaders-test
Disable failing `os.findheader()` unit test on macOS
2017-08-11 12:48:17 +10:00
Jason Perkins
e2a49986ee Disable failing os.findheader() unit test on macOS 2017-08-10 14:55:16 -04:00
Jason Perkins
c3b0da7894 Rework binmodule example to silence unit test console output 2017-08-10 14:40:45 -04: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
970f1e4689 Merge pull request #868 from Blizzard/fix-filter-vs201x
Filters always have to use \ regardless of target platform.
2017-08-10 08:24:46 -07:00
Tom van Dijck
55a2fc22b2 Merge pull request #870 from Blizzard/fix-oven
Fix prj.system bug in oven.
2017-08-10 08:24:23 -07:00
Tom van Dijck
a0cbd33b66 Merge pull request #824 from Blizzard/fix-default-toolset
Set default toolsets for vs2005 and vs2008.
2017-08-09 09:23:34 -07:00
Tom van Dijck
cb1cbe5c4f Merge pull request #865 from Blizzard/remove-prints
Remove "test.print" calls.
2017-08-09 09:21:01 -07:00
Tom van Dijck
4a500dbb7d Fix prj.system bug in oven. 2017-08-08 12:49:38 -07:00
Tom van Dijck
2916fc44b8 Filters always have to use \ regardless of target platform. 2017-08-07 17:54:18 -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
31353fbc56 Fix tests. 2017-08-07 09:44:48 -07:00
Tom van Dijck
571d6ae371 Set default toolsets for vs2005 and vs2008. 2017-08-07 09:34:16 -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
e0cbecd100 Remove "test.print" calls. 2017-08-07 09:26:07 -07:00
Tom van Dijck
133856c0ef Update embed.lua 2017-08-07 08:52:18 -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