update branch to trunk level

RESOLVED FIXED

Status

Core Graveyard
XForms
RESOLVED FIXED
11 years ago
10 months ago

People

(Reporter: aaronr, Assigned: aaronr)

Tracking

({fixed1.8.0.2, fixed1.8.1})

1.8 Branch
x86
All
fixed1.8.0.2, fixed1.8.1

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(2 attachments, 1 obsolete attachment)

(Assignee)

Description

11 years ago
We need to update 1.8 branch and 1.8.0 branch to trunk level functionality.
(Assignee)

Comment 1

11 years ago
Created attachment 208682 [details] [diff] [review]
patch of code changes

includes fixes for bugs: 311036, 313662, 307093 (2 patches), 312980, 299273 (2 patches), 313933, 311475, 308106, 283278, 314158, 306764, 303926, 315150, 309546, 271044, 316087, 312848, 279063, 106386 (the xforms only changes), 283344, 316931 (2 patches), 299766, 318624, 236613 (xforms only changes), 310109, 301571, 291119, 316624, 322975, 308500, and 323292
(Assignee)

Comment 2

11 years ago
Created attachment 208684 [details]
date pickers image file

also need to check in this .png file for datepicker as mozilla/extensions/xforms/resources/content/calendar.png

Comment 3

11 years ago
(In reply to comment #1)
> Created an attachment (id=208682) [edit]
> patch of code changes includes fixes for: 

I added the word 'bug' to linkify:
bug 311036, bug 313662, bug 307093 (2 patches), bug 312980, bug 299273 (2 patches), bug 313933, bug 311475, bug 308106, bug 283278, bug 314158, 
bug 306764, bug 303926, bug 315150, bug 309546, bug 271044, bug 316087, 
bug 312848, bug 279063, bug 106386 (the xforms only changes), bug 283344, 
bug 316931 (2 patches), bug 299766, bug 318624, bug 236613 (xforms only changes), bug 310109, bug 301571, bug 291119, bug 316624, bug 322975, 
bug 308500 and bug 323292
 
Built fine on MOZILLA_1_8_BRANCH on Mac OS X.  Did minimal testing, and didn't see anything wrong.

Updated

11 years ago
Attachment #208682 - Flags: approval1.8.1?
Comment on attachment 208682 [details] [diff] [review]
patch of code changes

Doron, this patch contain interface changes. Because xforms did not ship with FF/Tbird, these changes are technically acceptable on the 1.8 branch, but you should consider whether interface changes might affect any binary code.
Attachment #208682 - Flags: approval1.8.1? → branch-1.8.1?(doronr)

Comment 6

11 years ago
Comment on attachment 208682 [details] [diff] [review]
patch of code changes

We don't need to worry about binary compat, since no one builds against us.
Attachment #208682 - Flags: branch-1.8.1?(doronr) → branch-1.8.1+
(Assignee)

Comment 7

11 years ago
checked into MOZILLA_1_8_BRANCH
Keywords: fixed1.8.1
(Assignee)

Updated

11 years ago
Status: NEW → ASSIGNED
(Assignee)

Comment 8

11 years ago
Comment on attachment 208682 [details] [diff] [review]
patch of code changes

checked into MOZILLA_1_8_BRANCH.  These patches have been on the trunk for a long time so well baked.  We'd like to get these changes on 1.8.0 branch so that xforms.xpi users can try our increased level of functionality with 1.5.0.x releases.
Attachment #208682 - Flags: approval1.8.0.2?
(Assignee)

Comment 9

11 years ago
Created attachment 210932 [details] [diff] [review]
updated patch for the 1.8.0 branch

exact same patch as before, just applies better to the 1.8.0 branch.  The xforms/Makefile.in change for MOZ_XUL_APP in the earlier version of this patch was already added to 1.8.0 branch
Attachment #208682 - Attachment is obsolete: true
Attachment #208682 - Flags: approval1.8.0.2?

Comment 10

11 years ago
(In reply to comment #9)
> Created an attachment (id=210932) [edit]
> updated patch for the 1.8.0 branch
> 
> exact same patch as before, just applies better to the 1.8.0 branch.  The
> xforms/Makefile.in change for MOZ_XUL_APP in the earlier version of this patch
> was already added to 1.8.0 branch

Applying, and making gets this:
+++ making chrome /store/mozilla/source/firefox15/mozilla/extensions/xforms  => ../../dist/xpi-stage/xforms/chrome/xforms.jar
error: file './resources/content/calendar.png' doesn't exist at ../../config/make-jars.pl line 443, <STDIN> line 20.
gmake[1]: *** [libs] Error 2
make: *** [all] Error 2

Comment 11

11 years ago
ah, yes, of course, attachment 208684 [details]

Comment 12

11 years ago
Checked in to MOZILLA_1_8_0 branch.
Status: ASSIGNED → RESOLVED
Last Resolved: 11 years ago
Keywords: fixed1.8.0.2
Resolution: --- → FIXED

Comment 13

11 years ago
(In reply to comment #12)
> Checked in to MOZILLA_1_8_0 branch.

Bugs checked in:
https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&bugidtype=include&bug_id=311036,307093,%20311036,%20307093,%20312980,%20299273,%20313933,%20311475,%20308106,%20283278,%20314158,%20306764,%20303926,%20315150,%20309546,%20271044,%20316087,%20312848,%20279063,%20106386,%20283344,%20316931,%20299766,%20318624,%20236613,%20310109,%20301571,%20291119,%20316624,%20322975,%20308500,%20323292
Product: Core → Core Graveyard
You need to log in before you can comment on or make changes to this bug.