AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity
3,266 Commits 1 Branch 1 Tag 32 MiB
6da758cdd7
Commit Graph

3266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom van Dijck
9517fd54b8 Merge pull request #928 from Blizzard/fix-test_configset 
sometimes due to ordering of test, we're in a rule scope.
 2017-10-17 08:00:46 -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
3f0aa55e8b sometimes due to ordering of test, we're in a rule scope, which makes settings some of the values into configsets illegal. 
So we just force ourselves into a project scope.
 2017-10-16 16:43:02 -07:00
Tom van Dijck
bf8f711425 bug fix for recursive token expansion 
added test in gmake2.
 2017-10-16 16:38:32 -07:00
Tom van Dijck
0ee416a37c Merge pull request #922 from Blizzard/gmake2-pch-fix 
gmake2 bug fix.  When generating gmake file with pch headers
 2017-10-16 11:28:32 -07:00
Tom van Dijck
3708b49d54 Merge pull request #923 from Blizzard/arm64 
Add Visual Studio ARM64 support.
 2017-10-16 11:25:09 -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
R. Blaine Whittle
9be911390d gmake2 bug fix. When generating gmake file with pch headers 
for either gcc or clang, the generated
make files assumed the system had the touch command.
Which isn't true by default on windows.
 2017-10-13 09:12:03 -07:00
Tom van Dijck
a15c465d63 Merge pull request #921 from Blizzard/compiler-warnings 
Compiler warnings
 2017-10-13 09:08:34 -07:00
Tom van Dijck
5a0e2c8cb1 Merge pull request #920 from Blizzard/selftest-fix 
small fix in self-test module.
 2017-10-13 09:08:00 -07:00
Tom van Dijck
d4a95ae606 Merge pull request #919 from Blizzard/gmake2-perfile_flags-test 
Add perfile flags test for gmake backend.
 2017-10-13 09:07:45 -07:00
J Guy Davidson
922440da94 MASM preprocessor definitions (#917) 
* MASM preprocessor definitions
 2017-10-13 09:06:57 -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
a93fb478cf small fix in self-test module. 2017-10-12 16:09:49 -07:00
Tom van Dijck
9da8888af0 Add perfile flags test for gmake backend. 2017-10-12 16:08:58 -07:00
Samuel Surtees
798b72b7d4 Merge pull request #913 from Blizzard/fix-translate 
Fix subtle bug in table.translate
 2017-10-10 23:33:35 +10: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
Tom van Dijck
472523d59d fixes to dotnetbase code for C++ nuget support. 2017-10-09 10:38:01 -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
7a3d134d58 added unit test for path objects that contain premake tokens. 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
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
Thomas Desveaux
725b76943f Merge remote-tracking branch 'core/master' into fix-mergeFilters 2017-09-06 15:01:05 +02:00
Thomas Desveaux
49061141ef Fix context.mergeFilters 2017-09-06 14:44:42 +02: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
Tom van Dijck
c863674d1f flip default to clang and deal with platformToolset better. 2017-08-29 12:08:39 -07: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