Commit Graph

2040 Commits

Author SHA1 Message Date
Manu Evans
3cdfaa705b Merge pull request #132 from starkos/fix-preloading
Fix preloading of embedded modules
2015-06-26 10:47:17 +10:00
starkos
5ce2bc0a7b Merge pull request #127 from starkos/exception-rtti-fixes
Finish switching to exceptionhandling() and rtti()
2015-06-25 15:35:05 -04:00
Jason Perkins
6a66587079 Fix preloading of embedded modules
os.locate() wasn't able to find the embedded scripts; added an explicit check after scanning the file system
2015-06-25 14:18:14 -04:00
starkos
6ee9747358 Merge pull request #128 from leeonix/master
modify gmake Makefile LINKCMD $(TARGET) to "$@" issue #125
2015-06-25 13:14:06 -04:00
tbasnoopy
26326835c9 add customtoolnamespace 2015-06-25 11:34:46 +02:00
tbasnoopy
c9147296ce allow changing of local debugger type 2015-06-25 11:30:48 +02:00
leeonix
a01225a90a modify gmake Makefile LINKCMD $(TARGET) to "$@" issue #125 2015-06-25 07:03:10 +08:00
starkos
cab15e8277 Merge pull request #123 from starkos/require-version
Add optional versions argument to require()
2015-06-24 15:08:53 -04:00
Jason Perkins
e22834a220 Add more informative deprecation warnings for NoExceptions and NoRTTI flags 2015-06-23 19:06:25 -04:00
Jason Perkins
f59651f3f6 Deprecate SEH flag; add value to exceptionhandling() 2015-06-23 19:03:28 -04:00
Jason Perkins
313a7c31ce Replace usages of NoExceptions and NoRTTI flags with exceptionhandling() and rtti() 2015-06-23 16:53:10 -04:00
Jason Perkins
d35a5f5ebf Fix mapping of exception handler and rtti values in tool adapters 2015-06-23 16:52:17 -04:00
Jason Perkins
20bc431d03 Tweak release script for new versioning setup 2015-06-22 15:39:08 -04:00
Jason Perkins
5d98731c65 Add optional versions argument to require() 2015-06-22 15:35:20 -04:00
Jason Perkins
bc55dc5796 Add a version comparison call with tests 2015-06-22 14:48:26 -04:00
Tom van Dijck
59bd1c10b0 Update vs2010_vcxproj.lua 2015-06-22 08:25:18 -07:00
Tom van Dijck
ca049404cc Update _premake_init.lua 2015-06-22 08:24:42 -07:00
starkos
41dec88056 Merge pull request #114 from mindw/add_get_directory
Add file.directory token
2015-06-21 19:31:12 -04:00
starkos
d1a74ecf76 Merge pull request #106 from Blizzard/filterempty
adding table.filterempty to vstudio.path
2015-06-21 19:30:57 -04:00
starkos
0280d44efd Merge pull request #104 from Blizzard/normalize-fix
filter out /./ in path.join and path.normalize
2015-06-21 19:30:45 -04:00
starkos
fe1f9b4531 Merge pull request #102 from Blizzard/exceptionhandling
add new exceptionhandling and rtti API's, deprecate the corresponding flags.
2015-06-21 19:28:27 -04:00
starkos
8d30db02e4 Merge pull request #118 from starkos/module-load-tests
Embedded modules should now return "should load" test function from _preload.lua
2015-06-18 16:01:24 -04:00
Jason Perkins
3714abefde Embedded modules should now return "should load" test function from their _preload.lua script
Each _preload.lua should end by returning a function of the form `function (cfg) … end`, which should itself return true if the module is required by the provided configuration. For the D language module, this might look like `return function (cfg) return cfg.language == "D" end`
2015-06-17 15:48:47 -04:00
Jason Perkins
8f6d8e1d61 A bit of clean up on release support files 2015-06-16 17:20:21 -04:00
Jason Perkins
e533d748b6 Update CHANGES and CONTRIBUTORS 2015-06-16 16:37:35 -04:00
Tom van Dijck
8d0b2565b5 convert exceptionhandling, rtti and editandcontinue flags from boolean to "tri-states". 2015-06-16 08:44:18 -07:00
Tom van Dijck
307e04ed88 add new exceptionhandling and rtti API's, deprecate the corresponding flags. 2015-06-16 08:25:39 -07:00
Damien Courtois
f5d7ef1a5b fixed a crash when a token contains non-escaped backslashes, and added a unit test 2015-06-15 18:15:03 +02:00
Gabi Davar
eace6d5d59 Add file.directory token
Useful for buildrules which require the directory of the file separate from its basename (protobuf 2.x).
Example:

``` lua

       -- One or more commands to run (required)
       protobuf_base = path.getabsolute(path.join(os.getcwd(), 'Third-Party/nanopb'))

       buildcommands {
            protobuf_base .. '/bin/protoc.exe -o%{cfg.objdir}/%{file.basename}.pb --proto_path=%{file.directory} %{file.abspath}',
```
2015-06-14 10:18:43 +03:00
Manu Evans
701c5a8c65 Merge pull request #113 from starkos/issue-107
Fix issue #107: map "Win32" to the x86 architecture for Visual Studio projects
2015-06-14 10:52:52 +10:00
Jason Perkins
26333a3b7b Fix issue #107: map "Win32" to the x86 architecture for Visual Studio projects 2015-06-13 15:54:19 -04:00
starkos
7983320ec6 Merge pull request #112 from starkos/deterministic-flag-maps
Make application of flag mappings deterministic (and potentially prioritized)
2015-06-13 15:09:54 -04:00
starkos
a1af0f02ce Merge pull request #110 from moomalade/bootstrap
Bootstrap Makefile
2015-06-13 13:47:30 -04:00
Manu Evans
2851751963 Merge pull request #99 from moomalade/make_cc_override
Enable Makefile environment overrides for CC,CXX and AR.
2015-06-13 10:43:04 +10:00
Jason Perkins
575ca32f5f Make application of flag mappings deterministic (and potentially prioritized) 2015-06-12 18:12:27 -04:00
starkos
aeeb67d838 Merge pull request #108 from Blizzard/basicruntimefix
stricter fix for /O2 not liking /RTC1, only when using the debug runtime.
2015-06-12 18:03:14 -04:00
Tim Wharton
3782314585 Change Travis CI to use bootstrap process
Adds both osx and linux as CI targets.
2015-06-12 20:12:23 +01:00
Tim Wharton
d536aa67e7 Add support for MinGW as a host bootstrap platform. 2015-06-11 19:26:59 +01:00
Tim Wharton
42b3ca2c51 Add bootstrap Makefile create premake initial executable
On a fresh clone, Bootstrap.mak can be used to prepare the initial premake executable on Windows, OSX and Linux.
2015-06-11 19:26:59 +01:00
Tom van Dijck
678616b068 fix for /O2 not liking /RTC1 2015-06-10 16:32:09 -07:00
Manu Evans
913245013e Merge pull request #105 from Blizzard/auto-test
setup premake to run tests from visual studio by default.
2015-06-09 09:50:10 +10:00
Tom van Dijck
cf4d189368 adding table.filterempty to vstudio.path 2015-06-08 11:48:02 -07:00
Tom van Dijck
570da6fbea setup premake to run tests from visual studio by default. 2015-06-08 11:15:34 -07:00
Tom van Dijck
fc9c8d224d oops.. remove out paths. 2015-06-08 11:12:17 -07:00
Tom van Dijck
c3c2045d92 filter out /./ in path.join and path.normalize 2015-06-08 11:08:08 -07:00
Tom van Dijck
962f1e5a2d add inlining API. 2015-06-08 11:06:18 -07:00
Tim Wharton
45401aa57b Enable Makefile environment overrides for CC,CXX and AR.
Check if CC, CXX or AR are their default values before assigning them their premake defaults.
If they are not at their default values, they have been overriden in the environment and we should leave them alone.

Overriding toolchains from the command line is useful when swapping between compilers.
For example: `CC=gcc-4.8.1 make -C build`
2015-06-08 04:46:16 +01:00
starkos
65a69d6546 Merge pull request #97 from moomalade/calling_convention
Add Visual Studio calling convention support
2015-06-07 08:56:42 -04:00
starkos
4638c266a6 Merge pull request #84 from Blizzard/solution-filter
add "system" to the filter for solutions, so we can do system specific solution configurations.
2015-06-07 08:55:48 -04:00
Manu Evans
57eb8528e6 Merge pull request #98 from moomalade/fix_category_typo
Fix typo in support for 'category' option field
2015-06-06 14:44:02 +10:00