53999 - Non-jar builds get wrong chrome files sometimes

Status: VERIFIED FIXED

(SeaMonkey :: Build Config, defect, P2)

Description

[Simon Fraser [no longer active]]

If you turn off the flags to use jars in the mac build scripts, the build 
completes, but won't run, because installed-chrome.txt contains an extra / in the 
paths.

I have a fix.

Comment 1

[Simon Fraser [no longer active]]

This is a teeny change in the build scripts, and will only affect developers 
doing non-jar builds. The fix has to be checked in.

Comment 2

[rubydoo123]

ageed

Comment 3

[Simon Fraser [no longer active]]

Fixed yesterday, branch and trunk.

Comment 4

[Jon Granrose]

verified.

Comment 5

[Simon Fraser [no longer active]]

I need to reopen this, because non-jar builds don't follow the correct file 
replacement strategy for commercial builds.

Comment 6

[Simon Fraser [no longer active]]

Keyword fixes

Comment 7

[rubydoo123]

update whiteboard

Comment 8

[Simon Fraser [no longer active]]

Index: mozilla/build/mac/MozJar.pm
===================================================================
RCS file: /cvsroot/mozilla/build/mac/MozJar.pm,v
retrieving revision 1.5.2.1
diff -r1.5.2.1 MozJar.pm
290,291c290,321
<         # print "Aliassing $src\n to\n$dst\n";        
<         MakeAlias($src, $dst);      # don't check errors, otherwise we fail on 
replacement
---
>         # print "Aliassing $src\n to\n$dst\n";
>         if ($override)
>         {
>             unlink $dst;
>             MakeAlias($src, $dst);      # don't check errors, otherwise we fail on replacement
>         }
>         else
>         {
>             if (-e $dst)
>             {
>                 #compare dates here
>                 my($dst_moddate) = GetFileModDate($dst);
>                 my($file_moddate) = GetFileModDate($src);
>             
>                 if ($file_moddate > $dst_moddate)
>                 {
>                     print "Updating older file $rel_path in $dir_name\n";
>                     unlink $dst;
>                     MakeAlias($src, $dst);
>                 }
>                 else
>                 {
>                     print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
>                 }
>             
>             }
>             else
>             {
>                 MakeAlias($src, $dst);
>             }
>         }
>         

This patch affects non-jar builds only. i.e. it will have NO IMPACT on release 
builds, and is only useful for the jar developer.

warren, can you r=

Comment 9

[Warren Harris]

Comparing this to the logic on line 162 of make-jars.pl, I think they look 
roughly equivalent:

    if (!-e $destPath || $destMtime < $srcMtime || $override) {
        <unlink the old and make a copy>
    }

r=warren

Comment 10

[Simon Fraser [no longer active]]

scc, can you sr please?

Comment 11

[Scott Collins]

I might have factored this code slightly differently, since |MakeAlias| is the
last act of every possible code path except |$file_moddate<=$dst_moddate|.  But
this is clean, readable, and looks correct to me.  If you have tested this and
found it to work, then sr=scc.

Comment 12

[Simon Fraser [no longer active]]

Yes, it could be refactored, but I was following the pattern I used for files in 
jars above. Thanks.

Comment 13

[Phil Peterson]

rtm++

Comment 14

[Simon Fraser [no longer active]]

Fixed branch and trunk.

Comment 15

[Jon Granrose]

it's in there.  verified.