601910 - Port hg:ee594fb0fa3e to comm-central (Clean up configure.in a bit)

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Takanori MATSUURA]

Attachment: Fit configure.in to mozilla central

Fit configure.in
* merge hg:ee594fb0fa3e (no bug filed)
* blanks including bug 569261
* comments
* fix partially mis-merged bug 469654

Comment 1

[Takanori MATSUURA]

Do we have to fix parenthesis issue regarding Bug 542187 comment #16 too?

Comment 2

[Serge Gautherie (:sgautherie)]

Comment on attachment 480888 [details] [diff] [review]
Fit configure.in to mozilla central

>-        dnl Ensure to use an absolute path.

>     make OGLES_SDK_DIR="$OGLES_SDK_DIR" WINCE_SDK_DIR="$WINCE_SDK_DIR" \
>-         TOPSRCDIR="$_topsrcdirwin" OBJDIR="$_pwd" target="$target" \
>-         -C $srcdir/mozilla/build/wince/tools
>+    TOPSRCDIR="$_topsrcdirwin" OBJDIR="$_pwd" target="$target" \
>+    -C $srcdir/mozilla/build/wince/tools

At least these two were intentional differences.
I support fixing whitespace nits, but not making changes like these.

Comment 3

[Serge Gautherie (:sgautherie)]

(In reply to comment #2)
> At least these two were intentional differences.

In other words, you may (try to) fix these in m-c rather.

Comment 4

[Takanori MATSUURA]

(In reply to comment #2)
> At least these two were intentional differences.
> I support fixing whitespace nits, but not making changes like these.

Thank you for your comment.

Can I find coding guideline for scripts?
I found
https://developer.mozilla.org/En/Developer_Guide/Coding_Style
However I suppose this is for C++.
In the configure.in:
1) align by value
if test "$FOO" -o \
        "$BAR" -o \

2) 4 white spaces (sometimes 2 to 5)
if test "$FOO" = "xxx" \
    -o "$BAR" = "yyy" \

3) tabs

Comment 5

[Serge Gautherie (:sgautherie)]

(In reply to comment #4)
> Can I find coding guideline for scripts?

I'm not aware of such a guideline.
(And you may not like answers in this area: I went this kind of road before, multiple times.)

My advice would be to R.Invalid this bug,
then work as in bug 506493 blocking bugs from the list at
http://dev.seamonkey.at/?d=x&i=mozilla&m=c

Comment 6

[Takanori MATSUURA]

Hmm.
So I'd like to focus on the following two issues in this bug.
* merge hg:ee594fb0fa3e (no bug filed)
* fix partially mis-merged bug 469654

And I'll pending the issues below:
* blanks including bug 569261
* comments
What do you think?

Comment 7

[Takanori MATSUURA]

Attachment: Focused part of "fit configure.in to mozilla central"

Addressed comment #6.

Comment 8

[Justin Wood (:Callek)]

Comment on attachment 481481 [details] [diff] [review]
Focused part of "fit configure.in to mozilla central"

disclosure, I didn't compare against m-c configure for this too much. but the changes themselves look fine, I hope to "try" and do a full-fledged merge similar to my rules.mk change I did recently, to get us up to date again.

Comment 9

[Mark Banner (:standard8)]

Checked in: http://hg.mozilla.org/comm-central/rev/16853b562855