Re: NMakefile.template and README.W32.template proprosed revisions

[J. Grant]

Hello,

Does someone have a some time to review my two patches (which correct
problems with the win32 build) please?

(I attach them again with this email.)


Kind regards

JG



on the 29/02/04 14:59, J. Grant wrote:
> Hello
>
> I attached an additional subproc NMakefile patch for review, here is
> the ChangeLog entry:
>
> 2004-02-29  Jonathan R. Grant  <address@hidden>
>
>     * NMakefile.template: Add "MAKE = nmake".  A conflicting
>     environment variable is sometimes already defined which causes the
>     build to fail.
>
>
> Best regards
>
>
> JG
>
>
> on the 28/02/04 19:35, J. Grant wrote:
>
> > Hello,
> >
> > I attach a patch which updates the README.W32.template document inline
> > with the current WINDOWS32 builds supported.  Also fixes a problem
> > experienced in NMakefile.template.  Please review for addition.
> >
> > Suitable ChangeLog entry appended.
> >
> > Best regards
> >
> > JG
> >
> >
> >
> >
> > 2004-02-28  Jonathan R. Grant  <address@hidden>
> >
> >       * NMakefile.template: Add "MAKE = nmake".  A conflicting
> >     environment variable is sometimes already defined which causes the
> >     build to fail.
> >
> >       * README.W32.template: Revise to be inline with the current
> >     MS-Windows Operating Systems this port is compatible with.


Index: README.W32.template
===================================================================
RCS file: /cvsroot/make/make/README.W32.template,v
retrieving revision 2.3
diff -u -r2.3 README.W32.template
--- README.W32.template 24 Feb 2004 13:50:20 -0000      2.3
+++ README.W32.template 28 Feb 2004 19:24:20 -0000
@@ -1,11 +1,10 @@
-Port of GNU make to Windows NT and Windows 95
-Builds natively with MSVC 2.x or MSVC 4.x compilers.
-Should also build fine with MSVC 5.x and 6.x (though not confirmed).
+Port of GNU make to MS-Windows 95/98/NT/2000/XP
+Builds natively with MSVC 2.x, 4.x, 5.x, 6.x and MSVC.NET 7.x.
 
 This Windows 32-bit port of GNU make is maintained primarily by Rob
 Tulloh, who is also the author of this README.
 
-To build with nmake on Windows NT, Windows 95, or Windows 98:
+To build with nmake on MS-Windows:
 
        1. Make sure cl.exe is in your %Path%. Example:
 
@@ -63,10 +62,10 @@
 
        There are very few true ports of Bourne shell for NT right now.
        There is a version of GNU bash available from Cygnus "Cygwin"
-       porting effort (http://sourceware.cygnus.com/cygwin).
+       porting effort (http://www.cygwin.com/).
        Other possibilities are the MKS version of sh.exe, or building
         your own with a package like NutCracker (DataFocus) or Portage
-        (Consensys).
+        (Consensys).  Also MinGW includes sh (http://mingw.org/).
 
 GNU make and brain-dead shells (BATCH_MODE_ONLY_SHELL):
 
@@ -131,7 +130,8 @@
        Please note that you are free to mix colon and semi-colon in the
        specification of paths.  Make is able to figure out the intended
        result and convert the paths internally to the format needed
-       when interacting with the operating system.
+       when interacting with the operating system. (Providing the path
+       is not within quotes, i.e. "x:/test/test.c")
 
        You are encouraged to use colon as the separator character.
        This should ease the pain of deciding how to handle various path
@@ -175,7 +175,9 @@
        these sorts of paths could be handled. I offer these suggestions
        as workarounds:
 
-               1. Use 8.3 notation
+               1. Use 8.3 notation. i.e. "x:/long~1/", which is actually
+                  "x:\longpathtest".  Type "dir /x" to view these filenames
+                  within the cmd.exe shell.
                2. Rename the directory so it does not contain white space.
 
        If you are unhappy with this choice, this is free software
Index: NMakefile.template
===================================================================
RCS file: /cvsroot/make/make/NMakefile.template,v
retrieving revision 2.10
diff -u -r2.10 NMakefile.template
--- NMakefile.template  19 Nov 2002 04:39:15 -0000      2.10
+++ NMakefile.template  28 Feb 2004 19:24:20 -0000
@@ -25,6 +25,7 @@
 
 LINK = link
 CC = cl
+MAKE = nmake
 
 OUTDIR=.
 MAKEFILE=NMakefile

Index: w32/subproc/NMakefile
===================================================================
RCS file: /cvsroot/make/make/w32/subproc/NMakefile,v
retrieving revision 1.6
diff -u -r1.6 NMakefile
--- w32/subproc/NMakefile       3 Oct 1998 05:40:40 -0000       1.6
+++ w32/subproc/NMakefile       29 Feb 2004 14:24:43 -0000
@@ -23,6 +23,7 @@
 #
 LIB = lib
 CC = cl
+MAKE = nmake
 
 OUTDIR=.
 MAKEFILE=NMakefile