Commit Graph

2255 Commits

Author SHA1 Message Date
Tom van Dijck
cc2444ac7a Allow require("modulename") from a http server. (#620)
* Allow require("modulename") from a http server.

* Some requested cleanup.
2017-03-24 08:23:03 -07:00
Damien Courtois
7d7266656e fixed debugargs to allow duplicated arguments (#712) 2017-03-17 08:34:03 -07:00
Zeenobit
c200b08a53 Treat *.inl files as headers (#710)
This addresses issues with Visual Studio and Intellisense when using
*.inl files. If they're not treated as headers or source files,
Intellisense fails to parse them correctly.
2017-03-13 09:10:34 -07:00
Rory
6cb6f4a678 Add support for changing the debug information for Visual Studio 2017 files to DebugFull. The default for VS2017 (i.e. when debug information is set to 'true') is to use fastlink. There is a new option to use a full pdb file. For older versions of Visual Studio, the new 'Full' symbols option behaves like 'On'. (#694) 2017-02-13 09:02:02 -08:00
Tom van Dijck
566936cbe7 Fix a bunch of compile warnings. (#691) 2017-02-10 09:03:26 -08:00
Tom van Dijck
fda1845688 make buffered_io available for c code too. 2017-02-09 10:47:03 -08:00
Tom van Dijck
5a4ad51aec Define _HAS_EXCEPTIONS=0 when exceptionhandling is "off". (#674)
* Define _HAS_EXCEPTIONS=0 when exceptionhandling is "off".

* Fix unit-test.

* It should be for VS2013 and later only.

* update & add unit-test.
2017-02-03 07:05:23 -08:00
Tom van Dijck
0a7b45ce17 bring os.getversion() on par with the present (#688)
* bring os.getversion() on par with the present

* Use non-deprecated API's for Windows.

* Use Apple official names for MacOSX.
2017-02-01 09:19:13 -08:00
Tom van Dijck
6f7d0c16da intrinsics api. (#683)
* intrinsics api.

* add options to msc.lua
2017-02-01 09:06:31 -08:00
Tom van Dijck
8015673f40 functionlevellinking api. (#681)
* functionlevellinking api.

* add options to msc.lua
2017-02-01 08:57:32 -08:00
Tom van Dijck
b76bef918d floatingpointexceptions api. (#684)
* floatingpointexceptions api.

* generate options for msc
2017-02-01 08:53:49 -08:00
Tom van Dijck
94a5bb08a0 Fix for issue https://github.com/premake/premake-core/issues/669 (#689) 2017-02-01 08:49:38 -08:00
Tom van Dijck
ac2919e74c stringpooling api. (#682)
* stringpooling api.

* add options to msc.lua
2017-02-01 08:47:50 -08:00
Tom van Dijck
aae8917042 Merge pull request #687 from tvandijck/os_regkey
Windows Registry
2017-01-31 13:11:21 -08:00
Manu Evans
8bcad5d23d Detect native source files. 2017-01-31 17:05:32 +10:00
Tom van Dijck
9336b1d9df rename os_getreg to os_getWindowsRegistry 2017-01-30 09:29:01 -08:00
Manu Evans
1d2a8f44c1 Better detect debug build 2017-01-24 14:48:27 +10:00
Tom van Dijck
c677896dd9 update semver.lua 2017-01-20 11:20:56 -08:00
Tom van Dijck
9ff8668c13 Merge pull request #668 from UmbraSoftware/fixmakej
Fix sporadic failures when using make -j#
2017-01-20 09:34:20 -08:00
Tom van Dijck
be6ecbecf2 Merge pull request #672 from Blizzard/toolset-fix
Fix issue with msc.getlinks and vstudio.getLinks returning different results when 'explicit' is true.
2017-01-20 09:32:55 -08:00
Tom van Dijck
164e86d55b Add additional tokens to fileconfig and vs2010+. 2017-01-19 12:38:32 -08:00
Tom van Dijck
7edd2e7c99 Fix issue with msc.getlinks and vstudio.getLinks returning different results when 'explicit' is true. 2017-01-19 10:55:58 -08:00
Jason Perkins
a1056a55bf Merge branch 'release-5.0-alpha11' 2017-01-13 09:12:12 -05:00
Jason Perkins
a3ef3354ac Restore development version 2017-01-13 09:11:58 -05:00
Jason Perkins
609f16eb42 Update changes and version for 5.0-alpha11 release 2017-01-11 10:41:55 -05:00
Michael Savage
fe4456d608 squash: don't generate TARGETDIR/OBJDIR rules 2017-01-05 16:34:15 +02:00
Michael Savage
a4bfb70876 squash: tidy up the mkdirs 2017-01-05 16:33:51 +02:00
Michael Savage
d42c5fc422 Fix sporadic failures when using make -j# 2017-01-05 13:43:10 +02:00
Justin O'Dell
7bad45325f Windows Registry
- Added a new os command `getreg` which takes a registry path and returns the value or nil
2016-12-28 07:43:54 -08:00
Vlad Ivanov
b551d9fc99 Add C11 flag support for GCC 2016-12-23 09:43:57 +03:00
Jason Perkins
1f5976e3ed Omit NMake defines and include dirs when kind is "None"
"None" projects, by definiton, are never built, so these settings are unnecessary. Omit them so that changes to their value will not cause the generated project to change.
2016-12-19 10:09:30 -05:00
Jason Stewart
c34eee3e05 Fix VS2015 sln icon
This is a minor fix to make the correct sln icon appear in Windows. The
Icon Handler for sln files is apparently quite picky.

VS2015 sln files contain this:
# Visual Studio 14

Not this:
# Visual Studio 2015

Having 2015 instead of 14 does not appear to cause any major issues. But
you get the generic sln file icon in Explorer instead of the
VS2015-specific one.
2016-12-14 13:48:57 -05:00
Tom van Dijck
5bf562d5ae Merge pull request #645 from Blizzard/vs2017-support
Add 'vs2017' target.
2016-12-13 08:59:13 -08:00
Tom van Dijck
be7d8a2e4c Add 'vs2017' target. 2016-12-01 12:41:38 -08:00
Jason Perkins
acfde92a79 Fix VS mapping for file.path tokens
The `%{file.path}` token is an alias of `%{file.relpath}`, and should map to the same VS symbol. Specifically, it should be the relative path including the file name, and not just the path.
2016-11-30 14:18:37 -05:00
Jason Perkins
0731044ae7 Fix bugs introduced by shared compiler flags
Fix a few spots where the shared compiler flag changes (PR #623) caused things to misbehave.

- Fixed duplicate flags in VC 200x external compiler options
- Added missing C and CXX flag maps to Clang adapter
- Reworked SNC adapter to follow same shared flags approach
2016-11-29 11:29:32 -05:00
Samuel Surtees
1ed7b0c3fe Merge pull request #637 from starkos/fix-vs2015-link-symbols
Fix VS'15 <GenerateDebugInformation> to match Update 3
2016-11-25 18:12:30 +10:00
Jason Perkins
9017431249 Fix VS'15 <GenerateDebugInformation> to match Update 3 2016-11-23 16:00:05 -05:00
Jason Perkins
c6e400916e Fix MSC flags broken by PR #623 2016-11-23 15:50:45 -05:00
Samuel Surtees
4a0cebf0af Merge pull request #619 from Blizzard/per-file-config-C#
Add support in csproj backend to add files to certain configurations.
2016-11-23 14:05:38 +10:00
Tom van Dijck
5bb7c54e3f Add support in csproj backend to add files to certain configurations. 2016-11-22 09:45:02 -08:00
Roberto Perpuly
b5d7f944b3 Makefile generation - Don't force serial compilation for all projects
Only restrict parallel compilation when using precompiled
headers. Currently, the generated makefile has a `.NOTPARALLEL`
target, which means that make will ignore parallel builds, even
for projects which can build in parallel just fine.
2016-11-22 09:22:32 -08:00
Tom van Dijck
24f2da8842 Merge pull request #623 from mikisch81/gcc-add-c90-c99-flags
Added C90 and C99 flags to gcc
2016-11-22 09:12:07 -08:00
Tom van Dijck
94ab7bbb64 Merge pull request #634 from starkos/fix-default-rule-var-kinds
Default rule variables to string when `kind` is not set
2016-11-22 09:09:55 -08:00
Michael Schwarcz
3bc5e9623e Merge branch 'master' into gcc-add-c90-c99-flags 2016-11-22 15:44:44 +02:00
aleksijuvani
b1825c9ccd Always output LinkObjects for Visual Studio if specified 2016-11-22 13:36:20 +02:00
aleksijuvani
bceebd082c Change NoLinkObjects flag to a linkbuildoutputs API 2016-11-22 00:18:08 +02:00
aleksijuvani
e47ba372c8 Add NoLinkObjects flag
The default behaviour is to link .obj files if a custom build command
outputs them, but there are some cases where we don't want this to
happen, such as when dealing with Wavefront .obj model files.

This commit will prevent the automatic linking of .obj files that have
this new flag.

When an obj file is outputted by a custom build command, this prevents
the linker from linking it. This is necessary, for example, when
dealing with obj model files.
2016-11-22 00:18:08 +02:00
Jason Perkins
cf87c66ec1 Default rule variables to string when kind is not set
Because this is the most common case, we've been treating variables with no `kind` as an implicit string value.
2016-11-21 13:37:08 -05:00
Jason Perkins
30e8e4b510 Fix data type conversion warnings in HTTP response handling 2016-11-21 11:41:04 -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
Michael Schwarcz
0360b83669 Added C90 and C99 flags to gcc
- Split gcc.cflags to 2 tables: gcc.shared and gcc.cflags in order to allow adding relevant compilation flags to CC and CXX.
- ALL_CXXFLAGS should append ALL_CPPFLAGS and not ALL_CFLAGS.
2016-11-14 15:55:08 +02:00
Samuel Surtees
71be275023 Merge pull request #618 from Blizzard/fix-for-fastlink
Fix for debugInformationFormat handling with FastLink.
2016-11-08 11:04:44 +10:00
Tom van Dijck
ca89c9d79b Fix for debugInformationFormat handling with FastLink. 2016-11-07 09:44:47 -08:00
Tom van Dijck
449163ebf3 Select clang as default tool on MacOSX. 2016-11-07 08:54:25 -08:00
Samuel Surtees
30dda54f12 Merge pull request #600 from sbx320/bugfix/598
Fix for #598
2016-11-04 12:02:24 +10:00
Samuel Surtees
1b9af9aa6c Merge branch 'master' into bugfix/598 2016-11-04 03:17:04 +10:00
Samuel Surtees
9eedf6b5d8 Merge branch 'master' into ssurtees/monodevelop 2016-11-04 03:10:59 +10:00
Samuel Surtees
f5707c4d4e Merge pull request #611 from sbx320/bugfix/pchforceinclude
make: Fix forceincludes breaking precompiled headers
2016-11-03 20:33:01 +10:00
Samuel Surtees
e91bc6d57e Merge pull request #610 from mikisch81/vstudio-makefile-proj-includes-defines
Apply includedirs and defines for makefile projects in Visual Studio
2016-11-03 20:15:26 +10:00
Samuel Surtees
ecc0d0b739 Merge pull request #608 from mikisch81/fix-vstudio-staticlib-deps
VStudio: Add additional deps & additional libdirs for static lib
2016-11-03 20:10:10 +10:00
Samuel Surtees
81a9df934b Merge pull request #603 from andryblack/arargs
allow override AR arguments
2016-11-03 20:06:58 +10:00
Samuel Surtees
2e74dd464f Merge pull request #605 from LORgames/ssurtees/fixedObjdirsPrefixCode
Fixed bug with objdirs prefix code '!'
2016-11-03 19:23:05 +10:00
Sam Surtees
e8789acbe7 Added ability for duplicate build commands to be specified. Fixes #540 2016-11-03 19:16:37 +10:00
sbx320
52b9d1164f make: Fix forceincludes breaking precompiled headers 2016-11-02 06:32:47 +01:00
Michael Schwarcz
3444ef8e04 Apply includedirs and defines for makefile projects in vs
- This will help Intellisense when viewing makefile projects on Visual Studio
2016-11-01 13:17:09 +02:00
Michael Schwarcz
3328cfea38 VStudio: Add additionalDependencies & additionalLibraryDirectories for static lib
- Currently if static library links with another non-sibling library build fails.
   For example: If using the socket() API on windows in a static library, need to link with ws2_32.lib.
2016-10-30 16:09:15 +02: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
Sam Surtees
c543565f73 Fixed bug with objdirs prefix code '!'
- Fixed flawed tests that manipulated the actual result before testing it
- Added test to ensure prefix code '!' works
2016-10-28 01:53:55 +10:00
Andrey Kunitsyn
65ced6a6b0 allow override ar arguments 2016-10-27 00:05:40 +03:00
sbx320
1bf479bfdc Fix symbolspath setting ProgramDataBaseFileName instead of ProgramDatabaseFile 2016-10-20 07:29:22 +02:00
StiX
4f3b19f581 Enable Edit and Continue for x64 builds on VS2015 2016-10-17 22:05:54 +02:00
Jérôme Leclercq
a42c50b4cc Host/Posix: Fix os.copyfile with spaces in argument paths. 2016-09-28 16:39:47 +02:00
Sam Surtees
c6af364311 Fixed bug where path.normalize was being overzealous with removing instances of ".." breaking paths. Fixes #579 2016-09-21 01:40:27 +10:00
lailongwei
bd36129b83 fix windows platform compile error 2016-09-20 16:51:10 +08:00
Tom van Dijck
785671fad5 Merge pull request #545 from tvandijck/generated-files-vcxproj
Add generated files to vxcproj file.
2016-09-07 08:14:57 -07:00
Tom van Dijck
1559c15ee0 workaround for https://github.com/premake/premake-core/issues/572 2016-09-06 11:27:45 -07:00
Tom van Dijck
b230039fee fix bug in deprecation handler. 2016-09-01 16:41:39 -07:00
Tom van Dijck
72e30c9fd8 Merge pull request #546 from Blizzard/update-curl-mbedtls
Update curl and use mbedtls instead of openssl.
2016-08-31 17:25:09 -07:00
Tom van Dijck
f7468b66bf Clean up curl wrapper a bit... 2016-08-30 12:05:43 -07:00
Tom van Dijck
9a0b279a27 Update curl and use mbedtls instead of openssl. 2016-08-30 10:07:30 -07:00
Nils Moehrle
8e37cac91b Only normalize paths within os.execute (c.f. #320 akaStiX/premake-core@369c5ab) 2016-08-25 16:46:22 +02:00
Tom van Dijck
8b7b4c1139 Custom Rule fixes. 2016-08-22 15:13:30 -07:00
Tom van Dijck
7b712d7ce3 Add an 'extended' & 'uncached' sub-context to the context.
Context sensitive detokenization of Visual Studio rules property definitions.
2016-08-22 15:13:30 -07:00
Tom van Dijck
7fc49130ea Merge pull request #543 from noresources/macosx-no-arch-libdirs
do not add architecture-dependent library directories on macOS
2016-08-18 08:11:21 -07:00
Tom van Dijck
113b717d22 Merge pull request #401 from yuyoyuppe/link-mode-prefs
Link mode preference
2016-08-17 09:49:22 -07:00
Tom van Dijck
fbd2c40bf6 Merge pull request #525 from Blizzard/FastLink
Adding /Debug:FastLink support for VS2015.
2016-08-17 09:38:52 -07:00
Joao Matos
e06218c885 use rpaths & soname/install_name to link sibling shared libraries on OS X and Linux
new api runpathdirs().
	<toolset>.getrunpathdirs() adds user defined rpath set using runpathdirs().
	handle runpathdirs in gcc, clang and snc.

make.list() can now add quotes to list elements

Original patch by Renaud Guillard (@noresources).
2016-08-17 16:48:41 +01:00
Tom van Dijck
1d0a35b1d7 Fix in vs2010_nuget.lua 2016-08-11 09:13:02 -07:00
Jörn Heusipp
a0bd1612e4 Add "IA32" to valid vectorextensions values. 2016-08-08 10:59:25 +02:00
Jörn Heusipp
60899329a8 Add vectorextensions "IA32" support for VS>=2012 on x86. (#560) 2016-08-07 13:42:03 +02:00
Tom van Dijck
5d09255425 allow multiple extensions for a custom rule. (#555) 2016-08-01 14:41:25 -07:00
Tom van Dijck
9f67feb923 Add support for kind="list:path" in rule properties. (#553) 2016-08-01 14:40:40 -07:00
Tom van Dijck
48bf0a2b5e Allow an action to initialize itself before user scripts run. (#556)
* Allow an action to initialize itself before user scripts run.
2016-08-01 14:39:50 -07:00
Tom van Dijck
53ed5f693e only add config if not already added. 2016-07-29 09:31:25 -07:00
Tom van Dijck
6971902731 Adding /Debug:FastLink support for VS2015. 2016-07-28 16:01:13 -07:00
Tom van Dijck
027e47373f Move to oven, controlled by flag. 2016-07-28 12:51:39 -07:00
Tom van Dijck
fad541b183 Don't add linkable files,
Files in the ._.files table are absolute paths.
2016-07-22 14:32:27 -07:00
Tom van Dijck
11acc612b3 Add generated files to vxcproj file. 2016-07-21 14:15:55 -07:00
David Ely
d3d8269e7a symbols api introduced and working, with tests. 2016-07-19 16:29:26 +10:00
Renaud Guillard
3264c59f45 do not add architecture-dependent library directories on macOS 2016-07-17 19:27:24 +02:00
Jason Perkins
38ddf0b8eb Merge pull request #536 from Euclideon/expandtoken_fix
Fix regression in expandtoken
2016-07-14 12:01:31 -04:00
Jason Perkins
41580049be Merge pull request #532 from Euclideon/group_user_libs
Rearranged --start-group --end-group to enclose only the user libs.
2016-07-14 11:58:31 -04:00
Jason Perkins
c919827351 Revert "Add generated files to vxcproj file." (#539)
This reverts commit a2170a4f9e.
2016-07-14 12:46:20 +10:00
Manu Evans
0ce3015cf0 Fix regression in expandtoken 2016-07-11 17:13:06 +10:00
Manu Evans
a2b5fa727d Rearranged --start-group --end-group to enclose only the user libs. 2016-07-08 14:27:54 +10:00
Tom van Dijck
ab1b4edcb7 Merge pull request #527 from mendsley/removeextravar
Remove extra argument to os.match
2016-06-30 14:54:15 -07:00
Matthew Endsley
dc2651fdd4 Remove extra argument to os.match
This value will always be ignored as os.match only takes a single
argument and is not needed to generate correct results.
2016-06-30 02:41:28 +00:00
Matthew Endsley
bd19650f92 Use cached file attributes during matching
When _DIRENT_HAVE_D_TYPE is defined, struct dirent defines a
d_type member that will indicate if the type of the entry. This
saves an expensive syscall for each entry which can really add
up on slow filesystems (such as VirtualBox's shared folder FS).

We use the same logic as do_isfile, and return a 1 when the entry
is not a directory, and a 0 otherwise.

For our large project this reduced the overall stat syscalls from
118,865 to 39,177 and total premake generation time from 59,977ms
to 20,729ms on vboxsf.

See: https://gist.github.com/mendsley/4b56932056d5c231a94d1cdefd15c027
2016-06-30 00:40:08 +00:00
Tom van Dijck
5719c8f92a Adding 'symbolspath' API to allow specifying where the pdb file goes. (#524) 2016-06-22 09:18:03 -07:00
Tom van Dijck
c947338945 Symbols API. (#523)
* Symbols API.

* presedence bugfix.
2016-06-22 08:36:42 -07:00
Tom van Dijck
a2170a4f9e Add generated files to vxcproj file. 2016-06-17 10:22:41 -07:00
Tom van Dijck
1f5ea6a232 We need to actually compile the context of the rule, so we can propely use the "filter {}" system. (#511)
* We need to actually compile the context of the rule, so we can propely use the "filter {}" system.
2016-06-13 11:14:31 -07:00
Jason Perkins
a4a8ee19f8 Merge pull request #507 from Blizzard/rule-cpp-output
Allow rules to generate code that subsequently gets compiled.
2016-06-10 13:58:38 -04:00
Tom van Dijck
397d480a46 Merge pull request #504 from Blizzard/parent-to-classnew
provide the parent to class.new
2016-06-10 10:42:43 -07:00
Tom van Dijck
5b24ad2c94 Merge pull request #503 from Blizzard/linkgroups-api
https://github.com/premake/premake-core/wiki/linkgroups
2016-06-10 10:42:03 -07:00
Tom van Dijck
1153156e0e Merge pull request #508 from Blizzard/shallow-copy
Add table.shallowcopy
2016-06-10 10:00:59 -07:00
Tom van Dijck
2e8a26df5c Fix usage of bit32.arshift
added unit-test
2016-06-09 18:12:06 -07:00
Tom van Dijck
9282ab4f36 Add table.shallowcopy 2016-06-09 18:01:17 -07:00
Tom van Dijck
d6d36c6b18 Allow rules to generate code that subsequently gets compiled. 2016-06-09 17:56:10 -07:00
Tom van Dijck
38f0c6154c provide the parent to class.new 2016-06-08 11:31:13 -07:00
Tom van Dijck
2a67664fda linkgroups api. 2016-06-08 11:27:13 -07:00
Jason Perkins
1d817779df Merge branch 'release-v5.0.0-alpha9' 2016-06-06 19:15:00 -04:00
Jason Perkins
a6a5dbe488 Restore dev version number 2016-06-06 19:14:49 -04:00
Jason Perkins
68b86d4e29 Merge branch 'release-v5.0.0-alpha9' 2016-06-06 18:54:09 -04:00
Jason Perkins
1de49ee482 Update version and change log for alpha9 release 2016-05-31 11:22:50 -04:00
Matthew Versluys
f26c07baee Added timeout option to http.get/download
Allows setting a maximum timeout for a http request.
2016-05-29 10:07:37 -07:00
Mathew Versluys
31b22502b3 Improvements to http.get and http.download
There was an undocumented return code from http.download which was the
numerical CURL error code.

This has been replaced with the HTTP response code. The return for
http.download is now error message, HTTP response code. This could
break code that was relying on the CURL error but my light research is
that users of this call were checking for the error message being “OK”
and that functionality is preserved.

http.get has been updated to have a consistent return signature to
http.download and now returns the result, error message, HTTP response
code. The error message is now set to “OK” to match http.download.

These changes abstract this api from curl and make the focus http.

Cleaned up the code to make it easier to follow and removed some memory
leaks.

http.get and http.download would leak if headers were supplied.

http.get would leak the string buffer if curl_init failed.
2016-05-28 14:05:06 -07:00
Mathew Versluys
e7c855f089 Removed (now) unneeded table test from get_headers(). 2016-05-15 22:35:34 -07:00
Mathew Versluys
b9001f0d71 Cleanup of http.get and http.download
All options are now provided via a table which currently supports progress, userpwd, username, password, headers and should be extensible to add more options.

The previous signature of these funtions is supported for backward compatibility.

It appears that there were logic errors in the existing code such that a progress function would have only worked as the last parameter and would not work if headers were supplied. This is fixed such that the old signature will work if progress and headers are supplied.
2016-05-15 22:29:01 -07:00
Matthew Versluys
93f3ff3bb8 Fix for unused parameter warning on posix 2016-05-15 12:08:47 -07:00
Matthew Versluys
4d352ff01b Bug fix for os_getpass on Windows
Verified as working with Visual Studio 2015.
2016-05-15 11:27:02 -07:00
Mathew Versluys
d5e53a0be0 Added os.getpass
Prompt the user to enter a password and don't encho their entry.
2016-05-14 11:59:21 -07:00
Mathew Versluys
a51a4cfd6b Version used in user agent used well defined version.
Moved project definitions from premake.c to premake.h and added PREMAKE_ prefixes.
Utilized PREMAKE_VERSION in the user agent when making curl requests.
2016-05-14 11:01:37 -07:00
Mathew Versluys
8a03bbb065 Fixes for authentication functionality.
The userpwd paramater for http.get and http.download is now correctly optional.

Verified that it doesn't collide with the optional headers parameter to these functions because the type signature is different (headers is passed in as a table).

Added a user agent which is required to interface with GitHub APIs.
2016-05-14 09:49:35 -07:00
Mathew Versluys
0be3374acd Support for username/password in HTTP requests
http.get and http.download now accept an optional additional parameter which allows specifying the user name and password that will used in the request in the format of username:password.

This utilizes the default authentication of curl which is basic authentication.
This functionality will be utilized for authenticated http retrieval from GitHub APIs.
2016-05-13 13:38:17 -07:00
Jason Perkins
ea5cb0961e Merge pull request #491 from g012/ToolsetFilter
Add ability to filter configurations by toolset
2016-05-09 12:12:22 -04:00
paskal
c44e7c4ed6 Removed filter toolset patch prints 2016-05-08 01:35:06 +02:00
Tom van Dijck
48aea04b94 add 'io.writefile' and 'io.readfile' shortcut methods. 2016-05-04 16:10:10 -07:00
Jason Perkins
7859391d33 Merge pull request #486 from ThomasKugler/DependsUponXsd
Set DependsUpon to xsd files.
2016-05-03 11:48:01 -04:00
paskal
be9f5c079e Merge commit 'bf94b638f36f996b1ad208cf5fbb564890650704' of https://github.com/tritao/premake-core 2016-05-03 11:03:47 +02:00
Samuel Surtees
ef03d2a475 Merge pull request #487 from Blizzard/gmake-fixes
Gmake fixes
2016-05-03 18:38:35 +10:00
Tom van Dijck
43547450dd Fix precompiled header file lookup in gmake backend. 2016-05-02 16:55:50 -07:00
Jason Perkins
df7adbfe50 Fix casing on Visual Studio rule XML encoding entity 2016-05-02 19:30:45 -04:00
Tom van Dijck
1dbc1ea784 properly escape defines. 2016-05-02 13:57:12 -07:00
Thomas Kugler
f967bf3932 Set DependsUpon to xsd files.
Related tp #416.
2016-04-27 11:08:02 +02:00
aleksijuvani
8337746645 Fix optimize 'Debug' for clang
The compiler flag '-Og' isn't valid for clang, so just turn
optimizations off when 'Debug' is specified.
2016-04-15 15:30:18 +03:00
Samuel Surtees
5373584834 Merge pull request #475 from starkos/fix-no-nuget-packages
Only output NuGet project element if packages were listed by the project
2016-04-14 19:16:41 +10:00
Jason Perkins
10b83b950f Only output NuGet project element if packages were listed by the project 2016-04-13 18:55:44 -04:00
Sam Surtees
5059099a5b Added systemversion API. Fixes #315 2016-04-12 21:10:23 +10:00
Jason Perkins
870d21f382 Merge pull request #471 from Blizzard/optimize-copy-merge-filters
optimize copyFilters/mergeFilters
2016-04-12 06:25:36 -04:00
Tom van Dijck
c7bdab688e We want the packages table to be in the order we specified. 2016-04-11 13:13:53 -07:00
Tom van Dijck
29f588fdc9 optimize copyFilters/mergeFilters 2016-04-11 11:52:12 -07:00
Jason Perkins
002e65d428 Merge pull request #453 from aleksijuvani/nuget-in-vs-exporter
Add NuGet support to the Visual Studio exporter
2016-04-11 13:30:49 -04:00
Tom van Dijck
cf1b44018c refactor file categorization in vcxproj backend.
and add Masm support.
2016-04-07 12:52:58 -07:00
Jason Perkins
eb4741d6b1 Merge pull request #469 from Blizzard/call-array-fix
fix bug when callArray gets called with nil.
2016-04-07 15:34:15 -04:00
Tom van Dijck
16d55d603d fix bug when callArray gets called with nil. 2016-04-07 12:19:51 -07:00
Darryl Despie
8f95eaaba9 table fixes 2016-04-07 12:19:12 -07:00
Tom van Dijck
4f3a554a0c Merge pull request #467 from Blizzard/tostring-fix
table.tostring should displays the metatable.
2016-04-07 10:11:28 -07:00
aleksijuvani
3ff1501d81 Add .NET 4.6 to vstudio.frameworkVersions 2016-04-07 15:46:13 +03:00
aleksijuvani
c6a089374b Simplify cs2005.identifyFrameworkVersions 2016-04-07 15:46:12 +03:00
aleksijuvani
da625cf3f8 Match vstudio.frameworkVersions to dotnetframework API 2016-04-07 15:46:12 +03:00
Tom van Dijck
3232fd9cff table.tostring should displays the metatable. 2016-04-06 16:18:42 -07:00
Tom van Dijck
17620edaf8 table.deepclone should clone the metatable too. 2016-04-06 16:17:52 -07:00
Eyal Solnik
9d068901f9 Fix replaceextension from adding a leading dot
When an empty string was passed to replaceextension
as the new extension, it added a leading dot,
this update fixes/prevents it.
2016-03-29 20:15:19 +03:00
Eyal Solnik
82fd64e00c Fix getextension to handle paths w/ dot correctly 2016-03-29 10:02:49 +03:00
aleksijuvani
64c74679ab Fix some style errors 2016-03-24 20:55:29 +02:00
aleksijuvani
49d82207ba Move some NuGet logic into its own function 2016-03-24 20:48:58 +02:00
aleksijuvani
0592e36829 Remove redundant prj.nuget checks 2016-03-21 20:13:38 +02:00
aleksijuvani
f37f98e677 Add vstudio.frameworkVersions for extensibility 2016-03-21 12:44:08 +02:00
aleksijuvani
6059f8ff39 Change cs2005.assemblyReferences to use call arrays 2016-03-21 11:15:57 +02:00
aleksijuvani
2ba27a843a Move packages.config generation from vs2010 to vs2005 2016-03-21 11:01:56 +02:00
aleksijuvani
ecda0d6691 Use iscpp and isdotnet instead of string compares 2016-03-21 11:01:55 +02:00
aleksijuvani
05f7129641 Alphabetize nuget API definition 2016-03-21 11:01:54 +02:00
aleksijuvani
987818a9e7 Add NuGet support to the Visual Studio exporter 2016-03-19 20:43:37 +02:00
Tom van Dijck
0047780b3b fix path_translate for old compilers. 2016-03-17 14:24:00 -07:00
Jason Perkins
dbb42a0b77 Merge pull request #307 from LORgames/ssurtees/translatePathFix
Modify `path.translate()` to use target OS path separator by default
2016-03-17 12:13:55 -04:00
Jason Perkins
ef2f5c8945 Roll back PR #440; see discussion at https://github.com/premake/premake-core/pull/440 2016-03-15 14:48:33 -04:00
Samuel Surtees
c7bae391c7 Merge pull request #396 from tvandijck/fix-global-scope
Fix the oven to store the global container in the project and configs.
2016-03-08 21:45:36 +10:00
Samuel Surtees
495befbd7e Merge pull request #443 from starkos/isabsolute-allow-dot
Allow dot in path variables
2016-03-08 21:13:01 +10:00
Samuel Surtees
5421352255 Merge pull request #444 from starkos/fix-clang-getlinks
Fix mis-cased symbol in clang.getlinks()
2016-03-08 21:12:28 +10:00
Jason Perkins
150aed7bbb Fix mis-cased symbol in clang.getlinks() 2016-03-07 16:41:48 -05:00
Jason Perkins
5c3f2b8835 Some environments and toolsets allow additional characters within $(...) tokens. Adding the dot "." 2016-03-07 16:38:50 -05:00
Tom van Dijck
9324eb47fa fix global bake 2016-03-06 16:57:49 -08:00
Tom van Dijck
3c5ba0a6da Fix the baking process for 'global'. 2016-03-06 16:38:00 -08:00
Tom van Dijck
acfa41b697 Fix the oven to store the global container in the project and configs. 2016-03-06 16:37:55 -08:00
Tom van Dijck
745a135d5c Merge pull request #440 from LORgames/ssurtees/vstudioLinkerCleanup
Cleaned up vstudio linker elements
LGTM
2016-03-01 08:12:59 -08:00
Samuel Surtees
bf783483da Merge pull request #441 from starkos/fix-vs-warning
Fix a new Visual Studio unused variable build warning
2016-03-02 00:25:17 +10:00
Jason Perkins
51d5be7547 Fix a new Visual Studio unused variable build warning 2016-03-01 09:20:29 -05:00
Sam Surtees
a0242bb955 Cleaned up vstudio linker elements. Fixes #150 2016-03-01 22:11:33 +10:00
Sam Surtees
7886b04642 Added support for schema files in C# projects. Fixes #416 2016-02-29 21:39:32 +10:00
Tom van Dijck
d7581b6dae Move lua into 'contrib' folder, and build as any other 3rd party lib. 2016-02-25 15:39:49 -08:00
Sam Surtees
43dc8ccbcc Fixed issue with incorrect UUID being generated for groups. Fixes #100 2016-02-26 02:04:08 +10:00
Samuel Surtees
8a648f0241 Merge pull request #430 from lwjason/master
Add Build Customizations option
2016-02-24 11:11:26 +10:00
Jason Perkins
60b7acd2f4 Merge branch 'release-alpha8' 2016-02-23 15:50:04 -05:00
Jason Perkins
b3d5976461 Switch back to a dev version number 2016-02-23 15:49:29 -05:00
pohan
ae22c2bcd4 Remove hardcoded part
Remove hardcoded part: \\BuildCustomizations. Ya that's more flexible
now.
2016-02-23 22:21:31 +08:00
Samuel Surtees
6753dbe549 Merge pull request #344 from ardneran/master
Added frameworkdirs option.
2016-02-23 20:30:09 +10:00
Samuel Surtees
cd336b08fe Merge pull request #423 from Blizzard/link-groups
Link groups for gcc. (-Wl,--start-group)
2016-02-23 20:21:47 +10:00
Samuel Surtees
a381657629 Merge pull request #428 from tritao/patch-1
Fixed os.outputof to redirect standard streams to capture all output
2016-02-23 20:21:02 +10:00
pohan
2eacbe8623 Add Build Customizations option
Support Build Customization settings for projects. Now Premake5 can
recognize Build Customizations File that 3rd party API (e.g. CUDA)
maded.
2016-02-23 11:54:20 +08:00
Jason Perkins
6ebd7e1239 Prep for 5.0-alpha8 release 2016-02-19 16:19:49 -05:00
João Matos
981007fd4c Fixed os.outputof to redirect standard streams to capture all output. 2016-02-15 16:50:34 +00:00
Tom van Dijck
c98b5eef77 Fix couple of compiler warnings. 2016-02-08 08:59:29 -08:00
Sam Surtees
f60a1b391f path.translate now uses the target OS separator by default instead of Windows separator. 2016-02-06 13:35:03 +10:00
Tom van Dijck
d387209ed4 fix "do_isabsolute", and add more tests. 2016-02-05 13:15:01 -08:00
Tom van Dijck
305430ac11 Merge pull request #422 from Blizzard/log-project-bake
add logging in p.project.bake.
2016-02-05 09:57:23 -08:00
Tom van Dijck
6377a30a6a Link groups for gcc. (-Wl,--start-group) 2016-02-05 09:54:30 -08:00
Tom van Dijck
90036e0fb4 add logging in p.project.bake. 2016-02-05 09:40:21 -08:00
Tom van Dijck
b6c2b3c712 Fix do_isfile to support symbolic links on Windows. 2016-02-05 09:38:06 -08:00
Jason Perkins
834a4e46d2 Merge pull request #376 from Blizzard/makefile-utility-gmake
Add utility and makefile type in gmake.
2016-01-26 18:46:29 -05:00
Jason Perkins
ef5ac384cf Add support for DOS-style environment variables, e.g. %JAVA_HOME% 2016-01-20 14:06:38 -05:00
Jason Perkins
309ef32ff8 Move character set command line flags from switch lists to defines 2016-01-18 14:11:50 -05:00
Jason Perkins
84cb655069 Add missing Unicode/MBCS defines to MSC command line
Note that the defines are showing up in CFLAGS rather than DEFINES. The tool adapter API needs to be modified before they can be placed in the defines list where they should be.
2016-01-18 13:13:37 -05:00
Jason Perkins
46c1df4e61 Disable editorintegration() by default 2016-01-17 16:47:37 -05:00
Jason Perkins
0656a3ccc8 Merge pull request #403 from starkos/fix-vs-sln-indentation
Updating VS solutions to new output APIs; fix indentation of ExtensibilityGlobals block
2016-01-17 16:41:20 -05:00
Jason Perkins
0573e4f4b6 Update unit tests to match new VS solution output 2016-01-17 16:39:30 -05:00
Jason Perkins
d03ab85aa7 Merge pull request #402 from starkos/fix-buffered-write-realloc
Fix buffer overflow in buffered I/O dowrite()
2016-01-17 16:32:07 -05:00
Jason Perkins
0cd0a96463 Finish updating VS solution exporter to the new output APIs; fix indentation of ExtensibilityGlobals block 2016-01-17 16:29:27 -05:00
Jason Perkins
bff68f1ea8 Fix buffer overflow in buffered I/O dowrite()
If the string to be written is larger than the buffer's resize increment (capacity * 3 / 2), not enough space would be allocated and an overflow occurs when the string is copied. This fix keeps incrementing the buffer size until there is enough room to hold the incoming string.
2016-01-17 15:34:59 -05:00
Andrew
618f9227a3 cosmetic fix 2016-01-16 11:46:38 +05:00
Andrew
df8c2fd36e minor format fix 2016-01-15 21:08:30 +05:00
yuyoyuppe
196d46a412 add grouping by link mode 2016-01-15 22:02:01 +06:00
yuyoyuppe
82473183a5 feature + tests 2016-01-15 18:46:05 +06:00
Tom van Dijck
99bf0bc8cd Merge pull request #398 from Blizzard/premake-extension-support
add premake extension data.
2016-01-14 13:45:54 -08:00
Tom van Dijck
c9dd90f4b7 Merge pull request #370 from Blizzard/detoken-explicit-absolute
Allow the pathVars to return a table that specifies explicitly that a token represents a relative or absolute path.
2016-01-14 13:23:53 -08:00
Tom van Dijck
8f5bf73192 free memory from http requests. 2016-01-14 10:51:24 -08:00
Tom van Dijck
de38b921e3 Use call array, and move the 'if wks.editorintegration then'. 2016-01-14 08:42:07 -08:00
Tom van Dijck
00aff301b2 added 'editorintegration' flag
added tests
use p.push/pop api.
2016-01-12 08:27:42 -08:00
Tom van Dijck
294ff5e827 add premake extension data. 2016-01-11 15:29:37 -08:00
Jason Perkins
8f0683d823 Merge pull request #390 from starkos/fix-vs-warnings
Fix VS warnings
2015-12-30 14:53:55 -05:00
Jason Perkins
4102c9dd7f Split validation checks into individual tests and call arrays 2015-12-28 18:27:06 -05:00
Jason Perkins
7408010dcc Fix string-to-Unicode casting warnings 2015-12-28 11:58:54 -05:00
Jason Perkins
c74e8d12ee Merge pull request #367 from Blizzard/semver
make "premake.checkVersion" use Semantic Versioning
2015-12-28 11:11:43 -05:00
Jason Perkins
d5bd88c76b Merge pull request #386 from manxorist/fix-largeaddressaware-vs200x
Add largeaddressaware support for VS200x.
2015-12-27 15:07:33 -05:00
Jason Perkins
febb313eaa Merge pull request #387 from stream009/fix-cc
Fix "--cc" command line option
2015-12-27 15:06:54 -05:00
stream
3b7e983eca Write pchheader to Makefile as reletive path 2015-12-27 03:26:29 +09:00
stream
fef741eebb Support "--cc" command line option 2015-12-27 03:22:51 +09:00
Jörn Heusipp
e8c1ffeea5 Add largeaddressaware support for VS200x. 2015-12-26 15:14:51 +01:00
Jason Perkins
16b62f0877 Add new API characterset(); make Premake match Visual Studio default behavior
Visual Studio has been defaulting its projects to Unicode since at least 2008. Premake has been defaulting to MBCS to maintain backward compatibility with earlier Premake versions. This PR tries to set things right by switching Premake's default to Unicode.

This might set a record for most broken projects.
2015-12-18 16:59:13 -05:00
Tom van Dijck
6becbafa66 Add utility and makefile type in gmake. 2015-12-18 12:46:04 -08:00
Tom van Dijck
3ee51b9e14 Fix 0-termination. 2015-12-18 12:01:26 -08:00
Tom van Dijck
b01dde9889 Prevent a null pointer from being pushed, which will causes issues later on
in 'build_premake_path' on this line 'lua_concat(L, lua_gettop(L) - top);'.
2015-12-18 09:51:43 -08:00
Tom van Dijck
535e40db5f Allow the pathVars to return a table that specifies explicitly that a token represents a relative or absolute path. 2015-12-17 16:13:35 -08:00
Jason Perkins
3c1f106ebb Restore development version 2015-12-17 17:37:07 -05:00
Jason Perkins
3cae827c3d Update version number for release 2015-12-17 17:37:07 -05:00
Tom van Dijck
9f7ebdced2 make "premake.checkVersion" use Semantic Versioning
http://semver.org/
2015-12-17 10:55:43 -08:00
Jason Perkins
a7fa9b9142 Adds the missing resource file test on PR #365 2015-12-16 19:50:37 -05:00
Jason Perkins
79f453a285 Emit <TargetMachine> element to fix LNK4068 warnings in Visual Studio 2010+ 2015-12-16 16:25:37 -05:00
Tom van Dijck
7ee817b9a8 Merge pull request #304 from Blizzard/more-detoken-fixes
More fixes for detoken.
2015-12-15 09:30:15 -08:00