Commit Graph

2030 Commits

Author SHA1 Message Date
Jussi Pakkanen 0c9c29b6b6 Preserve b_ prefix for base option names. 2016-03-20 19:00:57 +02:00
Jussi Pakkanen 4bb665a577 Merge pull request #464 from tp-m/bool-to-string-and-to-int
Add bool to_string() and to_int() methods.
2016-03-20 18:53:01 +02:00
Jussi Pakkanen a3d49ca1ce Merge pull request #453 from nioncode/vs-customTargetDependencies
vs2010: fix dependencies of CustomTarget
2016-03-20 18:49:53 +02:00
Jussi Pakkanen 6eaeb05f8b Merge pull request #463 from tp-m/plus-assign-for-strings-and-ints
Add += support for strings and integers
2016-03-20 18:45:06 +02:00
Jussi Pakkanen 1bd3135bcb Merge pull request #461 from nirbheek/msvc-filter-clibs
compilers: While linking, filter out libraries that are bundled with the MSVC runtime
2016-03-20 18:43:49 +02:00
Jussi Pakkanen 254a688124 Pip clarification. 2016-03-20 18:37:22 +02:00
Tim-Philipp Müller 3eea1703ff Add bool to_string() and to_int() methods
bool to_int() will return 0 or 1, useful if one wants to set
a define to 0 or 1 based on a boolean result instead of having
it just defined or undefined.

bool to_string() will return 'true' or 'false' by default same
as when using it to format a string, but with the additional
possibility to specify two extra string arguments to be returned
as true/false values, e.g. to_string('yes', 'no'). This can be
useful when outputting messages to be shown to the user.
2016-03-19 17:57:11 +00:00
Tim-Philipp Müller fcbd60c291 Add += support for strings and integers 2016-03-19 17:11:53 +00:00
Nirbheek Chauhan 57e01c2964 compilers: While linking, filter out libraries that are bundled with the MSVC runtime 2016-03-19 05:39:48 +05:30
Jussi Pakkanen dc049660e7 Merge pull request #456 from nirbheek/implement_libexecdir
New builtin option: libexecdir for installation of helper executables
2016-03-18 23:28:48 +02:00
Jussi Pakkanen 2e73994978 Merge pull request #455 from nirbheek/meson_install_shebang_parsing
meson_install.py: Start by checking if the shebang is directly runnable
2016-03-18 23:28:00 +02:00
Jussi Pakkanen 7844fd54d9 Merge pull request #458 from nioncode/vs-object-extraction
vs2010: fix object extraction
2016-03-18 23:26:38 +02:00
Jussi Pakkanen ae1f284ade Added base options to Clang compilers. 2016-03-18 00:36:39 +02:00
Nirbheek Chauhan 64a0dc6269 Implement cc.find_library for the Visual Studio C/C++ compilers
Without this find_library always succeeds because MSVC just ignores -lfoo
as an invalid argument
2016-03-18 02:58:02 +05:30
Jussi Pakkanen 90c799fc61 Do not use lundef on OSX. 2016-03-17 22:52:55 +02:00
Jussi Pakkanen b5c7cca0dc Works when mixing Java and C. 2016-03-17 21:24:13 +02:00
Jussi Pakkanen de03ae5af0 Fix mesonintrospect. 2016-03-17 21:08:07 +02:00
Jussi Pakkanen 8b6848ebc3 Add dir support for find_library and remove deprecated standalone version. Closes #450. 2016-03-17 20:55:19 +02:00
Nicolas Schneider 147b7aa356 vs2010: add explicit objects as 'Object' ItemGroup instead of link dependency
This has two effects:
1. It makes targets with only object files work (test case 88).
2. It adds the object files to the project in the VS IDE.
2016-03-17 13:13:28 +01:00
Nicolas Schneider d72cc6e6f8 vs2010: fix object extraction
1. Dependencies must be set up with the target's id instead of its
basename.
2. Extracted object output file names must not include the directory
prefix, because MSBuild puts all object files into the same directory
and names them srcfilename.obj instead of dir/filename.obj or
dir_filename.obj.
2016-03-17 12:37:38 +01:00
Nirbheek Chauhan 11f63105d0 New builtin option: libexecdir for installation of helper executables 2016-03-17 16:17:06 +05:30
Nirbheek Chauhan d5c9b98cab meson_install.py: Start by checking if the shebang is directly runnable
If it's just runnable as-is, then we don't need to do fancy basename detection
and such to find the interpretor to use for running the script.
2016-03-17 16:16:35 +05:30
Jussi Pakkanen 19046fd854 Added new base options and some sample opts for gcc. 2016-03-16 21:55:03 +02:00
Nicolas Schneider 4d9db21039 vs2010: fix dependencies of CustomTarget 2016-03-16 00:00:39 +01:00
Nicolas Schneider 3871f22cc3 remove unnecessary os.path.join() calls
ofilenames and srcs are already absolute paths.
2016-03-15 23:37:50 +01:00
Nicolas Schneider e067c4a79d fix eval_custom_target_command() to use absolute paths for output files 2016-03-15 23:26:12 +01:00
Jussi Pakkanen a3004652ea Merge test framework options. 2016-03-14 21:00:23 +02:00
Jussi Pakkanen cefbea4816 Merge pull request #447 from nioncode/vs-fix-dirs
vs2010: give each target an own temp dir
2016-03-14 19:29:16 +02:00
Nicolas Schneider 2761f96fe9 vs2010: give each target an own temp dir
The 'Rebuild' target fails in mysterious ways if multiple targets use
the same directories because of output files being deleted between two
build steps (e.g. test case 78 fails on Rebuild, whereas Clean + Build
work just fine).
2016-03-14 09:56:42 +01:00
Nicolas Schneider 2511ff0970 check is_header() first, since it is a subset of is_source() 2016-03-14 00:03:16 +01:00
Nicolas Schneider 1f907e75da add everything that is not an object or source file to headers list 2016-03-13 23:08:37 +01:00
Nicolas Schneider c72cefaac4 only include known source file extensions into sources list 2016-03-13 19:07:44 +01:00
Nicolas Schneider baa639031b not all dependencies have a compile_args attribute 2016-03-13 19:01:46 +01:00
Nicolas Schneider e366631e9e don't fail if we don't compile anything (we might just bundle object files) 2016-03-13 18:58:41 +01:00
Nicolas Schneider 5503939866 only guess language for source files, not for header or object files 2016-03-13 18:03:14 +01:00
Nicolas Schneider 8eac78b861 vs2010: support language specific extra_args 2016-03-13 17:08:30 +01:00
Nicolas Schneider 246d9f4564 test24: check that a target extra_arg is not applied to other targets 2016-03-13 14:49:08 +01:00
Jussi Pakkanen 304c0d2cb5 Updated version number for new development. 2016-03-12 20:21:15 +02:00
Jussi Pakkanen 4e94a07f6e Bump version number for release. 2016-03-12 19:03:07 +02:00
Jussi Pakkanen f3e20b2570 Use assert instead of if/error. 2016-03-12 18:51:59 +02:00
Nicolas Schneider 5482a23936 enhance test framework to read meson arguments from a file per test
A 'test_args.txt' file in the same directory as the test case will be
parsed by the test framework and the content will be passed as arguments
to meson during configuration. The arguments are put before any
'extra_args' to make them overwritable from the command line.
2016-03-12 17:41:42 +01:00
Jussi Pakkanen 9c5bda3f40 Return array by value so it does not get modified. 2016-03-12 17:32:43 +02:00
Jussi Pakkanen 6b548a1c75 Added find_library method and deprecated the standalone version. Closes #396. 2016-03-12 17:00:55 +02:00
Jussi Pakkanen 0d5eaa2721 Merge pull request #442 from nioncode/vs-linker-args
vs2010: fix linker args
2016-03-12 16:44:33 +02:00
Jussi Pakkanen c218f221fd Merge pull request #444 from tp-m/config-undef
config file: write commented undef lines same as autoconf
2016-03-12 16:44:15 +02:00
Jussi Pakkanen 2afc1dd497 Merge pull request #443 from tp-m/more-string-funcs
Add more string funcs: to_upper(), to_lower(), contains() and underscorify()
2016-03-12 16:42:40 +02:00
Tim-Philipp Müller 3c8468cd4d Add string underscorify() function
So we can easily construct the defines for include headers and
struct checks and such.
2016-03-12 14:15:54 +00:00
Tim-Philipp Müller 02e84df010 Add more string functions: contains(), to_upper() and to_lower() 2016-03-12 14:15:31 +00:00
Nicolas Schneider 17f1323aca vs2010: fix linker args 2016-03-12 14:18:51 +01:00
Tim-Philipp Müller 48a2b201ea config file: write commented undef lines same as autoconf
For easier diffing to see if anything is missing when porting.
2016-03-12 09:34:35 +00:00