224897 - stray ^M characters in mailWindowOverlay.xul and messengercompose.xul makes build fail

Status: RESOLVED FIXED

(Thunderbird :: Build Config, defect)

Description

[Mitch]

User-Agent:       Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.6a) Gecko/20031031
Build Identifier: Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.6a) Gecko/20031031

There appears to be stray ^M characters in the aforementioned files that
inhibit builds of thunderbird on Solaris. The pre-processor barfs on the 
characters.

Example errors from a compile:

+++ updating chrome ../../dist/bin/chrome/installed-chrome.txt
+++     content,install,url,jar:resource:/chrome/messenger.jar!/content/messenger/
../../config/preprocessor.pl:/share/cprbld/users/scratch/mitch/mozilla/phoenix/mozilla/mail/base/content/mailWindowOverlay.xul:281:
error evaluating endif: argument unexpected

Preprocessing of content/mailWindowOverlay.xul failed: 1 at
../../config/make-jars.pl line 413, <STDIN> line 7.


Affected files are
  mozilla/mail/base/content/mailWindowOverlay.xul (line 281 and more)
  mozilla/mail/components/compose/content/messengercompose.xul (lines 139 and more)

Removing the offending ^M's manually lets me build cleanly.

Reproducible: Always

Steps to Reproduce:
1. obvious
2.
3.

Comment 1

[Scott MacGregor]

my windows box says the lines are clean with no Ctrl-m's. I ran dos2unix on the
files and still no change. Can you attach a diff that removes them? Sometimes I
have better luck that way.

Comment 2

[Mitch]

Attachment: Diff removing ^M from mozilla/mail/components/compose/content/messengercompose.xul

Wierd, the ^M from mozilla/mail/base/content/mailWindowOverlay.xul line 281
has disappeared from a pull i did 1 minute ago, but still exists in the
messengercomopse.xul file as shown in the diff attached.

Comment 3

[Scott MacGregor]

ok let's see if i fixed it. I think they got removed.

Comment 4

[Mitch]

Thanks Scott, just did a 'cvs update' and it;s now the size
i expect - the original was

-rw-r--r--   1 mitch  staff      42643 Nov  6 16:44 messengercompose.xul.orig

the new checked out size is

-rw-r--r--   1 mitch  staff      42588 Nov  6 17:14 messengercompose.xul

Please close as fixed.
much appreciated.

Comment 5

[Scott MacGregor]

great! thanks for the help.