Commit Graph

2888 Commits

Author SHA1 Message Date
Tom van Dijck
041d01bb21 Fix action (#138)
* Fix unit-test correctly setting action.
2017-08-01 10:01:01 -07:00
Tom van Dijck
4fc5827496 Fix --os overriding the target OS. 2017-08-01 10:00:29 -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
Tom van Dijck
4b74f899b5 Merge pull request #851 from aleksijuvani/fix-nuget-net-folders
Fix handling of unconventional NuGet .NET Framework folders
2017-07-31 13:27:12 -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
3ac01d9607 Merge pull request #843 from tvandijck/fix-tests
fix bug in testing framework leaving tests in random working folders.
2017-07-04 19:18:46 -07:00
Tom van Dijck
4ca8e9a8a0 Merge pull request #844 from tvandijck/unreferenced-argument
fix unreferenced argument warning.
2017-07-04 19:18:29 -07:00
Tom van Dijck
b4acd30cca fix unreferenced argument warning. 2017-07-04 18:41:48 -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
Samuel Surtees
5cc981d590 Merge pull request #842 from ejb1123/ejb1123-patch-2
Add bsd to the output of possible platforms
2017-07-03 21:07:53 +10:00
E.J. Bevenour
8c1e4a2f3b Add bsd to the output of possible platforms
Adds bsd to the default output as a possible platform
2017-07-03 06:54:51 -04: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
Tom van Dijck
fea573561c Merge pull request #834 from Blizzard/native-module-code
Allow modules to register C code too.
2017-06-23 14:25:14 -07:00
Tom van Dijck
4fa6dafdf1 Merge pull request #839 from Mikhael-Danilov/master
Expand {...} macros in pre|post build commands for codelite
2017-06-23 14:23:10 -07:00
Mikhael-Danilov
b7df8fa518 Merge branch 'master' into master 2017-06-23 17:46:42 +03:00
Mikhael-Danilov
2a99f66180 improve codelite test suite setup 2017-06-23 17:38:52 +03:00
Tom van Dijck
501466302f Merge pull request #838 from Blizzard/fix-action
Fix bug in 'action.isConfigurable' not checking for onWorkspace.
2017-06-22 13:34:07 -07:00
Mikhael-Danilov
9c22008a43 Expand {...} macros in pre|post build commands for codelite 2017-06-22 23:25:47 +03:00
Tom van Dijck
d2b8a2183c Fix bug in 'action.isConfigurable' not checking for onWorkspace. 2017-06-21 17:35:36 -07:00
Tom van Dijck
d31aa3f631 Merge pull request #837 from premake/tvandijck-patch-1
Removed "installer" kinds from vs2017.
2017-06-21 15:32:20 -07:00
Tom van Dijck
b4c4c4e614 Allow modules to register C code too.
only works for embedded modules.
2017-06-21 13:30:38 -07: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
eb992d3bcc Merge pull request #827 from Blizzard/osx-bundle
Added option to create bundle and frameworks on macOS.
2017-06-21 12:02:26 -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
6752ea16e4 Added option to create bundle and frameworks on macOS. 2017-06-21 09:53:56 -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
f7a5098d59 Merge pull request #833 from Blizzard/fix-empty-rules
Fix empty rules.
2017-06-21 09:37:17 -07:00
Tom van Dijck
9ad28d038a Merge pull request #832 from Blizzard/fix-compiler-warnings
Fix a few compiler warnings
2017-06-21 09:36:58 -07:00
Tom van Dijck
b77e5763f6 Merge pull request #831 from Blizzard/fix-options
Fix in oven, for options that are not strings.
2017-06-21 09:36:44 -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
57f6900d04 Merge pull request #828 from Blizzard/normalize-filelineinfo
Normalize path in 'getfileinfo' for local host.
2017-06-21 09:36:15 -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
508076688b Fix empty rules. 2017-06-20 15:24:05 -07:00
James Touton
cd3159e73f Fixed undeclared function warning (atexit) on non-Windows platforms. 2017-06-20 15:20:58 -07:00
Tom van Dijck
3c1373c4a0 Resolve a few compiler warnings. 2017-06-20 15:19:48 -07:00
Tom van Dijck
48bca39696 Merge pull request #826 from Mikhael-Danilov/patch-2
Escape '&' -> '&'
2017-06-20 15:18:35 -07:00
Tom van Dijck
4d72f4770e Fix in oven, for options that are not strings. 2017-06-20 15:18:04 -07:00
Tom van Dijck
5536704605 Add Test. 2017-06-20 15:16:23 -07:00
Travis Primm
1c0d711241 Adding configuration to allow .csproj dotNet project files
to be configured with generating publically acccesible
data based on generated code from resource files.
2017-06-20 15:10:40 -07:00
Tom van Dijck
e4f2481335 Reduced vs2010 file sizes by removing redundent config settings 2017-06-20 15:09:05 -07:00
Tom van Dijck
e1bc3cbe9e Normalize path in 'getfileinfo' for local host. 2017-06-20 15:07:29 -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
James Touton
d44dae735a Add workspace property to files. 2017-06-20 14:44:21 -07:00
Tom van Dijck
3e4ebb8acc Merge pull request #685 from TurkeyMan/native_source
Detect native source files.
2017-06-20 13:10:23 -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