Bootstrapping fails on w32 now

Bootstrapping fails on w32 now

[Lennart Borgman (gmail)]

The error message is

gcc -I. -c -gdwarf-2 -g3  -DEMACSDEBUG -Ic:/g/include -fno-crossjumping 
-Demacs=
1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 -DUSE_CRT_DLL=1 
-DPURESIZE=5000000
-o oo/i386/emacs.o emacs.c
In file included from dispextern.h:58,
                  from intervals.h:20,
                  from emacs.c:56:
w32gui.h:24:20: w32bdf.h: No such file or directory
In file included from dispextern.h:58,
                  from intervals.h:20,
                  from emacs.c:56:
w32gui.h:59: error: syntax error before "bdffont"
w32gui.h:59: warning: no semicolon at end of struct or union
w32gui.h:65: error: syntax error before '}' token
w32gui.h:65: warning: data definition has no type or storage class
make[2]: *** [oo/i386/emacs.o] Error 1
make[2]: Leaving directory `C:/eclean/bld/emacs/src'
make[1]: *** [bootstrap-temacs] Error 2
make[1]: Leaving directory `C:/eclean/bld/emacs/src'
make: *** [bootstrap-gmake] Error 2
bootstrap-080716.tmp

Re: Bootstrapping fails on w32 now

[David Robinow]

On Tue, Jul 15, 2008 at 6:28 PM, Lennart Borgman (gmail)
<lennart.borgman@gmail.com> wrote:
> The error message is
>
> gcc -I. -c -gdwarf-2 -g3  -DEMACSDEBUG -Ic:/g/include -fno-crossjumping
> -Demacs=
> 1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 -DUSE_CRT_DLL=1
> -DPURESIZE=5000000
> -o oo/i386/emacs.o emacs.c
> In file included from dispextern.h:58,
>                 from intervals.h:20,
>                 from emacs.c:56:
> w32gui.h:24:20: w32bdf.h: No such file or directory
> In file included from dispextern.h:58,
>                 from intervals.h:20,
>                 from emacs.c:56:
> w32gui.h:59: error: syntax error before "bdffont"
> w32gui.h:59: warning: no semicolon at end of struct or union
> w32gui.h:65: error: syntax error before '}' token
> w32gui.h:65: warning: data definition has no type or storage class
> make[2]: *** [oo/i386/emacs.o] Error 1
> make[2]: Leaving directory `C:/eclean/bld/emacs/src'
> make[1]: *** [bootstrap-temacs] Error 2
> make[1]: Leaving directory `C:/eclean/bld/emacs/src'
> make: *** [bootstrap-gmake] Error 2
> bootstrap-080716.tmp
>
>
>

It appears that a recent change to w32gui.h inadvertently reverted the
change that Jason made on June 26. The fix below seems to work for me.

Index: w32gui.h
===================================================================
RCS file: /sources/emacs/emacs/src/w32gui.h,v
retrieving revision 1.35
diff -u -r1.35 w32gui.h
--- w32gui.h	15 Jul 2008 18:15:17 -0000	1.35
+++ w32gui.h	16 Jul 2008 03:36:04 -0000
@@ -21,8 +21,6 @@
 #define EMACS_W32GUI_H
 #include <windows.h>

-#include "w32bdf.h"
-
 /* Emulate XCharStruct.  */
 typedef struct _XCharStruct
 {
@@ -47,16 +45,13 @@
 {
   UNKNOWN_FONT = 0 /* FONT_TYPE_UNKNOWN */,
   ANSI_FONT,
-  UNICODE_FONT,
-  BDF_1D_FONT,
-  BDF_2D_FONT
+  UNICODE_FONT
 };

 typedef struct W32FontStruct {
   enum w32_char_font_type font_type;
   TEXTMETRIC tm;
   HFONT hfont;
-  bdffont *bdf;
   int double_byte_p;
   XCharStruct max_bounds;
   XCharStruct scratch;

Re: Bootstrapping fails on w32 now

[Miles Bader]

"David Robinow" <drobinow@gmail.com> writes:
> It appears that a recent change to w32gui.h inadvertently reverted the
> change that Jason made on June 26. The fix below seems to work for me.

That's slightly worrying...  I wonder if any other changes were lost due
to the NS merge...  How was the merge done?

-Miles

-- 
Pray, v. To ask that the laws of the universe be annulled in behalf of a
single petitioner confessedly unworthy.

Re: Bootstrapping fails on w32 now

[Jason Rumney]

Lennart Borgman (gmail) wrote:
> The error message is
> 
> gcc -I. -c -gdwarf-2 -g3  -DEMACSDEBUG -Ic:/g/include -fno-crossjumping
> -Demacs=
> 1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 -DUSE_CRT_DLL=1
> -DPURESIZE=5000000
> -o oo/i386/emacs.o emacs.c
> In file included from dispextern.h:58,
>                  from intervals.h:20,
>                  from emacs.c:56:
> w32gui.h:24:20: w32bdf.h: No such file or directory

w32bdf.h was removed, along with all references to it, on 26 June. It is
very disturbing that the merge of the nextstep port has clobbered
changes that old. How many other recent changes has it clobbered?

Re: Bootstrapping fails on w32 now

[dhruva]

Hi,

> From: Jason Rumney <jasonr@gnu.org>
> Subject: Re: Bootstrapping fails on w32 now
> To: "Lennart Borgman (gmail)" <lennart.borgman@gmail.com>
> Cc: Emacs Devel <emacs-devel@gnu.org>
> Message-ID: <487DAB3D.9080001@gnu.org>
> Content-Type: text/plain; charset=ISO-8859-1
>
> Lennart Borgman (gmail) wrote:
>> The error message is
>>
>> gcc -I. -c -gdwarf-2 -g3  -DEMACSDEBUG -Ic:/g/include -fno-crossjumping
>> -Demacs=
>> 1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 -DUSE_CRT_DLL=1
>> -DPURESIZE=5000000
>> -o oo/i386/emacs.o emacs.c
>> In file included from dispextern.h:58,
>>                  from intervals.h:20,
>>                  from emacs.c:56:
>> w32gui.h:24:20: w32bdf.h: No such file or directory
>
> w32bdf.h was removed, along with all references to it, on 26 June. It is
> very disturbing that the merge of the nextstep port has clobbered
> changes that old. How many other recent changes has it clobbered?

The following patch works for me (very few references to bdf removed).

diff --git a/src/w32gui.h b/src/w32gui.h
index d9f09e3..8f1a7e7 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -21,8 +21,6 @@ along with GNU Emacs.  If not, see
<http://www.gnu.org/licenses/>.  */
 #define EMACS_W32GUI_H
 #include <windows.h>

-#include "w32bdf.h"
-
 /* Emulate XCharStruct.  */
 typedef struct _XCharStruct
 {
@@ -47,16 +45,13 @@ enum w32_char_font_type
 {
   UNKNOWN_FONT = 0 /* FONT_TYPE_UNKNOWN */,
   ANSI_FONT,
-  UNICODE_FONT,
-  BDF_1D_FONT,
-  BDF_2D_FONT
+  UNICODE_FONT
 };

 typedef struct W32FontStruct {
   enum w32_char_font_type font_type;
   TEXTMETRIC tm;
   HFONT hfont;
-  bdffont *bdf;
   int double_byte_p;
   XCharStruct max_bounds;
   XCharStruct scratch;


-dhruva

-- 
Contents reflect my personal views only!

Re: Bootstrapping fails on w32 now

[Dan Nicolaescu]

Jason Rumney <jasonr@gnu.org> writes:

  > Lennart Borgman (gmail) wrote:
  > > The error message is
  > > 
  > > gcc -I. -c -gdwarf-2 -g3  -DEMACSDEBUG -Ic:/g/include -fno-crossjumping
  > > -Demacs=
  > > 1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 -DUSE_CRT_DLL=1
  > > -DPURESIZE=5000000
  > > -o oo/i386/emacs.o emacs.c
  > > In file included from dispextern.h:58,
  > >                  from intervals.h:20,
  > >                  from emacs.c:56:
  > > w32gui.h:24:20: w32bdf.h: No such file or directory
  > 
  > w32bdf.h was removed, along with all references to it, on 26 June. It is
  > very disturbing that the merge of the nextstep port has clobbered
  > changes that old. How many other recent changes has it clobbered?

If the diff at
http://cortex.med.cornell.edu/~arobert/emacs-app/diffBeforeMerge.patch
is accurate, there might be some other changes that are suspicious.  I
just posted a review of that patch.  It would be good if more people
could look over and see if there are other things that need more work.