2
0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-29 13:30:32 +01:00
Commit Graph

2945 Commits

Author SHA1 Message Date
Thomas Nagy
b72fabf8e5
Do not expose Task.allow_argsfile and remove allow_argsfile from non-Task class #2216
The class waflib.Tools.winres.rc_parser is not a subclass of waflib.Task.Task:
rc_parser -> c_preproc.c_parser -> object
2019-03-03 17:04:53 +01:00
ita1024
e3c0c1b571 Merge branch 'add-allow_argsfile-to-tasks' into 'master'
task: winres: allow tasks to disable @argsfile

Closes #2224

See merge request ita1024/waf!2216
2019-03-03 15:15:36 +00:00
ita1024
7aa608889d Merge branch 'fix-path-calculations-in-git-bash' into 'master'
Utils: only use msys2 paths from msys2 python

See merge request ita1024/waf!2217
2019-02-26 17:26:32 +00:00
James Harris
84fd982f4b Utils: only use msys2 paths from msys2 python
This patch attempts to detects if, when we are running from within an
MSYS2 environement (MSYSTEM is set) we are also executing inside an
MSYS2 provided version of python. It does this by assuming that if we
are not in a cygwin environment and we are building on windows, If the
value of sys.executable is /usr/bin or /bin or /usr/local/bin (somethign
unixy) then we are running in an MSYS2 python interpreter and shoudl
compensate for msys2 root paths. Otherwise we shouldn't be doing extra
path manipulation.
2019-02-26 17:26:32 +00:00
Thomas Nagy
57377901fe
Fix 4046e48ac1 from #2214
TypeError: can only concatenate list
2019-02-24 10:50:44 +01:00
James Harris
9599cc532f task: winres: allow tasks to disable @argsfile
Not all tools executed by tasks support the '@argsfile' syntax for
shunting commandline arguments to a file. This means that if such
commands are shunted to a file early, he command will not work. On
windows the rc.exe command is such an example, but some tools on linux
have similar limitations. In the posix case, we artifically limit our
commandline size because it is difficult/variable to caluclate what the
actual limit is (it is partially dependent on environment size). This
could artifically cause commands to fail due to commandline length when
they otherwise wouldn't.

This patch fixes this issue by adding the 'allow_argsfile' flag to the
task. This way certain task instances will be able to specify if they
are compatible with the '@argsfile' syntax or not.
2019-02-19 12:48:04 -06:00
ita1024
2af495bcad Merge branch 'bug-2225-fix' into 'master'
Address ntpath bug with empty prefix

See merge request ita1024/waf!2215
2019-02-18 18:05:19 +00:00
James Harris
17b69226c4 Address ntpath bug with empty prefix
This patch addresses the bug described in issue #2225 where in using
posix paths and an empty PREFIX value can result in files being
installed to the root of the drive specified by destdir instead of to
the desired prefix value.  This is a bug in the assumption that user
specified paths that are strings will contain directory separators that
match the target operating system.
2019-02-18 11:38:45 -06:00
ita1024
bd3431e483 Merge branch 'fix-cmd-length-calculation' into 'master'
task: calculate correct cmdline bytes

See merge request ita1024/waf!2214
2019-02-15 17:33:27 +00:00
James Harris
4046e48ac1 task: calculate correct cmdline bytes
The previous patches to workaround
http://support.microsoft.com/kb/830473 drastically over estimated the
number of characters in commands by treating the repr() version of the
command array as a reasonable estimator of commandline length. This
caused commands attempt to write argsfiles before they should have.

The new calculation calculates the number characters in the command
array and adds the number of spaces that would be added by ' '.join(cmd)
this provides a much closer estimate of the commandline length.

This also limits the CLI-length on non windows platforms to 200kB. This
prevents us hitting the much larger argument limits on Linux/BSD/MacOS
platforms.
2019-02-15 10:50:27 -06:00
ita1024
f01354049d Merge branch 'patch-1' into 'master'
added stubs/ to lib search paths

See merge request ita1024/waf!2213
2019-02-14 06:45:43 +00:00
Maurizio Drocco
cb28dc94ab added stubs/ to lib search paths 2019-02-13 23:40:47 +00:00
ita1024
62e5397d98 Merge branch 'java_antglob_warnings' into 'master'
javaw: add quiet=True to ant_globs to suppress warnings of globbing in build

See merge request ita1024/waf!2212
2019-01-31 19:34:22 +00:00
fedepell
44046343c9 javaw: add quiet=True to ant_globs to suppress warnings of globbing in build
Most of the ant_globs used are explicitly and knowingly on build directory
(ie. javadoc, jar re) so the warning is quite spurious. The only one that
may be in doubt is the source re one: I added also here because if you use
a code generator (ie. protoc) then it is also correct to glob on builds and
the warning is misleading.
2019-01-31 07:03:26 +01:00
ita1024
3050136230 Merge branch 'allow_multiple_default_cmds' into 'master'
Support multiple 'default_cmd'

See merge request ita1024/waf!2211
2019-01-30 06:53:25 +00:00
Adriano Scoditti
21ac17d510 Support multiple 'default_cmd' 2019-01-29 11:48:54 +01:00
ita1024
b59dcf5d80 Merge branch 'buildcopy-no-nodes' into 'master'
buildcopy: Added warning if buildcopy is used without any files to copy

See merge request ita1024/waf!2210
2019-01-25 18:43:23 +00:00
xbreak
33208b3747 buildcopy: Added warning if buildcopy is used without any files to copy 2019-01-25 12:25:28 +00:00
Thomas Nagy
e641f171be
Use .pipelines/Jenkinsfile instead of demos/wscript 2019-01-22 08:08:55 +01:00
Thomas Nagy
a827a73af6
Add a pipelines file 2019-01-21 07:30:19 +01:00
ita1024
389e2e4a4b Merge branch 'protoc_gen_java_poc' into 'master'
protoc: simplify the java generation also solving problems with .proto input files generated during build

See merge request ita1024/waf!2209
2019-01-20 10:41:51 +00:00
Federico Pellegrin
429c4c88d9 protoc: simplify the java generation also solving problems with .proto input files generated during build 2019-01-20 10:41:51 +00:00
Thomas Nagy
2f3d5e5163
Prevent protoc errors on "waf list" 2019-01-19 09:40:11 +01:00
Thomas Nagy
3bf0e7049b
Remove xrange in one example 2019-01-18 18:48:26 +01:00
ita1024
17e973a7d3 Merge branch 'protoc_java_fname_1' into 'master'
protoc: fix filename generation for .java

See merge request ita1024/waf!2208
2019-01-17 18:07:10 +00:00
fedepell
f876a7b18c protoc: fix filename generation for .java 2019-01-17 14:45:40 +01:00
Thomas Nagy
68997828c8
Fix a few deprecation warnings 2019-01-16 06:51:14 +01:00
Thomas Nagy
1c75284614
docs 2019-01-05 16:20:45 +01:00
Thomas Nagy
4bd0c72809
Rework the previous changes 2019-01-05 16:16:48 +01:00
ita1024
ab24e0041e Merge branch 'fix-invalid-seq-warnings' into 'master'
Fix all DeprecationWarning: invalid escape sequence

See merge request ita1024/waf!2207
2019-01-05 15:07:58 +00:00
Mickaël Schoentgen
412a9b819e Fix all DeprecationWarning: invalid escape sequence
Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
2019-01-05 12:02:42 +01:00
ita1024
e68dc88857 Merge branch 'cython' into 'master'
Cython enhancements

See merge request ita1024/waf!2196
2018-12-29 10:11:19 +00:00
Thomas Nagy
353ffefa21
waf-2.0.14 2018-12-23 12:12:15 +01:00
Thomas Nagy
907519cab9
waf-2.0.14 2018-12-23 11:52:46 +01:00
ita1024
a77deaebdb Merge branch 'features/fc_submodules' into 'master'
Support for Fortran 2008 submodules.

See merge request ita1024/waf!2205
2018-12-22 00:14:42 +00:00
Harald Klimach
24ea24ff24 Added more syntactic cases to the demos/fortran/submodules example.
Also build a main program that uses the parent module.
2018-12-21 23:36:55 +01:00
Harald Klimach
9ff9eb73ad Added submodules demonstrator to demos/fortran.
Its only built if gfortran is used at least with version 6.
2018-12-21 23:14:19 +01:00
Harald Klimach
e0254f7a75 Missing bracket in submodule appending of fc_scan. 2018-12-21 23:13:35 +01:00
Harald Klimach
3dbf2ee7f8 Support for the Fortran Compiler of the NEC SX-Aurora TSUBASA system. 2018-12-21 20:18:12 +01:00
Harald Klimach
e77a6561a1 Support for Fortran 2008 submodules. 2018-12-21 19:53:12 +01:00
Thomas Nagy
3d1744151f
Possible solution for Msys path issues #2217 2018-12-21 11:47:51 +01:00
Thomas Nagy
b1928ee46b
Let the protoc demo build even if java is missing 2018-12-21 11:10:57 +01:00
fedepell
70f1522fa1 protoc: handle extra taskgen and out of project include directories 2018-12-21 06:16:08 +01:00
ita1024
b755748c4c Merge branch 'features/gccdeps' into 'master'
Use correct variable in gccdeps config

See merge request ita1024/waf!2203
2018-12-19 17:56:00 +00:00
ita1024
fe873242bc Merge branch 'protoc-eh-1' into 'master'
protoc: fix included protoc search on nested wscripts

See merge request ita1024/waf!2202
2018-12-19 17:44:23 +00:00
Daniel Welty
4b905773ea Use correct variable in gccdeps config
The global value gccdeps was appended to CFLAGS and CXXFLAGS instead of
the actual flags tested against the compiler.  This ignored
modifications to the GCCDEPS_FLAGS environment variable and complicated
adding support for additional compilers at the project level.
2018-12-19 11:14:43 -06:00
fedepell
ba1947b113 protoc: fix included protoc search on nested wscripts
previously code was erroneously using tg.bld.path instead of tg.path
so for nested wscript calls the wrong directory was used in search.

added also better error handling with error message if an included
directory does not exist
2018-12-19 15:45:48 +01:00
Thomas Nagy
82679503eb
docs 2018-12-19 11:30:45 +01:00
Thomas Nagy
4fd4de389c
Fix the api documentation build 2018-12-15 19:45:47 +01:00
ita1024
6417d5129d Merge branch 'javaw-docs' into 'master'
javaw: add some documentation on tool usage

See merge request ita1024/waf!2200
2018-12-14 06:40:49 +00:00