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 '&' -> '&'
...
#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
Tom van Dijck
3016d51e28
Add --insecure option for SSL curl requests.
2017-06-13 13:37:21 -07:00
Tom van Dijck
230efba691
Adding gmake2 module
2017-06-13 09:51:58 -07:00
Rick Appleton
382778c317
Added unittest for Xcode group support.
2017-06-08 13:47:50 +02:00