361332 - Need a better way to determine if an NSPR_CO_TAG can pulled by date

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Wan-Teh Chang]

This bug is the NSPR_CO_TAG analog of the patch "A better way
to determine if an NSS_CO_TAG can pulled by date" (attachment 217086 [details] [diff] [review])
in bug 301249.  Right now we compare $(NSPR_CO_TAG) with only the
NSPRPUB_CLIENT_TAG:

    # Cannot pull static tags by date
    ifeq ($(NSPR_CO_TAG),NSPRPUB_CLIENT_TAG)
    CVSCO_NSPR = $(CVS) $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(NSPR_CO_MODULE)
    else
    CVSCO_NSPR = $(CVS) $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSPR_CO_MODULE)
    endif

This code has two problems:
1. The NSPRPUB_CLIENT_TAG doesn't exist.
2. This is not flexible enough because there are many other static tags
for NSPR.

Comment 1

[Wan-Teh Chang]

Attachment: Proposed patch

Since both Mozilla and NSPR use the naming convention that branch
tags end in _BRANCH, it is safe to use that pattern to determine
if a tag is a branch tag.

Comment 2

[Wan-Teh Chang]

Attachment: Patch for the MOZILLA_1_8_BRANCH

I need to backport the fix for this bug and attachment 217086 [details] [diff] [review]
of bug 301249 to the MOZILLA_1_8_BRANCH so that the MOZILLA_1_8_BRANCH
can start using NSPR and NSS static tags (bug 357333).

Comment 3

[Wan-Teh Chang]

Comment on attachment 246090 [details] [diff] [review]
Proposed patch

I checked in this patch on the Mozilla trunk (Mozilla 1.9 alpha).

Checking in client.mk;
/cvsroot/mozilla/client.mk,v  <--  client.mk
new revision: 1.303; previous revision: 1.302
done

Comment 4

[Wan-Teh Chang]

Comment on attachment 246098 [details] [diff] [review]
Patch for the MOZILLA_1_8_BRANCH

Requesting approval for MOZILLA_1_8_BRANCH checkin.

The NSS portion of this patch has been on the trunk for several
months.  The NSPR portion of this patch is a copy of the NSS change.

This patch is a pre-requisite for MOZILLA_1_8_BRANCH to pull NSPR
and NSS by static tags (bug 357333).

Comment 5

[Daniel Veditz [:dveditz]]

Comment on attachment 246098 [details] [diff] [review]
Patch for the MOZILLA_1_8_BRANCH

approved for 1.8 branch, a=dveditz for drivers

Comment 6

[Wan-Teh Chang]

I checked in the patch for the MOZILLA_1_8_BRANCH.

Checking in client.mk;
/cvsroot/mozilla/client.mk,v  <--  client.mk
new revision: 1.245.2.28; previous revision: 1.245.2.27
done

Comment 7

[Wan-Teh Chang]

I checked in the patch on the MOZILLA_1_8_0_BRANCH for 1.8.0.10.

Comment 8

[alice nodelman [:alice] [:anode]]

This bug is marked [needs testcase].

Is there a series of steps to be followed that would confirm the fix?

If there is a method of verifying the bug, could you either provide a description/testcase or test the latest builds?  If you confirm the fix please provide the buildid that you verified it on and change the keywords from fixedx.x.x.x to verifiedx.x.x.x.

Comment 9

[Wan-Teh Chang]

Alice,

To verify the bug, look at mozilla/client.mk and confirm
that the value of NSS_CO_TAG is a static tag.  (Right now
it is NSS_3_11_5_RTM, which is a static tag.)  Then, verify
that the tinderboxes are working.  Since tinderboxes check
out the source tree by date, the success of tinderboxes is
proof that this patch solves the problem.

Comment 10

[alice nodelman [:alice] [:anode]]

From checkin on 2007-01-18 value of NSS_CO_TAG set to:
  1.8 branch: NSS_3_11_5_RTM 
  1.8.0 branch: NSS_3_11_5_RTM    

These are both static tags.

Tinderboxes have been successfully cycling.

Verified for 1.8.1.1 & 1.8.0.10