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 '&' -> '&'
...
#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
Rick Appleton
79d1c6f429
Groups in XCode workspace working.
2017-06-07 09:26:45 +02:00
Tom van Dijck
c5c3cd5b2c
Merge pull request #776 from Blizzard/dialect-language
...
[core] Use 'cdialect' and 'cppdialect' instead of 'language'.
2017-05-25 08:43:53 -07:00
Tom van Dijck
ff9114c031
[self-test] fix nil dereference crash in test.isequal
2017-05-19 14:56:08 -07:00
Tom van Dijck
7af2817869
[core] Use 'cdialect' and 'cppdialect' instead of 'language'.
2017-05-03 17:05:11 -07:00
Sam Surtees
b251234b27
Cleaned up inconsistencies in whitespace
2017-04-26 03:40:43 +10:00
Sam Surtees
fa3328440e
Increased consistency of p. usage
2017-04-25 16:41:30 +10:00
Samuel Surtees
43c5e0a4ae
Merge pull request #745 from LORgames/ssurtees/codeliteStartProjectFix
...
Fixed issue with using startproject API in CodeLite
2017-04-25 15:09:21 +10:00
Tom van Dijck
694f934693
Merge pull request #755 from Blizzard/fix-supported-languages
...
Add 'supports_language' callback to action
2017-04-24 13:54:53 -07:00
Tom van Dijck
6d471ecc2a
Add 'supports_language' callback to action to validate languages now that we have multiple dialects
2017-04-24 13:37:28 -07:00
Tom van Dijck
5f589ad5a6
replaced:
...
os.get() -> os.target()
os.is() -> os.istarget()
_OS -> _TARGET_OS
added:
os.current()
os.iscurrent()
2017-04-24 13:01:31 -07:00
Sam Surtees
83e0229a2a
Fixed issue with using startproject API in CodeLite
...
- Added test to ensure this doesn't break again
2017-04-18 00:41:48 +10:00
Jason Perkins
d1f5c333b0
Clean up the deprecated APIs
...
- Add "Use … instead." messages to any deprecations that did not have one
- Change deprecation date on APIs without a message to current date
- Remove APIs that have been deprecated for more than a year
h/t to @samsinsane for original PR on which this is based (#741 )
2017-04-13 15:37:49 -04:00
Tom van Dijck
d285fa68a6
Refactor language flags to go through the language API.
...
So you can use 'language "C++11"' instead of 'flags { "C++11" }'
2017-04-11 12:43:58 -07:00
Tom van Dijck
21bcefe892
Fixes to codelite module.
2017-03-27 08:51:22 -07:00
Joshua Bodine
34c844e14b
String literals passed to defines() must be escaped for Xcode.
2017-01-21 18:52:01 -07:00
Joshua Bodine
b6ce517d99
Use better terminology for marking items to be excluded from Xcode build.
2017-01-03 16:45:02 -07:00
Joshua Bodine
47e3bd444e
Fixed the xcode "dependson" linking issue in a more efficient way.
2017-01-02 21:45:49 -07:00
Joshua Bodine
38181e259c
Fixed an issue where libraries listed under "dependson" would be linked into the executable in Xcode.
2017-01-02 20:09:12 -07:00
Jason Perkins
e2e2841fc7
Fix out-of-date sources in the Xcode module
...
I must not have been on the latest revision when I merged the Xcode module into core. This catches things back up to the state of the submodule repository.
2016-12-06 13:52:20 -05:00
Michael Schwarcz
8d9fee6941
Fix codelite module test failure
...
- Align clang cflags and cxxflags with gcc
2016-11-14 17:04:10 +02:00
Jason Perkins
af7b674265
Move core modules into main repository; drop submodules
...
As discussed numerous times, get rid of the submodule approach for core modules and just included the sources directly in the main repository.
I have no idea how this will play with existing working copies. It might be necessary to [manually clear out the existing submodules](http://stackoverflow.com/questions/1260748 ) first.
2016-11-09 14:29:33 -05:00
Sam Surtees
e300d4c619
Removed MonoDevelop from core
...
The format output is no longer supported by the IDE, instead Visual Studio projects are utilized instead. See issue #604 for more information on deprecation.
2016-10-29 12:25:47 +10:00
Jason Perkins
f104467e9b
Merge branch 'release-5.0-alpha10'
2016-10-04 19:09:14 -04:00
Jason Perkins
98fa40dad3
Update submodules to latest versions
2016-10-04 18:09:37 -04:00
Tom van Dijck
5e0afffd49
Add raw module as a standard module.
2016-09-01 16:49:49 -07:00
Tom van Dijck
d2580bab86
Adding some tests.
2016-08-22 16:06:55 -07:00
Tom van Dijck
326a2e5cd6
update codelite submodule to latest master.
2016-08-11 09:13:02 -07:00
David Ely
d3d8269e7a
symbols api introduced and working, with tests.
2016-07-19 16:29:26 +10:00
Tom van Dijck
6b30ce5908
Print full text in test_assertions ( #522 )
...
It makes it easier to see what is wrong.
2016-06-22 08:36:14 -07:00
Tom van Dijck
453c1eda8e
test_runner failed to correctly count failed tests ( #515 )
...
https://github.com/premake/premake-core/issues/514
2016-06-15 14:38:47 -07:00
Jason Perkins
7f0ceff074
Fix crashing bug when --test-only
argument is used to select a single ttest
2016-06-03 17:00:06 -04:00
Jason Perkins
1339933a01
Add a bit of organization and documentation to the code, make it easier to follow
2016-05-26 19:57:27 -04:00
Jason Perkins
3283b1d141
Consolidate and clean up the test runner logic and associated environment hooks
2016-05-25 16:55:49 -04:00
Jason Perkins
8cc046fa1b
Break up the test runner and make the logic easier to follow
2016-05-20 20:13:04 -04:00
Jason Perkins
e95b23a7b3
Use module symbol "m" in place of "test", free that up for other people to use
2016-05-20 19:14:08 -04:00
Jason Perkins
b240131d09
Split test declarations and stubs out into their own files; improve encapsulation a bit
2016-05-18 15:56:04 -04:00
Jason Perkins
e0e988eccb
Move testing framework into a core module
2016-05-16 16:32:35 -04:00
Jason Perkins
72865a4961
Update to latest version of the CodeLite module
2016-04-21 19:17:00 -04:00
aleksijuvani
66344e8e43
Update CodeLite submodule to fix unit tests
2016-04-15 15:30:18 +03:00
Manu Evans
612c4feefc
Fixed CodeLite path separator problem.
2016-04-15 21:34:07 +10:00
Sam Surtees
8fbbd7d949
Updated xcode submodule for frameworkdirs usage
2016-02-25 20:45:38 +10:00
Jason Perkins
7c8fd6175a
Advance submodules to latest revisions
2016-02-01 16:59:23 -05:00
Sam Surtees
ad56a58f79
Fixed bug in sln2005
that prevented p.override from working on the sln2005.elements
functions.
2015-10-14 23:09:22 +10:00
Sam Surtees
18fbcf01f2
Updated submodules to the latest versions. Fixes #298 .
2015-10-08 02:12:24 +10:00
Jason Perkins
b4703a52ac
Update core modules to reflect recent test framework solution symbol renaming
2015-09-05 10:28:35 -04:00
Jason Perkins
1312a586e3
Update core modules to reflect recent test framework solution symbol renaming
2015-09-04 11:09:49 -04:00
Jason Perkins
f1f0b55639
Update to latest Xcode module
2015-08-23 15:41:06 -04:00
Jason Perkins
0b85db1151
Fix Xcode unit tests broken by buffering changes
2015-08-23 15:29:36 -04:00
Manu Evans
bade299f6b
Updated gmake actions to use function arrays
...
- Updated gmake action in the D module aswell
2015-07-27 23:14:32 +10:00
Jason Perkins
bfc67b5c51
Add capture support to UTF8 BOM output
...
If `io.utf8()` is called while running unit tests, it would be output directly to the console since there is no active file output while testing. Replace call with premake.utf8() as a companion to premake.w() and ignore while capturing to prevent this spurious output.
2015-07-27 20:14:48 +10:00
Manu Evans
fa02da93c6
Updated extensions to modern style, added a heap of tests
2015-07-26 23:53:24 +10:00
Jason Perkins
86d40be605
Fix unit tests broken by the previous commit
2015-07-05 12:51:36 -04:00
Jason Perkins
8f8fb3646c
Update modules to latest versions
2015-06-26 16:33:35 -04:00
Manu Evans
7965886fb0
Update D submodule reference (fixes _preload.lua not working like I thought).
2015-06-04 23:47:55 +10:00
Manu Evans
3a40a7a4b1
Added D language submodule.
2015-05-21 14:26:48 +10:00
Jason Perkins
514d01631a
Update to latest Xcode module
2015-05-12 12:14:59 -04:00
Manu Evans
bc9f636414
Added MonoDevelop/Xamarin submodule.
2015-05-08 11:01:54 +10:00
Manu Evans
bb9b6bcb6e
Added CodeLite submodule.
2015-05-01 19:27:03 +10:00
Jason Perkins
17f1843c71
Finish renaming architectures away from x32/x64
...
A number of tests were relying on the fact that x32/x64 were being converted implicitly to x86/x86_64. If/when we retire those symbols, all of those tests would break. Renamed them now to avoid having to sort it out later. Also fixed up comments to keep everything consistent.
2015-04-13 18:27:11 -04:00
Manu Evans
07e90323cd
Changed x32/x64 to explicit architecture names for clarity.
...
Aliases should probably be deprecated.
2015-04-13 21:41:08 +10:00
Florian Zwoch
f56cd061d8
update xcode revision
2015-04-08 10:09:27 +02:00
Manu Evans
7093058647
Added xcode submodule
2015-04-03 12:36:34 +10:00