Paul Smith [Sun, 15 Sep 2013 20:41:42 +0000 (16:41 -0400)]
[SV 27374] Fatal immediately on unrecoverable fopen() errors.
Paul Smith [Sun, 15 Sep 2013 19:05:18 +0000 (15:05 -0400)]
[SV 39934] Verify jobserver FDs before something else uses them.
Paul Smith [Sun, 15 Sep 2013 17:30:21 +0000 (13:30 -0400)]
[SV 39203] Don't set MAKEFLAGS when restarting.
We are restarting with the original command line flags, so if we set
MAKEFLAGS as well that will cause double flags.
Paul Smith [Sun, 15 Sep 2013 01:01:10 +0000 (21:01 -0400)]
[SV 35248] Add --debug "n" flag to turn off current debug options.
Paul Smith [Sun, 15 Sep 2013 00:40:30 +0000 (20:40 -0400)]
[SV 33134] Don't try to close stdout when it's already closed.
Petr Machata [Thu, 22 Aug 2013 14:46:17 +0000 (16:46 +0200)]
[SV 39851] Reinstate stack size limit for processes spawned via $(shell)
Paul Smith [Sat, 14 Sep 2013 05:04:04 +0000 (01:04 -0400)]
Support the -Orecurse option properly.
In this mode we still collect all the output from a given target and
dump it at once. However we don't treat recursive lines any differently
from non-recursive lines. Also we don't print enter/leave messages
after every dump. However we do ensure that we always print them once
to stdout, so the parent make will collect it properly.
Paul Smith [Thu, 12 Sep 2013 08:07:52 +0000 (04:07 -0400)]
Enhance the output sync mode.
Create a new file, output.c, and collect functions that generate output there.
We introduce a new global context specifying where output should go (to stdout
or to a sync file), and the lowest level output generator chooses where to
write output based on that context.
This allows us to set the context globally, and all operations that write
output (including functions like $(info ...) etc.) will use it.
Removed the "--trace=dir" capability. It was too confusing. If you have
directory tracking enabled then output sync will print the enter/leave message
for each synchronized block. If you don't want that, disable directory
tracking.
Paul Smith [Mon, 22 Jul 2013 06:19:13 +0000 (02:19 -0400)]
[Bug #39310] Parse simple pattern prereqs for globbing.
We tried to get some efficiency by avoiding a parse_file_seq() for simple
pattern prerequisites, but this also means no wildcard expansion was
happening, so add it back. Add regression tests for wildcards in target and
prerequisite lists.
Paul Smith [Sun, 21 Jul 2013 21:52:13 +0000 (17:52 -0400)]
[Bug #39158] Source cleanups suggested by cppcheck utility.
Paul Smith [Sun, 21 Jul 2013 20:55:40 +0000 (16:55 -0400)]
Safety cleanups: ensure OUTFD is -1 when closed.
Paul Smith [Sun, 14 Jul 2013 23:18:46 +0000 (19:18 -0400)]
Notify the compiler that exec_command() won't return.
Paul Smith [Sun, 14 Jul 2013 23:18:21 +0000 (19:18 -0400)]
Modify the update_status field in struct file to be an enum.
Makes the code a little clearer/cleaner, and solves a problem on systems
where a char is unsigned by default.
Paul Smith [Tue, 9 Jul 2013 23:14:40 +0000 (19:14 -0400)]
Keep a local count of the max dependency list size.
This global variable could be modified during recursion so keep our
own local copy to compare against.
Paul Smith [Sat, 29 Jun 2013 01:57:59 +0000 (21:57 -0400)]
Set O_APPEND mode for stdout/stderr and output-sync temporary files.
POSIX does not guarantee that writes will be atomic if a file is
opened for normal (non-append) output. That means if multiple processes
are writing to the same file, output could be lost. I can't think of
a real use-case where we would NOT want append for stdout/stderr, so
force it if we can.
Eli Zaretskii [Sat, 22 Jun 2013 14:32:46 +0000 (17:32 +0300)]
Minor fix in build_w32.bat.
build_w32.bat (LinkGCC): Prevent a comment from being displayed
at build time.
Eli Zaretskii [Sat, 22 Jun 2013 13:22:25 +0000 (16:22 +0300)]
Compare internal commands of non-Unix shells on Windows case-insensitively.
job.c (construct_command_argv_internal) [WINDOWS32]: Use
case-insensitive comparison with internal commands of non-Unix
shells.
Eli Zaretskii [Sat, 22 Jun 2013 13:16:56 +0000 (16:16 +0300)]
Fix a fatal error at startup on Windows due to non-ASCII characters in PATH.
main.c (find_and_set_default_shell): Don't use file_exists_p or
dir_file_exists_p, as those call readdir, which can fail if PATH
includes directories with non-ASCII characters, and that would
cause Make to fail at startup with confusing diagnostics. See
https://sourceforge.net/mailarchive/message.php?msg_id=
30846737
for the details.
Paul Smith [Sat, 22 Jun 2013 04:22:08 +0000 (00:22 -0400)]
Create a character map to use for locating stop-points in strings.
In various places we were passing flags and characters to compare, then
using complex conditionals to see where to stop in string searches.
Performance numbers reveal that we were spending as much as 23% of our
processing time in these functions, most of it in the comparison lines.
Instead create a character map and use a single bitwise comparison to
determine if this is any one of the stop characters.
Paul Smith [Sat, 22 Jun 2013 03:59:38 +0000 (23:59 -0400)]
Disable database verification unless debug enabled.
The database verification can take a long time. Only enable it if debug mode
is enabled. If MAKE_MAINTAINER_MODE is set, it's also enabled by default.
Paul Smith [Sat, 22 Jun 2013 01:57:35 +0000 (21:57 -0400)]
Add job.h to POTFILES as it now has a translation.
Paul Smith [Mon, 27 May 2013 17:52:15 +0000 (13:52 -0400)]
Cleanups.
Paul Smith [Mon, 27 May 2013 17:52:08 +0000 (13:52 -0400)]
Create a new variable MAKE_HOST providing the host architecture.
Paul Smith [Mon, 27 May 2013 17:01:48 +0000 (13:01 -0400)]
Porting to VMS, from Hartmut Becker.
Paul Smith [Sun, 26 May 2013 20:53:17 +0000 (16:53 -0400)]
[SV #38442] Add library names to the string cache.
Paul Smith [Sun, 26 May 2013 18:41:45 +0000 (14:41 -0400)]
[SV #38945] Copy the entire buffer back when overwriting CR
Paul Smith [Sun, 26 May 2013 18:06:25 +0000 (14:06 -0400)]
[SV #39028] Fix some small typos in messages.
Paul Smith [Sun, 26 May 2013 17:56:51 +0000 (13:56 -0400)]
[SV #39035] Compare OUT to the beginning of the OUT var/func, not IN.
Paul Smith [Sun, 26 May 2013 17:53:21 +0000 (13:53 -0400)]
Add dates to the NEWS file to make things simpler.
Paul Smith [Wed, 22 May 2013 11:51:46 +0000 (07:51 -0400)]
Fix regression tests after MAKEFLAGS enhancements.
Paul Smith [Wed, 22 May 2013 06:51:45 +0000 (02:51 -0400)]
Force version printing whenever we print the database.
Paul Smith [Wed, 22 May 2013 06:14:19 +0000 (02:14 -0400)]
Make MFLAGS and MAKEFLAGS more reliable and predictable.
Ensure all simple flags are kept in the initial batch of flags.
Do not allow any flags with options in that batch.
If there are only non-simple flags ensure MAKEFLAGS begins with " ".
Don't let MFLAGS start with "- ".
Alexey Pavlov [Sat, 18 May 2013 14:58:10 +0000 (17:58 +0300)]
Fix the MS-Windows build using the Posix configury.
w32/Makefile.am (libw32_a_SOURCES): Add compat/posixfcn.c.
configure.ac (OUTPUT_SYNC): Define for mingw32 target.
Eli Zaretskii [Sat, 18 May 2013 11:07:36 +0000 (14:07 +0300)]
Support "move" as internal shell command on Windows with cmd.exe.
job.c (construct_command_argv_internal) <sh_cmds_dos> [WINDOWS32]: Add
"move". Fixes Savannah bug #30714.
Eli Zaretskii [Sat, 18 May 2013 11:03:26 +0000 (14:03 +0300)]
Fix MS-Windows build with Guile.
guile.c: Move inclusion of makeint.h before gnumake.h. This
order must be observed when building Make, because gnumake.h must
be included with GMK_BUILDING_MAKE defined, which makeint.h
already does. Otherwise, the linker will look for, and fail to
find, gmk_* functions in some external dynamic library.
Eli Zaretskii [Fri, 17 May 2013 13:24:13 +0000 (16:24 +0300)]
Fix MS-Windows compilation when OUTPUT_SYNC is not defined.
main.c (prepare_mutex_handle_string): Define conditioned on OUTPUT_SYNC.
Eli Zaretskii [Fri, 17 May 2013 10:34:24 +0000 (13:34 +0300)]
Fix a bug in build_w32.bat when building a released tarball.
build_w32.bat: Copy config.h.W32 to config.h regardless of
whether or not we are building from SCM.
Paul Smith [Fri, 17 May 2013 06:40:37 +0000 (02:40 -0400)]
Update for GNU make release candidate 3.99.90.
Paul Smith [Fri, 17 May 2013 06:29:46 +0000 (02:29 -0400)]
Update source file format: remove TABs, use GNU coding styles.
Paul Smith [Fri, 17 May 2013 05:46:11 +0000 (01:46 -0400)]
Update copyright for changes in 2013.
Paul Smith [Fri, 17 May 2013 05:24:19 +0000 (01:24 -0400)]
Use xcalloc() in hash.c to handle out of memory errors.
Paul Smith [Fri, 17 May 2013 05:20:39 +0000 (01:20 -0400)]
Remove the dlopen() pointer from struct filedef.
This pointer is almost never needed, and it increases the size of the filedef
struct for all files (of which there are a huge number for large builds).
Instead keep a bit field marking whether the file is a loaded object and if so
call a new function to unload it. In load.c we keep a simple linked list of
loaded objects (of which there will be very few typically) and their dlopen()
pointers.
Paul Smith [Wed, 15 May 2013 02:53:42 +0000 (22:53 -0400)]
Add requirement for plugin_is_GPL_compatible symbol in loaded objects.
Paul Smith [Mon, 13 May 2013 08:29:35 +0000 (04:29 -0400)]
[Savannah #20501] Handle adding -r/-R to MAKEFLAGS in the makefile.
If -R is set in the makefile and not the command line, then go through all the
default variables and undefine them. If -r is set in the makefile and not in
the command line, then remove all .SUFFIX prefixes (unless the user set it)
and SUFFIX variable setting. In -p mode don't print builtins.
Paul Smith [Mon, 13 May 2013 06:48:04 +0000 (02:48 -0400)]
Add a new variable: GNUMAKEFLAGS
This allows you to write portable makefiles that set GNU make-specific command
line options in the environment or makefile: add them to GNUMAKEFLAGS instead
of MAKEFLAGS and they will be seen by GNU make but ignored by other
implementations of make.
Paul Smith [Mon, 13 May 2013 06:17:29 +0000 (02:17 -0400)]
Use level o_env_override for MAKEFLAGS so it's reset even with -e.
Fixes Savannah bug #2216.
Paul Smith [Mon, 13 May 2013 05:30:24 +0000 (01:30 -0400)]
Add new --trace[=MODE] flags, with --trace=dir
This mode replaces the previous heuristic setting enabled with -O, where we
would log directory enter/leave for each synchronized output. Now we only
do that if --trace=dir is given.
Eli Zaretskii [Sat, 11 May 2013 14:42:56 +0000 (17:42 +0300)]
Avoid printing stdout and stderr messages without a newline between them.
job.c (child_out): Output the newline following the message
before fllush-ing the stream. Avoids displaying the following
failure message, which goes to stderr, on the same line.
Eli Zaretskii [Mon, 6 May 2013 17:18:58 +0000 (20:18 +0300)]
Rearrange dllimport/dllexport declarations for MS-Windows.
gnumake.h (GMK_EXPORT) [_WIN32]: Move the dllexport declaration
here from makeint.h.
makeint.h (GMK_BUILDING_MAKE) [WINDOWS32]: Define before
including gnumake.h.
Eli Zaretskii [Mon, 6 May 2013 17:16:40 +0000 (20:16 +0300)]
doc/make.texi (Loaded Object Example): Add a note about building
shared objects on MS-Windows.
Stefano Lattarini [Tue, 30 Apr 2013 15:19:04 +0000 (17:19 +0200)]
build: enable 'subdir-objects' and 'silent-rules' automake options
On 04/30/2013 05:11 PM, Stefano Lattarini wrote:
> * configure.ac (AM_INIT_AUTOMAKE): Here. The future major Automake
> version 2.0 (ETA about one, one and half year from now) will likely
> enable them by default, so better prepare ourselves.
>
Please drop this patch. Enabling 'subdir-objects' would require
sublter changes to several other parts of the build system that I
don't know how to test properly. We should only enable the
'silent-rules' option for the moment. The updated patch below
does this.
Sorry for the noise,
Stefano
---- 8< ---- 8< ---- 8< ---- 8< ---- 8< ---- 8< ---- 8< ---- 8< ----
>From
46623411f017a447caa8fe75b3b42ec2fbeac458 Mon Sep 17 00:00:00 2001
Message-Id: <
46623411f017a447caa8fe75b3b42ec2fbeac458.
1367335124.git.stefano.lattarini@gmail.com>
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 30 Apr 2013 16:30:04 +0200
Subject: [PATCH] build: enable the 'silent-rules' automake options
* configure.ac (AM_INIT_AUTOMAKE): Here. The future major Automake
version 2.0 (ETA about one, one and half year from now) will enable
it by default, so better prepare ourselves.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Tue, 30 Apr 2013 15:11:16 +0000 (17:11 +0200)]
build: require Autoconf >= 2.62 and Automake >= 1.11.1
Older versions of those tools should be considered fully obsolete.
Also, GNU make already requires Gettext >= 0.18.1, which has been
released six months after Automake 1.11.1 and two years after
Autoconf 2.62; so the new requirement shouldn't be problematic
for people already bootstrapping GNU make from the Git repository.
* configure.ac (AC_PREREQ): Require Autoconf 2.62 or later.
(AM_INIT_AUTOMAKE): Require Automake 1.11.1 or later (1.11 had
some serious bugs, and should not be used).
Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Paul Smith [Mon, 6 May 2013 04:22:27 +0000 (00:22 -0400)]
Remove use of vfork().
GCC was giving us warnings, most OS's now just run fork() when you call
vfork(), and looking at the standard definition of vfork() we are a long way
from using it safely anyway: you're not allowed to even call a function before
you exec().
Stefano Lattarini [Sat, 4 May 2013 22:44:41 +0000 (00:44 +0200)]
docs: port manual to Texinfo 5.x
* doc/make.texi: Here. It was sufficient to change an '@itemx'
into an '@item'.
Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Tue, 30 Apr 2013 13:37:03 +0000 (15:37 +0200)]
cosmetics: fix few innocuous typos
Most of these were found using Lucas De Marchi's 'codespell' tool.
* ChangeLog: Fix minor typos.
* ChangeLog.2: Likewise.
* README.Amiga: Likewise.
* TODO.private: Likewise.
* function.c: Likewise.
* glob/glob.h: Likewise.
* job.c: Likewise.
* main.c: Likewise.
* readme.vms: Likewise.
* remake.c: Likewise.
* tests/ChangeLog: Likewise.
* tests/NEWS: Likewise.
* tests/README: Likewise.
* tests/scripts/variables/private: Likewise.
* vmsdir.h: Likewise.
* signame.c: Likewise. While at it, improve line wrapping in the
touched comment.
Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Tue, 30 Apr 2013 15:11:18 +0000 (17:11 +0200)]
build: get rid of 'HAVE_ANSI_COMPILER' C preprocessor conditional
GNU make already assume C89 or later throughout the codebase, and
that preprocessor conditional was no longer used anyway.
* configure.ac: Remove AC_DEFINE of HAVE_ANSI_COMPILER.
* config.ami.template: Remove #define of HAVE_ANSI_COMPILER.
* config.h-vms.template: Likewise.
* config.h.W32.template: Likewise.
* configh.dos.template: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Paul Smith [Mon, 6 May 2013 00:19:00 +0000 (20:19 -0400)]
Rename the -O "job" mode to "line" and "make" to "recurse".
Paul Smith [Sun, 5 May 2013 21:03:51 +0000 (17:03 -0400)]
Ensure command lines are written synchronously with -O.
If output-sync is enabled, have make write the command line to the temp file
instead of printing it directly to the screen to ensure that the output is
ordered properly. Also, remove extraneous enter/leave operations by having
them printed directly when dumping temp file output.
Paul Smith [Sat, 4 May 2013 21:38:53 +0000 (17:38 -0400)]
Add memory allocation cleanup to loadable objects.
Add gmk_alloc() and gmk_free() functions so loadable objects can access our
memory model. Also provide a more extensive example in the manual.
Paul Smith [Sat, 4 May 2013 21:31:20 +0000 (17:31 -0400)]
Don't pump output to the descriptor, as we use FILE* elsewhere.
Eli Zaretskii [Sat, 4 May 2013 18:03:55 +0000 (21:03 +0300)]
Minor portabiulity fixes for MS-Windows.
makeint.h (ftruncate) [_MSC_VER]: Redirect to _chsize.
(_S_ISDIR): If not defined (MinGW64), define to S_ISDIR.
Paul Smith [Sat, 4 May 2013 17:14:39 +0000 (13:14 -0400)]
Merge branch 'master' of git.savannah.gnu.org:/srv/git/make
Paul Smith [Sat, 4 May 2013 17:10:56 +0000 (13:10 -0400)]
Improve sync handling for -Ojob/-Otarget and recursion.
If we are not going to sync a command line then dump any collected output
first to preserve ordering. Do some code cleanup:
* Move the handle init to a separate function.
* Move the temp file truncation to the output function.
* Remember whether we sync in a variable for readability.
* Handle EINTR and short writes in child_out().
* Always call sync_output() in case output_sync was changed due to error.
Eli Zaretskii [Sat, 4 May 2013 14:19:56 +0000 (17:19 +0300)]
Fix a typo in the manual.
Eli Zaretskii [Sat, 4 May 2013 07:56:32 +0000 (10:56 +0300)]
Fix a possibly confusing comment at end of pump_from_tmp_fd.
Eli Zaretskii [Sat, 4 May 2013 07:41:11 +0000 (10:41 +0300)]
Fix the MS-Windows branch of output_sync code.
job.c (start_job_command): Make the condition for creating a
temporary output file be identical to the Posix code branch.
Suggested by Frank Heckenbach <f.heckenbach@fh-soft.de>.
Eli Zaretskii [Fri, 3 May 2013 13:24:24 +0000 (16:24 +0300)]
Fix invocation of Windows batch files with whitespace in their names.
w32/subproc/sub_proc.c: Include makeint.h. Remove a private
incompatible prototype of xmalloc.
(batch_file_with_spaces): New function, detects Windows batch
files whose names include whitespace characters.
(process_begin): If exec_name is a batch file with whitespace
characters in its name, pass NULL as the first argument to
CreateProcess. This avoids weird failures due to buggy quoting by
CreateProcess. For the details, see the discussion starting at
http://lists.gnu.org/archive/html/make-w32/2013-04/msg00008.html.
Eli Zaretskii [Fri, 3 May 2013 13:09:12 +0000 (16:09 +0300)]
Fix interfacing with and remaking dynamic objects on MS-Windows.
load.c (load_object, load_file): Accept an additional argument
DLP and return in it a pointer that can be used to unload the
dynamic object.
read.c (eval): Call load_file with an additional argument, and
record the pointer returned there in the 'struct file' object of
dynamic objects in that object's 'struct file'.
commands.c (execute_file_commands): Unload dynamic objects
before remaking them, to avoid failure to remake if the OS doesn't
allow overwriting objects that are in use.
filedef.h (struct file): New member dlopen_ptr.
gnumake.h (GMK_EXPORT): Define to dllexport/dllimport
decorations for Windows and to nothing on other platforms.
(gmk_eval, gmk_expand, gmk_add_function): Add GMK_EXPORT qualifier
to prototypes.
makeint.h (MAIN): Define before including gnumake.h, to give
correct dllexport decorations to exported functions.
(load_file): Adjust prototype.
loadapi.c: Don't include gnumake.h, since makeint.h already
includes it, and takes care of defining MAIN before doing so.
build_w32.bat (LinkGCC): Produce an import library for functions
exported by Make for loadable dynamic objects.
w32/compat/posixfcn.c (dlclose): New function.
w32/include/dlfcn.h (dlclose): Add prototype.
scripts/features/load: Fix signatures of testload_gmk_setup and
explicit_setup, to bring them in line with the documentation.
Eli Zaretskii [Wed, 1 May 2013 15:41:14 +0000 (18:41 +0300)]
Mention in NEWS change on Windows with quotes in command lines.
Eli Zaretskii [Wed, 1 May 2013 15:31:53 +0000 (18:31 +0300)]
Fix treatment of whitespace after a backslash on MS-Windows.
job.c (construct_command_argv_internal): Don't treat a backslash as an
escape character before whitespace, if the shell is not a Posix
shell. For the description of the problem, see
http://lists.gnu.org/archive/html/make-w32/2013-04/msg00014.html.
Eli Zaretskii [Wed, 1 May 2013 15:15:16 +0000 (18:15 +0300)]
job.c (start_job_command) [WINDOWS32]: Make the same fix for
MS-Windows as the previous commit did for Posix platforms.
Paul Smith [Wed, 1 May 2013 11:59:24 +0000 (07:59 -0400)]
Don't synchronize output for recursive make unless -Omake
Eli Zaretskii [Mon, 29 Apr 2013 16:26:06 +0000 (19:26 +0300)]
Support dynamic object loading on MS-Windows.
w32/include/dlfcn.h: New file.
w32/compat/posixfcn.c: Include dlfcn.h.
(dlopen, dlerror, dlsym) [MAKE_LOAD]: New functions, in support of
dynamic loading.
config.h.W32.template (MAKE_LOAD): Define.
load.c (load_object) [HAVE_DOS_PATHS]: Support backslashes and
drive letters in file names of dynamic objects.
Eli Zaretskii [Mon, 29 Apr 2013 16:17:07 +0000 (19:17 +0300)]
Fix the .ONESHELL operation on MS-Windows.
job.c (construct_command_argv_internal) [WINDOWS32]: Return
right after generating new_argv for one_shell case. This fixes
the Windows build for both Unixy shell and stock Windows shells.
Paul Smith [Sun, 28 Apr 2013 23:25:24 +0000 (19:25 -0400)]
Merge branch 'master' of git.savannah.gnu.org:/srv/git/make
Paul Smith [Sun, 28 Apr 2013 23:09:20 +0000 (19:09 -0400)]
Ensure error messages are printed with sync'd output.
Enhance the child_error() function so that it will write error output to the
child's sync output buffer, if it exists. If it doesn't the output goes to
stdout/stderr.
Paul Smith [Sun, 28 Apr 2013 21:59:28 +0000 (17:59 -0400)]
Remove support for pre-ANSI variadic function calls.
We've required support for ANSI C (ISO C 89) or better for quite a while. Get
rid of the old varags.h, doprnt() stuff and simply assume ANSI C variadic
function capability and basic C runtime library support (vfprintf, vsprintf,
etc.)
Paul Smith [Sun, 28 Apr 2013 21:31:46 +0000 (17:31 -0400)]
Small cleanups and fixes.
Eli Zaretskii [Sun, 28 Apr 2013 17:53:36 +0000 (20:53 +0300)]
Fix Savannah bug #37065 with $(wildcard foo/*/.) returning non-directories.
dir.c (local_stat) [WINDOWS32]: Use the wrapper on MS-Windows.
If the argument ends in "dir/.", make sure the parent dir exists
and is indeed a directory. Fixes Savannah bug #37065.
Paul Smith [Sun, 28 Apr 2013 05:41:47 +0000 (01:41 -0400)]
Fix a few compiler warnings found by Eli.
Paul Smith [Sun, 28 Apr 2013 05:19:19 +0000 (01:19 -0400)]
Add support for per-job output sync.
A new flag to the -O/--output-sync, "job", selects a per-job (that is, per
line of a recipe) output synchronization. To support this move the close of
the temp file out of the sync_output() function and don't do it until we free
the child, since we may call sync_output() multiple times in a given recipe.
When we set up for a new temp file, if we're in per-job mode we truncate the
file and seek to the beginning to re-use it for every job.
Paul Smith [Sat, 27 Apr 2013 21:28:05 +0000 (17:28 -0400)]
Fix support for .ONESHELL when dealing with non-POSIX shells.
Paul Smith [Sat, 27 Apr 2013 20:57:05 +0000 (16:57 -0400)]
Rework the implementation of load.c to increase portability.
It should be sufficient, now, to write a new version of the load_object()
function. That function won't be called unless we really want to load, so all
checking and parsing is taken care of before that.
Paul Smith [Sat, 27 Apr 2013 20:24:08 +0000 (16:24 -0400)]
Merge branch 'master' of git.savannah.gnu.org:/srv/git/make
Eli Zaretskii [Sat, 27 Apr 2013 16:12:01 +0000 (19:12 +0300)]
Support .ONESHELL on MS-Windows, for default Windows shells.
read.c (record_files): Pay attention to .ONESHELL in MS-Windows.
job.c (construct_command_argv_internal): Support .ONESHELL on
MS-Windows, when the shell is not a Unixy shell.
Eli Zaretskii [Sat, 27 Apr 2013 11:30:01 +0000 (14:30 +0300)]
job.c: Fix compilation error on GNU/Linux due to "label at end of compound statement".
Eli Zaretskii [Sat, 27 Apr 2013 11:20:49 +0000 (14:20 +0300)]
Support --output-sync on MS-Windows.
w32/compat/posixfcn.c: New file, with emulations of Posix
functions and Posix functionality for MS-Windows.
w32/subproc/sub_proc.c: Include io.h.
(process_noinherit): New function, forces a file descriptor to not
be inherited by child processes.
(process_easy): Accept two additional arguments, and use them to
set up the standard output and standard error handles of the child
process.
w32/include/sub_proc.h (process_easy): Adjust prototype.
(process_noinherit): Add prototype.
read.c [WINDOWS32]: Include windows.h and sub_proc.h.
makeint.h (LOCALEDIR) [WINDOWS32}: Define to NULL if not
defined. This is needed because the MS-Windows build doesn't have
a canonical place for LOCALEDIR.
(WIN32_LEAN_AND_MEAN) [WINDOWS32]: Define, to avoid getting from
windows.h header too much stuff that could conflict with the code.
main.c <sync_mutex>: New static variable.
<switches>: Add support for "--sync-mutex" switch.
(decode_output_sync_flags): Decode the --sync-mutex= switch.
(prepare_mutex_handle_string) [WINDOWS32]: New function.
(main): Add "output-sync" to .FEATURES.
job.h (CLOSE_ON_EXEC) [WINDOWS32]: Define to call
process_noinherit.
(F_GETFD, F_SETLKW, F_WRLCK, F_UNLCK, struct flock) [WINDOWS32]:
New macros.
(RECORD_SYNC_MUTEX): New macro, a no-op for Posix platforms.
(sync_handle_t): New typedef.
job.c <sync_handle>: Change type to sync_handle_t.
(FD_NOT_EMPTY): Seek to the file's end. Suggested by Frank
Heckenbach <f.heckenbach@fh-soft.de>.
(pump_from_tmp_fd) [WINDOWS32]: Switch to_fd to binary mode for
the duration of this function, and then change back before
returning.
(start_job_command) [WINDOWS32]: Support output_sync mode on
MS-Windows. Use a system-wide mutex instead of locking
stdout/stderr. Call process_easy with two additional arguments:
child->outfd and child->errfd.
(exec_command) [WINDOWS32]: Pass two additional arguments, both
-1, to process_easy, to adjust for the changed function signature.
function.c (windows32_openpipe) [WINDOWS32]: This function now
returns an int, which is -1 if it fails and zero otherwise. It
also calls 'error' instead of 'fatal', to avoid exiting
prematurely.
(func_shell_base) [WINDOWS32]: Call perror_with_name if
windows32_openpipe fails, now that it always returns. This avoids
a compiler warning that error_prefix is not used in the MS-Windows
build.
config.h.W32.template (OUTPUT_SYNC): Define.
build_w32.bat: Add w32/compat/posixfcn.c to compilation and
linking commands.
From Frank Heckenbach <f.heckenbach@fh-soft.de>:
job.c (sync_output): Don't discard the output if
acquire_semaphore fails; instead, dump the output unsynchronized.
Eli Zaretskii [Thu, 25 Apr 2013 17:41:53 +0000 (20:41 +0300)]
Improve MS-Windows build scripts.
build_w32.bat: Improve. Remove 'setlocal', as it isn't
supported on Windows 9X. Add --help and usage instructions.
Support both debug and optimized builds with GCC under --debug.
If building out of Git repo, always produce config.h, and edit
gmk-default.scm into gmk-default.h.
w32/subproc/build.bat: Support debug and optimized builds with
GCC.
Stefano Lattarini [Sat, 20 Apr 2013 20:18:16 +0000 (22:18 +0200)]
Reflect the 'configure.in' -> 'configure.ac' rename throughout
In README, code comments, and auxiliary files.
Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Paul Smith [Tue, 16 Apr 2013 23:51:29 +0000 (19:51 -0400)]
Some cleanups for Windows builds after the output-sync option.
Note currently output-sync is not supported on Windows.
Paul Smith [Tue, 16 Apr 2013 05:47:05 +0000 (01:47 -0400)]
Cleanup some source and fix autoconf warnings.
Paul Smith [Tue, 16 Apr 2013 04:35:48 +0000 (00:35 -0400)]
Create an open_tmpfd() function to return temp files by FD. Use it.
Paul Smith [Mon, 15 Apr 2013 23:17:19 +0000 (19:17 -0400)]
Save the output from the entire recipe, not per-job.
Paul Smith [Mon, 15 Apr 2013 17:22:51 +0000 (13:22 -0400)]
Change the arg option for -O from numeric to string.
Paul Smith [Sun, 14 Apr 2013 23:13:42 +0000 (19:13 -0400)]
Modify output-sync tests to be more reliable.
Paul Smith [Sun, 14 Apr 2013 23:09:16 +0000 (19:09 -0400)]
Handle test timeouts in a more understandable way.
Paul Smith [Sun, 14 Apr 2013 20:31:18 +0000 (16:31 -0400)]
Rename the "parallel-sync" option to "output-sync".
Frank Heckenbach [Sun, 14 Apr 2013 19:38:07 +0000 (15:38 -0400)]
Initial patch for output synchronization. See Savannah bug #33138.
Based on work by David Boyce <David.S.Boyce@gmail.com>.
Paul Smith [Sat, 6 Apr 2013 14:51:57 +0000 (10:51 -0400)]
Clarify LDFLAGS vs. LDLIBS. Fixes Savannah bug #37970.
Paul Smith [Sat, 6 Apr 2013 14:29:20 +0000 (10:29 -0400)]
Reconsider targets waiting for prerequisites. Fixes Savannah bug #37703.