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

215 Commits

Author SHA1 Message Date
Tom van Dijck
0a79816d28 in some contexts we need pathVars regardless of whether the property allows it or not. 2017-12-06 09:42:34 -08:00
Tom van Dijck
5401bb0480 utility projects also allow configuration of the executable path. 2017-12-05 14:34:05 -08:00
Manu Evans
02f5a75fc9
Merge pull request #959 from Blizzard/multiple-gmake2-fixes 
Multiple gmake2 fixes
 2017-11-30 15:58:22 -08:00
Tom van Dijck
0eb325469b
Merge pull request #960 from Blizzard/sln-determinism 
Improve determinism in sln output.
 2017-11-30 15:50:42 -08:00
Tom van Dijck
117fc82f81
Merge pull request #957 from Blizzard/gmake2-fix 
fix gmake2 utility
 2017-11-30 12:00:40 -08:00
Tom van Dijck
c92c7a595e Improve determinism in sln output. 2017-11-30 09:39:17 -08:00
Tom van Dijck
366bb63a10 default toolset for linux/gmake is 'gcc'. 2017-11-30 09:34:27 -08:00
Tom van Dijck
431cba5c6a Gmake elseif (#161) 
* gmake2 elseif pattern for configurations.
https://ghosthub.corp.blizzard.net/premake/premake-core/issues/131

* fix error message.

* don't output else if there is no if statements.
 2017-11-30 09:33:55 -08:00
Tom van Dijck
0b4659cf1e makeUnique only for internal rules, not for all rules. 2017-11-30 09:33:42 -08:00
Tom van Dijck
6800af3342 fix buildoutput sequencing. 2017-11-30 09:33:31 -08:00
Tom van Dijck
bf4c71e8ba Fixes translateCommandsAndPaths, and debugargs. 2017-11-30 09:25:11 -08:00
Tom van Dijck
c7f0080a80 fix gmake2 utility outputting an entire set of elements. 2017-11-30 09:14:37 -08:00
Manu Evans
78a17435ca C++0x (and friends) dialect support. Useful on machines with old compilers. 2017-11-29 14:15:25 -08:00
Tom van Dijck
1279e6baf6
Merge pull request #950 from LORgames/ssurtees/gmakeDefaultPlatform 
Added defaultplatform support to gmake and gmake2 actions
 2017-11-29 12:14:30 -08:00
Tom van Dijck
0a61717399
Merge pull request #938 from premake/staticruntime 
Added `staticruntime` API. (#163)
 2017-11-29 12:13:07 -08:00
Tom van Dijck
a3c80ae238
Merge pull request #939 from premake/resolve_rule_props 
Resolve the rule properties for gmake (#162)
 2017-11-29 12:12:27 -08:00
Tom van Dijck
e1ece5672e
Merge pull request #941 from premake/pch_tabs 
Fix makefile PCH tab problem
 2017-11-29 12:11:57 -08:00
Tom van Dijck
ebbab7b452
Merge pull request #948 from Gereld/gmake2_clang_pch 
Fixed a bug in gmake2 with clang and pch.
 2017-11-29 12:11:40 -08:00
Tom van Dijck
9b55b587de
Merge branch 'master' into ssurtees/gmakeDefaultPlatform 2017-11-29 12:11:07 -08:00
tempura-sukiyaki
1c65a141b0 Add support for targetextension in xcode4 2017-11-29 00:44:00 +09:00
Sam Surtees
de03bb3249 Added defaultplatform support to gmake and gmake2 actions 2017-11-24 00:07:26 +10:00
Sam Surtees
d125d520e6 Added DPI awareness support to VS2010+ projects 2017-11-23 22:58:03 +10:00
Unknown
3bf3f791be Fixed a bug in gmake2 with clang and pch. 
Clang requires the pch file to be the first force-included item. This fix doesn't break pch usage in gcc.
 2017-11-12 20:59:51 +01:00
Manu Evans
16bf40dd00 Natvis files have an item group. 2017-11-09 14:44:06 -08:00
Manu Evans
0ebb85ba87 Fix makefile PCH tab problem 2017-11-06 18:00:54 -08:00
Manu Evans
861003a8ca Resolve the rule properties for gmake (#162) 2017-11-01 13:57:29 -07:00
Manu Evans
2de9966995 Added staticruntime API. (#163) 2017-11-01 13:55:21 -07: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
c80ea34fb4 Withdraw explicit "Default" option for exception handling 2017-10-17 16:24:00 +01: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
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
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
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
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
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
7a3d134d58 added unit test for path objects that contain premake tokens. 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
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
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
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
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
2916fc44b8 Filters always have to use \ regardless of target platform. 2017-08-07 17:54:18 -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
2edb25de33 Merge pull request #859 from aleksijuvani/nuget-cache 
Use NuGet package cache instead of the API if possible
 2017-08-02 11:01:10 -07:00
Aleksi Juvani
52ef256ef9 Use NuGet package cache instead of the API if possible 2017-08-02 13:35:39 +03:00
Aleksi Juvani
8046b030d6 Fix io.readfile erroring when running tests 2017-08-02 13:35:39 +03:00
Aleksi Juvani
8eaecd1278 vs2010_nuget.lua: fix indentation 2017-08-02 13:35:39 +03:00
Joao Matos
2ba09656f8 Fix Nuget package file path regex matching to support Unix-style path separators. 2017-08-01 21:39:56 +01: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
6ce1562867 fix xcode tests as well. 2017-08-01 10:18:33 -07:00
Tom van Dijck
041d01bb21 Fix action (#138) 
* Fix unit-test correctly setting action.
 2017-08-01 10:01:01 -07:00
Patrick Doane
56f29a343f Add filter for <Image> files (#135) 2017-08-01 09:58:11 -07:00
Tom van Dijck
5ecd0a3102 Merge pull request #849 from mendsley/utility_buildlog 
Write out build log element for VS utility projects
 2017-07-31 13:27:51 -07:00
Aleksi Juvani
9638738404 Fix handling of unconventional NuGet .NET Framework folders 2017-07-31 16:01:27 +03:00
Matthew Endsley
c0790d0e8e Write out build log element for VS utility projects 
In vs2017, utility projects were ignoring the value of buildlog
and defaulting the output to $(IntDir)$(MSBuildProjectName).log
 2017-07-25 13:55:28 -07:00
Tom van Dijck
31df5d9604 fix bug in testing framework leaving tests in random working folders. 2017-07-04 18:40:28 -07:00
Tom van Dijck
2912f8ab87 Merge pull request #829 from Blizzard/reduce-vcxproj-size 
Reduced vs2010+ file sizes by removing redundant config settings
 2017-06-25 15:52:43 -07:00
Mikhael-Danilov
2a99f66180 improve codelite test suite setup 2017-06-23 17:38:52 +03:00
Mikhael-Danilov
9c22008a43 Expand {...} macros in pre|post build commands for codelite 2017-06-22 23:25:47 +03:00
Tom van Dijck
9faaace5a4 Removed "installer" kinds from vs2017. 
Copy-Paste error from Blizzard, this is an internal extension we made to visual studio.
 2017-06-21 13:26:21 -07:00
Tom van Dijck
273b2fc46e Merge pull request #836 from Blizzard/fix-setTextColor-xterm 
Hook setTextColor in tests, so on linux/mac we don't get random color…
 2017-06-21 12:02:12 -07:00
Tom van Dijck
a53e17948f Hook setTextColor in tests, so on linux/mac we don't get random color changes but no output. 2017-06-21 09:52:25 -07:00
Tom van Dijck
5b8a3d26eb Merge pull request #830 from Blizzard/resource-generator-access 
Resource generator access
 2017-06-21 09:36:29 -07:00
Tom van Dijck
2d1e29047e Merge pull request #825 from Blizzard/use-workspace-everywhere 
Use workspace everywhere
 2017-06-21 09:29:24 -07:00
Tom van Dijck
5536704605 Add Test. 2017-06-20 15:16:23 -07:00
Tom van Dijck
e4f2481335 Reduced vs2010 file sizes by removing redundent config settings 2017-06-20 15:09:05 -07:00
Mikhael-Danilov
0f0647f011 Escape '&' -> '&amp;' 
#823
 2017-06-21 00:51:14 +03:00
Tom van Dijck
b7d140330b Use 'workspace' instead of 'solution'. 2017-06-20 14:44:26 -07:00
Tom van Dijck
5d141f52a0 Merge pull request #811 from Blizzard/preferredtoolarchitecture 
Add 'preferredtoolarchitecture' API
 2017-06-20 12:46:20 -07:00
Tom van Dijck
0ce15ca188 Merge pull request #774 from Blizzard/default-toolset 
Assure a default toolset is always set.
 2017-06-20 11:34:26 -07:00
Tom van Dijck
b280f2bebe Make this work on Visual Studio prior to VS2013 too. 2017-06-20 11:33:36 -07:00
Tom van Dijck
6f2e6f5a0e Add 'preferredtoolarchitecture' API 2017-06-20 11:33:36 -07:00
Tom van Dijck
4d95798a8e Assure a default toolset is always set. 2017-06-20 10:58:49 -07:00
R. Blaine Whittle
777fadae95 Added os touchfile and a workaround for vs2010 reloading 
vs2010 (and above) has an issue where if the vcxproj file
isn't modified but the.vcxproj.filters is modified during
premake, then VS doesn't notify the user that the project has
changed.  This can occur if the only change to a project is
with the vpaths.  Before this fix, the user would be need to
manually unload and reload the project to pick up the change.

This VS workaround checks for the case where the vcxproj.filters
file is modified but the .vcxproj file is not. At which point
premake preforms a touch on the .vcxproj file to trigger the IDE.
 2017-06-20 09:53:43 -07:00
Tom van Dijck
3f2f40c5fa Move VStudio action into a module. 2017-06-19 13:12:05 -07:00
Tom van Dijck
8d509c6d75 Merge pull request #805 from Blizzard/insecure-option 
Add --insecure option for SSL curl requests.
 2017-06-19 13:06:51 -07:00
Tom van Dijck
05cf8d3c7f Make module of 'gmake' action. 2017-06-19 12:15:13 -07:00
Tom van Dijck
5663d25857 fix rare xcode test failure. 2017-06-19 12:11:49 -07:00
Tom van Dijck
7b9ff9f840 Update to Lua 5.3.4 2017-06-19 12:11:49 -07:00
Tom van Dijck
b22de644b7 Merge pull request #801 from ricka-github/master 
Groups in XCode workspace working.
 2017-06-18 15:12:34 -07:00
Tom van Dijck
13a3423f61 A few gmake2 fixes due to it moving into a module. 2017-06-14 15:47:48 -07:00
Tom van Dijck
0a442f78ca A few fixes from our Blizzard Fork. 2017-06-13 14:46:49 -07:00