Markus Maurhart.
+2006-01-31 Paul D. Smith <psmith@gnu.org>
+
+ * README.W32.template: Applied patch #4785 from
+ Markus Mauhart <qwe123@chello.at>.
+ * README.cvs: Applied patch #4786 from
+ Markus Mauhart <qwe123@chello.at>.
+ * make_msvc_net2003.vcproj [WINDOWS32]: New version from
+ Markus Mauhart <qwe123@chello.at>.
+
+ * main.c: Update the copyright year in the version output.
+ * prepare_w32.bat: Remove this file from the distribution.
+
+2006-01-21 Eli Zaretskii <eliz@gnu.org>
+
+ * remake.c (update_goal_chain): Set g->changed instead of
+ incrementing it, as it is only 8-bit wide, and could overflow if
+ many commands got started in update_file.
+
+ * w32/include/sub_proc.h: Add a prototype for process_used_slots.
+
+ * w32/subproc/sub_proc.c: Change dimension of proc_array[] to
+ MAXIMUM_WAIT_OBJECTS.
+ (process_wait_for_any_private): Change dimension of handles[]
+ array to MAXIMUM_WAIT_OBJECTS.
+ (process_used_slots): New function.
+ (process_register): Don't register more processes than the
+ available number of slots.
+ (process_easy): Don't start new processes if all slots are used up.
+
+ * job.c (load_too_high, start_waiting_jobs) [WINDOWS32]: If there
+ are already more children than sub_proc.c can handle, behave as if
+ the load were too high.
+ (start_job_command): Fix a typo in error message when process_easy
+ fails.
+
+2006-01-14 Eli Zaretskii <eliz@gnu.org>
+
+ * main.c (main) [WINDOWS32]: Don't refuse to run with -jN, even if
+ the shell is not sh.exe.
+
+ * job.c (create_batch_file): Renamed from create_batch_filename;
+ all callers changed. Don't close the temporary file; return its
+ file descriptor instead. New arg FD allows to return the file
+ descriptor.
+ (construct_command_argv_internal): Use _fdopen instead of fopen to
+ open the batch file.
+
2006-01-04 Paul D. Smith <psmith@gnu.org>
* readme.vms: Updates for case-insensitive VMS file systems from
disable warnings for MSC.
Patch by Rob Tulloh <rtulloh@yahoo.com>.
-2005-12-18 Paul D. Smith <psmith@gnu.org>
-
- * Makefile.am (EXTRA_DIST): Distribute prepare_w32.bat.
-
2005-12-17 Eli Zaretskii <eliz@gnu.org>
* doc/make.texi (Execution): Add a footnote about changes in
README.Amiga Makefile.ami config.ami make.lnk amiga.c amiga.h \
README.DOS Makefile.DOS configure.bat dosbuild.bat configh.dos\
README.W32 NMakefile config.h.W32 build_w32.bat subproc.bat \
- make_msvc_net2003.sln make_msvc_net2003.vcproj prepare_w32.bat\
+ make_msvc_net2003.sln make_msvc_net2003.vcproj \
readme.vms makefile.vms makefile.com config.h-vms \
vmsdir.h vmsfunctions.c vmsify.c
* On VMS there is now support for case-sensitive filesystems such as ODS5.
See the readme.vms file for information.
+* Parallel builds (-jN) no longer require a working Bourne shell on
+ Windows platforms. They work even with the stock Windows shells, such
+ as cmd.exe and command.com.
+
* Updated to autoconf 2.59, automake 1.9.5, and gettext 0.14.1. Users
should not be impacted.
The Windows 32-bit port of GNU make is maintained jointly by various
people. It was originally made by Rob Tulloh.
-To build with MinGW:
- 1. Edit config.h.W32 to your liking (especially the few
- shell-related defines near the end).
+Do this first, regardless of the build method you choose:
+---------------------------------------------------------
- 2. Invoke build_w32.bat with the "gcc" argument:
+ 0. If your sources come from CVS, read the Windows-specific section of
+ README.cvs.
- build_w32 gcc
+ 1. At the Windows command prompt run:
- This produces gnumake.exe in the current directory.
+ if not exist config.h copy config.h.W32 config.h
-To build with nmake:
+ Then edit config.h to your liking (especially the few shell-related
+ defines near the end, or HAVE_CASE_INSENSITIVE_FS which corresponds
+ to './configure --enable-case-insensitive-file-system').
- 1. Make sure cl.exe is in your %Path%. Example:
- set Path=%Path%;c:/msdev/bin
+Using make_msvc_net2003.vcproj
+------------------------------
- 2. Make sure %include% is set to msvc include directory. Example:
+ 2. Open make_msvc_net2003.vcproj in MSVS71 or MSVC71 or any compatible IDE,
+ then build this project as usual.
- set include=c:/msdev/include
- 3. Make sure %lib% is set to msvc lib directory. Example:
+Building with (MinGW-)GCC using build_w32.bat
+---------------------------------------------
- set lib=c:/msdev/lib
+ 2. Open a W32 command prompt for your installed (MinGW-)GCC, setup a
+ correct PATH and other environment variables for it, then execute ...
- 4. nmake /f NMakefile
+ build_w32.bat gcc
+ This produces gnumake.exe in the current directory.
- A short cut to steps 1, 2, and 3 is to run VCVARS32.bat before
- invoking nmake. For example:
- c:
- cd \msdev\bin
- VCVARS32.bat
- cd \path\to\make-%VERSION%
- nmake /f NMakefile
+Building with (MSVC++-)cl using build_w32.bat or NMakefile
+----------------------------------------------------------
+
+ 2. Open a W32 command prompt for your installed (MSVC++-)cl, setup a
+ correct PATH and other environment variables for it (usually via
+ executing vcvars32.bat or vsvars32.bat from the cl-installation,
+ e.g. "%VS71COMNTOOLS%vsvars32.bat"; or using a corresponding start
+ menue entry from the cl-installation), then execute EITHER ...
+
+ build_w32.bat
-There is a bat file (build_w32.bat) for folks who have fear of nmake.
+ (this produces WinDebug/gnumake.exe and WinRel/gnumake.exe)
-Outputs:
+ ... OR ...
+
+ nmake /f NMakefile
- WinDebug/make.exe
- WinRel/make.exe
+ (this produces WinDebug/make.exe and WinRel/make.exe).
+-------------------
-- Notes/Caveats --
+-------------------
GNU make on Windows 32-bit platforms:
the GNU make source code via anonymous CVS from the FSF's Savannah
project <http://savannah.gnu.org/projects/make/>:
- $ cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/make co make
+ $ cvs -d:pserver:anoncvs@cvs.savannah.gnu.org:/sources/make co make
You might want to use the "-z3" option to get compression, and you most
certainly will want the -P option to avoid unneeded directories
That's it, you're done!
+Windows builds from CVS
+-----------------------
+
+IF you have managed to successfully perform the 1st two or three steps of
+the general build procedure as explained above:
+
+ $ autoreconf [-i] -s
+ $ ./configure
+ [$ make update]
+
+THEN proceed with file README.W32.
+
+ELSE ignore the general build procedure, instead execute the following
+command lines at a Windows command prompt:
+
+ if not exist README.W32 copy README.W32.template README.W32
+ if not exist config.h.W32 copy config.h.W32.template config.h.W32
+ if not exist NMakefile copy NMakefile.template NMakefile
+
+Now proceed with file README.W32.
+
+
Appendix A - For The Brave
--------------------------
Maybe after the code cleanup for ISO C we can remove some/all of these. */
#if _MSC_VER > 1000
# pragma warning(disable:4100) /* unreferenced formal parameter */
+# pragma warning(disable:4102) /* unreferenced label */
# pragma warning(disable:4127) /* conditional expression is constant */
+# pragma warning(disable:4131) /* uses old-style declarator */
# pragma warning(disable:4702) /* unreachable code */
#endif
@set RCSID $Id$
@set EDITION 0.70
@set VERSION 3.81
-@set UPDATED 28 Dec 2005
-@set UPDATE-MONTH Dec 2005
+@set UPDATED 29 Jan 2006
+@set UPDATE-MONTH Jan 2006
@c ISBN provided by Lisa M. Opus Goldstein <opus@gnu.org>, 5 May 2004
@set ISBN 1-882114-83-5
searches using that library filename. If no library is found, the next
word in the list will be used.
-The default value for @code{.LIBPATTERNS} is ``@samp{lib%.so lib%.a}'',
+The default value for @code{.LIBPATTERNS} is @samp{lib%.so lib%.a},
which provides the default behavior described above.
You can turn off link library expansion completely by setting this
@example
@group
ifeq (0,$@{MAKELEVEL@})
-cur-dir := $(shell pwd)
whoami := $(shell whoami)
host-type := $(shell arch)
MAKE := $@{MAKE@} host-type=$@{host-type@} whoami=$@{whoami@}
@example
@group
$@{subdirs@}:
- $@{MAKE@} cur-dir=$@{cur-dir@}/$@@ -C $@@ all
+ $@{MAKE@} -C $@@ all
@end group
@end example
that the @samp{%} matches is called the @dfn{stem}.@refill
@samp{%} in a prerequisite of a pattern rule stands for the same stem
-that was matched by the @samp{%} in the target. In order for
-the pattern rule to apply, its target pattern must match the file name
-under consideration, and its prerequisite patterns must name files that
-exist or can be made. These files become prerequisites of the target.
+that was matched by the @samp{%} in the target. In order for the
+pattern rule to apply, its target pattern must match the file name
+under consideration and all of its prerequisites (after pattern
+substitution) must name files that exist or can be made. These files
+become prerequisites of the target.
@cindex prerequisite pattern, implicit
Thus, a rule of the form
return ((process_kill((HANDLE)pid, sig) == TRUE) ? 0 : -1);
}
-/* This function creates a temporary file name with the given extension
- * the unixy param controls both the extension and the path separator
- * return an xmalloc'ed string of a newly created temp file or die. */
+/* This function creates a temporary file name with an extension specified
+ * by the unixy arg.
+ * Return an xmalloc'ed string of a newly created temp file and its
+ * file descriptor, or die. */
static char *
-create_batch_filename(char const *base, int unixy)
+create_batch_file (char const *base, int unixy, int *fd)
{
const char *const ext = unixy ? "sh" : "bat";
const char *error = NULL;
const unsigned final_size = path_size + size + 1;
char *const path = (char *) xmalloc (final_size);
memcpy (path, temp_path, final_size);
- CloseHandle (h);
+ *fd = _open_osfhandle ((long)h, 0);
if (unixy)
{
char *p;
}
}
+ *fd = -1;
if (error == NULL)
error = _("Cannot create a temporary file\n");
fatal (NILF, error);
int i;
unblock_sigs();
fprintf(stderr,
- _("process_easy() failed failed to launch process (e=%ld)\n"),
+ _("process_easy() failed to launch process (e=%ld)\n"),
process_last_err(hPID));
for (i = 0; argv[i]; i++)
fprintf(stderr, "%s ", argv[i]);
/* If we are running at least one job already and the load average
is too high, make this one wait. */
- if (!c->remote && job_slots_used > 0 && load_too_high ())
+ if (!c->remote
+ && ((job_slots_used > 0 && load_too_high ())
+#ifdef WINDOWS32
+ || (process_used_slots () >= MAXIMUM_WAIT_OBJECTS)
+#endif
+ ))
{
/* Put this child on the chain of children waiting for the load average
to go down. */
double load, guess;
time_t now;
+#ifdef WINDOWS32
+ /* sub_proc.c cannot wait for more than MAXIMUM_WAIT_OBJECTS children */
+ if (process_used_slots () >= MAXIMUM_WAIT_OBJECTS)
+ return 1;
+#endif
+
if (max_load_average < 0)
return 0;
command line (e.g. Cygnus GNUWIN32 sh.exe on WIN32 systems). In these
cases, run commands via a script file. */
if ((no_default_sh_exe || batch_mode_shell) && batch_filename_ptr) {
+ int temp_fd;
FILE* batch = NULL;
int id = GetCurrentProcessId();
PATH_VAR(fbuf);
/* create a file name */
sprintf(fbuf, "make%d", id);
- *batch_filename_ptr = create_batch_filename (fbuf, unixy_shell);
+ *batch_filename_ptr = create_batch_file (fbuf, unixy_shell, &temp_fd);
DB (DB_JOBS, (_("Creating temporary batch file %s\n"),
*batch_filename_ptr));
- /* create batch file to execute command */
- batch = fopen (*batch_filename_ptr, "w");
+ /* Create a FILE object for the batch file, and write to it the
+ commands to be executed. */
+ batch = _fdopen (temp_fd, "w");
if (!unixy_shell)
fputs ("@echo off\n", batch);
fputs (command_ptr, batch);
/* look one last time after reading all Makefiles */
if (no_default_sh_exe)
no_default_sh_exe = !find_and_set_default_shell(NULL);
-
- if (no_default_sh_exe && job_slots != 1) {
- error (NILF, _("Do not specify -j or --jobs if sh.exe is not available."));
- error (NILF, _("Resetting make for single job mode."));
- job_slots = 1;
- }
#endif /* WINDOWS32 */
#if defined (__MSDOS__) || defined (__EMX__)
word "Copyright", so it hardly seems worth it. */
printf ("%sGNU Make %s\n\
-%sCopyright (C) 2003 Free Software Foundation, Inc.\n",
+%sCopyright (C) 2006 Free Software Foundation, Inc.\n",
precede, version_string, precede);
printf (_("%sThis is free software; see the source for copying conditions.\n\
ForceConformanceInForLoopScope="TRUE"\r
UsePrecompiledHeader="0"\r
WarningLevel="4"\r
- Detect64BitPortabilityProblems="TRUE"\r
+ SuppressStartupBanner="TRUE"\r
+ Detect64BitPortabilityProblems="FALSE"\r
DebugInformationFormat="4"/>\r
<Tool\r
Name="VCCustomBuildTool"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
- Name="VCPreBuildEventTool"/>\r
+ Name="VCPreBuildEventTool"\r
+ Description="Copying config.h.W32 to config.h"\r
+ CommandLine="if not exist config.h copy config.h.W32 config.h"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
ForceConformanceInForLoopScope="TRUE"\r
UsePrecompiledHeader="0"\r
WarningLevel="4"\r
- Detect64BitPortabilityProblems="TRUE"\r
+ Detect64BitPortabilityProblems="FALSE"\r
DebugInformationFormat="3"/>\r
<Tool\r
Name="VCCustomBuildTool"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
- Name="VCPreBuildEventTool"/>\r
+ Name="VCPreBuildEventTool"\r
+ Description="Copying config.h.W32 to config.h"\r
+ CommandLine="if not exist config.h copy config.h.W32 config.h"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
+2006-01-28 Paul D. Smith <psmith@gnu.org>
+
+ * LINGUAS: Added new translation for Vietnamese (vi).
+
2005-07-14 Paul D. Smith <psmith@gnu.org>
* LINGUAS: Added new translation for Indonesian (id).
-# Set of available languages: 22 languages
+# Set of available languages: 23 languages
-be da de es fi fr ga gl he hr id ja ko nl pl pt_BR ru rw sv tr uk zh_CN
+be da de es fi fr ga gl he hr id ja ko nl pl pt_BR ru rw sv tr uk vi zh_CN
# Can't seem to get en@quot and en@boldquot to build properly?
/* Set the goal's `changed' flag if any commands were started
by calling update_file above. We check this flag below to
decide when to give an "up to date" diagnostic. */
- g->changed += commands_started - ocommands_started;
+ if (commands_started > ocommands_started)
+ g->changed = 1;
/* If we updated a file and STATUS was not already 1, set it to
1 if updating failed, or to 0 if updating succeeded. Leave
$details = "Verify that symlink handling with and without -L works properly.";
# Only run these tests if the system sypports symlinks
-if (eval { symlink("",""); 1 }) {
+
+# Apparently the Windows port of Perl reports that it does support symlinks
+# (in that the symlink() function doesn't fail) but it really doesn't, so
+# check for it explicitly.
+
+if ($port_type ne 'W32' && eval { symlink("",""); 1 }) {
# Set up a symlink sym -> dep
# We'll make both dep and targ older than sym
EXTERN_DECL(void process_register, (HANDLE proc));\r
EXTERN_DECL(HANDLE process_easy, (char** argv, char** env));\r
EXTERN_DECL(BOOL process_kill, (HANDLE proc, int signal));\r
+EXTERN_DECL(int process_used_slots, (VOID_DECL));\r
\r
/* support routines */\r
EXTERN_DECL(long process_errno, (HANDLE proc));\r
} sub_process;
/* keep track of children so we can implement a waitpid-like routine */
-static sub_process *proc_array[256];
+static sub_process *proc_array[MAXIMUM_WAIT_OBJECTS];
static int proc_index = 0;
static int fake_exits_pending = 0;
static sub_process *
process_wait_for_any_private(void)
{
- HANDLE handles[256];
+ HANDLE handles[MAXIMUM_WAIT_OBJECTS];
DWORD retval, which;
int i;
void
process_register(HANDLE proc)
{
- proc_array[proc_index++] = (sub_process *) proc;
+ if (proc_index < MAXIMUM_WAIT_OBJECTS)
+ proc_array[proc_index++] = (sub_process *) proc;
+}
+
+/*
+ * Return the number of processes that we are still waiting for.
+ */
+int
+process_used_slots(void)
+{
+ return proc_index;
}
/*
HANDLE hErr;
HANDLE hProcess;
+ if (proc_index >= MAXIMUM_WAIT_OBJECTS) {
+ DB (DB_JOBS, ("process_easy: All process slots used up\n"));
+ return INVALID_HANDLE_VALUE;
+ }
if (DuplicateHandle(GetCurrentProcess(),
GetStdHandle(STD_INPUT_HANDLE),
GetCurrentProcess(),
projects / platform / upstream / make.git / commitdiff