Commit Graph

344 Commits

Author SHA1 Message Date
Samuel Surtees
e45b8cfc6b
Merge pull request #1092 from Gaztin/codelite-groups
CodeLite workspace folders (groups)
2018-05-24 19:59:48 +10:00
Sebastian Kylander
d42bcf54f7 Add tests for CodeLite debugenvs 2018-05-23 21:43:53 +02:00
Sebastian Kylander
df8ea09cdd Implement debugenvs for CodeLite 2018-05-23 21:43:19 +02:00
Sebastian Kylander
531437901d Add tests for CodeLite workspace folders 2018-05-22 00:31:27 +02:00
Sebastian Kylander
fec55c549f Implement CodeLite workspace folders 2018-05-22 00:30:58 +02:00
Manu Evans
8dac762d6f Translate the import paths 2018-05-19 11:21:09 -07:00
Rory Driscoll
a1f9874f46 Fix missing DebugInformationFormat when symbols are set to full 2018-05-14 22:10:51 -07:00
Manu Evans
968fc118f0
Merge pull request #1062 from redorav/android_config
Allow system("android") per configuration
2018-05-07 13:56:29 -07:00
Sam Surtees
5b73685522 Added GoogleTest style output for unit tests 2018-05-07 23:52:56 +10:00
Mkr
a98d7ce716 Update readme.md file in D module 2018-05-07 10:14:16 +02:00
Mkr
3c6edd6e39 Update tests to support mixed C++/D in the D module 2018-05-07 10:14:16 +02:00
Marco Alamia
e7b9e63118 Add support for mixed C++/D to premake D module 2018-05-07 10:14:16 +02:00
Jörn Heusipp
2e7ca5fb18 Add C++17 support for Visual Studio 2017.
This also adds support for 'cppdialect "C++latest"'.
2018-04-30 17:35:01 +02:00
Ben Ratzlaff
f910ede248 Print failing test names to the console in the 'warning' color 2018-04-30 17:32:40 +02:00
Sam Surtees
138a443b3c Fixed issues with duplicate tests
- Test suite will now fail when test names are reused
- Fixed several unit tests that reused test names
2018-04-30 17:01:20 +02:00
Sebastian Kylander
a808fb55d1
Merge branch 'master' into codelite-libdirs 2018-04-20 16:59:33 +02:00
Emilio López
f46c2006a4 Allow system("android") per configuration 2018-04-18 00:55:59 +01:00
Samuel Surtees
2061b151b9
Merge pull request #1043 from tdesveauxPKFX/omit-frame-pointer
Add omitframepointer API
2018-04-17 20:19:36 +10:00
J. Perkins
c121b2f6b5
Merge branch 'master' into codelite-libdirs 2018-04-16 14:24:08 -04:00
redorav
92e32ddf2b
Merge branch 'master' into systemversion 2018-04-16 19:16:26 +01:00
Thomas Desveaux
da3915d30d Merge remote-tracking branch 'origin/master' into omit-frame-pointer 2018-04-16 19:30:28 +02:00
thomas desveaux
28b0a6db0f Update vs200x_vcproj to new omitframepointer API 2018-04-15 18:14:24 +02:00
thomas desveaux
b21b43aa92 Update XCode module to new omitframepointer API 2018-04-15 18:09:08 +02:00
thomas desveaux
c629c4a1c1 Merge remote-tracking branch 'origin/master' into omit-frame-pointer 2018-04-15 17:56:41 +02:00
Sam Surtees
15426309b3 Fixed issue with floatingpoint "Strict" causing errors in XCode 2018-04-15 22:25:27 +10:00
Emilio López
61dae7b235 Merge branch 'systemversion' of https://github.com/redorav/premake-core into systemversion 2018-04-13 00:30:04 +01:00
Emilio López
d528430f08 Conditionally output the PropertyGroup by previously capturing the result of the global configuration property function. If there's nothing to capture, don't emit. 2018-04-13 00:29:49 +01:00
redorav
e8e23a16e6
Merge branch 'master' into systemversion 2018-04-12 21:10:08 +01:00
Emilio López
e4c2318de8 Move the systemversion back to globals, and create additional global entries based on configuration 2018-04-12 21:09:31 +01:00
Tom van Dijck
776a4c92b9
Merge pull request #1011 from Dandielo/patch-1
Fixes an issue with custom rules tracking files.
2018-04-12 20:48:02 +02:00
thomas desveaux
3ebbe97c2c Add test for omitframepointer Default in vstudio + fix omitframepointer Default in vstudio 2018-04-12 20:14:57 +02:00
thomas desveaux
906e86d994 Merge remote-tracking branch 'origin/master' into omit-frame-pointer 2018-04-12 19:24:09 +02:00
Thomas Desveaux
80e2bb02e6 Merge remote-tracking branch 'origin/master' into struct-member-align 2018-04-11 14:08:50 +02:00
Samuel Surtees
dc641e5c69
Merge pull request #1045 from tdesveauxPKFX/debuggerflavor
Add debuggerflavor API
2018-04-11 18:48:03 +10:00
Emilio López
aa41dad734 Move the tests from the globals to the config where they now live 2018-04-10 21:58:30 +01:00
Thomas Desveaux
228bba9702 Implement unsignedchar tests for CodeLite 2018-04-10 22:03:12 +02:00
Thomas Desveaux
6ad87a76c1 Implement unsignedchar for xcode 2018-04-10 21:54:51 +02:00
Emilio López
2b133b16f8 * Move systemversion to config scope instead of project scope on VS. The UI can't do this but setting it actually works 2018-04-10 20:38:31 +01:00
Thomas Desveaux
159281ea5a Implement unsignedchar for vstudio 2018-04-10 21:38:31 +02:00
Thomas Desveaux
7d23654c16 structmemberalign: simplify API 2018-04-10 20:10:49 +02:00
tdesveauxPKFX
c92c58037b
Merge branch 'master' into struct-member-align 2018-04-10 20:02:02 +02:00
Thomas Desveaux
92f0f08648 debuggerflavor: use simpler terms in api 2018-04-10 20:00:41 +02:00
Thomas Desveaux
6fdb94a5f2 Merge remote-tracking branch 'origin/master' into debuggerflavor 2018-04-10 19:54:53 +02:00
tdesveauxPKFX
74a9277bf8
Merge branch 'master' into omit-frame-pointer 2018-04-10 19:17:26 +02:00
Thomas Desveaux
b981e67e89 Add structmemberalign API + implement for vstudio 2018-04-09 17:23:10 +02:00
Thomas Desveaux
ed2b419128 Add debuggerflavor API + implement for vstudio 2018-04-09 17:20:38 +02:00
Thomas Desveaux
0160e82188 Add omitframepointer API + implement for gcc and vstudio 2018-04-09 17:11:38 +02:00
tdesveaux
40a01361d3 VStudio: Add tests for FxCompile block 2018-04-07 19:16:29 +02:00
tdesveaux
c9870879c6 VStudio: Implement FxCompile block for hlsl shader compilation 2018-04-07 19:15:45 +02:00
tdesveauxPKFX
5a1b8ad287
Merge branch 'master' into vstudio-staticlib-symbolspath 2018-04-06 19:04:45 +02:00
Thomas Desveaux
825c1b989a VStudio: Factorise conditions and value for ProgramDataBaseFile[Name] 2018-04-06 19:04:19 +02:00
J. Perkins
e06097b20b
Merge branch 'master' into codelite-libdirs 2018-04-06 12:23:06 -04:00
tdesveauxPKFX
324c3bb757
Merge branch 'master' into vstudio-staticlib-symbolspath 2018-04-05 18:30:02 +02:00
Thomas Desveaux
40e0539aa0 VStudio: Extract ProgramDataBaseFileName from vstudio.programDatabaseFile 2018-04-05 18:28:38 +02:00
Sam Surtees
f7626d4e2a Add 'modules/android/' from premake-android
- Additional changes to get tests working
2018-04-05 20:58:31 +10:00
Tom van Dijck
53ec0cc3bf
Merge branch 'master' into patch-1 2018-04-05 12:42:46 +02:00
Thomas Desveaux
bd2aff7ef2 VStudio: symbolspath tests generateDebugInfo -> generateProgramDataBaseFile 2018-04-03 20:21:48 +02:00
Thomas Desveaux
2bb0800b04 VStudio: Add tests for symbolspath 2018-04-03 20:18:50 +02:00
Thomas Desveaux
75692a7920 VStudio: Implement symbolspath for static libs 2018-04-03 20:03:18 +02:00
J. Perkins
c461176e29
Merge branch 'master' into fix-gmake2-callarray 2018-04-03 10:35:01 -04:00
thomas desveaux
04f22eead1 Gmake2: Clean Makefile tests 2018-04-02 21:18:40 +02:00
thomas desveaux
dbf36a5f97 Gmake2: Add tests for Makefile project kind 2018-04-02 21:15:24 +02:00
thomas desveaux
bc71ad0d9e Gmake2: Fix callArray calls 2018-04-02 20:25:57 +02:00
tdesveaux
9ecde94dd2 VStudio: Fix symbolspath not generated for FastLink and Full 2018-04-02 19:45:51 +02:00
tdesveaux
be01050638 VStudio: Add tests for symbolspath 2018-04-02 19:44:06 +02:00
Sebastian Kylander
37045dc3ce Add test for codelite libdirs 2018-03-26 15:44:40 +02:00
Sebastian Kylander
70ddafef74 List libdirs in codelite projects 2018-03-26 15:43:51 +02:00
Samuel Surtees
5348773851
Merge pull request #952 from tempura-sukiyaki/xcode4-targetextension
Add support for `targetextension` in xcode4
2018-03-24 16:29:47 +10:00
Manu Evans
1cd1f4df6c Update tests. 2018-03-21 16:45:36 -07:00
Manu Evans
ba96baa62c Attempt to fix the gmake dependency chain 2018-03-21 16:45:36 -07:00
Dandielo
a4e06bc8f3
Fixes an issue with custom rules tracking files.
Using 'Build Rules' would sometimes cause the tracker ignore changes in a source file, because of the tracker file being in the wrong directory.
2018-02-27 14:03:52 +01:00
Damien Courtois
928076a13a fixed a crash in latestSDK10Version when the registry value is not found 2018-01-18 11:37:37 +01:00
Damien Courtois
7017f09263 fixed system 'latest' test 2018-01-18 09:20:37 +01:00
Damien Courtois
3a63d496e6 fixed incorrect unit test with systemversion 'latest' 2018-01-17 09:13:58 +01:00
Damien Courtois
d5089b5d9b added a 'latest' systemversion for vs2017
forgot to add the ".0" suffix


added unit tests for systemversion "latest"
2018-01-16 16:45:47 +01:00
Samuel Surtees
ef9b341d6f
Merge pull request #979 from tdesveauxPKFX/fix-noexceptions-vs2010
Define _HAS_EXCEPTIONS=0 from vs2010 for exceptionhandling off
2017-12-21 20:07:16 +10:00
Cat Stevens
b779f6f600 src/base and modules: change links to industriousone.com to working HTTPS github links 2017-12-19 13:52:30 -05:00
Thomas Desveaux
75ff8934f6 vstudio: Fix exception handling tests 2017-12-19 15:50:45 +01:00
Thomas Desveaux
c3ceb52b94 vstudio: Define _HAS_EXCEPTIONS=0 from vs2010 for exceptionhandling off 2017-12-19 14:53:11 +01:00
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