Compare commits

..

75 Commits

Author SHA1 Message Date
(no author)
7665fa8325 This commit was manufactured by cvs2svn to create tag 'commit'.
git-svn-id: svn://10.0.0.236/tags/commit@177985 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 19:53:03 +00:00
(no author)
e3556ede22 This commit was manufactured by cvs2svn to create branch
'FIREFOX_1_5b1_MINIBRANCH'.

git-svn-id: svn://10.0.0.236/branches/FIREFOX_1_5b1_MINIBRANCH@177984 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 19:53:02 +00:00
bsmedberg%covad.net
bfa01a746d From bug 304476 - version.txt entries need mozilla/ in front
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177983 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 19:53:01 +00:00
aaronleventhal%moonset.net
d9d36fadeb Bug 304488. Accesibility issues with frames and iframes. r=timeless, sr=dmose, a=cbeard
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177980 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 19:07:52 +00:00
cmp%mozilla.org
d5c5d13cb6 Swap sl and sk to ensure they are built in the correct order by the build
systems.  Bug 304992, attachment 192973.  r+a=chase@mozilla.org


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177979 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 18:38:25 +00:00
smfr%smfr.org
10a9a7be6b Fix bug 259903: allow the user to show file extensions when saving web pages, and correctly fix up the file extension when they swap formats.
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177977 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 18:33:50 +00:00
bzbarsky%mit.edu
67308f41f3 Make sure to set base tag info on the leaf forms we create when HTML is
misnested. Bug 73818, r=mrbkap, sr=jst, a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177975 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 18:22:50 +00:00
bryner%brianryner.com
b656f7998b Don't duplicate entries in MOZCONFIG_MODULES (bug 304504). r+a=bsmedberg.
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177971 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 18:09:56 +00:00
bsmedberg%covad.net
5a0b4fc01e Part of bug 299992 - intl makefiles are defining __STDC__ for no good reason, r=jshin+cls a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177969 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 17:51:38 +00:00
scott%scott-macgregor.org
4b48602c14 Bug #304898 --> View Certificates, Manage CRLs and Device Manager dialog should be resizable window
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177968 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 17:50:31 +00:00
aaronleventhal%moonset.net
1b076301c4 Bug 304484. Expose alerts, prompts and message boxes as ROLE_ALERT so screen readers have a cue to speak the entire dialog when it appears. r=mconnor, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177965 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 17:24:38 +00:00
aaronleventhal%moonset.net
752c0788be Bug 304871. Hitting enter with screen reader active will not open new window links. r=timeless, sr=jst, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177963 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 17:22:55 +00:00
aaronleventhal%moonset.net
49ba9d91a8 Bug 303404. Crash when hitting escape in context menu for a menu item. r=dbaron, sr=neil, a=cbeard
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177961 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 17:18:25 +00:00
bsmedberg%covad.net
b43a21ee0d Bug 304476 and 304478 - remove app.extensions.version from default prefs - r=chase a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177960 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 17:17:17 +00:00
bienvenu%nventure.com
405489c150 fix 303948, rebuild group sort by date when date changes, sr=mscott a= asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177959 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 17:03:44 +00:00
jst%mozilla.jstenback.com
569f47cfda Fixing bug 301476. Make XPCNativeWrapper's checkAccess hook always forward to the wrapper's checkAccess hook, if it's got one. r=shaver@mozilla.org, sr=brendan@mozilla.org, a=asa@mozilla.org
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177955 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 16:51:01 +00:00
bsmedberg%covad.net
2294affeb4 Bug 302136 - Two clicks on "Install Now" button are necessary to install an extension - r+a=beng
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177953 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 16:40:43 +00:00
gavin%gavinsharp.com
c530b44444 Bug 303644 : Remove livemark autodiscovery's handrolled wrapper, patch by Phil Ringnalda <bugzilla@philringnalda.com>, r=vlad, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177952 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 16:37:42 +00:00
cbiesinger%web.de
17c0db36bf bug 301004 make native gtk2 filepicker modal to its parent
patch by Christian Persch <chpe@gnome.org> r=caillon sr=roc a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177945 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 13:42:42 +00:00
cbiesinger%web.de
2d76924659 bug 277587 nsSecureBrowserUIImpl's nsUIContext interface requestor doesn't give
access to the dom window
patch by Christian Persch <chpe@gnome.org> r=jgmyers sr=roc a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177944 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 13:39:30 +00:00
axel%pike.org
3e3e48fba4 adding mk to thunderbird 1.5, l10n only, per request of damjan
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177942 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 11:46:03 +00:00
timeless%mozdev.org
050a74b34b Bug 299825 Search plugins in App directory are updated into Profile directory (resulting in double Search Bar entries)
patch by torisugari@gmail.com r=timeless sr=neil a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177938 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 09:26:09 +00:00
timeless%mozdev.org
ffdbfd0beb Bug 304237 Enable xpcom under windows debuggers to filter assertions the way it does without a debugger
to enable this feature, set XPCOM_DEBUG_DLG=1, or if you're already in the debugger, just poke the static to 2.
r=dougt a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177933 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 07:49:30 +00:00
jshin%mailaps.org
b44c107d84 bug 304277: add further TLDs to IDN whitelist : patch by gerv, rs=jshin, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177923 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-17 01:31:00 +00:00
jwalden%mit.edu
227b358e20 Bug 299976 - Remove identical items from glossary/index datasources and make them platform-specific. p=steffen, r=me, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177909 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 22:40:16 +00:00
cbiesinger%web.de
198e275f18 bug 283606 make nsOSHelperAppService::GetApplicationDescription get
a friendly description
r=darin sr=bz a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177902 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 22:01:35 +00:00
cbiesinger%web.de
b711722a0e bug 297388 make nsIWebBrowserStream implement ReadSegments correctly (by
just forwarding to the underlying pipe)
r=caillon sr=darin a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177899 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 21:53:18 +00:00
mrbkap%gmail.com
634e4913d2 bug 289933: functions, RegExps, and Script objects should all be of type "function" for compatibility with older SpiderMonkeys and to more closely imitate ECMA. r+a=brendan
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177897 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 21:43:54 +00:00
roc+%cs.cmu.edu
3ccd8d696b Bug 303484. Limit the nesting of modal event loops so we avoid overflowing the C++ stack. r+sr=brendan,a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177889 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 21:03:12 +00:00
jst%mozilla.jstenback.com
0c1074dda7 Fixing frame crasher from bug 296639. Wrap frames in the scope of the frame's outer window. r=mrbkap@gmail.com, sr=shaver@mozilla.org, a=asa@mozilla.org
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177883 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 20:17:57 +00:00
myk%mozilla.org
2de5835b34 Bug 304362: makes feedview parse W3C-DTF dates correctly; also, fixes several regressions from the checkin for bug 303848, specifically: uncomments call to Feed.init() so feeds get initialized (and dates show up and refresh works); calls the refresh function appropriately so refresh works; disables refresh by default; adds back menu display and refresh prefs; makes refresh pref refer to minutes rather than seconds; and looks for prefs in DOM by correct name (all lowercase, since XSLT forces them to that) so the menu shows up and refresh works. r=mconnor, sr=beng, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177877 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 19:47:06 +00:00
aaronleventhal%moonset.net
68e7466914 Bug 258285. Findbar coming up when it shouldn't (textareas/textfields). r=mats, sr=bryner, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177875 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 19:33:48 +00:00
smfr%smfr.org
dfff2b57ba Fix bug 295737: use Core Graphics to do image tiling, because it's much faster than doing it ourselves. r=jhpedemonte, sr=bryner, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177859 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 18:10:18 +00:00
mrbkap%gmail.com
941e888ae2 bug 303267: Back/forward with bfcache on break javascript. We now store the entire inner window in the cache instead of just random properties from it. r=bryner sr=jst a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177856 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 17:59:44 +00:00
aaronleventhal%moonset.net
4a5d8941ec Backing out. Doh! I have approval but I only wanted to check this into the trunk at first, for testing.
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177854 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 17:52:43 +00:00
scott%scott-macgregor.org
22f98faaad Bug #303786 --> "Delete Message" filter action missing for IMAP and Newsgroups
sr=bienvenu
a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177852 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 17:42:07 +00:00
scott%scott-macgregor.org
aca80bdc15 Bug #304466 --> SSL Icon for IMAP Accounts no longer shows up
sr=bienvenu
a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177851 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 17:39:36 +00:00
aaronleventhal%moonset.net
c595157e1c Bug 258285. Find As You Type coming up when it shouldn't (textareas/textfields). r=mats, sr=bryner
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177850 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 17:36:46 +00:00
timeless%mozdev.org
a1fac68280 Bug 303654 InstallTrigger.install(null) crashes [@ JS_Enumerate]
patch by shutdown@flashmail.com r=dveditz sr=dveditz a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177848 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 16:32:53 +00:00
mozilla.mano%sent.com
c444e0172b Bug 304748 - 'Bookmark This Tab' command doesn't work if the context element is the tabbar itself. r=mconnor, a=asa.
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177841 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 14:28:31 +00:00
mozilla.mano%sent.com
e7fe612941 Bug 299239 - BiDi: Caret is stuck when reaching a single LTR character in RTL text. patch from Eyal Rozenberg <eyalroz@technion.ac.il>, r+sr=roc, a=asa.
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177839 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 14:22:51 +00:00
bzbarsky%mit.edu
f9db98fa3d Use a valid MIME type for the "display" stuff in mailnews. Bug 303336, r=bienvenu,
sr=mscott, a=asa.


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177838 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 14:20:17 +00:00
gavin%gavinsharp.com
a03c8b171a Bug 243324: Download manager fails to close with files that download very quickly (small files / cached files), patch by Ben Basson <cusser.bugs@cusser.net>, r=mconnor, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177832 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 12:10:38 +00:00
bugzilla%arlen.demon.co.uk
c5314a600c Bug 304137 Junk/scam header pane remains after selection of an empty folder (i.e. no message selection)
p=me r=neil.parkwaycc.co.uk sr=bienvenu a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177830 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 12:00:25 +00:00
neil%parkwaycc.co.uk
f73483ce99 Ability to navigate the search folderpicker when closed b=302120 sr=mscott a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177827 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 08:18:12 +00:00
neil%parkwaycc.co.uk
c550c37397 Bug 304053 Don't draw canvas focus on editor/midas frames r+sr=roc a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177825 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 08:14:06 +00:00
neil%parkwaycc.co.uk
2017890d24 Fix typo (Enter key is VK_RETURN, not VK_ENTER ?!) b=304500 sr=bienvenu a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177823 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 08:08:17 +00:00
gavin%gavinsharp.com
dd1e3c2efd Bug 304469 : Add -new-tab option to auto-remote, r=benjamin, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177813 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 05:18:43 +00:00
smfr%smfr.org
cccdbcb886 Fix bug 304565: bookmark descriptions all getting the same value. Make sure we make a copy of [NSTextView string] before setting the bookmark description, and clean up other minor NSString usage.
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177812 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 04:51:10 +00:00
myk%mozilla.org
217d024ced Bug 304734: update Mozilla Store bookmark to point to store.mozilla.org; r=mconnor, a=cbeard
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177802 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 01:17:28 +00:00
relyea%netscape.com
af70ef05e8 Bug 225034 Certificate Manager Crashes Mozilla [@ nsCertTree::CmpByCrit]
sr=brendan r=wtc a=dbaron
The issue is the use of the PL_DHash* functions. It's possible that a given call to PL_DHashOperate which adds a new entry may cause the hash table to expand, and all the existing entries to be reallocated. PL_DHash does this by allocating new memory, then copying the entries. getCacheEntry() returns one of these hash entries. CmpBy() makes two consecutive calls to getCacheEntry, then uses the returned entries for it's comparisons. If the second entry call causes a new entry to be added to the table, and causes the hash table to expand, the pointer to the first entry we retrieved will point to freed memory. The fix is to make the usable entry a pointer in the hashtable entry, and return that pointer. When the hashtable rebuilds it's entries, the pointer will be copied to the new entry and not be disturbed.


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177796 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 00:23:42 +00:00
scott%scott-macgregor.org
a40c90f749 Bug #269483 --> the check for updates menu item needs to be iconic so we the animated throbber shows
up when downloading an update.


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177779 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-15 21:16:00 +00:00
scott%scott-macgregor.org
f004b39561 Porting the changes for Bug #302269 to Thunderbird. Fixes some Thunderbird padding issues with the software update wizard.
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177778 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-15 21:07:23 +00:00
scott%scott-macgregor.org
86781c7a2f Bug #269483 --> remove some obsolete auto update UI
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177777 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-15 20:59:07 +00:00
mozilla.mano%sent.com
3492c1517e bug 304436 - [mac] RSS button is displayed empty. patch from Kevin Gerich (on bug 303848). a=asa.
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177773 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-15 19:08:11 +00:00
doronr%us.ibm.com
feb4a7d3ee Bug 303058 - Missing plugin bar no longer appears. r/a=mconnor
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177757 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-15 17:31:22 +00:00
aaronleventhal%moonset.net
1accd323b1 Bug 304457. Can't tab out of location bar (regression). r=mconnor, a=dbaron
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177743 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-15 03:04:34 +00:00
bzbarsky%mit.edu
2d7f2d7ca1 Removing unused code. Bug 303102, r+sr=jst, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177742 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-15 02:50:31 +00:00
bzbarsky%mit.edu
6faa2cc5f3 Don't leak radio visitors through shutdown. Bug 302706, r+sr=jst, a=asa.
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177740 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-15 02:46:46 +00:00
bzbarsky%mit.edu
e55bd192e6 Make the one-arg version of scrollIntoView scriptable in IDL. Bug 296965,
r+sr=jst, a=asa.


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177737 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-15 02:37:48 +00:00
bzbarsky%mit.edu
0cc47592c8 Make table.rows["rowid"] work like it should. Bug 295561, r+sr=jst, a=asa
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177735 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-15 02:35:42 +00:00
steffen.wilberg%web.de
c0400f0495 Bug 222654: global/scrollbars.css for native scrollbars different on Mac (many Firefox themes break scrollbars on Mac). Use nativescrollbars.css and xulscrollbars.css and ship both files on all platforms. r=neil, kevin, sr=bz, a=bsmedberg
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177731 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-14 16:28:42 +00:00
gavin%gavinsharp.com
99aca96354 Bug 304233: fix "preference has no properties" error in advanced JS Options, patch by Ronny Perinke <ronny.perinke@gmx.de>, r+a=mconnor
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177723 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-13 22:54:24 +00:00
gavin%gavinsharp.com
6dac3d3e80 Bug 303743: fix typo in richlistbox.xml, patch by Adam Guthrie <ispiked@gmail.com>, r+a=mconnor
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177721 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-13 22:37:52 +00:00
dbaron%dbaron.org
0ef723541e Make nsIChannel implementations follow the rules that prevent them from leaking due to cycles with their notification callbacks. b=303043 r=biesi sr=darin a=cbeard
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177716 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-13 19:34:01 +00:00
mnyromyr%tprac.de
85cb92260e Bug 299581: Mac application menu still named Mozilla; r=pinkerton, sr=sfraser, a=cbeard
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177715 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-13 19:33:25 +00:00
dbaron%dbaron.org
0458974e37 Add tools/update-packaging to all pull. b=304377 r=chase a=chase
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177714 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-13 19:32:16 +00:00
gavin%gavinsharp.com
082ba176b6 Bug 304418 : Fix a couple of regressions from the checkin for bug 284868, r+a=mconnor
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177708 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-13 17:41:28 +00:00
bugzilla%arlen.demon.co.uk
d375b2fd63 Bug 301737 Support multiple selection for xul:listbox - Revised xpfe version of patch v2.1
p=me r=cbiesinger sr=neil.parkwaycc.co.uk a=asa


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177698 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-13 13:42:03 +00:00
cbiesinger%web.de
0abc04d831 Bug 297238 incorrect parameter specification for signal open-uri of gtkembedmoz
patch by chpe@gnome.org r=mpgritti sr=roc


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177694 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-13 12:11:23 +00:00
cbiesinger%web.de
996effeff6 bug 97580 back out the original patch for this bug, since it's not necessary
anymore and breaks plugins
patch by chpe@gnome.org r=blizzard sr=roc a=cbeard


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177693 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-13 12:00:34 +00:00
cbiesinger%web.de
c98e01adcb bug 292998
- move textZoom storage to the prescontext from the documentviewer
- copy the textZoom between document viewers for fastback
r=bryner sr=dbaron a=cbeard


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177691 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-13 11:55:32 +00:00
cbiesinger%web.de
463d2d8489 bug 250375 allow necko consumers to append to the Cookie header
r+sr=darin a=cbeard


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177689 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-13 11:51:55 +00:00
cltbld
bd3cab6a8e Update client.mk to pull from the MOZILLA_1_8_BRANCH tag. (chase)
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177657 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-12 20:32:24 +00:00
(no author)
f7df88887e This commit was manufactured by cvs2svn to create branch
'MOZILLA_1_8_BRANCH'.

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177651 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-12 19:01:32 +00:00
3 changed files with 816 additions and 276 deletions

816
mozilla/client.mk Normal file
View File

@@ -0,0 +1,816 @@
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Stephen Lamm
# Benjamin Smedberg <bsmedberg@covad.net>
# Chase Phillips <chase@mozilla.org>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
# Build a mozilla application.
#
# To checkout and build a tree,
# 1. cvs co mozilla/client.mk
# 2. cd mozilla
# 3. create your .mozconfig file with
# mk_add_options MOZ_CO_PROJECT=suite,browser,mail,minimo,xulrunner
# 4. gmake -f client.mk
#
# This script will pick up the CVSROOT from the CVS/Root file. If you wish
# to use a different CVSROOT, you must set CVSROOT in your environment:
#
# export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# export CVSROOT=:pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
#
# You must specify which products/modules you wish to checkout, with
# MOZ_CO_PROJECT, MOZ_CO_MODULE, and BUILD_MODULES variables.
#
# MOZ_CO_PROJECT possibilities include the following:
# suite (Seamonkey suite)
# browser (aka Firefox)
# mail (aka Thunderbird)
# minimo (small browser for devices)
# composer (standalone composer, aka NVU)
# calendar (aka Sunbird, use this to build the calendar extensions also)
# xulrunner
# macbrowser (aka Camino)
#
# Other common MOZ_CO_MODULE options include the following:
# mozilla/other-licenses/libart_lgpl
# mozilla/other-licenses/bsdiff
# mozilla/tools/codesighs
#
# Other targets (gmake -f client.mk [targets...]),
# checkout
# build
# clean (realclean is now the same as clean)
# distclean
#
# See http://www.mozilla.org/build/ for more information.
#
# Options:
# MOZ_OBJDIR - Destination object directory
# MOZ_CO_DATE - Date tag to use for checkout (default: none)
# MOZ_CO_MODULE - Module to checkout
# MOZ_CVS_FLAGS - Flags to pass cvs (default: -q -z3)
# MOZ_CO_FLAGS - Flags to pass after 'cvs co' (default: -P)
# MOZ_MAKE_FLAGS - Flags to pass to $(MAKE)
# MOZ_CO_LOCALES - localizations to pull (MOZ_CO_LOCALES="de-DE,pt-BR")
# MOZ_LOCALE_DIRS - directories which contain localizations
# LOCALES_CVSROOT - CVSROOT to use to pull localizations
#
AVAILABLE_PROJECTS = \
all \
suite \
toolkit \
browser \
mail \
minimo \
composer \
calendar \
xulrunner \
macbrowser \
$(NULL)
MODULES_core := \
SeaMonkeyAll \
mozilla/browser/config/version.txt \
mozilla/mail/config/version.txt \
mozilla/ipc/ipcd \
mozilla/modules/libpr0n \
mozilla/modules/libmar \
mozilla/modules/libbz2 \
mozilla/accessible \
mozilla/security/manager \
mozilla/toolkit \
mozilla/storage \
mozilla/db/sqlite3 \
$(NULL)
LOCALES_core := \
netwerk \
dom \
$(NULL)
MODULES_toolkit := \
$(MODULES_core) \
mozilla/chrome \
$(NULL)
LOCALES_toolkit := \
$(LOCALES_core) \
toolkit \
security/manager \
$(NULL)
MODULES_suite := \
$(MODULES_core) \
mozilla/suite \
$(NULL)
LOCALES_suite := \
$(LOCALES_core) \
$(NULL)
MODULES_browser := \
$(MODULES_toolkit) \
mozilla/browser \
mozilla/other-licenses/branding/firefox \
mozilla/other-licenses/7zstub/firefox \
$(NULL)
LOCALES_browser := \
$(LOCALES_toolkit) \
browser \
other-licenses/branding/firefox \
$(NULL)
BOOTSTRAP_browser := mozilla/browser/config/mozconfig
MODULES_minimo := \
$(MODULES_toolkit) \
mozilla/minimo \
$(NULL)
MODULES_mail := \
$(MODULES_toolkit) \
mozilla/mail \
mozilla/other-licenses/branding/thunderbird \
mozilla/other-licenses/7zstub/thunderbird \
$(NULL)
LOCALES_mail := \
$(LOCALES_toolkit) \
mail \
other-licenses/branding/thunderbird \
editor/ui \
$(NULL)
BOOTSTRAP_mail := mozilla/mail/config/mozconfig
MODULES_composer := \
$(MODULES_toolkit) \
mozilla/composer \
$(NULL)
MODULES_calendar := \
$(MODULES_toolkit) \
mozilla/storage \
mozilla/db/sqlite3 \
mozilla/calendar \
$(NULL)
BOOTSTRAP_calendar := mozilla/calendar/sunbird/config/mozconfig
MODULES_xulrunner := \
$(MODULES_toolkit) \
mozilla/xulrunner \
$(NULL)
LOCALES_xulrunner := \
$(LOCALES_toolkit) \
$(NULL)
BOOTSTRAP_xulrunner := mozilla/xulrunner/config/mozconfig
MODULES_macbrowser := \
$(MODULES_core) \
mozilla/camino \
$(NULL)
BOOTSTRAP_macbrowser := mozilla/camino/config/mozconfig
MODULES_all := \
mozilla/other-licenses/bsdiff \
mozilla/other-licenses/libart_lgpl \
mozilla/tools/trace-malloc \
mozilla/tools/jprof \
mozilla/tools/codesighs \
mozilla/tools/update-packaging \
mozilla/other-licenses/branding \
mozilla/other-licenses/7zstub \
$(NULL)
#######################################################################
# Checkout Tags
#
# For branches, uncomment the MOZ_CO_TAG line with the proper tag,
# and commit this file on that tag.
MOZ_CO_TAG = MOZILLA_1_8_BRANCH
NSPR_CO_TAG = MOZILLA_1_8_BRANCH
NSS_CO_TAG = MOZILLA_1_8_BRANCH
LDAPCSDK_CO_TAG = MOZILLA_1_8_BRANCH
LOCALES_CO_TAG = MOZILLA_1_8_BRANCH
BUILD_MODULES = all
#######################################################################
# Defines
#
CVS = cvs
comma := ,
CWD := $(shell pwd)
ifeq "$(CWD)" "/"
CWD := /.
endif
ifneq (, $(wildcard client.mk))
# Ran from mozilla directory
ROOTDIR := $(shell dirname $(CWD))
TOPSRCDIR := $(CWD)
else
# Ran from mozilla/.. directory (?)
ROOTDIR := $(CWD)
TOPSRCDIR := $(CWD)/mozilla
endif
# on os2, TOPSRCDIR may have two forward slashes in a row, which doesn't
# work; replace first instance with one forward slash
TOPSRCDIR := $(shell echo "$(TOPSRCDIR)" | sed -e 's%//%/%')
ifndef TOPSRCDIR_MOZ
TOPSRCDIR_MOZ=$(TOPSRCDIR)
endif
# if ROOTDIR equals only drive letter (i.e. "C:"), set to "/"
DIRNAME := $(shell echo "$(ROOTDIR)" | sed -e 's/^.://')
ifeq ($(DIRNAME),)
ROOTDIR := /.
endif
AUTOCONF := autoconf
MKDIR := mkdir
SH := /bin/sh
ifndef MAKE
MAKE := gmake
endif
CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess)
ifdef CONFIG_GUESS_SCRIPT
CONFIG_GUESS = $(shell $(CONFIG_GUESS_SCRIPT))
else
_IS_FIRST_CHECKOUT := 1
endif
####################################
# CVS
# Add the CVS root to CVS_FLAGS if needed
CVS_ROOT_IN_TREE := $(shell cat $(TOPSRCDIR)/CVS/Root 2>/dev/null)
ifneq ($(CVS_ROOT_IN_TREE),)
ifneq ($(CVS_ROOT_IN_TREE),$(CVSROOT))
CVS_FLAGS := -d $(CVS_ROOT_IN_TREE)
endif
endif
CVS_CO_DATE_FLAGS = $(if $(MOZ_CO_DATE),-D "$(MOZ_CO_DATE)")
CVSCO = $(CVS) $(CVS_FLAGS) co $(MOZ_CO_FLAGS) $(if $(MOZ_CO_TAG),-r $(MOZ_CO_TAG)) $(CVS_CO_DATE_FLAGS)
CVSCO_LOGFILE := $(ROOTDIR)/cvsco.log
CVSCO_LOGFILE := $(shell echo $(CVSCO_LOGFILE) | sed s%//%/%)
# if LOCALES_CVSROOT is not specified, set it here
# (and let mozconfig override it)
LOCALES_CVSROOT ?= :pserver:anonymous@cvs-mirror.mozilla.org:/l10n
####################################
# Load mozconfig Options
# See build pages, http://www.mozilla.org/build/ for how to set up mozconfig.
MOZCONFIG_LOADER := mozilla/build/autoconf/mozconfig2client-mk
MOZCONFIG_FINDER := mozilla/build/autoconf/mozconfig-find
MOZCONFIG_MODULES := mozilla/build/unix/modules.mk mozilla/build/unix/uniq.pl
run_for_side_effects := \
$(shell cd $(ROOTDIR); \
if test "$(_IS_FIRST_CHECKOUT)"; then \
$(CVSCO) $(MOZCONFIG_FINDER) $(MOZCONFIG_LOADER) $(MOZCONFIG_MODULES); \
else true; \
fi; \
$(MOZCONFIG_LOADER) $(TOPSRCDIR) mozilla/.mozconfig.mk > mozilla/.mozconfig.out)
include $(TOPSRCDIR)/.mozconfig.mk
include $(TOPSRCDIR)/build/unix/modules.mk
####################################
# Options that may come from mozconfig
MOZ_PROJECT_LIST := $(subst $(comma), ,$(MOZ_CO_PROJECT))
ifneq (,$(filter-out $(AVAILABLE_PROJECTS),$(MOZ_PROJECT_LIST)))
$(error MOZ_CO_PROJECT contains an unrecognized project.)
endif
ifeq (all,$(filter all,$(MOZ_PROJECT_LIST)))
MOZ_PROJECT_LIST := $(AVAILABLE_PROJECTS)
endif
MOZ_MODULE_LIST := $(subst $(comma), ,$(MOZ_CO_MODULE)) $(foreach project,$(MOZ_PROJECT_LIST),$(MODULES_$(project)))
LOCALE_DIRS := $(MOZ_LOCALE_DIRS) $(foreach project,$(MOZ_PROJECT_LIST),$(LOCALES_$(project)))
MOZCONFIG_MODULES += $(foreach project,$(MOZ_PROJECT_LIST),$(BOOTSTRAP_$(project)))
# Using $(sort) here because it also removes duplicate entries.
MOZ_MODULE_LIST := $(sort $(MOZ_MODULE_LIST))
LOCALE_DIRS := $(sort $(LOCALE_DIRS))
MOZCONFIG_MODULES := $(sort $(MOZCONFIG_MODULES))
# Change CVS flags if anonymous root is requested
ifdef MOZ_CO_USE_MIRROR
CVS_FLAGS := -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
endif
# MOZ_CVS_FLAGS - Basic CVS flags
ifeq "$(origin MOZ_CVS_FLAGS)" "undefined"
CVS_FLAGS := $(CVS_FLAGS) -q -z 3
else
CVS_FLAGS := $(MOZ_CVS_FLAGS)
endif
ifdef MOZ_OBJDIR
OBJDIR := $(MOZ_OBJDIR)
MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
else
OBJDIR := $(TOPSRCDIR)
MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS)
endif
####################################
# CVS defines for NSS
#
NSS_CO_MODULE = \
mozilla/security/nss \
mozilla/security/coreconf \
$(NULL)
NSS_CO_FLAGS := -P
ifdef MOZ_CO_FLAGS
NSS_CO_FLAGS := $(MOZ_CO_FLAGS)
endif
NSS_CO_FLAGS := $(NSS_CO_FLAGS) $(if $(NSS_CO_TAG),-r $(NSS_CO_TAG),-A)
# Cannot pull static tags by date
ifeq ($(NSS_CO_TAG),NSS_CLIENT_TAG)
CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(NSS_CO_MODULE)
else
CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSS_CO_MODULE)
endif
####################################
# CVS defines for NSPR
#
NSPR_CO_MODULE = mozilla/nsprpub
NSPR_CO_FLAGS := -P
ifdef MOZ_CO_FLAGS
NSPR_CO_FLAGS := $(MOZ_CO_FLAGS)
endif
NSPR_CO_FLAGS := $(NSPR_CO_FLAGS) $(if $(NSPR_CO_TAG),-r $(NSPR_CO_TAG),-A)
# 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
####################################
# CVS defines for the C LDAP SDK
#
LDAPCSDK_CO_MODULE = mozilla/directory/c-sdk
LDAPCSDK_CO_FLAGS := -P
ifdef MOZ_CO_FLAGS
LDAPCSDK_CO_FLAGS := $(MOZ_CO_FLAGS)
endif
LDAPCSDK_CO_FLAGS := $(LDAPCSDK_CO_FLAGS) $(if $(LDAPCSDK_CO_TAG),-r $(LDAPCSDK_CO_TAG),-A)
CVSCO_LDAPCSDK = $(CVS) $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(LDAPCSDK_CO_MODULE)
####################################
# CVS defines for standalone modules
#
ifeq ($(BUILD_MODULES),all)
CHECKOUT_STANDALONE := true
CHECKOUT_STANDALONE_NOSUBDIRS := true
else
STANDALONE_CO_MODULE := $(filter-out $(NSPRPUB_DIR) security directory/c-sdk, $(BUILD_MODULE_CVS))
STANDALONE_CO_MODULE += allmakefiles.sh client.mk aclocal.m4 configure configure.in
STANDALONE_CO_MODULE += Makefile.in
MOZ_MODULE_LIST += $(addprefix mozilla/,$(STANDALONE_CO_MODULE))
NOSUBDIRS_MODULE := $(addprefix mozilla/,$(BUILD_MODULE_CVS_NS))
ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
CVSCO_NSPR :=
endif
ifeq (,$(filter security security/manager, $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
CVSCO_NSS :=
endif
ifeq (,$(filter directory/c-sdk, $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
CVSCO_LDAPCSDK :=
endif
endif
####################################
# Error on obsolete variables.
#
ifdef MOZ_MAPINFO
$(warning MOZ_MAPINFO is obsolete, use MOZ_CO_MODULE=mozilla/tools/codesighs instead.)
MOZ_MODULE_LIST += mozilla/tools/codesighs
endif
ifdef MOZ_INTERNAL_LIBART_LGPL
$(error MOZ_INTERNAL_LIBART_LGPL is obsolete, use MOZ_CO_MODULE=mozilla/other-licenses/libart_lgpl instead.)
endif
ifdef MOZ_PHOENIX
$(warning MOZ_PHOENIX is obsolete.)
MOZ_MODULE_LIST += $(MODULES_browser)
# $(error MOZ_PHOENIX is obsolete, use MOZ_CO_PROJECT=browser and --enable-application=browser)
endif
ifdef MOZ_THUNDERBIRD
$(warning MOZ_THUNDERBIRD is obsolete.)
MOZ_MODULE_LIST += $(MODULES_mail)
# $(error MOZ_THUNDERBIRD is obsolete, use MOZ_CO_PROJECT=mail and --enable-application=mail)
endif
###################################
# Checkout main modules
#
# sort is used to remove duplicates. SeaMonkeyAll is special-cased to
# checkout last, because if you check it out first, there is a sticky
# tag left over from checking out the LDAP SDK, which causes files in
# the root directory to be missed.
MOZ_MODULE_LIST := $(sort $(filter-out SeaMonkeyAll,$(MOZ_MODULE_LIST))) $(firstword $(filter SeaMonkeyAll,$(MOZ_MODULE_LIST)))
MODULES_CO_FLAGS := -P
ifdef MOZ_CO_FLAGS
MODULES_CO_FLAGS := $(MOZ_CO_FLAGS)
endif
MODULES_CO_FLAGS := $(MODULES_CO_FLAGS) $(if $(MOZ_CO_TAG),-r $(MOZ_CO_TAG),-A)
CVSCO_MODULES_NS = $(CVS) $(CVS_FLAGS) co $(MODULES_CO_FLAGS) $(CVS_CO_DATE_FLAGS) -l $(NOSUBDIRS_MODULE)
ifeq (,$(strip $(MOZ_MODULE_LIST)))
FASTUPDATE_MODULES = $(error No modules or projects were specified. Use MOZ_CO_PROJECT to specify a project for checkout.)
CHECKOUT_MODULES = $(error No modules or projects were specified. Use MOZ_CO_PROJECT to specify a project for checkout.)
else
FASTUPDATE_MODULES := fast_update $(CVS) $(CVS_FLAGS) co $(MODULES_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(MOZ_MODULE_LIST)
CHECKOUT_MODULES := $(foreach module,$(MOZ_MODULE_LIST),cvs_co $(CVS) $(CVS_FLAGS) co $(MODULES_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(module);)
endif
ifeq (,$(NOSUBDIRS_MODULE))
FASTUPDATE_MODULES_NS := true
CHECKOUT_MODULES_NS := true
else
FASTUPDATE_MODULES_NS := fast_update $(CVSCO_MODULES_NS)
CHECKOUT_MODULES_NS := cvs_co $(CVSCO_MODULES_NS)
endif
###################################
# CVS defines for locales
#
LOCALES_CO_FLAGS := -P
ifdef MOZ_CO_FLAGS
LOCALES_CO_FLAGS := $(MOZ_CO_FLAGS)
endif
LOCALES_CO_FLAGS := $(LOCALES_CO_FLAGS) $(if $(LOCALES_CO_TAG),-r $(LOCALES_CO_TAG),-A)
ifndef MOZ_CO_LOCALES
FASTUPDATE_LOCALES := true
CHECKOUT_LOCALES := true
else
override MOZ_CO_LOCALES := $(subst $(comma), ,$(MOZ_CO_LOCALES))
ifeq (all,$(MOZ_CO_LOCALES))
MOZCONFIG_MODULES += $(foreach project,$(MOZ_PROJECT_LIST),mozilla/$(project)/locales/all-locales)
LOCALE_CO_DIRS := $(sort $(foreach project,$(MOZ_PROJECT_LIST),$(foreach locale,$(shell cat mozilla/$(project)/locales/all-locales),$(foreach dir,$(LOCALES_$(project)),l10n/$(locale)/$(dir)))))
else # MOZ_CO_LOCALES != all
LOCALE_CO_DIRS = $(sort $(foreach locale,$(MOZ_CO_LOCALES),$(foreach dir,$(LOCALE_DIRS),l10n/$(locale)/$(dir))))
endif
CVSCO_LOCALES := $(CVS) $(CVS_FLAGS) -d $(LOCALES_CVSROOT) co $(LOCALES_CO_FLAGS) $(LOCALE_CO_DIRS)
FASTUPDATE_LOCALES := fast_update $(CVSCO_LOCALES)
CHECKOUT_LOCALES := cvs_co $(CVSCO_LOCALES)
endif #MOZ_CO_LOCALES
#######################################################################
# Rules
#
# Print out any options loaded from mozconfig.
all build checkout clean depend distclean export libs install realclean::
@if test -f .mozconfig.out; then \
cat .mozconfig.out; \
rm -f .mozconfig.out; \
else true; \
fi
ifdef _IS_FIRST_CHECKOUT
all:: checkout build
else
all:: checkout alldep
endif
# Windows equivalents
pull_all: checkout
build_all: build
build_all_dep: alldep
build_all_depend: alldep
clobber clobber_all: clean
pull_and_build_all: checkout alldep
# Do everything from scratch
everything: checkout clean build
####################################
# CVS checkout
#
checkout::
# @: Backup the last checkout log.
@if test -f $(CVSCO_LOGFILE) ; then \
mv $(CVSCO_LOGFILE) $(CVSCO_LOGFILE).old; \
else true; \
fi
ifdef RUN_AUTOCONF_LOCALLY
@echo "Removing local configures" ; \
cd $(ROOTDIR) && \
$(RM) -f mozilla/configure mozilla/nsprpub/configure \
mozilla/directory/c-sdk/configure
endif
@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
@echo '$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES)'; \
cd $(ROOTDIR) && \
$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES)
@cd $(ROOTDIR) && $(MAKE) -f mozilla/client.mk real_checkout
# Start the checkout. Split the output to the tty and a log file.
real_checkout:
@set -e; \
cvs_co() { set -e; echo "$$@" ; \
"$$@" 2>&1 | tee -a $(CVSCO_LOGFILE); }; \
cvs_co $(CVSCO_NSPR); \
cvs_co $(CVSCO_NSS); \
cvs_co $(CVSCO_LDAPCSDK); \
$(CHECKOUT_MODULES) \
$(CHECKOUT_MODULES_NS); \
$(CHECKOUT_LOCALES);
@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
# update the NSS checkout timestamp
@if test `egrep -c '^(U|C) mozilla/security/(nss|coreconf)' $(CVSCO_LOGFILE) 2>/dev/null` != 0; then \
touch $(TOPSRCDIR)/security/manager/.nss.checkout; \
fi
# @: Check the log for conflicts. ;
@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
if test "$$conflicts" ; then \
echo "$(MAKE): *** Conflicts during checkout." ;\
echo "$$conflicts" ;\
echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
false; \
else true; \
fi
ifdef RUN_AUTOCONF_LOCALLY
@echo Generating configures using $(AUTOCONF) ; \
cd $(TOPSRCDIR) && $(AUTOCONF) && \
cd $(TOPSRCDIR)/nsprpub && $(AUTOCONF) && \
cd $(TOPSRCDIR)/directory/c-sdk && $(AUTOCONF)
endif
fast-update:
# @: Backup the last checkout log.
@if test -f $(CVSCO_LOGFILE) ; then \
mv $(CVSCO_LOGFILE) $(CVSCO_LOGFILE).old; \
else true; \
fi
ifdef RUN_AUTOCONF_LOCALLY
@echo "Removing local configures" ; \
cd $(ROOTDIR) && \
$(RM) -f mozilla/configure mozilla/nsprpub/configure \
mozilla/directory/c-sdk/configure
endif
@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
@echo '$(CVSCO) mozilla/client.mk $(MOZCONFIG_MODULES)'; \
cd $(ROOTDIR) && \
$(CVSCO) mozilla/client.mk $(MOZCONFIG_MODULES)
@cd $(TOPSRCDIR) && \
$(MAKE) -f client.mk real_fast-update
# Start the update. Split the output to the tty and a log file.
real_fast-update:
@set -e; \
fast_update() { set -e; config/cvsco-fast-update.pl $$@ 2>&1 | tee -a $(CVSCO_LOGFILE); }; \
cvs_co() { set -e; echo "$$@" ; \
"$$@" 2>&1 | tee -a $(CVSCO_LOGFILE); }; \
fast_update $(CVSCO_NSPR); \
cd $(ROOTDIR); \
cvs_co $(CVSCO_NSS); \
cd mozilla; \
fast_update $(CVSCO_LDAPCSDK); \
$(FASTUPDATE_MODULES); \
$(FASTUPDATE_MODULES_NS); \
$(FASTUPDATE_LOCALES);
@echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE)
# update the NSS checkout timestamp
@if test `egrep -c '^(U|C) mozilla/security/(nss|coreconf)' $(CVSCO_LOGFILE) 2>/dev/null` != 0; then \
touch $(TOPSRCDIR)/security/manager/.nss.checkout; \
fi
# @: Check the log for conflicts. ;
@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
if test "$$conflicts" ; then \
echo "$(MAKE): *** Conflicts during fast-update." ;\
echo "$$conflicts" ;\
echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
false; \
else true; \
fi
ifdef RUN_AUTOCONF_LOCALLY
@echo Generating configures using $(AUTOCONF) ; \
cd $(TOPSRCDIR) && $(AUTOCONF) && \
cd $(TOPSRCDIR)/nsprpub && $(AUTOCONF) && \
cd $(TOPSRCDIR)/directory/c-sdk && $(AUTOCONF)
endif
####################################
# Web configure
WEBCONFIG_FILE := $(HOME)/.mozconfig
MOZCONFIG2CONFIGURATOR := build/autoconf/mozconfig2configurator
webconfig:
@cd $(TOPSRCDIR); \
url=`$(MOZCONFIG2CONFIGURATOR) $(TOPSRCDIR)`; \
echo Running mozilla with the following url: ;\
echo ;\
echo $$url ;\
mozilla -remote "openURL($$url)" || \
netscape -remote "openURL($$url)" || \
mozilla $$url || \
netscape $$url ;\
echo ;\
echo 1. Fill out the form on the browser. ;\
echo 2. Save the results to $(WEBCONFIG_FILE)
#####################################################
# First Checkout
ifdef _IS_FIRST_CHECKOUT
# First time, do build target in a new process to pick up new files.
build::
$(MAKE) -f $(TOPSRCDIR)/client.mk build
else
#####################################################
# After First Checkout
####################################
# Configure
CONFIG_STATUS := $(wildcard $(OBJDIR)/config.status)
CONFIG_CACHE := $(wildcard $(OBJDIR)/config.cache)
ifdef RUN_AUTOCONF_LOCALLY
EXTRA_CONFIG_DEPS := \
$(TOPSRCDIR)/aclocal.m4 \
$(wildcard $(TOPSRCDIR)/build/autoconf/*.m4) \
$(NULL)
$(TOPSRCDIR)/configure: $(TOPSRCDIR)/configure.in $(EXTRA_CONFIG_DEPS)
@echo Generating $@ using autoconf
cd $(TOPSRCDIR); $(AUTOCONF)
endif
CONFIG_STATUS_DEPS := \
$(TOPSRCDIR)/configure \
$(TOPSRCDIR)/allmakefiles.sh \
$(TOPSRCDIR)/.mozconfig.mk \
$(wildcard $(TOPSRCDIR)/nsprpub/configure) \
$(wildcard $(TOPSRCDIR)/directory/c-sdk/configure) \
$(wildcard $(TOPSRCDIR)/mailnews/makefiles) \
$(wildcard $(TOPSRCDIR)/themes/makefiles) \
$(wildcard $(TOPSRCDIR)/config/milestone.txt) \
$(wildcard $(TOPSRCDIR)/config/chrome-versions.sh) \
$(NULL)
# configure uses the program name to determine @srcdir@. Calling it without
# $(TOPSRCDIR) will set @srcdir@ to "."; otherwise, it is set to the full
# path of $(TOPSRCDIR).
ifeq ($(TOPSRCDIR),$(OBJDIR))
CONFIGURE := ./configure
else
CONFIGURE := $(TOPSRCDIR)/configure
endif
ifdef MOZ_TOOLS
CONFIGURE := $(TOPSRCDIR)/configure
endif
configure:
@if test ! -d $(OBJDIR); then $(MKDIR) $(OBJDIR); else true; fi
@echo cd $(OBJDIR);
@echo $(CONFIGURE) $(CONFIGURE_ARGS)
@cd $(OBJDIR) && $(CONFIGURE_ENV_ARGS) $(CONFIGURE) $(CONFIGURE_ARGS) \
|| ( echo "*** Fix above errors and then restart with\
\"$(MAKE) -f client.mk build\"" && exit 1 )
@touch $(OBJDIR)/Makefile
$(OBJDIR)/Makefile $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS)
@$(MAKE) -f $(TOPSRCDIR)/client.mk configure
ifdef CONFIG_STATUS
$(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in
cd $(OBJDIR); \
CONFIG_FILES=config/autoconf.mk ./config.status
endif
####################################
# Depend
depend:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
$(MOZ_MAKE) export && $(MOZ_MAKE) depend
####################################
# Build it
build:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
$(MOZ_MAKE)
####################################
# Profile-feedback build (gcc only)
# To use this, you should set the following variables in your mozconfig
# mk_add_options PROFILE_GEN_SCRIPT=/path/to/profile-script
#
# The profile script should exercise the functionality to be included
# in the profile feedback.
profiledbuild:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
$(MOZ_MAKE) MOZ_PROFILE_GENERATE=1
OBJDIR=${OBJDIR} $(PROFILE_GEN_SCRIPT)
$(MOZ_MAKE) clobber_all
$(MOZ_MAKE) MOZ_PROFILE_USE=1
find $(OBJDIR) -name "*.da" -exec rm {} \;
####################################
# Other targets
# Pass these target onto the real build system
install export libs clean realclean distclean alldep:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
$(MOZ_MAKE) $@
cleansrcdir:
@cd $(TOPSRCDIR); \
if [ -f webshell/embed/gtk/Makefile ]; then \
$(MAKE) -C webshell/embed/gtk distclean; \
fi; \
if [ -f Makefile ]; then \
$(MAKE) distclean ; \
else \
echo "Removing object files from srcdir..."; \
rm -fr `find . -type d \( -name .deps -print -o -name CVS \
-o -exec test ! -d {}/CVS \; \) -prune \
-o \( -name '*.[ao]' -o -name '*.so' \) -type f -print`; \
build/autoconf/clean-config.sh; \
fi;
# (! IS_FIRST_CHECKOUT)
endif
echo_objdir:
@echo $(OBJDIR)
.PHONY: checkout real_checkout depend build export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything configure

View File

@@ -1,27 +0,0 @@
#
## hostname: fx-win32-tbox
## uname: CYGWIN_NT-5.2 fx-win32-tbox 1.5.19(0.150/4/2) 2006-01-20 13:28 i686 Cygwin
#
# . $topsrcdir/browser/config/mozconfig
mk_add_options MOZ_CO_PROJECT=browser
mk_add_options MOZ_MAKE_FLAGS="-j5"
mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
mk_add_options MOZ_PACKAGE_NSIS=1
ac_add_options --enable-application=browser
ac_add_options --enable-update-channel=nightly
ac_add_options --enable-optimize
ac_add_options --disable-debug
# ac_add_options --enable-codesighs
ac_add_options --disable-tests
ac_add_options --enable-static
ac_add_options --disable-shared
# ac_add_options --enable-official-branding
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --enable-default-toolkit=cairo-windows
ac_add_options --enable-update-packaging
ac_add_options --enable-places-bookmarks

View File

@@ -1,249 +0,0 @@
#
## hostname: fx-win32-tbox
## uname: CYGWIN_NT-5.2 fx-win32-tbox 1.5.19(0.150/4/2) 2006-01-20 13:28 i686 Cygwin
#
#- tinder-config.pl - Tinderbox configuration file.
#- Uncomment the variables you need to set.
#- The default values are the same as the commented variables.
$ENV{MOZ_INSTALLER_USE_7ZIP} = '1';
$ENV{NO_EM_RESTART} = '1';
$ENV{MOZ_PACKAGE_NSIS} = '1';
# $ENV{MOZ_PACKAGE_MSI}
#-----------------------------------------------------------------------------
# Default: 0
# Values: 0 | 1
# Purpose: Controls whether a MSI package is made.
# Requires: Windows and a local MakeMSI installation.
#$ENV{MOZ_PACKAGE_MSI} = 0;
# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
#-----------------------------------------------------------------------------
# Default: scp
# Values: scp | rsync
# Purpose: Use scp or rsync to transfer symbols to the Talkback server.
# Requires: The selected type requires the command be available both locally
# and on the Talkback server.
#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
$BuildAdministrator = 'build@mozilla.org';
#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
#- You'll need to change these to suit your machine's needs
#$DisplayServer = ':0.0';
#- Default values of command-line opts
#-
#$BuildDepend = 1; # Depend or Clobber
#$BuildDebug = 0; # Debug or Opt (Darwin)
#$ReportStatus = 1; # Send results to server, or not
#$ReportFinalStatus = 1; # Finer control over $ReportStatus.
#$UseTimeStamp = 1; # Use the CVS 'pull-by-timestamp' option, or not
#$BuildOnce = 0; # Build once, don't send results to server
#$TestOnly = 0; # Only run tests, don't pull/build
#$BuildEmbed = 0; # After building seamonkey, go build embed app.
#$SkipMozilla = 0; # Use to debug post-mozilla.pl scripts.
#$BuildLocales = 0; # Do l10n packaging?
# Tests
$CleanProfile = 1;
#$ResetHomeDirForTests = 1;
$ProductName = "Firefox";
$VendorName = "Mozilla";
$RunMozillaTests = 1; # Allow turning off of all tests if needed.
$RegxpcomTest = 1;
$AliveTest = 1;
$JavaTest = 0;
$ViewerTest = 0;
$BloatTest = 0; # warren memory bloat test
$BloatTest2 = 0; # dbaron memory bloat test, require tracemalloc
$DomToTextConversionTest = 0;
$XpcomGlueTest = 0;
$CodesizeTest = 0; # Z, require mozilla/tools/codesighs
$EmbedCodesizeTest = 0; # mZ, require mozilla/tools/codesigns
$MailBloatTest = 0;
$EmbedTest = 0; # Assumes you wanted $BuildEmbed=1
$LayoutPerformanceTest = 1; # Tp
$DHTMLPerformanceTest = 0; # Tdhtml
$QATest = 0;
$XULWindowOpenTest = 0; # Txul
$StartupPerformanceTest = 0; # Ts
$NeckoUnitTest = 0;
$RenderPerformanceTest = 0; # Tgfx
$TestsPhoneHome = 0; # Should test report back to server?
$GraphNameOverride = 'fx-win32-tbox-places';
# $results_server
#----------------------------------------------------------------------------
# Server on which test results will be accessible. This was originally tegu,
# then became axolotl. Once we moved services from axolotl, it was time
# to give this service its own hostname to make future transitions easier.
# - cmp@mozilla.org
#$results_server = "build-graphs.mozilla.org";
$pageload_server = "pageload.build.mozilla.org"; # localhost
#
# Timeouts, values are in seconds.
#
#$CVSCheckoutTimeout = 3600;
#$CreateProfileTimeout = 45;
#$RegxpcomTestTimeout = 120;
#$AliveTestTimeout = 30;
#$ViewerTestTimeout = 45;
#$EmbedTestTimeout = 45;
#$BloatTestTimeout = 120; # seconds
#$MailBloatTestTimeout = 120; # seconds
#$JavaTestTimeout = 45;
#$DomTestTimeout = 45; # seconds
#$XpcomGlueTestTimeout = 15;
#$CodesizeTestTimeout = 900; # seconds
#$CodesizeTestType = "auto"; # {"auto"|"base"}
$LayoutPerformanceTestTimeout = 800; # entire test, seconds
#$DHTMLPerformanceTestTimeout = 1200; # entire test, seconds
#$QATestTimeout = 1200; # entire test, seconds
#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
#$StartupPerformanceTestTimeout = 20; # seconds
#$XULWindowOpenTestTimeout = 90; # seconds
#$NeckoUnitTestTimeout = 30; # seconds
$RenderPerformanceTestTimeout = 1800; # seconds
#$MozConfigFileName = 'mozconfig';
#$UseMozillaProfile = 1;
#$MozProfileName = 'default';
#- Set these to what makes sense for your system
$Make = 'make'; # Must be GNU make
#$MakeOverrides = '';
#$mail = '/bin/mail';
#$CVS = 'cvs -q';
#$CVSCO = 'checkout -P';
# win32 usually doesn't have /bin/mail
$blat = 'd:/moztools/bin/blat';
$use_blat = 0;
# Set moz_cvsroot to something like:
# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
#
# Note that win32 may not need \@, depends on ' or ".
# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
#$moz_cvsroot = $ENV{CVSROOT};
$moz_cvsroot = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
#- Set these proper values for your tinderbox server
#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
# Allow for non-client builds, e.g. camino.
#$moz_client_mk = 'client.mk';
#- Set if you want to build in a separate object tree
#$ObjDir = 'fx-trunk-cairo';
# Extra build name, if needed.
$BuildNameExtra = 'Places';
# User comment, eg. ip address for dhcp builds.
# ex: $UserComment = "ip = 208.12.36.108";
#$UserComment = 0;
#-
#- The rest should not need to be changed
#-
#- Minimum wait period from start of build to start of next build in minutes.
#$BuildSleep = 10;
#- Until you get the script working. When it works,
#- change to the tree you're actually building
#$BuildTree = 'MozillaTest';
$BuildTree = 'MozillaExperimental';
#$BuildName = '';
#$BuildTag = '';
#$BuildConfigDir = 'mozilla/config';
#$Topsrcdir = 'mozilla';
$BinaryName = 'firefox.exe';
#
# For embedding app, use:
#$EmbedBinaryName = 'TestGtkEmbed';
#$EmbedDistDir = 'dist/bin'
#$ShellOverride = ''; # Only used if the default shell is too stupid
#$ConfigureArgs = '';
#$ConfigureEnvArgs = '';
#$Compiler = 'gcc';
#$NSPRArgs = '';
#$ShellOverride = '';
# Release build options
$ReleaseBuild = 1;
$shiptalkback = 0;
$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
$build_hour = "4";
$package_creation_path = "/browser/installer";
# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
$ssh_version = "2";
#$ssh_user = "cltbld";
#$ssh_server = "stage.mozilla.org";
$ftp_path = "/home/ftp/pub/firefox/nightly/experimental/places";
$url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/experimental/places";
$tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds";
$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds";
$milestone = "trunk";
$notify_list = 'build-announce@mozilla.org';
$stub_installer = 0;
$sea_installer = 1;
$archive = 1;
$push_raw_xpis = 1;
$update_package = 1;
$update_product = "Firefox";
$update_version = "trunk";
$update_platform = "WINNT_x86-msvc";
$update_hash = "sha1";
$update_filehost = "ftp.mozilla.org";
$update_ver_file = 'browser/config/version.txt';
$update_pushinfo = 0;
# Reboot the OS at the end of build-and-test cycle. This is primarily
# intended for Win9x, which can't last more than a few cycles before
# locking up (and testing would be suspect even after a couple of cycles).
# Right now, there is only code to force the reboot for Win9x, so even
# setting this to 1, will not have an effect on other platforms. Setting
# up win9x to automatically logon and begin running tinderbox is left
# as an exercise to the reader.
#$RebootSystem = 0;
# LogCompression specifies the type of compression used on the log file.
# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
# for 'gzip' or 'bzip2' are in the user's path before setting this
# option.
#$LogCompression = '';
# LogEncoding specifies the encoding format used for the logs. Valid
# options are 'base64', and 'uuencode'. If $LogCompression is set above,
# this needs to be set to 'base64' or 'uuencode' to ensure that the
# binary data is transferred properly.
#$LogEncoding = '';
# Prevent Extension Manager from spawning child processes during tests
# - processes that tbox scripts cannot kill.
#$ENV{NO_EM_RESTART} = '1';
# Build XForms
$BuildXForms = 1;