Fix for 3731. Thanks peterl and bruce@cybersight

git-svn-id: svn://10.0.0.236/branches/N3@24979 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/LEGAL

@@ -0,0 +1,40 @@
+Please be apprised of the following Legal Notices:
+
+A) The U.S. District Court for the Eastern District of Virginia has
+ruled that the Netscape Navigator code does not infringe Wang's U.S.
+Patent No. 4,751,669 ("the '669 Patent") because: 1) HTML is not
+Videotex as defined by the '669 patent; 2) web servers are not central
+suppliers; and 3) Navigator does not "connect," as defined by the '669
+Patent, to web servers on the Internet. Wang may appeal this decision to
+the Federal Circuit. Wang contended that its Patent disclosing a
+"Videotext" system, is infringed by the following functionality in the
+Netscape Navigator code: 1) the animated logo and status line indicators
+--See Claims 1,8 and 9; 2)  the "File Save As" function --See Claims
+23-27; 3) Bookmarks and Rename Bookmarks in the Properties window --See
+Claims 20-22; 4) storing HTML, GIF, and JPEG files and adding filename
+extensions --See Claim 38
+
+B)   Intermind owns pending U.S. patent applications on communications
+systems which employ metadata ("channel objects") to define a control
+structure for information transfer.  The Netscape code does not infringe
+as released; however, modifications which utilize channel objects as
+described by Intermind should be considered carefully. The following is
+a statement from Intermind:  "Intermind's claims fundamentally involve
+the use of a control structure to automate communications. ...The
+essence of Intermind's top claim is that two devices sender and
+receiver have persistent storage, communicate over a network,
+and exchange a control structure including metadata which describes: 1)
+what information is to be updated, 2) when to update this information,
+and 3) how to transfer the updated information. In addition, at  least
+the receiving device must be able to process the metadata in order to
+perform the update determination and transfer. Any digital
+communications system which incorporates all of these elements will be
+covered by Intermind's patents."  See Intermind.com.
+
+C) Stac, Inc., and its licensing agent Hi/fn, own several patents which
+disclose data compression methods implementing an LZS compression
+algorithm, including U.S. Patent Nos.  4,701,745 and 5,016, 009 ("the
+Stac Patents").  The Netscape Communicator code  does not perform
+compression. If you modify the Netscape source code to perform
+compression, please take notice of the Stac Patents.
+

mozilla/LICENSE

@@ -0,0 +1,421 @@
+                           NETSCAPE PUBLIC LICENSE
+                                Version 1.0
+
+                              ----------------
+
+1. Definitions.
+
+     1.1. ``Contributor'' means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. ``Contributor Version'' means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. ``Covered Code'' means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. ``Electronic Distribution Mechanism'' means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. ``Executable'' means Covered Code in any form other than Source
+     Code.
+
+     1.6. ``Initial Developer'' means the individual or entity identified as
+     the Initial Developer in the Source Code notice required by Exhibit A.
+
+     1.7. ``Larger Work'' means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. ``License'' means this document.
+
+     1.9. ``Modifications'' means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. ``Original Code'' means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this License
+     is not already Covered Code governed by this License.
+
+     1.11. ``Source Code'' means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus any
+     associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or a list of source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. ``You'' means an individual or a legal entity exercising rights
+     under, and complying with all of the terms of, this License or a future
+     version of this License issued under Section 6.1. For legal entities,
+     ``You'' includes any entity which controls, is controlled by, or is
+     under common control with You. For purposes of this definition,
+     ``control'' means (a) the power, direct or indirect, to cause the
+     direction or management of such entity, whether by contract or
+     otherwise, or (b) ownership of fifty percent (50%) or more of the
+     outstanding shares or beneficial ownership of such entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+
+          (a) to use, reproduce, modify, display, perform, sublicense and
+          distribute the Original Code (or portions thereof) with or without
+          Modifications, or as part of a Larger Work; and
+
+          (b) under patents now or hereafter owned or controlled by Initial
+          Developer, to make, have made, use and sell (``Utilize'') the
+          Original Code (or portions thereof), but solely to the extent that
+          any such patent is reasonably necessary to enable You to Utilize
+          the Original Code (or portions thereof) and not to any greater
+          extent that may be necessary to Utilize further Modifications or
+          combinations.
+
+     2.2. Contributor Grant.
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+
+          (a) to use, reproduce, modify, display, perform, sublicense and
+          distribute the Modifications created by such Contributor (or
+          portions thereof) either on an unmodified basis, with other
+          Modifications, as Covered Code or as part of a Larger Work; and
+
+          (b) under patents now or hereafter owned or controlled by
+          Contributor, to Utilize the Contributor Version (or portions
+          thereof), but solely to the extent that any such patent is
+          reasonably necessary to enable You to Utilize the Contributor
+          Version (or portions thereof), and not to any greater extent that
+          may be necessary to Utilize further Modifications or combinations.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be distributed
+     only under the terms of this License or a future version of this
+     License released under Section 6.1, and You must include a copy of this
+     License with every copy of the Source Code You distribute. You may not
+     offer or impose any terms on any Source Code version that alters or
+     restricts the applicable version of this License or the recipients'
+     rights hereunder. However, You may include an additional document
+     offering the additional rights described in Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which you contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that the
+     Modification is derived, directly or indirectly, from Original Code
+     provided by the Initial Developer and including the name of the Initial
+     Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+
+          (a) Third Party Claims.
+          If You have knowledge that a party claims an intellectual property
+          right in particular functionality or code (or its utilization
+          under this License), you must include a text file with the source
+          code distribution titled ``LEGAL'' which describes the claim and
+          the party making the claim in sufficient detail that a recipient
+          will know whom to contact. If you obtain such knowledge after You
+          make Your Modification available as described in Section 3.2, You
+          shall promptly modify the LEGAL file in all copies You make
+          available thereafter and shall take other steps (such as notifying
+          appropriate mailing lists or newsgroups) reasonably calculated to
+          inform those who received the Covered Code that new knowledge has
+          been obtained.
+
+          (b) Contributor APIs.
+          If Your Modification is an application programming interface and
+          You own or control patents which are reasonably necessary to
+          implement that API, you must also include this information in the
+          LEGAL file.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code, and this License in any documentation for the Source Code, where
+     You describe recipients' rights relating to Covered Code. If You
+     created one or more Modification(s), You may add your name as a
+     Contributor to the notice described in Exhibit A. If it is not possible
+     to put such notice in a particular Source Code file due to its
+     structure, then you must include such notice in a location (such as a
+     relevant directory file) where a user would be likely to look for such
+     a notice. You may choose to offer, and to charge a fee for, warranty,
+     support, indemnity or liability obligations to one or more recipients
+     of Covered Code. However, You may do so only on Your own behalf, and
+     not on behalf of the Initial Developer or any Contributor. You must
+     make it absolutely clear than any such warranty, support, indemnity or
+     liability obligation is offered by You alone, and You hereby agree to
+     indemnify the Initial Developer and every Contributor for any liability
+     incurred by the Initial Developer or such Contributor as a result of
+     warranty, support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of the
+     Covered Code is available under the terms of this License, including a
+     description of how and where You have fulfilled the obligations of
+     Section 3.2. The notice must be conspicuously included in any notice in
+     an Executable version, related documentation or collateral in which You
+     describe recipients' rights relating to the Covered Code. You may
+     distribute the Executable version of Covered Code under a license of
+     Your choice, which may contain terms different from this License,
+     provided that You are in compliance with the terms of this License and
+     that the license for the Executable version does not attempt to limit
+     or alter the recipient's rights in the Source Code version from the
+     rights set forth in this License. If You distribute the Executable
+     version under a different license You must make it absolutely clear
+     that any terms which differ from this License are offered by You alone,
+     not by the Initial Developer or any Contributor. You hereby agree to
+     indemnify the Initial Developer and every Contributor for any liability
+     incurred by the Initial Developer or such Contributor as a result of
+     any such terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to statute
+     or regulation then You must: (a) comply with the terms of this License
+     to the maximum extent possible; and (b) describe the limitations and
+     the code they affect. Such description must be included in the LEGAL
+     file described in Section 3.4 and must be included with all
+     distributions of the Source Code. Except to the extent prohibited by
+     statute or regulation, such description must be sufficiently detailed
+     for a recipient of ordinary skill to be able to understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A, and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation (``Netscape'') may publish revised
+     and/or new versions of the License from time to time. Each version will
+     be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If you create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), you must (a) rename Your license so that the
+     phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or
+     any confusingly similar phrase do not appear anywhere in your license
+     and (b) otherwise make it clear that your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial Developer,
+     Original Code or Contributor in the notice described in Exhibit A shall
+     not of themselves be deemed to be modifications of this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER
+     PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+     OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
+     GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
+     ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
+     BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT
+     EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a ``commercial item,'' as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer
+     software'' and ``commercial computer software documentation,'' as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if any,
+     provides otherwise), excluding its conflict-of-law provisions. With
+     respect to disputes in which at least one party is a citizen of, or an
+     entity chartered or registered to do business in, the United States of
+     America: (a) unless otherwise agreed in writing, all disputes relating
+     to this License (excepting any dispute relating to intellectual
+     property rights) shall be subject to final and binding arbitration,
+     with the losing party paying all costs of arbitration; (b) any
+     arbitration relating to this Agreement shall be held in Santa Clara
+     County, California, under the auspices of JAMS/EndDispute; and (c) any
+     litigation relating to this Agreement shall be subject to the
+     jurisdiction of the Federal Courts of the Northern District of
+     California, with venue lying in Santa Clara County, California, with
+     the losing party responsible for costs, including without limitation,
+     court costs and reasonable attorneys fees and expenses. The application
+     of the United Nations Convention on Contracts for the International
+     Sale of Goods is expressly excluded. Any law or regulation which
+     provides that the language of a contract shall be construed against the
+     drafter shall not apply to this License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     Except in cases where another Contributor has failed to comply with
+     Section 3.4, You are responsible for damages arising, directly or
+     indirectly, out of Your utilization of rights under this License, based
+     on the number of copies of Covered Code you made available, the
+     revenues you received from utilizing such rights, and other relevant
+     factors. You agree to work with affected parties to distribute
+     responsibility on an equitable basis.
+
+AMENDMENTS
+Additional Terms applicable to the Netscape Public License.
+
+     I. Effect.
+     These additional terms described in this Netscape Public License --
+     Amendments shall apply to the Mozilla Communicator client code and to
+     all Covered Code under this License.
+
+     II. ``Netscape's Branded Code'' means Covered Code that Netscape
+     distributes and/or permits others to distribute under one or more
+     trademark(s) which are controlled by Netscape but which are not
+     licensed for use under this License.
+
+     III. Netscape and logo.
+     This License does not grant any rights to use the trademark
+     ``Netscape'', the ``Netscape N and horizon'' logo or the Netscape
+     lighthouse logo, even if such marks are included in the Original Code.
+
+     IV. Inability to Comply Due to Contractual Obligation.
+     Prior to licensing the Original Code under this License, Netscape has
+     licensed third party code for use in Netscape's Branded Code. To the
+     extent that Netscape is limited contractually from making such third
+     party code available under this License, Netscape may choose to
+     reintegrate such code into Covered Code without being required to
+     distribute such code in Source Code form, even if such code would
+     otherwise be considered ``Modifications'' under this License.
+
+     V. Use of Modifications and Covered Code by Initial Developer.
+
+          V.1. In General.
+          The obligations of Section 3 apply to Netscape, except to the
+          extent specified in this Amendment, Section V.2 and V.3.
+
+          V.2. Other Products.
+          Netscape may include Covered Code in products other than the
+          Netscape's Branded Code which are released by Netscape during the
+          two (2) years following the release date of the Original Code,
+          without such additional products becoming subject to the terms of
+          this License, and may license such additional products on
+          different terms from those contained in this License.
+
+          V.3. Alternative Licensing.
+          Netscape may license the Source Code of Netscape's Branded Code,
+          including Modifications incorporated therein, without such
+          additional products becoming subject to the terms of this License,
+          and may license such additional products on different terms from
+          those contained in this License.
+
+     VI. Arbitration and Litigation.
+     Notwithstanding the limitations of Section 11 above, the provisions
+     regarding arbitration and litigation in Section 11(a), (b) and (c) of
+     the License shall apply to all disputes relating to this License.
+
+EXHIBIT A.
+
+     ``The contents of this file are subject to the Netscape Public License
+     Version 1.0 (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/NPL/
+
+     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 Communicator client code, released March
+     31, 1998.
+
+     The Initial Developer of the Original Code is Netscape Communications
+     Corporation. Portions created by Netscape are Copyright (C) 1998
+     Netscape Communications Corporation. All Rights Reserved.
+
+     Contributor(s): ______________________________________.''
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. This is due
+     to time constraints encountered in simultaneously finalizing the
+     License and in preparing the Original Code for release. You should use
+     the text of this Exhibit A rather than the text found in the Original
+     Code Source Code for Your Modifications.]

mozilla/Makefile.in

@@ -0,0 +1,105 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= .
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+# The list of directories that need to be built to build the standalone
+# nglayout test program. The order is important.
+DIRS =				\
+  config			\
+  $(NULL)
+
+ifdef MOZ_BUILD_NSPR
+DIRS +=				\
+  nsprpub			\
+  $(NULL)
+endif
+
+DIRS +=				\
+  dbm				\
+  modules/libreg		\
+  xpcom				\
+  $(NULL)
+
+ifndef MOZ_NATIVE_ZLIB
+DIRS +=				\
+  modules/zlib			\
+  $(NULL)
+endif
+
+ifndef MOZ_NATIVE_JPEG
+DIRS +=				\
+  jpeg				\
+  $(NULL)
+endif
+
+DIRS +=				\
+  modules/libutil		\
+  base				\
+  intl				\
+  js				\
+  modules/security/freenav	\
+  modules/libpref		\
+  modules/libimg		\
+  modules/oji			\
+  modules/plugin		\
+  caps				\
+  lib/xp			\
+  lib/libpwcac			\
+  network			\
+  htmlparser			\
+  expat             \
+  gfx				\
+  dom				\
+  view				\
+  widget			\
+  layout			\
+  rdf				\
+  webshell			\
+  editor			\
+  silentdl			\
+  sun-java			\
+  $(NULL)
+
+ifdef MOZ_BUILD_XPFE
+DIRS += xpfe
+endif
+
+ifdef MOZ_MAIL_NEWS
+DIRS += mailnews
+endif
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
+
+real_all: all
+
+real_export: export
+
+real_libs: libs
+
+real_install: install
+
+real_clobber: clobber
+
+real_depend: depend

mozilla/README/mozilla/classic-mac.html

@@ -0,0 +1,443 @@
+
+<HEAD>
+   <TITLE>Building Mozilla on the Macintosh PPC platform</TITLE>
+</HEAD>
+<BODY BGCOLOR="#FFFFFF" LINK="#0000EE" VLINK="#551A8B">
+<P>
+
+<HR>
+
+</P>
+
+<H1>Building Mozilla on the Macintosh PPC platform</H1>
+
+<H2>Daniel Nunes, <A HREF="mailto:leaf@netscape.com"><TT>leaf@netscape.com</TT></A></H2>
+
+<P>v 1.1, 1998-9-29<BR>
+updated for the Pro4 IDE</P>
+
+<P>
+
+<HR>
+
+<I>How to build Mozilla on a Macintosh PPC System.</I>
+
+<HR>
+
+</P>
+
+<H2>1. <A HREF="#s1">Introduction</A></H2>
+
+<H2>2. <A HREF="#s2">Building Mozilla</A></H2>
+
+<UL>
+   <LI><A HREF="#ss2.1">2.1 Get the Code </A></LI>
+   
+   <LI><A HREF="#ss2.2">2.2 Requirements</A></LI>
+   
+   <LI><A HREF="#ss2.3">2.3 Set up the Build Environment</A></LI>
+   
+   <LI><A HREF="#ss2.4">2.4 Build the Lizard </A></LI>
+</UL>
+
+<H2>3. <A HREF="#s3"> Common Problems </A></H2>
+
+<H2>4. <A HREF="#s4"> Credits </A></H2>
+
+<P>
+
+<HR>
+
+</P>
+
+<H2><A NAME=s1></A>1. Introduction</H2>
+
+<P>What this document is: A guide to building the Mozilla
+application. This includes:</P>
+
+<OL>
+   <LI>A listing of the development tools you will need to build
+   Mozilla.</LI>
+   
+   <LI>A list of environment variables you will need to set before
+   building.</LI>
+</OL>
+
+<P>If you're looking for documentation on developing features or
+fixing bugs, the Mozilla <A HREF="http://www.mozilla.org/docs/tplist/tplist.html">Technical
+Documents </A> or <A HREF="http://www.mozilla.org/library.html">
+Library </A> are probably what you're looking for.</P>
+
+<P>
+
+<HR>
+
+</P>
+
+<H2><A NAME=s2></A>2. Building Mozilla</H2>
+
+<P>&nbsp;</P>
+
+<UL>
+   <LI>Each of the following subsections describes, or gives
+   references to descriptions of, the steps necessary to build
+   Mozilla.
+   
+   <H2><A NAME="ss2.1"></A>2.1 Get the Code</H2>
+   
+   <P>&nbsp;</P>
+   
+   <UL>
+      <LI>There are two principal ways of getting the code, <A HREF="http://www.mozilla.org/download.html">
+      ftp</A> and <A HREF="http://www.mozilla.org/cvs.html"> CVS</A>.
+      CVS will provide the most current code for building, but is
+      slower than ftp. Ftp drops are generally produced once per
+      month, and are known to compile.</LI>
+   </UL>
+   
+   <P>&nbsp;</P>
+   
+   <H2><A NAME="ss2.2"></A>2.2 Requirements</H2>
+   
+   <P>The following need to be installed:</P>
+   
+   <UL>
+      <LI>CodeWarrior (CW) Pro4 - obtainable from <A HREF="http://www.metrowerks.com">Metrowerks</A>.
+      See <A HREF="#s3">Common Sticking Points</A> if you have a
+      different version. Mozilla will no longer build with anything
+      earlier.</LI>
+      
+      <LI>PowerPlant - obtainable from the CodeWarrior CD.</LI>
+      
+      <LI>MSL - the Metrowerks Standard Library, obtainable from the
+      CodeWarrior CD</LI>
+      
+      <LI><A HREF="ftp://ftp.boingo.com//dan/WASTE/waste-13.hqx">WASTE
+      1.3</A></LI>
+      
+      <LI><A HREF="http://www.bact.wisc.edu/CWASTEEdit/CWASTEEdit.sit.hqx">CWASTE
+      1.6.2</A></LI>
+      
+      <LI><A HREF="ftp://ftp.scripting.com/userland/menuSharingToolkit4.1.sit.hqx">Menu
+      Sharing Toolkit</A> (from UserLand)</LI>
+      
+      <LI><A HREF="ftp://ftp.share.com/pub/internet-configuration/ICProgKit1.4.sit">Internet
+      Config 1.4 SDK</A></LI>
+      
+      <LI><A HREF="http://www.mooseyard.com/Jens/Software/">AEGizmos
+      1.4.2</A></LI>
+      
+      <LI><A HREF="ftp://sunsite.cnlab-switch.ch/software/platform/macos/perl/Mac_Perl_520r4_tool.bin">MacPerl
+      5 MPW Tool</A></LI>
+      
+      <LI><A HREF="ftp://sunsite.cnlab-switch.ch/software/platform/macos/perl/Mac_Perl_520r4_appl.bin">MacPerl
+      5 Application</A></LI>
+      
+      <LI>The module Mac:AppleEvents:Simple, which should be stored
+      in your Perl library folder under :Mac:AppleEvents:Simple.pm,
+      may be downloaded <A HREF="http://www.perl.com/CPAN-local/modules/by-module/Mac/Mac-AppleEvents-Simple-0.10.tgz">here</A>.</LI>
+      
+      <LI>The module Mac:Apps:Launch, which should be stored in your
+      Perl library folder under :Mac:Apps:Launch.pm, may be
+      downloaded <A HREF="http://www.perl.com/CPAN-local/modules/by-module/Mac/Mac-Apps-Launch-1.30.tar.gz">here</A>.</LI>
+      
+      <LI>MakeStub - MPW (installed with CodeWarrior Heaven option).
+      If you choose not to install MPW, it is located on the MacOS
+      Tools CD in "CW Pro 4 Tools:CodeWarrior MPW:MPW:Tools"</LI>
+      
+      <LI>RunTSScript - in Mozilla source distribution
+      (mozilla:build:mac:RunTSScript), needs to be installed by
+      hand</LI>
+      
+      <LI><A HREF="ftp://dev.apple.com/devworld/Tool_Chest/Core_Mac_OS_Tools/MPW_etc./MPW-GM/MPW/ToolServer.sit.hqx">ToolServer</A>
+      - or in the CW distribution (CW Pro 4 Tools:Apple Development
+      Tools:ToolServer 3.4.1.sit). <B>We recommend pulling it off the
+      CD</B> because it comes with configuration files for
+      CodeWarrior which you would have to create manually were you to
+      pull it off the net.</LI>
+      
+      <LI><A HREF="http://sunsite.cnlab-switch.ch/ftp/software/platform/macos/src/HTML/MPW_C.html">patch
+      2.1</A></LI>
+   </UL>
+   
+   <P>Hardware/OS</P>
+   
+   <UL>
+      <LI>To build Navigator, you need a fast PPC Mac. The faster the
+      better.</LI>
+      
+      <LI>You will need about 96 MB of physical RAM to "fast link"
+      the app. You can still fast link if you give your machine 96 MB
+      of virtual memory, but then the VM hit is large enough to
+      counteract any improvement. One of our beta testers had a
+      machine with only 64MB of physical RAM (VM was off) and it ran
+      out of memory trying to link. Turning VM on got it to link, but
+      build time increased greatly.</LI>
+      
+      <LI>Reports from the net indicate that the optimized version
+      (MozillaPPC) take much less RAM to build than the 96MB we
+      suggest. If you are running out of memory, try building that
+      instead of the debug version (the debug symbols require a lot
+      of RAM come link time).</LI>
+      
+      <LI>You should be ok with a 400MB disk partition, even when
+      fully built. This does not include tools like the IDE, just
+      source.</LI>
+      
+      <LI>On an HFS+ volume, a full build takes about 110MB. HFS+ is
+      good, but utilities are sparse.</LI>
+   </UL>
+   
+   <P>&nbsp;</P>
+   
+   <H2><A NAME="ss2.3"></A>2.3 Setup the Build Environment</H2>
+   
+   <P>&nbsp;</P>
+   
+   <OL>
+      <LI>Install CodeWarrior from the CD. While it is large,
+      installing the "CodeWarrior Heaven" option will guarantee that
+      you have everything you need. This will give you PowerPlant,
+      MSL, and MPW. If you choose to install less, proceed at your
+      own risk.</LI>
+      
+      <LI>In the Finder, increase the memory partition of the IDE to
+      15MB (you can get by with 12, if need be).</LI>
+      
+      <LI>Uncompress the StuffIt Archive for ToolServer. The goal is
+      to let ToolServer and MPW share the same Tools directory so you
+      don't need to have multiple versions of tools. Do the
+      following:
+      
+      <OL>
+         <LI>Open ToolServer's Tools folder. There is one file called
+         "RMetrowerks".</LI>
+         
+         <LI>Move RMetrowerks to Tools folder of MPW. MPW folder must
+         be at "Metrowerks:Codewarrior MPW:MPW" if you installed
+         Codewarrior Heaven.</LI>
+         
+         <LI>Remove ToolServer's Tools folder.</LI>
+         
+         <LI>Now create an alias of Tools folder in "CodeWarrior MPW"
+         and move it to your ToolServer folder. Rename the alias
+         (probably called "Tools alias") to "Tools"</LI>
+         
+         <LI><FONT COLOR="#FF0000"><B>IMPORTANT</B></FONT>: Make sure
+         you only have one instance of ToolServer on your machine. If
+         the build script finds the wrong one, the correct tools will
+         not be found and strange things will happen.</LI>
+      </OL>
+      </LI>
+      
+      <LI>After installing the MacPerl MPW Tool distribution (run the
+      InstallerVISE application), in the "MacPerl &#131;" folder,
+      there will be an MPW tool named "perl". Install this in MPW's
+      tools folder.</LI>
+      
+      <LI>Install the MacPerl Application (run the InstallerVISE
+      application). You can install this anywhere, but it is
+      recommended that you install it inside of your CodeWarrior
+      folder for easy reference. After installation, you will need to
+      set a preference to enable double-click launch of the perl
+      scripts. This preference is set by going under the Edit Menu to
+      Preferences. Click on the "Script" button and hit the radio
+      button "Run Scripts opened from Finder"</LI>
+      
+      <LI>Install the "patch" and "MakeStub" Tools in the tools
+      folder. Note that "MakeStub" is automatically installed by the
+      "CodeWarrior Heaven" install option.</LI>
+      
+      <LI>Install RunTSScript (found in the Mozilla source
+      distribution) in the compilers folder in your build environment
+      ("Metrowerks:Metrowerks Codewarrior:Codewarrior
+      Plugins:Compilers")</LI>
+      
+      <LI>Next, after downloading all the 3rd party software
+      components, drag WASTE, CWASTE, Menu Sharing, Internet Config,
+      and the AEGizmo folders (just as they are) into the "MacOS
+      Support" folder in your build environment.</LI>
+      
+      <LI>Create a folder inside the PowerPlant folder
+      (Metrowerks:Metrowerks CodeWarrior:MacOS Support:PowerPlant)
+      called "_Will Be Obsolete" Make sure you include the leading
+      underscore.</LI>
+      
+      <LI>Unstuff the obsolete LGA classes (located on the Reference
+      CD in "CodeWarrior Examples:MacOS Examples:PowerPlant
+      Examples:Obsolete PP Items:Old GA Classes.sit) and place the
+      resulting folder into the "_Will Be Obsolete" folder you
+      created in the previous step.</LI>
+      
+      <LI>Start ToolServer from within CodeWarrior (or use MPW if you
+      are brave enough). We're about to patch some files. Make sure
+      the ToolServer menu is in the CodeWarrior menu bar by turning
+      on the <A HREF="IDEPrefs.gif">preference</A> under the "Extras"
+      panel in the IDE Preferences (not the project preferences!).
+      The menu bar should look like this:
+      
+      <P><IMG SRC="IDEMenuBar.gif" WIDTH=359 HEIGHT=20 X-CLARIS-USEIMAGEWIDTH X-CLARIS-USEIMAGEHEIGHT ALIGN=bottom></P>
+      
+      <P>Choose "Start ToolServer" from the ToolServer menu (this is
+      the icon menu between "Window" and "Help" in the menubar
+      above). You will now see a window with no close box. This is
+      your ToolServer Worksheet where you will type (or cut &amp;
+      paste) the commands for the following steps.</P>
+      
+      <P>In case you have never used MPW/ToolServer before, the
+      following is <B>very important</B>. Pressing "return" does not
+      execute commands like you might think. It just inserts a
+      newline into the worksheet like a normal text editor. <B>To
+      actually get ToolServer to execute the command, you must press
+      "Enter" (lower right of numeric keypad).</B> This executes the
+      line that the cursor is on, and only that line. If you want to
+      execute multiple lines at once, select them all and hit
+      Enter.</P></LI>
+      
+      <LI>Set the shell variables {IDE} and {Source} to the correct
+      paths for your build environment. {IDE} is where your
+      CodeWarrior IDE is located. {Source} is the folder containing
+      the toplevel "ns" folder of the Mozilla source. Mine look like
+      this (don't forget to keep the quotes if your path includes
+      spaces), yours will almost certainly be different
+      (<FONT COLOR="#FF0000">to punctuate this, the things you need
+      to change are in red</FONT>).
+      
+      <PRE>Set IDE "<FONT COLOR="#FF0000">Develop:CW Pro 4:Metrowerks CodeWarrior:</FONT>"
+Set Source "<FONT COLOR="#FF0000">Source:FreeSource:</FONT>"</PRE></LI>
+      
+      <LI>Execute the following lines to patch menusharing.c to allow
+      it to compile with the new Universal Headers. It references an
+      obsolete header file (GestaltEqu.h).
+      
+      <PRE>directory "{IDE}MacOS Support:Menu Sharing Toolkit 4.1:"
+patch menusharing.c "{Source}mozilla:lib:mac:patches:menusharing.patch"</PRE></LI>
+      
+      <LI>You need to patch stat.mac.h to fix a problem in MSL where
+      lines were omitted.
+      
+      <PRE>directory "{IDE}Metrowerks Standard Library:MSL C:MSL Mac:Public Includes"
+patch stat.mac.h "{Source}mozilla:lib:mac:patches:stat.mac.h.patch"</PRE></LI>
+      
+      <LI>Congratulations! Now you are ready to build. Once these
+      steps are done, you don't have to repeat these setups the next
+      time!</LI>
+   </OL>
+   
+   <P>&nbsp;</P>
+   
+   <H2><A NAME="ss2.4"></A>2.4 Run the build</H2>
+   
+   <UL>
+      <LI>In the folder mozilla:build:mac:, there are several Perl
+      scripts with names of the form BuildMozillaXXX.pl, where XXX is
+      "Optimized", "Debug", "Tinderbox", et al. Each script builds
+      the corresponding version of Mozilla. If you configured the
+      MacPerl application to execute scripts that are opened from the
+      finder, all you have to do is double click on the appropriate
+      one; otherwise, launch MacPerl, and run the appropriate script
+      from the "Run Script..." menu item.
+      
+      <P>These `configured build' scripts are simple, and you might
+      want to make your own to force your build to StopForErrors(),
+      or alternatively DontStopForErrors(), et al. You can set up
+      certain build-script variables and (soon) compile-time flags.
+      Compare the supplied scripts to figure out what you might want.
+      Note that CodeWarriorLib, Moz.pm, and BuildList.pm, are
+      AppleScript libraries and Perl modules meant to be used by a
+      `configured build'. Use your favorite POD viewer (Shuck comes
+      with MacPerl) to view the documentation in the Perl
+      scripts.</P>
+      
+      <P>If there were any errors in any of the projects along the
+      way, the script will stop at that point and the IDE will tell
+      you the errors. You can fix them and make sure they current
+      project builds, but to continue the automation, you have to
+      start from the beginning by double-clicking the script again.
+      This isn't quite as bad as it sounds because the previous
+      projects are already built (unless you changed some major
+      header file). Please note that stopping the script once it has
+      started is difficult. We are working to address this issue.</P>
+      
+      <P>After the build is complete, you can find aliases to the
+      built libraries and the final Mozilla application. Debug builds
+      are built to Mozilla:dist:client_debug, while optimized builds
+      are built to Mozilla:dist:client.</P>
+      
+      <P>Don't worry too much about the numerous warnings generated
+      during the build. We try our best to get the XP teams to use
+      real compilers, but alas, they continue to write warning-laden
+      code. There is also some generated code (Java is one example)
+      that has a lot of warnings that we can't help either. If you
+      write any new code, please help us in our quest to get zero
+      warnings.</P></LI>
+   </UL>
+   </LI>
+</UL>
+
+<P>
+
+<HR>
+
+</P>
+
+<H2><A NAME=s3></A>3. Common Sticking Points</H2>
+
+<UL>
+   <LI><B>I only have CodeWarrior Pro3 or Pro2. How do i build with
+   it?</B>
+   
+   <UL>
+      <LI>Currently, the answer is, "You don't." We make use of
+      several classes in PowerPlant which recently appeared in Pro4.
+      Time to upgrade, I'm afraid. Don't even try opening the
+      projects with Pro2 because you will get data loss and have to
+      throw the project away (it won't even prompt you!)</LI>
+   </UL>
+   </LI>
+   
+   <LI><B>I'm having problems building. MacPerl tells me it can't
+   fine MemAllocatorStubs</B>
+   
+   <UL>
+      <LI>It sounds like your ToolServer environment is not setup
+      correctly. Make sure you follow the directions to the letter.
+      You could also be seeing this if you have multiple versions of
+      ToolServer on your computer and the Finder lauches the wrong
+      one. This is very common, as the <I>Carbon Dater</I> app from
+      Apple DTS contains a copy of ToolServer. Either remove all the
+      other versions of ToolServer or make sure you launch the
+      appropriate version before you start building.</LI>
+   </UL>
+   </LI>
+   
+   <LI><B>The IDE runs out of memory building jsinterp.c. What do I
+   do?</B>
+   
+   <UL>
+      <LI>We have seen this every now and then, and it only appears
+      to show up when building optimized (non-debug) builds. You can
+      normally get around this by building that file by itself
+      (select it and choose "Compile") and then continuing the make.
+      We're not sure why this is happening, so if you have any
+      answers or solutions, please let us know!</LI>
+   </UL>
+   </LI>
+</UL>
+
+<P>
+
+<HR>
+
+</P>
+
+<H2><A NAME=s4></A>4. Credits</H2>
+
+<UL>
+   <LI>The majority of this document is taken from the build document
+   included in the Mozilla source distribution at
+   README:mozilla:macbuild.htm written by Mike Pinkerton, <A HREF="mailto:pinkerton@netscape.com">
+   pinkerton@netscape.com</A>.</LI>
+</UL>
+</BODY>
+</HTML>

mozilla/README/mozilla/classic-unix.html

@@ -0,0 +1,158 @@
+<HTML>
+<HEAD>
+<TITLE>Building Mozilla on unix platforms</TITLE>
+</HEAD>
+<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000EE" VLINK="#551A8B"
+ALINK="#FF0000">
+<HR>
+<H1>
+Building Mozilla on Unix platforms</H1>
+
+<H2>
+Daniel Nunes, <TT><A HREF="mailto:leaf@netscape.com">leaf@netscape.com</A></TT></H2>
+v 1.1, June 1998
+
+<P>
+<HR><I>How to build Mozilla on a Unix System.</I>
+<HR>
+<H2>1. <A HREF="#s1">Introduction</A></H2>
+
+<H2>2. <A HREF="#s2">Building Mozilla</A></H2>
+
+<UL>
+<LI>
+<A HREF="#ss2.1">2.1 Get the Code </A></LI>
+
+<LI>
+<A HREF="#ss2.2">2.2 Requirements</A></LI>
+
+<LI>
+<A HREF="#ss2.3">2.3 Set up the Build Environment</A></LI>
+
+<LI>
+<A HREF="#ss2.4">2.4 Build the Lizard </A></LI>
+
+<LI>
+<A HREF="#ss2.5">2.5 Run the Lizard </A></LI>
+</UL>
+
+<H2>3. <A HREF="#s3"> Common Problems </A></H2>
+
+<HR>
+<H2><A NAME="s1">1. Introduction</A></H2>
+
+<P>
+What this document is: A guide to building the Mozilla application.
+<BR>
+This includes:
+<OL>
+<LI> A listing of the development tools you will need to build Mozilla. </LI>
+<LI> A list of environment variables you will need to set before building. </LI>
+</OL>
+<P>
+If you're looking for documentation on developing features or fixing bugs,
+the Mozilla
+<A HREF="http://www.mozilla.org/docs/tplist/tplist.html">Technical Documents
+</A> or <A HREF="http://www.mozilla.org/library.html"> Library </A>
+are probably what you're looking for.
+<P>
+<HR>
+<H2><A NAME="s2">2. Building Mozilla </A></H2>
+<P>
+<UL>Each of the following subsections describes, or gives references to
+descriptions of, the steps necessary to build Mozilla.
+</UL>
+<H2><A NAME="ss2.1">2.1 Get the Code</A></H2>
+<P>
+<UL>
+There are two principal ways of getting the code,
+<A HREF="http://www.mozilla.org/download.html"> ftp</A> and
+<A HREF="http://www.mozilla.org/cvs.html"> CVS</A>.
+CVS will provide the most current code for building, but is
+slower than ftp. Ftp drops are generally produced once per month,
+and are known to compile.
+</UL>
+<P>
+<H2><A NAME="ss2.2">2.2 Requirements</A></H2>
+<UL>
+The following should be installed:
+<UL>
+<LI>Motif 1.2
+<LI>The native C/C++ compiler (or GNU C/C++ compiler 2.7.2 in lieu of the 
+    native compiler)
+<LI>GNU make 3.74 or better
+<LI>Perl (or, if you have no Perl, then set <CODE>PERL=/bin/echo</CODE>)
+</UL>
+<P>
+Your hardware should be equal to, or better than:
+<UL>
+32 MB RAM, 128 MB swap (64 MB RAM recommended)
+</UL>
+</UL>
+<P>
+<H2><A NAME="ss2.3">2.3 Setup the Build Environment</A></H2>
+<P>
+<UL>
+The following environment variables need to be set:
+<CODE>
+<PRE>
+MOZILLA_CLIENT=1
+MOZ_MEDIUM=1
+NO_MDUPDATE=1
+</PRE>
+</CODE>
+Optionally, you can set <CODE>BUILD_OPT=1</CODE> if you don't want a debug
+build.
+<P>
+If your Motif libraries are installed in a non-standard place, you can tell
+the Mozilla makefiles where to look by setting
+<CODE>MOZILLA_MOTIF_SEARCH_PATH</CODE> to point to the directory in which
+your Motif installation resides.
+<P>
+Environment variables are set by the shell, and there are two common ways 
+of setting them. <BR> 
+Type <CODE>setenv VARIABLE value</CODE> or <CODE>export VARIABLE=value</CODE>.
+<P>
+</UL>
+
+<H2><A NAME="ss2.4">2.4 Run the build </A></H2>
+<UL>
+Change to the directory you copied the source into (for example,
+<CODE>cd /builds</CODE>). If this directory was empty before you
+installed the source, there should be two directories here:
+<CODE>README</CODE> and <CODE>mozilla</CODE>.
+<CODE>
+<PRE>
+cd mozilla
+gmake
+</PRE>
+</CODE>
+</UL>
+<H2><A NAME="ss2.5">2.5 After the build </A></H2>
+<UL>
+You may notice that if you try running mozilla-export right after the build, 
+you'll run into a problem. You need to set <CODE>LD_LIBRARY_PATH</CODE> to 
+<CODE>
+${LD_LIBRARY_PATH}:/PATH_TO_SOURCE/mozilla/dist/Linux2.0.32_x86_OPT.OBJ/bin
+</CODE> (where <CODE>PATH_TO_SOURCE</CODE> is the full path to your source 
+tree) before the dynamically linked binary will run. <BR><BR>
+This varies by platform:<br>
+<UL>
+<LI>On HP-UX, the equivalent environment variable is <CODE>SHLIB_PATH</CODE>.
+<LI>On AIX, the equivalent environment variable is <CODE>LIBPATH</CODE>.
+</UL>
+</UL>
+
+<HR>
+<H2><A NAME="s3">3. Common Sticking Points</A></H2>
+<LI>My linker dies with this error: undefined reference to `_Xsetlocale'
+<UL>If this error occurs, you might have to recompile libX11.so
+with the -DX_LOCALE flag (thanks to Scott Lampert,
+<A HREF="mailto:fortunato@heavymetal.org">fortunato@heavymetal.org</A>).
+
+</UL>
+<HR>
+
+
+</BODY>
+</HTML>

mozilla/README/mozilla/classic-win.html

@@ -0,0 +1,217 @@
+<HTML>
+<HEAD>
+<TITLE>Building Mozilla on Microsoft Windows 32-bit platforms</TITLE>
+</HEAD>
+<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000EE" VLINK="#551A8B"
+ALINK="#FF0000">
+<HR>
+<H1>
+Building Mozilla on Microsoft Windows 32-bit platforms</H1>
+
+<H2>
+Daniel Nunes, <TT><A HREF="mailto:leaf@netscape.com">leaf@netscape.com</A></TT>
+</H2>
+v 1.0, June 1998
+
+<P>
+<HR><I>How to build Mozilla on a Microsoft Windows 32-bit System.</I>
+<HR>
+<H2>1. <A HREF="#s1">Introduction</A></H2>
+
+<H2>2. <A HREF="#s2">Building Mozilla</A></H2>
+
+<UL>
+<LI>
+<A HREF="#ss2.1">2.1 Get the Code </A></LI>
+
+<LI>
+<A HREF="#ss2.2">2.2 Requirements</A></LI>
+
+<LI>
+<A HREF="#ss2.3">2.3 Set up the Build Environment</A></LI>
+
+<LI>
+<A HREF="#ss2.4">2.4 Build the Lizard </A></LI>
+</UL>
+
+<H2>3. <A HREF="#s3"> Common Problems </A></H2>
+
+<HR>
+<H2><A NAME="s1">1. Introduction</A></H2>
+
+<P>
+What this document is: A guide to building the Mozilla application.
+<BR>
+This includes:
+<OL>
+<LI> A listing of the development tools you will need to build Mozilla. </LI>
+<LI> A list of environment variables you will need to set before building. </LI>
+</OL>
+<P>
+If you're looking for documentation on developing features or fixing bugs,
+the Mozilla
+<A HREF="http://www.mozilla.org/docs/tplist/tplist.html">Technical Documents
+</A> or <A HREF="http://www.mozilla.org/library.html"> Library </A>
+are probably what you're looking for.
+<P>
+<HR>
+<H2><A NAME="s2">2. Building Mozilla </A></H2>
+<P>
+<UL>Each of the following subsections describes, or gives references to
+descriptions of, the steps necessary to build Mozilla.
+<H2><A NAME="ss2.1">2.1 Get the Code</A></H2>
+<P>
+<UL>
+There are two principal ways of getting the code, 
+<A HREF="http://www.mozilla.org/download.html"> ftp</A> and 
+<A HREF="http://www.mozilla.org/cvs.html"> CVS</A>.
+CVS will provide the most current code for building, but is
+slower than ftp. Ftp drops are generally produced once per month,
+and are known to compile.
+
+</UL>
+<P>
+<H2><A NAME="ss2.2">2.2 Requirements</A></H2>
+<UL>
+The following need to be installed:
+<UL>
+<LI>Microsoft Visual C++ version 4.2 or later
+<LI>GNU Tools for Microsoft Windows, located:
+<UL>
+<LI><A HREF="http://www.cygnus.com/misc/gnu-win32">Cygnus</A></LI>
+<LI><A HREF="http://www.gnu.org/order/ftp.html">GNU home page</A></LI>
+<LI><A HREF="ftp://prep.ai.mit.edu/pub/gnu">MIT</A></LI>
+</UL>
+Specifically, you'll need:
+<UL><CODE>
+cp.exe<BR>
+rm.exe<BR>
+uname.exe<BR>
+</CODE>
+</UL>
+Netscape has internally modified version of gmake, shmsdos and win32gnu
+that we use to get around some problems we were having keeping in sync
+with the Unix version of gmake. This version of gmake can be found in the 
+Windows Build Tools package, which can be ftp'd from
+<A HREF="http://www.mozilla.org/download-mozilla.html"> the Mozilla
+Download page</A>.
+The three files you will need are:
+<UL><CODE>
+gmake.exe<BR>
+shmsdos.exe<BR>
+uname.exe<BR>
+</CODE>
+</UL>
+
+</UL>
+<P>
+Hardware/OS
+<UL>
+<LI>Pentium 133 MHz or better</LI>
+<LI>64 MB RAM, 128 MB recommended</LI>
+<LI>250 MB NTFS or 500 MB FAT disk space</LI>
+<LI>NT 4.0 is preferred; NT 3.51 will also work.
+</LI>
+</UL>
+</UL>
+<P>
+<H2><A NAME="ss2.3">2.3 Setup the Build Environment</A></H2>
+<P>
+<UL>
+The following environment variables need to be set:
+<UL>
+<CODE>
+set MOZ_BITS=32
+<BR>
+set MOZ_DEBUG=1 (set this only if you want to build a debug build)
+<BR>
+set MOZ_MEDIUM=1
+<BR>
+set MOZ_NT=351 (if running NT3.51)
+<BR>
+set MOZ_OUT=(optional: specifies location of resultant executable)
+<BR>
+set MOZ_SRC=(top of your tree, for example: set MOZ_SRC=d:\mozilla_source 
+    if this is the directory where you checked or unzipped the source into)
+<BR>
+set MOZ_TOOLS=(the parent directory of the GNU tools 'bin' directory. The build
+    looks for MOZ_TOOLS\bin\gmake.exe, so make sure that the gmake.exe from
+    the Windows Build Tools package resides there.)
+<BR>
+set NSPR20=1
+<BR>
+set _MSC_VER=1100 (if you are running VC++ 5.0) or 1200 
+(if you are running VC++ 6.0)
+<BR>
+</CODE>
+</UL>
+<BR>
+<P>
+</UL>
+
+<H2><A NAME="ss2.4">2.4 Run the build </A></H2>
+<UL>
+Change to the directory you copied the source into (for example,
+<CODE>cd d:\mozilla_source</CODE>). If this directory was empty before you
+installed the source, there should be two directories here:
+<CODE>README</CODE> and <CODE>mozilla</CODE>.
+<CODE>
+<PRE>
+cd mozilla\config
+nmake /f makefile.win
+cd ..
+nmake /f client.mak
+</PRE>
+</CODE>
+</UL>
+</UL>
+
+<HR>
+<H2><A NAME="s3">3. Common Sticking Points</A></H2>
+<UL>
+<LI><B>nmake has a 'fatal error', listing one of the GNU commands and a 
+hexadecimal return code.</B>
+<UL>
+This will happen as a result of not having the GNU tools and Windows Build
+tools in your path. Add the directories with the appropriate binaries to your 
+path.
+</UL>
+</LI>
+<LI>
+<B>It fails with the message "'.\WIN32' unexpected": </B>
+<UL>
+You didn't properly
+set the environment variables -- you must not include a space at the end
+of the set statements (be careful if you are cut'n'pasting).
+</UL>
+</LI>
+<LI>
+<B>It fails to build, with directory-related errors: </B>
+<UL>
+The full path
+to the source must not include any spaces. Additionally, the source must
+be extracted with an intact directory structure by a utility that understands
+long filenames. If in doubt, grab Info-Zip at 
+<A HREF="ftp://ftp.cdrom.com/pub/infozip">ftp://ftp.cdrom.com/pub/infozip</A>
+</UL>
+</LI>
+<LI>
+<B>It fails immediately with the message "Cannot find specified directory": 
+</B>
+<UL>
+You didn't properly set the environment variable MOZ_TOOLS; 
+this needs to be set to the path up to, but not including, the final \bin
+directory in the path to the gnu tools. So, the path to the tool executables 
+is '%MOZ_TOOLS%\bin\<executable>'.
+</UL>
+</LI>
+<LI>
+<B>I'm not running a 32-bit windows system, how do i build?</B>
+<UL>
+Currently, the build process depends on a 32-bit operating system. 
+Windows NT 4.0 is the recommended windows operating system. 
+</UL>
+</UL>
+<HR>
+</BODY>
+</HTML>

mozilla/README/mozilla/mac-build.html

@@ -0,0 +1,400 @@
+<HTML>
+<HEAD>
+<TITLE>Building Mozilla on the Macintosh PPC platform</TITLE>
+</HEAD>
+<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000EE" VLINK="#551A8B"
+ALINK="#FF0000">
+<HR>
+<H1>
+Building Mozilla on the Macintosh PPC platform</H1>
+
+<H2>
+Daniel Nunes, <TT><A HREF="mailto:leaf@netscape.com">leaf@netscape.com</A></TT>
+</H2>
+v 1.0, June 1998
+
+<P>
+<HR><I>How to build Mozilla on a Macintosh PPC System.</I>
+<HR>
+<H2>1. <A HREF="#s1">Introduction</A></H2>
+
+<H2>2. <A HREF="#s2">Building Mozilla</A></H2>
+
+<UL>
+<LI>
+<A HREF="#ss2.1">2.1 Get the Code </A></LI>
+
+<LI>
+<A HREF="#ss2.2">2.2 Requirements</A></LI>
+
+<LI>
+<A HREF="#ss2.3">2.3 Set up the Build Environment</A></LI>
+
+<LI>
+<A HREF="#ss2.4">2.4 Build the Lizard </A></LI>
+</UL>
+
+<H2>3. <A HREF="#s3"> Common Problems </A></H2>
+
+<H2>4. <A HREF="#s4"> Credits </A></H2>
+
+<HR>
+<H2><A NAME="s1">1. Introduction</A></H2>
+
+<P>
+What this document is: A guide to building the Mozilla application.
+This includes:
+<OL>
+<LI> A listing of the development tools you will need to build Mozilla. </LI>
+<LI> A list of environment variables you will need to set before building. </LI>
+</OL>
+<P>
+If you're looking for documentation on developing features or fixing bugs,
+the Mozilla
+<A HREF="http://www.mozilla.org/docs/tplist/tplist.html">Technical Documents
+</A> or <A HREF="http://www.mozilla.org/library.html"> Library </A>
+are probably what you're looking for.
+<P>
+<HR>
+<H2><A NAME="s2">2. Building Mozilla </A></H2>
+<P>
+<UL>Each of the following subsections describes, or gives references to
+descriptions of, the steps necessary to build Mozilla.
+<H2><A NAME="ss2.1">2.1 Get the Code</A></H2>
+<P>
+<UL>
+There are two principal ways of getting the code, 
+<A HREF="http://www.mozilla.org/download.html"> ftp</A> and 
+<A HREF="http://www.mozilla.org/cvs.html"> CVS</A>.
+CVS will provide the most current code for building, but is
+slower than ftp (takes longer to download).
+
+</UL>
+<P>
+<H2><A NAME="ss2.2">2.2 Requirements</A></H2>
+The following need to be installed:
+<UL>
+   <LI>CodeWarrior (CW) 2 - obtainable from 
+   <A HREF="http://www.metrowerks.com">Metrowerks</A>.
+   See <A HREF="#s3">Common Sticking Points</A> if you have a different
+   version.
+   </LI>
+
+   <LI>PowerPlant 1.8 - obtainable from the CodeWarrior CD.</LI>
+
+   <LI>MSL - the Metrowerks Standard Library, obtainable from the
+   CodeWarrior CD</LI>
+
+   <LI><A HREF="ftp://ftp.boingo.com//dan/WASTE/waste-13.hqx">WASTE
+   1.3</A></LI>
+
+   <LI><A HREF="http://www.bact.wisc.edu/CWASTEEdit/CWASTEEdit.sit.hqx">CWASTE
+   1.6.2</A></LI>
+
+   <LI>
+   <A HREF="ftp://ftp.scripting.com/userland/menuSharingToolkit4.1.sit.hqx">
+   Menu Sharing Toolkit</A> (from UserLand)</LI>
+
+   <LI>
+ <A HREF="ftp://ftp.digitalalchemy.com/pub/digitalalchemy/mercutio-SDK.sit.bin">
+   Mercutio 1.5 SDK</A> (only download the SDK, not the entire package, else
+   the access paths will be wrong)</LI>
+
+   <LI> 
+  <A HREF="ftp://ftp.share.com/pub/internet-configuration/ICProgKit1.4.sit">
+  Internet Config 1.4 SDK</A></LI>
+
+   <LI><A HREF="http://www.mooseyard.com/Jens/Software/">AEGizmos
+   1.4.2</A></LI>
+
+   <LI><A HREF="ftp://sunsite.cnlab-switch.ch/software/platform/macos/perl/Mac_Perl_520r4_tool.bin">
+   MacPerl 5 MPW Tool</A></LI>
+
+   <LI>
+  <A HREF="ftp://sunsite.cnlab-switch.ch/software/platform/macos/perl/Mac_Perl_520r4_appl.bin">MacPerl 5 Application</A></LI>
+
+   <LI>MakeStub - MPW (installed with CodeWarrior Heaven option). If
+   you choose not to install MPW, it is located on the MacOS Tools CD
+   in "CW Pro 2 Tools:CodeWarrior MPW:MPW:Tools"</LI>
+
+   <LI>RunTSScript - in Mozilla source distribution
+   (mozilla:build:mac:RunTSScript), needs to be installed by hand</LI>
+
+   <LI><A HREF="ftp://dev.apple.com/devworld/Tool_Chest/Core_Mac_OS_Tools/MPW_etc./MPW-GM/MPW/ToolServer.sit.hqx">ToolServer</A>
+   - or in the CW distribution (CW Pro 2 Tools:Apple Development
+   Tools:ToolServer 3.4.1.sit). <B>We recommend pulling it off the
+   CD</B> because it comes with configuration files for CodeWarrior
+   which you would have to create manually were you to pull it off
+   the net.</LI>
+
+   <LI>
+   <A HREF="http://people.netscape.com/sfraser/software/NewAlias_tool.sit.hqx">
+   New Alias MPW Tool</A> An MPW tool that creates Finder aliases for files.
+   </LI>
+
+   <LI>StreamEdit MPW Tool - MPW (installed with CodeWarrior Heaven option). If
+   you choose not to install MPW, it is located on the MacOS Tools CD
+   in "CW Pro 2 Tools:CodeWarrior MPW:MPW:Tools"</LI>
+   </LI>
+
+   <LI>
+   <A HREF="ftp://dev.apple.com/devworld/Periodicals/develop/develop25/develop_Issue_25_code/ToolFrontEnd.sit.hqx">ToolFrontEnd</A></LI>
+
+   <LI>
+   <A HREF="http://sunsite.cnlab-switch.ch/ftp/software/platform/macos/src/HTML/MPW_C.html">
+    patch 2.1</A></LI>
+</UL>
+
+<P>
+Hardware/OS
+<UL>
+<LI>To build Navigator, you need a fast PPC Mac. The faster the
+better. You can't build with a 68K machine because we have too many
+resources, and the build process will crash when trying to generate
+resources out of our cross-platform strings. See the discussion below
+for a way around this.
+</LI>
+<LI>You will need about 96 MB of physical RAM to "fast link" the app.
+You can still fast link if you give your machine 96 MB of virtual
+memory, but then the VM hit is large enough to counteract any
+improvement. One of our beta testers had a machine with only 64MB of
+physical RAM (VM was off) and it ran out of memory trying to link.
+Turning VM on got it to link, but build time increased greatly.
+</LI>
+<LI>Reports from the net indicate that the optimized version
+(MozillaPPC) take much less RAM to build than the 96MB we suggest. If
+you are running out of memory, try building that instead of the debug
+version (the debug symbols require a lot of RAM come link time).
+</LI>
+<LI>You should be ok with a 400MB disk partition, even when fully
+built. This does not include tools like the IDE, just source.
+</LI>
+<LI>On an HFS+ volume, a full build takes about 110MB. HFS+ is good,
+but utilities are sparse.
+</LI>
+</UL>
+<P>
+<H2><A NAME="ss2.3">2.3 Setup the Build Environment</A></H2>
+<P>
+<OL>
+   <LI>Install CodeWarrior from the CD. While it is large, installing
+   the "CodeWarrior Heaven" option will guarantee that you have
+   everything you need. This will give you PowerPlant, MSL, and MPW.
+   If you choose to install less, proceed at your own risk.</LI>
+
+   <LI>In the Finder, increase the memory partition of the IDE to
+   15MB (you can get by with 12, if need be).</LI>
+
+   <LI>Download ToolFrontEnd. After expanding it, in "ToolFrontEnd
+   Folder:Drop-Ins" there are three items:
+
+   <UL>
+      <LI><I>#include</I></LI>
+
+      <LI><I>ToolFrontEnd</I></LI>
+
+      <LI><I>ToolFrontEnd Panel</I></LI>
+   </UL>
+
+   <P>Create a folder named "Include Scanners". Place the file
+   "#include" into the Include Scanners folder. Move the Include
+   Scanners folder to the CodeWarrior Plugins folder. Create a folder
+   named "ToolFrontEnd". Place the files "ToolFrontEnd" and
+   "ToolFrontEnd Panel" into the ToolFrontEnd folder. Place this
+   folder in the CodeWarrior Plugins folder.</P></LI>
+
+   <LI>Open "ToolFrontEnd Panel" with ResEdit. Change the file type
+   from <B>'Panl'</B> to <B>'PanL'</B>. Save.</LI>
+
+   <LI>Uncompress the StuffIt Archive for ToolServer. The goal is to
+   let ToolServer and MPW share the same Tools directory so you don't
+   need to have multiple versions of tools. Do the following:
+
+   <OL>
+      <LI>Open ToolServer's Tools folder. There is one file called
+      "RMetrowerks". </LI>
+
+      <LI>Move RMetrowerks to Tools folder of MPW. MPW folder must be
+      at "Metrowerks:Codewarrior MPW:MPW" if you installed
+      Codewarrior Heaven. </LI>
+
+      <LI>Remove ToolServer's Tools folder.</LI>
+
+      <LI>Now create an alias of Tools folder in "CodeWarrior MPW"
+      and move it to your ToolServer folder. Rename the alias
+      (probably called "Tools alias") to "Tools"</LI>
+
+
+      <LI><FONT COLOR="#FF0000"><B>IMPORTANT</B></FONT>: Make sure
+      you only have one instance of ToolServer on your machine. If
+      the build script finds the wrong one, the correct tools will
+      not be found and strange things will happen.</LI>
+   </OL>
+   </LI>
+
+   <LI>After installing the MacPerl MPW Tool distribution (run the
+   InstallerVISE application), in the "MacPerl &#131;" folder, there
+   will be an MPW tool named "perl". Install this in MPW's tools
+   folder.</LI>
+
+   <LI>Install the MacPerl Application (run the
+   InstallerVISE application).  You can install this anywhere, but it is
+   recommended that you install it inside of your CodeWarrior folder for
+   easy reference. After installation, you will need to set a preference
+   to enable double-click launch of the perl scripts. This preference is set
+   by going under the Edit Menu to Preferences.  Click on the "Script" button
+   and hit the radio button "Run Scripts opened from Finder"</LI>
+
+   <LI>Install the "patch", "MakeStub", "NewAlias" and "StreamEdit" Tools in the
+ tools
+   folder. Note that "MakeStub" and "StreamEdit" are automatically installed by the
+   "CodeWarrior Heaven" install option.</LI>
+
+   <LI>Install RunTSScript (found in the Mozilla source distribution)
+   in the compilers folder in your build environment
+   ("Metrowerks:Metrowerks Codewarrior:Codewarrior
+   Plugins:Compilers")</LI>
+
+   <LI>Next, after downloading all the 3rd party software components,
+   drag WASTE, CWASTE, Menu Sharing, Mercutio, Internet Config, and
+   the AEGizmo folders (just as they are) into the "MacOS Support"
+   folder in your build environment.</LI>
+
+   <LI>Start ToolServer from within CodeWarrior (or use MPW if you
+   are brave enough). We're about to patch some files. Make sure the
+   ToolServer menu is in the CodeWarrior menu bar by turning on the
+   <A HREF="IDEPrefs.gif">preference</A> under the "Extras" panel in
+   the IDE Preferences (not the project preferences!). The menu bar
+   should look like this:
+
+
+   <P><IMG SRC="IDEMenuBar.gif" WIDTH=359 HEIGHT=20 X-CLARIS-USEIMAGEWIDTH X-CLARIS-USEIMAGEHEIGHT ALIGN=bottom></P>
+
+   <P>Choose "Start ToolServer" from the ToolServer menu (this is the
+   icon menu between "Window" and "Help" in the menubar above). You
+   will now see a window with no close box. This is your ToolServer
+   Worksheet where you will type (or cut &amp; paste) the commands
+   for the following steps.</P>
+
+   <P>In case you have never used MPW/ToolServer before, the
+   following is <B>very important</B>. Pressing "return" does not
+   execute commands like you might think. It just inserts a newline
+   into the worksheet like a normal text editor. <B>To actually get
+   ToolServer to execute the command, you must press "Enter" (lower
+   right of numeric keypad).</B> This executes the line that the
+   cursor is on, and only that line. If you want to execute multiple
+   lines at once, select them all and hit Enter.</P></LI>
+
+   <LI>Set the shell variables {IDE} and {Source} to the correct
+   paths for your build environment. {IDE} is where your CodeWarrior
+   IDE is located. {Source} is the folder containing the toplevel
+   "ns" folder of the Mozilla source. Mine look like this (don't
+   forget to keep the quotes if your path includes spaces), yours
+   will almost certainly be different (<FONT COLOR="#FF0000">to
+   punctuate this, the things you need to change are in red</FONT>).
+   
+  <PRE>Set IDE "<FONT COLOR="#FF0000">Develop:Source331 Build Environment:CW Pro 2:Metrowerks CodeWarrior:</FONT>"
+Set Source "<FONT COLOR="#FF0000">Source:FreeSource:</FONT>"</PRE>
+</LI>
+
+   <LI>If you are using CWPro2, execute the following lines to patch
+   LDropFlag to draw correcly over non-white backgrounds. 
+
+   <PRE>directory "{IDE}MacOS Support:PowerPlant:_In Progress:_Table Classes:"
+patch LDropFlag.cp "{Source}mozilla:lib:mac:patches:LDropFlag.patch"
+duplicate -y "{Source}mozilla:lib:mac:patches:DropFlag Icons.rsrc" "{IDE}MacOS Support:PowerPlant:PowerPlant Resources:"</PRE></LI>
+
+   <LI>Execute the following lines to patch menusharing.c to allow it
+   to compile with the new Universal Headers. It references an
+   obsolete header file (GestaltEqu.h).
+
+   <PRE>directory "{IDE}MacOS Support:Menu Sharing Toolkit 4.1:"
+patch menusharing.c "{Source}mozilla:lib:mac:patches:menusharing.patch"</PRE></LI>
+
+
+   <LI>If you are using CWPro2 straight off the CD, you need to patch
+   AppleEvents.r to fix a problem with the Universal Headers (the
+   definition of the 'aedt' resource was omitted). <B>You do not have
+   to do this if you have applied the netborne patch to Pro2e
+   </B> because it has been fixed.
+
+   <PRE>directory "{IDE}MacOS Support:Headers:Rez Headers:"
+patch AppleEvents.r "{Source}mozilla:lib:mac:patches:AppleEvents.r.patch"</PRE></LI>
+
+   <LI>You need to patch stat.mac.h to fix a problem in MSL where
+   lines were omitted.
+
+   <PRE>directory "{IDE}Metrowerks Standard Library:MSL C:MSL Mac:Public Includes"
+patch stat.mac.h "{Source}mozilla:lib:mac:patches:stat.mac.h.patch"</PRE></LI>
+
+   <LI>Congratulations! Now you are ready to build. Once these steps
+   are done, you don't have to repeat these setups the next
+   time!</LI>
+</OL>
+
+
+<P>
+
+<H2><A NAME="ss2.4">2.4 Run the build </A></H2>
+<UL>
+<P>In the folder mozilla:build:mac:, there are several Perl scripts with
+names of the form BuildMozillaXXX.pl, where XXX is "Optimized",
+"Debug", "Tinderbox", et al.  Each script builds the corresponding
+version of Mozilla.  If you configured the MacPerl application to
+execute scripts that are opened from the finder, all you have to do is
+double click on the appropriate one; otherwise, launch MacPerl, and
+run the appropriate script from the "Run Script..." menu item.</P>
+
+<P>These `configured build' scripts are simple, and you might want to
+make your own to force your build to StopForErrors(), or alternatively
+DontStopForErrors(), et al.  You can set up certain build-script
+variables and (soon) compile-time flags.  Compare the supplied scripts
+to figure out what you might want.  Note that CodeWarriorLib, Moz.pm,
+and BuildList.pm, are AppleScript libraries and Perl modules meant to
+be used by a `configured build'.  Use your favorite POD viewer (Shuck
+comes with MacPerl) to view the documentation in the Perl scripts.</P>
+
+<P>If there were any errors in any of the projects along the way, the
+script will stop at that point and the IDE will tell you the errors.
+You can fix them and make sure they current project builds, but to
+continue the automation, you have to start from the beginning by
+double-clicking the script again. This isn't quite as bad as it
+sounds because the previous projects are already built (unless you
+changed some major header file). Please note that stopping the script
+once it has started is difficult. We are working to address
+this issue.</P>
+
+<P>After the build is complete, you can find aliases to the built libraries
+and the final Mozilla application. Debug builds are built to
+Mozilla:dist:client_debug, while optimized builds are built to Mozilla:dist:client.
+</P>
+
+<P>Don't worry too much about the numerous warnings generated during
+the build. We try our best to get the XP teams to use real compilers,
+but alas, they continue to write warning-laden code. There is also
+some generated code (Java is one example) that has a lot of warnings
+that we can't help either. If you write any new code, please help us
+in our quest to get zero warnings.</P>
+
+</UL>
+</UL>
+
+<HR>
+<H2><A NAME="s3">3. Common Sticking Points</A></H2>
+<UL>
+<LI><B>I have CodeWarrior3, how do i build with it?</B>
+<UL> Currently, the answer is, "You don't." Eventually, the distribution
+will be modified to allow building using CodeWarrior3, but for now 
+CodeWarrior2 is the only IDE that is supported.
+</UL>
+</LI>
+</UL>
+<HR>
+<H2><A NAME="s4">4. Credits</A></H2>
+<UL>
+The majority of this document is taken from the build document included
+in the Mozilla source distribution at README:mozilla:macbuild.htm written
+by Mike Pinkerton, <A HREF="mailto:pinkerton@netscape.com">
+pinkerton@netscape.com</A>.
+</BODY>
+</HTML>

mozilla/README/mozilla/unix-build.html

@@ -0,0 +1,163 @@
+<HTML>
+<HEAD>
+<TITLE>Building the Mozilla client on unix platforms</TITLE>
+</HEAD>
+<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000EE" VLINK="#551A8B"
+ALINK="#FF0000">
+<HR>
+<H1>Building the Mozilla client on Unix platforms</H1>
+
+<H2>
+Daniel Nunes, <TT><A HREF="mailto:leaf@mozilla.org">leaf@mozilla.org</A></TT></H2>
+v 1.2, 1998-11-02
+
+<P>
+<HR><I>How to build Mozilla on a Unix System.</I>
+<HR>
+<H2>1. <A HREF="#s1">Introduction</A></H2>
+
+<H2>2. <A HREF="#s2">Building Mozilla</A></H2>
+
+<UL>
+<LI>
+<A HREF="#ss2.1">2.1 Get the Code </A></LI>
+
+<LI>
+<A HREF="#ss2.2">2.2 Requirements</A></LI>
+
+<LI>
+<A HREF="#ss2.3">2.3 Build the Lizard</A></LI>
+
+<LI>
+<A HREF="#ss2.4">2.4 After the Build</A></LI>
+</UL>
+
+<H2>3. <A HREF="#s3"> Common Problems </A></H2>
+
+<HR>
+<H2><A NAME="s1">1. Introduction</A></H2>
+
+<P>
+Perhaps you are interested in building classic Mozilla, before the 
+fall of the old layout engine, and the rise of the new. If so, the
+<B><A HREF="classic-unix.html">Classic Mozilla Build document</A></B> 
+is what you're looking for.
+
+<P>
+ 
+<P>
+What this document is: A guide to building the Mozilla application.
+<BR>
+This includes:
+<OL>
+<LI> A listing of the development tools you will need to build Mozilla. </LI>
+<LI> A sample set of commands to build Mozilla using the Autoconf 
+build system. </LI>
+</OL>
+<P>
+If you're looking for documentation on developing features or fixing bugs,
+the Mozilla
+<A HREF="../tplist.html">Technical Documents</A> or 
+<A HREF="../../../library.html"> Library </A>
+are probably what you're looking for.
+<P>
+<HR>
+<H2><A NAME="s2">2. Building Mozilla </A></H2>
+<P>
+<UL>Each of the following subsections describes, or gives references to
+descriptions of, the steps necessary to build Mozilla.
+</UL>
+<UL>
+<H2><A NAME="ss2.1">2.1 Get the Code</A></H2>
+<P>
+<UL>
+
+Eventually, there will be two principal ways of getting the code,
+<A HREF="../../../download.html"> ftp</A> and
+<A HREF="../../../cvs.html"> CVS</A>.
+CVS will provide the most current code for building, but is
+slower than ftp. Ftp drops are generally produced once per month,
+and are known to compile on some machine, somewhere.
+
+<B>For now</B>, however, you must do the following to obtain the newest 
+browser source:
+<BR>
+<CODE>
+cvs co mozilla/nglayout.mk<BR>
+cd mozilla<BR>
+gmake -f nglayout.mk pull_all<BR>
+</CODE>
+<BR>
+This should pull all the right source.
+</UL>
+<P>
+<H2><A NAME="ss2.2">2.2 Requirements</A></H2>
+<UL>
+The following should be installed:
+<UL>
+<LI>Motif 1.2
+<LI>The native C/C++ compiler (or GNU C/C++ compiler 2.7.2 in lieu of the 
+    native compiler)
+<LI>GNU make 3.74 or better
+<LI>Perl5
+<LI><A HREF="../../../projects/autoconf/">Autconf</A> requirements, 
+    including NSPR.
+<LI><CODE>LD_LIBRARY_PATH</CODE> must include the path to the NSPR
+    shared objects.<BR>
+    For most people, this means adding <CODE>/usr/local/nspr/lib</CODE> 
+    to <CODE>LD_LIBRARY_PATH</CODE> 
+    (either:
+     <BR> 
+    <CODE>setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/usr/local/nspr/lib</CODE>
+     <BR>
+      or 
+     <BR>
+    <CODE>export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/nspr/lib</CODE>
+     .<BR>
+     If you get an error like "No such variable" then omit the 
+     <CODE>${LD_LIBRARY_PATH}:</CODE> part
+   )
+</UL>
+<P>
+Your hardware should be equal to, or better than:
+<UL>
+32 MB RAM, 128 MB swap (64 MB RAM recommended)
+</UL>
+</UL>
+<P>
+<H2><A NAME="ss2.3">2.3 Build the Lizard</A></H2>
+<P>
+<UL>
+<CODE>
+autoconf<BR>
+mkdir obj-`./build/autoconf/config.guess`<BR>
+cd obj-`./build/autoconf/config.guess`<BR>
+../configure --with-nspr=/usr/local/nspr --enable-toolkit=motif<BR>
+gmake depend<BR>
+gmake<BR>
+</CODE>
+</UL>
+<H2><A NAME="ss2.4">2.4 After the build </A></H2>
+<UL>
+
+<LI> <CODE>cd dist/bin</CODE> and you should see links to the objects you
+      need to run <CODE>main</CODE>. 
+
+<LI>On most unixen LD_LIBRARY_PATH must be set to wherever the necessary
+libraries are. 
+
+<UL>
+<LI>On HP-UX, the equivalent environment variable is <CODE>SHLIB_PATH</CODE>.
+<LI>On AIX, the equivalent environment variable is <CODE>LIBPATH</CODE>.
+</UL>
+</UL>
+</UL>
+<HR>
+<H2><A NAME="s3">3. Common Sticking Points</A></H2>
+<LI>I'm sure there are bound to be some. Send 
+<A HREF="mailto:leaf@mozilla.org"> me</A> mail. 
+<HR>
+
+
+</BODY>
+</HTML>

mozilla/README/mozilla/win-build.html

@@ -0,0 +1,209 @@
+<HTML>
+<HEAD>
+<TITLE>Building Mozilla on Microsoft Windows 32-bit platforms</TITLE>
+</HEAD>
+<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000EE" VLINK="#551A8B"
+ALINK="#FF0000">
+<HR>
+<H1>
+Building Mozilla on Microsoft Windows 32-bit platforms</H1>
+
+<H2>
+Daniel Nunes, <TT><A HREF="mailto:leaf@netscape.com">leaf@netscape.com</A></TT>
+</H2>
+v 1.0, June 1998
+
+<P>
+<HR><I>How to build Mozilla on a Microsoft Windows 32-bit System.</I>
+<HR>
+<H2>1. <A HREF="#s1">Introduction</A></H2>
+
+<H2>2. <A HREF="#s2">Building Mozilla</A></H2>
+
+<UL>
+<LI>
+<A HREF="#ss2.1">2.1 Get the Code </A></LI>
+
+<LI>
+<A HREF="#ss2.2">2.2 Requirements</A></LI>
+
+<LI>
+<A HREF="#ss2.3">2.3 Set up the Build Environment</A></LI>
+
+<LI>
+<A HREF="#ss2.4">2.4 Build the Lizard </A></LI>
+</UL>
+
+<H2>3. <A HREF="#s3"> Common Problems </A></H2>
+
+<HR>
+<H2><A NAME="s1">1. Introduction</A></H2>
+
+<P>
+What this document is: A guide to building the Mozilla application.
+<BR>
+This includes:
+<OL>
+<LI> A listing of the development tools you will need to build Mozilla. </LI>
+<LI> A list of environment variables you will need to set before building. </LI>
+</OL>
+<P>
+If you're looking for documentation on developing features or fixing bugs,
+the Mozilla
+<A HREF="http://www.mozilla.org/docs/tplist/tplist.html">Technical Documents
+</A> or <A HREF="http://www.mozilla.org/library.html"> Library </A>
+are probably what you're looking for.
+<P>
+<HR>
+<H2><A NAME="s2">2. Building Mozilla </A></H2>
+<P>
+<UL>Each of the following subsections describes, or gives references to
+descriptions of, the steps necessary to build Mozilla.
+<H2><A NAME="ss2.1">2.1 Get the Code</A></H2>
+<P>
+<UL>
+There are two principal ways of getting the code, 
+<A HREF="http://www.mozilla.org/download.html"> ftp</A> and 
+<A HREF="http://www.mozilla.org/cvs.html"> CVS</A>.
+CVS will provide the least outdated code for building, but is
+slower than ftp.
+
+</UL>
+<P>
+<H2><A NAME="ss2.2">2.2 Requirements</A></H2>
+<UL>
+The following need to be installed:
+<UL>
+<LI>Microsoft Visual C++ version 4.2 or later
+<LI>GNU Tools for Microsoft Windows, located:
+<UL>
+<LI><A HREF="http://www.cygnus.com/misc/gnu-win32">Cygnus</A></LI>
+<LI><A HREF="http://www.gnu.org/order/ftp.html">GNU home page</A></LI>
+<LI><A HREF="ftp://prep.ai.mit.edu/pub/gnu">MIT</A></LI>
+</UL>
+Specifically, you'll need:
+<UL><CODE>
+cp.exe<BR>
+rm.exe<BR>
+uname.exe<BR>
+</CODE>
+</UL>
+Netscape has internally modified version of gmake, shmsdos and win32gnu
+that we use to get around some problems we were having keeping in sync
+with the Unix version of gmake. This version of gmake can be found in the 
+Windows Build Tools package, which can be ftp'd from
+<A HREF="http://www.mozilla.org/download-mozilla.html"> the Mozilla
+Download page</A>.
+The three files you will need are:
+<UL><CODE>
+gmake.exe<BR>
+shmsdos.exe<BR>
+uname.exe<BR>
+</CODE>
+</UL>
+
+</UL>
+<P>
+Hardware/OS
+<UL>
+<LI>Pentium 133 MHz or better</LI>
+<LI>64 MB RAM, 128 MB recommended</LI>
+<LI>250 MB NTFS or 500 MB FAT disk space</LI>
+<LI>NT 4.0 is preferred; NT 3.51 will also work.
+</LI>
+</UL>
+</UL>
+<P>
+<H2><A NAME="ss2.3">2.3 Setup the Build Environment</A></H2>
+<P>
+<UL>
+The following environment variables need to be set:
+<UL>
+<CODE>
+set MOZ_BITS=32
+<BR>
+set MOZ_DEBUG=1 (set this only if you want to build a debug build)
+<BR>
+set MOZ_GOLD=1
+<BR>
+set MOZ_MEDIUM=1
+<BR>
+set MOZ_NT=351 (if running NT3.51)
+<BR>
+set MOZ_OUT=(optional: specifies location of resultant executable)
+<BR>
+set MOZ_SRC=(top of your tree, for example: set MOZ_SRC=d:\mozilla_source 
+    if this is the directory where you checked or unzipped the source into)
+<BR>
+set MOZ_TOOLS=(location of the bin directory of your GNU tools. The build
+    looks for MOZ_TOOLS\bin\gmake.exe, so make sure that the gmake.exe from
+    the Windows Build Tools package resides there.)
+<BR>
+set NO_SECURITY=1
+<BR>
+set NSPR20=1
+<BR>
+set _MSC_VER=1100 (if you are running VC++ 5.0 or higher)
+<BR>
+</CODE>
+</UL>
+<BR>
+<P>
+</UL>
+
+<H2><A NAME="ss2.4">2.4 Run the build </A></H2>
+<UL>
+Change to the directory you copied the source into (for example,
+<CODE>cd d:\mozilla_source</CODE>). If this directory was empty before you
+installed the source, there should be two directories here:
+<CODE>README</CODE> and <CODE>mozilla</CODE>.
+<CODE>
+<PRE>
+cd mozilla\config
+nmake /f makefile.win
+cd ..
+nmake /f client.mak
+</PRE>
+</CODE>
+</UL>
+</UL>
+
+<HR>
+<H2><A NAME="s3">3. Common Sticking Points</A></H2>
+<UL>
+<LI><B>nmake has a 'fatal error', listing one of the GNU commands and a 
+hexadecimal return code.</B>
+<UL>
+This will happen as a result of not having the GNU tools and Windows Build
+tools in your path. Add the directories with the appropriate binaries to your 
+path.
+</UL>
+</LI>
+<LI>
+<B>It fails with the message "'.\WIN32' unexpected": </B>
+<UL>
+You didn't properly
+set the environment variables -- you must not include a space at the end
+of the set statements (be careful if you are cut'n'pasting).
+</UL>
+</LI>
+<LI>
+<B>It fails to build, with directory-related errors: </B>
+<UL>
+The full path
+to the source must not include any spaces. Additionally, the source must
+be extracted with an intact directory structure by a utility that understands
+long filenames. If in doubt, grab Info-Zip at 
+<A HREF="ftp://ftp.cdrom.com/pub/infozip">ftp://ftp.cdrom.com/pub/infozip</A>
+</UL>
+</LI>
+<LI>
+<B>I'm not running a 32-bit windows system, how do i build?</B>
+<UL>
+Currently, the build process depends on a 32-bit operating system. 
+Windows NT 4.0 is the recommended windows operating system. 
+</UL>
+</UL>
+<HR>
+</BODY>
+</HTML>

mozilla/README/mozilla/wininstall.htm

@@ -0,0 +1,53 @@
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="Author" CONTENT="Chris Yeh">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.05 [en]C-NSCP  (WinNT; U) [Netscape]">
+   <TITLE>Running Mozilla...</TITLE>
+</HEAD>
+<BODY>
+
+<H2>
+<FONT FACE="Arial,Helvetica">Running Mozilla Without Trashing Netscape
+Installation</FONT></H2>
+This document explains how to run <TT>mozilla.exe</TT> separately from
+<TT>netscape.exe</TT> without trashing your regular installation of Netscape
+Communicator. This is necessary if, for example, you want to use Communicator's
+mail client while you work on Mozilla development.
+<BR>
+<HR WIDTH="100%">
+<OL>
+<LI>
+Before running <TT>mozilla.exe</TT>, create a new user profile either from
+a Netscape 4.0x installation using the "User Profile Manager" shortcut
+in the Utilities folder (on Windows) or by using&nbsp; the <TT>-new_account</TT>
+option on the command line of either <TT>netscape.exe</TT> or <TT>mozilla.exe</TT>.&nbsp;
+We suggest calling the profile "<TT>mozilla</TT>."</LI>
+
+<LI>
+Always use that new account when running <TT>mozilla.exe</TT>, and never
+run <TT>netscape.exe</TT> using that same account profile.</LI>
+</OL>
+To make things easier, you can start the application with the user account
+on the command line, for example:
+<UL><TT>mozilla.exe -P"mozilla"</TT></UL>
+This assures that prefs and the cache will not interfere between the two
+versions. This will be especially
+<BR>important as new prefs are added to the Mozilla product. Note that
+you must use quotes around the name and there can be no space between the
+"P" and the profile name. Otherwise, the application won't catch the profile
+switch, and it will try to load the profile name as the initial URL.
+
+<P>
+<HR WIDTH="100%">
+<BR>You can copy your <TT>bookmark.htm</TT> file from an existing profile
+to your new profile directory if you want to share bookmarks.
+
+<P>After the initial 3/31 release, we will add some code to Mozilla to
+prevent running with a profile that is already being used by <TT>netscape.exe</TT>.
+<BR>&nbsp;
+<HR WIDTH="100%">
+<BR><FONT SIZE=-1>Copyright &copy; 1998 <A HREF="http://home.netscape.com/misc/contact_info.html">Netscape
+Communications Corporation</A></FONT>
+</BODY>
+</HTML>

mozilla/README/nglayout/winbuild.html

@@ -0,0 +1,184 @@
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=x-mac-roman">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.04 [en] (WinNT; I) [Netscape]">
+   <META NAME="KeyWords" CONTENT="client, source, documentation">
+   <META NAME="Author" CONTENT="Kipp E.B. Hickman">
+   <TITLE>NGLayout Windows Build Instructions</TITLE>
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+
+<H2>
+<FONT FACE="Arial,Helvetica">NGLayout Windows Build Instructions</FONT></H2>
+This document explains how to build NGLayout for the Windows platform.&nbsp;
+<HR><B><FONT SIZE=+1>Required Tools:</FONT></B>
+<UL>
+<LI>
+<B>Microsoft Visual C++ version 4.2 or later</B></LI>
+
+<LI>
+<B>The same set of tools for building <A HREF="http://www.mozilla.org/docs/tplist/catBuild/winbuild.htm">Mozilla</A></B></LI>
+</UL>
+<B><FONT SIZE=+1>Setting up:</FONT></B>
+<UL>
+<LI>
+You need a Pentium with at least a 133 MHz processor and at least 250 megs
+(NTFS partition) or 500 megs (FAT partition) of hard drive space. You need
+to have a minimum of 64 megs of memory in order to build this tree. These
+numbers are approximations.</LI>
+
+<LI>
+The preferred platform is NT 4.0. NT 3.51 will also work, and Win95 might
+work if you're lucky. Maybe.</LI>
+
+<LI>
+Install MSVC. If you don't choose to have the MSVC install modify your
+environment variables for PATH, INCLUDE, and LIB information, be sure to
+run VCVARS32.BAT out of the MSVC bin directory prior to attempting to build.</LI>
+
+<LI>
+Download and install GNU tools. Put them in your path.</LI>
+
+<LI>
+Install NGLayout source.</LI>
+
+<UL>
+<LI>
+cd &lt;your-source-area></LI>
+
+<LI>
+unzip -o -q win-19980415.zip</LI>
+</UL>
+
+<LI>
+There are several environment variables you will need to set, either manually
+or via a script within a command session, or by setting them in your system
+environment located through the Control Panel | System icon.</LI>
+
+
+<P>&nbsp;<B>Note: There is an additional variable for building NGLayout!
+Use this list carefully!</B>
+
+<P>&nbsp;The variables are:
+<UL>
+<LI>
+set MOZ_BITS=32</LI>
+
+<LI>
+set MOZ_DEBUG=1 (don't set this if you want to build an optimized release
+build)</LI>
+
+<LI>
+set MOZ_GOLD=1</LI>
+
+<LI>
+set MOZ_MEDIUM=1</LI>
+
+<LI>
+set MOZ_NT=351 (if running NT 3.51, don't set otherwise)</LI>
+
+<LI>
+set MOZ_OUT=(location of resulting executable and totally optional, see
+Notes for more details)</LI>
+
+<LI>
+set MOZ_SRC=(top of your tree, drive letter and path, i.e. set MOZ_SRC=d:\mozilla_src.
+The topmost directory under this should be mozilla)</LI>
+
+<LI>
+set MOZ_TOOLS=(location of the bin directory containing your GNU tools.
+The build looks for MOZ_TOOLS\bin\gmake.exe, so make sure your MOZ_TOOLS
+is figured appropriately)</LI>
+
+<LI>
+set NO_SECURITY=1</LI>
+
+<LI>
+set NSPR20=1</LI>
+
+<LI>
+if you are running VC++ 5.0 or higher: set _MSC_VER=1100; if you are running
+VC++ 4.2 then set MOZ_VCVER=42</LI>
+
+<LI>
+<B>set STANDALONE_IMAGE_LIB=1</B></LI>
+
+<LI>
+<B>set MODULAR_NETLIB=1</B></LI>
+</UL>
+</UL>
+<B><FONT SIZE=+1>Building:</FONT></B>
+<UL>
+<LI>
+You need to be running a vanilla command prompt. Other shells may work,
+but you might have to tweak makefiles.</LI>
+
+<LI>
+<B>Build the tools:</B> This generates several tools that handle things
+like dependency generation</LI>
+
+<UL>
+<LI>
+cd mozilla\config</LI>
+
+<LI>
+nmake /f makefile.win</LI>
+</UL>
+
+<LI>
+<B>Build the NGLayout:</B> This will do a complete build of the source
+tree. You will end up with a viewer.exe at the end. The viewer.exe will
+be in your dist\win32_[OD].obj\bin directory (O will be used when you don't
+set MOZ_DEBUG; D will be used when you set MOZ_DEBUG).</LI>
+
+<UL>
+<LI>
+cd mozilla</LI>
+
+<LI>
+nmake /f nglayout.mak</LI>
+</UL>
+</UL>
+<B><FONT SIZE=+1>Running:</FONT></B>
+<UL>
+<LI>
+Once you have built the system, do this to run the viewer program (the
+viewer program is a simple test program that uses the nsIWebWidget API
+to embed a web widget object). The viewer program has a few basic menu
+items, include "Samples" which load sample tests.</LI>
+
+<UL>
+<LI>
+cd mozilla\dist\win32_[OD].obj\bin</LI>
+
+<LI>
+.\viewer.exe</LI>
+</UL>
+</UL>
+<B><FONT SIZE=+1>Notes:</FONT></B>
+<UL>
+<LI>
+This build process does not use Visual C++ generated project files for
+several reasons having to do with (among other things) size, maintainability,
+and the long term desire to start using more of tools like gmake, or plug
+and play developer tools. This does not preclude you from using the Visual
+C++ IDE, or it's debugger. Once you have built a viewer.exe do this to
+run it under the debugger:</LI>
+</UL>
+
+<UL>
+<UL>
+<LI>
+cd mozilla\dist\win32_[OD].obj\bin</LI>
+
+<LI>
+msdev viewer.exe</LI>
+</UL>
+</UL>
+
+<HR WIDTH="100%">
+<CENTER><FONT SIZE=-1>Copyright &copy; 1998 <A HREF="http://home.netscape.com/misc/contact_info.html">Netscape
+Communications Corporation</A></FONT></CENTER>
+&nbsp;
+</BODY>
+</HTML>

mozilla/aclocal.m4

@@ -0,0 +1,8 @@
+dnl
+dnl Local autoconf macros used with mozilla
+dnl The contents of this file are under the Public Domain.
+dnl 
+
+builtin(include, build/autoconf/gtk.m4)dnl
+builtin(include, build/autoconf/altoptions.m4)dnl
+

mozilla/allmakefiles.sh

@@ -0,0 +1,345 @@
+#! /bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# allmakefiles.sh - List of all makefiles. 
+#   Appends the list of makefiles to the variable, MAKEFILES.
+#   There is no need to rerun autoconf after adding makefiles.
+#   You only need to run configure.
+#
+#   Unused makefiles may be commented out with '#'.
+#   ('#' must be the first character on the line).
+
+# add_makefiles - Shell function to add makefiles to MAKEFILES
+add_makefiles() {
+  while read line; do
+    case $line in
+      \#*|dnl*) ;;
+      *) MAKEFILES="$MAKEFILES $line" ;;
+    esac
+  done
+}
+
+if [ -z "${srcdir}" ]; then
+    srcdir=.
+fi
+
+add_makefiles <<END_NGMAKEFILES
+Makefile
+base/Makefile
+base/public/Makefile
+base/src/Makefile
+base/src/motif/Makefile
+base/src/rhapsody/Makefile
+base/src/gtk/Makefile
+base/tests/Makefile
+config/Makefile
+config/autoconf.mk
+config/mkdepend/Makefile
+config/mkdetect/Makefile
+config/ports/Makefile
+dbm/Makefile
+dbm/include/Makefile
+dbm/src/Makefile
+dbm/tests/Makefile
+dom/Makefile
+dom/public/Makefile
+dom/public/base/Makefile
+dom/public/coreDom/Makefile
+dom/public/coreEvents/Makefile
+dom/public/css/Makefile
+dom/public/events/Makefile
+dom/public/html/Makefile
+dom/src/Makefile
+dom/src/base/Makefile
+dom/src/build/Makefile
+dom/src/coreDOM/Makefile
+dom/src/css/Makefile
+dom/src/events/Makefile
+dom/src/html/Makefile
+dom/src/jsurl/Makefile
+dom/tools/Makefile
+editor/Makefile
+editor/public/Makefile
+expat/Makefile
+expat/xmlparse/Makefile
+expat/xmltok/Makefile
+gfx/Makefile
+gfx/public/Makefile
+gfx/src/Makefile
+gfx/src/gtk/Makefile
+gfx/src/ps/Makefile
+gfx/src/motif/Makefile
+gfx/src/rhapsody/Makefile
+gfx/tests/Makefile
+htmlparser/Makefile
+htmlparser/robot/Makefile
+htmlparser/src/Makefile
+htmlparser/tests/Makefile
+htmlparser/tests/grabpage/Makefile
+htmlparser/tests/logparse/Makefile
+include/Makefile
+intl/Makefile
+intl/uconv/Makefile
+intl/uconv/public/Makefile
+intl/uconv/src/Makefile
+intl/uconv/tests/Makefile
+intl/uconv/ucvja/Makefile
+intl/uconv/ucvlatin/Makefile
+intl/uconv/ucvja2/Makefile
+intl/locale/Makefile
+intl/locale/public/Makefile
+intl/locale/src/Makefile
+intl/locale/src/unix/Makefile
+intl/locale/tests/Makefile
+intl/lwbrk/Makefile
+intl/lwbrk/src/Makefile
+intl/lwbrk/public/Makefile
+intl/lwbrk/tests/Makefile
+intl/unicharutil/Makefile
+intl/unicharutil/src/Makefile
+intl/unicharutil/public/Makefile
+intl/unicharutil/tests/Makefile
+intl/unicharutil/tools/Makefile
+intl/strres/Makefile
+intl/strres/public/Makefile
+intl/strres/src/Makefile
+intl/strres/tests/Makefile
+jpeg/Makefile
+js/Makefile
+js/jsd/Makefile
+js/jsd/classes/Makefile
+js/src/Makefile
+js/src/fdlibm/Makefile
+js/src/liveconnect/Makefile
+js/src/liveconnect/classes/Makefile
+# js/src/xpcom/Makefile
+js/src/xpconnect/Makefile
+js/src/xpconnect/md/Makefile
+js/src/xpconnect/md/unix/Makefile
+js/src/xpconnect/test/Makefile
+layout/Makefile
+layout/base/Makefile
+layout/base/public/Makefile
+layout/base/src/Makefile
+layout/base/tests/Makefile
+layout/build/Makefile
+layout/events/Makefile
+layout/events/public/Makefile
+layout/events/src/Makefile
+layout/html/Makefile
+layout/html/base/Makefile
+layout/html/base/src/Makefile
+layout/html/content/Makefile
+layout/html/content/public/Makefile
+layout/html/content/src/Makefile
+layout/html/document/Makefile
+layout/html/document/src/Makefile
+layout/html/forms/Makefile
+layout/html/forms/public/Makefile
+layout/html/forms/src/Makefile
+layout/html/style/Makefile
+layout/html/style/public/Makefile
+layout/html/style/src/Makefile
+layout/html/table/Makefile
+layout/html/table/public/Makefile
+layout/html/table/src/Makefile
+layout/html/tests/Makefile
+layout/tools/Makefile
+layout/xml/Makefile
+layout/xml/content/Makefile
+layout/xml/content/public/Makefile
+layout/xml/content/src/Makefile
+layout/xml/document/Makefile
+layout/xml/document/public/Makefile
+layout/xml/document/src/Makefile
+layout/xul/Makefile
+layout/xul/base/Makefile
+layout/xul/base/src/Makefile
+layout/xul/content/Makefile
+layout/xul/content/src/Makefile
+# lib/liblayer/Makefile
+# lib/liblayer/include/Makefile
+# lib/liblayer/src/Makefile
+lib/libpwcac/Makefile
+lib/xp/Makefile
+modules/libimg/Makefile
+modules/libimg/classes/Makefile
+modules/libimg/classes/netscape/Makefile
+modules/libimg/classes/netscape/libimg/Makefile
+modules/libimg/png/Makefile
+modules/libimg/public/Makefile
+modules/libimg/src/Makefile
+modules/libpref/Makefile
+modules/libpref/admin/Makefile
+modules/libpref/l10n/Makefile
+modules/libpref/public/Makefile
+modules/libpref/src/Makefile
+modules/libreg/Makefile
+modules/libreg/include/Makefile
+modules/libreg/src/Makefile
+modules/libutil/Makefile
+modules/libutil/public/Makefile
+modules/libutil/src/Makefile
+modules/oji/Makefile
+modules/oji/public/Makefile
+modules/oji/src/Makefile
+modules/plugin/Makefile
+modules/plugin/nglsrc/Makefile
+modules/plugin/public/Makefile
+modules/plugin/src/Makefile
+modules/plugin/test/Makefile
+modules/security/freenav/Makefile
+modules/zlib/Makefile
+modules/zlib/src/Makefile
+nav-java/Makefile
+nav-java/stubs/Makefile
+nav-java/stubs/include/Makefile
+nav-java/stubs/jri/Makefile
+nav-java/stubs/src/Makefile
+network/Makefile
+network/cache/Makefile
+network/cache/nu/Makefile
+network/cache/nu/include/Makefile
+network/cache/nu/public/Makefile
+network/cache/nu/src/Makefile
+network/cache/nu/tests/Makefile
+network/cache/nu/tests/fftest/Makefile
+network/client/Makefile
+network/cnvts/Makefile
+network/cstream/Makefile
+network/main/Makefile
+network/mimetype/Makefile
+network/public/Makefile
+network/module/Makefile
+network/module/tests/Makefile
+network/protocol/Makefile
+network/protocol/about/Makefile
+network/protocol/callback/Makefile
+network/protocol/dataurl/Makefile
+network/protocol/file/Makefile
+network/protocol/ftp/Makefile
+network/protocol/gopher/Makefile
+network/protocol/http/Makefile
+network/protocol/js/Makefile
+network/protocol/ldap/Makefile
+network/protocol/marimba/Makefile
+network/protocol/remote/Makefile
+network/protocol/sockstub/Makefile
+network/util/Makefile
+rdf/Makefile
+rdf/base/Makefile
+rdf/base/idl/Makefile
+rdf/base/public/Makefile
+rdf/base/src/Makefile
+rdf/util/Makefile
+rdf/util/public/Makefile
+rdf/util/src/Makefile
+rdf/build/Makefile
+rdf/content/Makefile
+rdf/content/public/Makefile
+rdf/content/src/Makefile
+rdf/datasource/Makefile
+rdf/datasource/public/Makefile
+rdf/datasource/src/Makefile
+rdf/tests/Makefile
+rdf/tests/localfile/Makefile
+rdf/tests/rdfsink/Makefile
+sun-java/Makefile
+sun-java/stubs/Makefile
+sun-java/stubs/include/Makefile
+sun-java/stubs/jri/Makefile
+sun-java/stubs/src/Makefile
+caps/Makefile
+caps/include/Makefile
+caps/public/Makefile
+caps/src/Makefile
+view/Makefile
+view/public/Makefile
+view/src/Makefile
+webshell/Makefile
+webshell/public/Makefile
+webshell/src/Makefile
+webshell/tests/Makefile
+webshell/tests/viewer/Makefile
+webshell/tests/viewer/public/Makefile
+widget/Makefile
+widget/public/Makefile
+widget/src/Makefile
+widget/src/build/Makefile
+widget/src/motif/Makefile
+widget/src/rhapsody/Makefile
+widget/src/gtk/Makefile
+widget/src/xpwidgets/Makefile
+widget/tests/Makefile
+widget/tests/scribble/Makefile
+widget/tests/widget/Makefile
+xpcom/Makefile
+xpcom/public/Makefile
+xpcom/src/Makefile
+xpcom/tests/Makefile
+xpcom/tests/dynamic/Makefile
+xpcom/tools/Makefile
+xpcom/tools/xpidl/Makefile
+xpcom/libxpt/Makefile
+xpcom/libxpt/public/Makefile
+xpcom/libxpt/src/Makefile
+xpcom/libxpt/tests/Makefile
+xpcom/libxpt/tools/Makefile
+xpcom/libxpt/xptinfo/Makefile
+xpcom/libxpt/xptinfo/public/Makefile
+xpcom/libxpt/xptinfo/src/Makefile
+xpcom/libxpt/xptinfo/tests/Makefile
+xpcom/idl/Makefile
+silentdl/Makefile
+xpfe/Makefile
+xpfe/AppCores/Makefile
+xpfe/AppCores/public/Makefile
+xpfe/AppCores/src/Makefile
+xpfe/AppCores/xul/Makefile
+xpfe/AppCores/idl/Makefile
+xpfe/browser/Makefile
+xpfe/browser/public/Makefile
+xpfe/browser/src/Makefile
+# xpfe/xpviewer/Makefile
+# xpfe/xpviewer/src/Makefile
+# xpfe/xpviewer/public/Makefile
+xpfe/appshell/Makefile
+xpfe/appshell/src/Makefile
+xpfe/appshell/public/Makefile
+xpfe/bootstrap/Makefile
+xpfe/browser/Makefile
+xpfe/browser/src/Makefile
+# xpfe/browser/public/Makefile
+END_NGMAKEFILES
+
+if [ "$MOZ_EDITOR" ]; then
+  add_makefiles <<END_EDITOR_MAKEFILES
+editor/base/Makefile
+editor/txmgr/Makefile
+editor/txmgr/public/Makefile
+editor/txmgr/src/Makefile
+editor/txmgr/tests/Makefile
+editor/guimgr/Makefile
+editor/guimgr/src/Makefile
+editor/guimgr/public/Makefile
+END_EDITOR_MAKEFILES
+fi
+
+if [ "$MOZ_MAIL_NEWS" ]; then
+  add_makefiles < ${srcdir}/mailnews/makefiles
+fi

mozilla/base/makefile.win

@@ -18,6 +18,6 @@
 DEPTH=..
 IGNORE_MANIFEST=1
 
-DIRS=public src tests 
+DIRS=public src 
 
 include <$(DEPTH)\config\rules.mak>

mozilla/base/public/MANIFEST

@@ -6,7 +6,9 @@ nsAutoLock.h
 nsISizeOfHandler.h
 nsFileStream.h
 nsIFileStream.h
+nsIStringStream.h
 nsFileSpec.h
 nsRepeater.h
 nsIProperties.h
 nsCaretProperties.h
+nsSpecialSystemDirectory.h

mozilla/base/public/Makefile.in

@@ -33,6 +33,8 @@ EXPORTS =		\
     nsFileSpec.h        \
     nsFileStream.h      \
     nsIFileStream.h     \
+    nsIStringStream.h   \
+    nsSpecialSystemDirectory.h \
     $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

mozilla/base/public/makefile.win

@@ -29,6 +29,8 @@ EXPORTS =                       \
         nsFileSpec.h            \
         nsFileStream.h          \
         nsIFileStream.h         \
+        nsIStringStream.h       \
+        nsSpecialSystemDirectory.h \
         $(NULL)
 
 MODULE = raptor 

mozilla/base/public/nsCaretProperties.h

@@ -28,7 +28,7 @@ class nsCaretProperties
 												nsCaretProperties();
 		virtual							~nsCaretProperties() {}
 	
-		virtual PRUint32		GetCaretWidth() 		{ return mCaretWidth; }
+		virtual PRInt32			GetCaretWidth() 		{ return mCaretWidth; }
 		virtual PRUint32		GetCaretBlinkRate()	{ return mBlinkRate; }
 		
 		
@@ -37,12 +37,12 @@ class nsCaretProperties
 	// have value for no blinking
 	
 		enum {
-			eDefaulBlinkRate					= 500,		// twice a second
-			eDefaultCaretWidth				= 1				// one pixel wide
+			eDefaulBlinkRate					= 500,			// twice a second
+			eDefaultCaretWidth				= 20				// 20 twips = 1 pixel
 		};
 
 
-		PRUint32				mCaretWidth;			// caret width in twips
+		PRInt32					mCaretWidth;			// caret width in twips
 		PRUint32				mBlinkRate;				// blink rate in milliseconds
 		
 		

mozilla/base/public/nsFileSpec.h

@@ -24,7 +24,8 @@
 //
 //  Classes defined:
 //
-//      nsFilePath, nsFileURL, nsFileSpec, nsPersistentFileDescriptor.
+//      nsFilePath, nsFileURL, nsFileSpec, nsPersistentFileDescriptor
+//      nsDirectoryIterator. Oh, and a convenience class nsAutoCString.
 //
 //  Q.  How should I represent files at run time?
 //  A.  Use nsFileSpec.  Using char* will lose information on some platforms.
@@ -113,6 +114,7 @@
 
 #include "nscore.h"
 #include "nsError.h"
+#include "nsString.h"
 
 //========================================================================================
 //                          Compiler-specific macros, as needed
@@ -159,8 +161,12 @@ class nsPersistentFileDescriptor; // Used for storage across program launches.
 
 class nsOutputStream;
 class nsInputStream;
+class nsIOutputStream;
+class nsIInputStream;
 class nsOutputFileStream;
 class nsInputFileStream;
+class nsOutputConsoleStream;
+class nsString;
 
 //========================================================================================
 // Conversion of native file errors to nsresult values. These are really only for use
@@ -173,15 +179,43 @@ class nsInputFileStream;
 nsresult ns_file_convert_result(PRInt32 nativeErr);
 #define NS_FILE_FAILURE NS_FILE_RESULT(-1)
 
+//========================================================================================
+class NS_BASE nsAutoCString
+//
+// This should be in nsString.h, but the owner would not reply to my proposal.  After four
+// weeks, I decided to put it in here.
+//
+// This is a quiet little class that acts as a sort of autoptr for
+// a const char*.  If you used to call nsString::ToNewCString(), just
+// to pass the result a parameter list, it was a nuisance having to
+// call delete [] on the result after the call.  Now you can say
+//     nsString myStr;
+//     ...
+//     f(nsAutoCString(myStr));
+// where f is declared as void f(const char*);  This call will
+// make a temporary char* pointer on the stack and delete[] it
+// when the function returns.
+//========================================================================================
+{
+public:
+    NS_EXPLICIT                  nsAutoCString(const nsString& other) : mCString(other.ToNewCString()) {}
+    virtual                      ~nsAutoCString();    
+                                 operator const char*() const { return mCString; }
+                                 operator const char*() { return mCString; }
+protected:
+                                 const char* mCString;
+}; // class nsAutoCString
+
 //========================================================================================
 class NS_BASE nsFileSpec
 //    This is whatever each platform really prefers to describe files as.  Declared first
-//  because the other two types have an embeded nsFileSpec object.
+//  because the other two types have an embedded nsFileSpec object.
 //========================================================================================
 {
     public:
                                 nsFileSpec();
         NS_EXPLICIT             nsFileSpec(const char* inString, PRBool inCreateDirs = PR_FALSE);
+        NS_EXPLICIT             nsFileSpec(const nsString& inString, PRBool inCreateDirs = PR_FALSE);
         NS_EXPLICIT             nsFileSpec(const nsFilePath& inPath);
         NS_EXPLICIT             nsFileSpec(const nsFileURL& inURL);
         NS_EXPLICIT             nsFileSpec(const nsPersistentFileDescriptor& inURL);
@@ -189,17 +223,29 @@ class NS_BASE nsFileSpec
         virtual                 ~nsFileSpec();
 
         void                    operator = (const char* inPath);
+        void                    operator = (const nsString& inPath)
+                                {
+                                    const nsAutoCString path(inPath);
+                                    *this = path;
+                                }
         void                    operator = (const nsFilePath& inPath);
         void                    operator = (const nsFileURL& inURL);
         void                    operator = (const nsFileSpec& inOther);
         void                    operator = (const nsPersistentFileDescriptor& inOther);
 
-#ifndef XP_MAC
-                                operator const char* () const { return mPath; }
-                                    // This is the only automatic conversion to const char*
+        PRBool                  operator ==(const nsFileSpec& inOther) const;
+        PRBool                  operator !=(const nsFileSpec& inOther) const;
+
+                                operator const char* () const { return GetCString(); }
+                                    // Same as GetCString (please read the comments).
+       const char*              GetCString() const;
+                                    // This is the only conversion to const char*
                                     // that is provided, and it allows the
-                                    // path to be "passed" to NSPR file routines.
-#endif
+                                    // path to be "passed" to legacy code.  This practice
+                                    // is VERY EVIL and should only be used to support legacy
+                                    // code.  Using it guarantees bugs on Macintosh.
+                                    // The path is cached and freed by the nsFileSpec destructor
+                                    // so do not delete (or free) it.
 
 #ifdef XP_MAC
         // For Macintosh people, this is meant to be useful in its own right as a C++ version
@@ -209,12 +255,19 @@ class NS_BASE nsFileSpec
                                     long parID,
                                     ConstStr255Param name);
                                 nsFileSpec(const FSSpec& inSpec)
-                                    : mSpec(inSpec), mError(NS_OK) {}
+                                    : mSpec(inSpec), mError(NS_OK), mPath(nsnull) {}
+        void                    operator = (const FSSpec& inSpec)
+                                    { mSpec = inSpec; mError = NS_OK; }
 
                                 operator FSSpec* () { return &mSpec; }
                                 operator const FSSpec* const () { return &mSpec; }
                                 operator  FSSpec& () { return mSpec; }
                                 operator const FSSpec& () const { return mSpec; }
+                                
+        const FSSpec&           GetFSSpec() const { return mSpec; }
+        FSSpec&                 GetFSSpec() { return mSpec; }
+        ConstFSSpecPtr          GetFSSpecPtr() const { return &mSpec; }
+        FSSpecPtr               GetFSSpecPtr() { return &mSpec; }
         void                    MakeAliasSafe();
                                     // Called for the spec of an alias.  Copies the alias to
                                     // a secret temp directory and modifies the spec to point
@@ -228,14 +281,22 @@ class NS_BASE nsFileSpec
 #endif // end of Macintosh utility methods.
 
         PRBool                  Valid() const { return NS_SUCCEEDED(Error()); }
-        nsresult                Error() const { return mError; }
+        nsresult                Error() const
+                                {
+                                    #ifndef XP_MAC 
+                                    if (!mPath && NS_SUCCEEDED(mError)) 
+                                        ((nsFileSpec*)this)->mError = NS_FILE_FAILURE; 
+                                    #endif 
+                                    return mError;
+                                }
+        PRBool                  Failed() const { return NS_FAILED(Error()); }
+
 
-#if DEBUG
         friend                  NS_BASE nsOutputStream& operator << (
                                     nsOutputStream& s,
                                     const nsFileSpec& spec); // THIS IS FOR DEBUGGING ONLY.
                                         // see PersistentFileDescriptor for the real deal.
-#endif
+
 
         //--------------------------------------------------
         // Queries and path algebra.  These do not modify the disk.
@@ -245,7 +306,11 @@ class NS_BASE nsFileSpec
         void                    SetLeafName(const char* inLeafName);
                                     // inLeafName can be a relative path, so this allows
                                     // one kind of concatenation of "paths".
-
+        void                    SetLeafName(const nsString& inLeafName)
+                                {
+                                    const nsAutoCString leafName(inLeafName);
+                                    SetLeafName(leafName);
+                                }
         void                    GetParent(nsFileSpec& outSpec) const;
                                     // Return the filespec of the parent directory. Used
                                     // in conjunction with GetLeafName(), this lets you
@@ -254,8 +319,35 @@ class NS_BASE nsFileSpec
                                     // but a spec.  Volumes on Macintosh can have identical
                                     // names.  Perhaps could be used for an operator --() ?
 
+        typedef PRUint32        TimeStamp; // ie nsFileSpec::TimeStamp.  This is 32 bits now,
+                                           // but might change, eg, to a 64-bit class.  So use the
+                                           // typedef, and use a streaming operator to convert
+                                           // to a string, so that your code won't break.  It's
+                                           // none of your business what the number means.  Don't
+                                           // rely on the implementation.
+        void                    GetModDate(TimeStamp& outStamp) const;
+                                           // This will return different values on different
+                                           // platforms, even for the same file (eg, on a server).
+                                           // But if the platform is constant, it will increase after
+                                           // every file modification.
+        PRBool                  ModDateChanged(const TimeStamp& oldStamp) const
+                                {
+                                    TimeStamp newStamp;
+                                    GetModDate(newStamp);
+                                    return newStamp != oldStamp;
+                                }
+        
+        PRUint32                GetFileSize() const;
+        PRUint32                GetDiskSpaceAvailable() const;
+        
         nsFileSpec              operator + (const char* inRelativePath) const;
-        void			        operator += (const char* inRelativePath);
+        nsFileSpec              operator + (const nsString& inRelativePath) const
+                                {
+                                    const nsAutoCString 
+                                      relativePath(inRelativePath);
+                                    return *this + relativePath;
+                                }
+        void                    operator += (const char* inRelativePath);
                                     // Concatenate the relative path to this directory.
                                     // Used for constructing the filespec of a descendant.
                                     // This must be a directory for this to work.  This differs
@@ -264,9 +356,19 @@ class NS_BASE nsFileSpec
                                     // away its leaf information, whereas this one assumes
                                     // this is a directory, and the relative path starts
                                     // "below" this.
+        void                    operator += (const nsString& inRelativePath)
+                                {
+                                    const nsAutoCString relativePath(inRelativePath);
+                                    *this += relativePath;
+                                }
 
         void                    MakeUnique();
         void                    MakeUnique(const char* inSuggestedLeafName);
+        void                    MakeUnique(const nsString& inSuggestedLeafName)
+                                {
+                                    const nsAutoCString suggestedLeafName(inSuggestedLeafName);
+                                    MakeUnique(suggestedLeafName);
+                                }
     
         PRBool                  IsDirectory() const;
                                     // More stringent than Exists()
@@ -279,24 +381,39 @@ class NS_BASE nsFileSpec
         //--------------------------------------------------
 
         void                    CreateDirectory(int mode = 0700 /* for unix */);
-        void                    Delete(PRBool inRecursive);
+        void                    Delete(PRBool inRecursive) const;
         
         nsresult                Rename(const char* inNewName); // not const: gets updated
+        nsresult                Rename(const nsString& inNewName)
+                                {
+                                    const nsAutoCString newName(inNewName);
+                                    return Rename(newName);
+                                }
         nsresult                Copy(const nsFileSpec& inNewParentDirectory) const;
         nsresult                Move(const nsFileSpec& inNewParentDirectory) const;
         nsresult                Execute(const char* args) const;
+        nsresult                Execute(const nsString& args) const
+                                {
+                                    const nsAutoCString argsString(args);
+                                    return Execute(argsString);
+                                }
 
+    protected:
+    #ifdef XP_MAC
+        OSErr                   GetCatInfo(CInfoPBRec& outInfo) const;
+    #endif
         //--------------------------------------------------
         // Data
         //--------------------------------------------------
 
-    private:
+    protected:
                                 friend class nsFilePath;
+                                friend class nsFileURL;
+                                friend class nsDirectoryIterator;
 #ifdef XP_MAC
         FSSpec                  mSpec;
-#else
-        char*                   mPath;
 #endif
+        char*                   mPath;
         nsresult                mError;
 }; // class nsFileSpec
 
@@ -314,6 +431,7 @@ class NS_BASE nsFileURL
     public:
                                 nsFileURL(const nsFileURL& inURL);
         NS_EXPLICIT             nsFileURL(const char* inString, PRBool inCreateDirs = PR_FALSE);
+        NS_EXPLICIT             nsFileURL(const nsString& inString, PRBool inCreateDirs = PR_FALSE);
         NS_EXPLICIT             nsFileURL(const nsFilePath& inPath);
         NS_EXPLICIT             nsFileURL(const nsFileSpec& inPath);
         virtual                 ~nsFileURL();
@@ -324,9 +442,17 @@ class NS_BASE nsFileURL
 
         void                    operator = (const nsFileURL& inURL);
         void                    operator = (const char* inString);
+        void                    operator = (const nsString& inString)
+                                {
+                                    const nsAutoCString string(inString);
+                                    *this = string;
+                                }
         void                    operator = (const nsFilePath& inOther);
         void                    operator = (const nsFileSpec& inOther);
 
+                                operator const char* () const { return mURL; } // deprecated.
+        const char*             GetAsString() const { return mURL; }
+
         friend                  NS_BASE nsOutputStream& operator << (
                                      nsOutputStream& s, const nsFileURL& spec);
 
@@ -337,8 +463,7 @@ class NS_BASE nsFileURL
     private:
         // Should not be defined (only nsFilePath is to be treated as strings.
                                 operator char* ();
-                                operator const char* const ();
-    private:
+    protected:
                                 friend class nsFilePath; // to allow construction of nsFilePath
         char*                   mURL;
 #ifdef XP_MAC
@@ -350,13 +475,15 @@ class NS_BASE nsFileURL
 
 //========================================================================================
 class NS_BASE nsFilePath
-//    This is a string that looks like "/foo/bar/mumble%20fish".  Same as nsFileURL, but
-//    without the "file:// prefix".
+//    This is a string that looks like "/foo/bar/mumble fish".  Same as nsFileURL, but
+//    without the "file:// prefix", and NOT %20 ENCODED! Strings passed in must be
+//    valid unix-style paths in this format.
 //========================================================================================
 {
     public:
                                 nsFilePath(const nsFilePath& inPath);
         NS_EXPLICIT             nsFilePath(const char* inString, PRBool inCreateDirs = PR_FALSE);
+        NS_EXPLICIT             nsFilePath(const nsString& inString, PRBool inCreateDirs = PR_FALSE);
         NS_EXPLICIT             nsFilePath(const nsFileURL& inURL);
         NS_EXPLICIT             nsFilePath(const nsFileSpec& inPath);
         virtual                 ~nsFilePath();
@@ -373,6 +500,11 @@ class NS_BASE nsFilePath
 
         void                    operator = (const nsFilePath& inPath);
         void                    operator = (const char* inString);
+        void                    operator = (const nsString& inString)
+                                {
+                                    const nsAutoCString string(inString);
+                                    *this = string;
+                                }
         void                    operator = (const nsFileURL& inURL);
         void                    operator = (const nsFileSpec& inOther);
 
@@ -394,6 +526,10 @@ class NS_BASE nsFilePath
 
 //========================================================================================
 class NS_BASE nsPersistentFileDescriptor
+// To save information about a file's location in another file, initialize
+// one of these from your nsFileSpec, and then write this out to your output stream.
+// To retrieve the info, create one of these, read its value from an input stream.
+// and then make an nsFileSpec from it.
 //========================================================================================
 {
     public:
@@ -404,9 +540,12 @@ class NS_BASE nsPersistentFileDescriptor
         void					operator = (const nsPersistentFileDescriptor& inPath);
         
         // Conversions
-                                nsPersistentFileDescriptor(const nsFileSpec& inPath);
+        NS_EXPLICIT             nsPersistentFileDescriptor(const nsFileSpec& inPath);
         void					operator = (const nsFileSpec& inPath);
         
+    	nsresult                Read(nsIInputStream* aStream);
+    	nsresult                Write(nsIOutputStream* aStream);
+    	    // writes the data to a file
     	friend NS_BASE nsInputStream& operator >> (nsInputStream&, nsPersistentFileDescriptor&);
     		// reads the data from a file
     	friend NS_BASE nsOutputStream& operator << (nsOutputStream&, const nsPersistentFileDescriptor&);
@@ -419,7 +558,7 @@ class NS_BASE nsPersistentFileDescriptor
                                      // DON'T FREE the returned data!
         void                    SetData(const void* inData, PRInt32 inSize);
 
-    private:
+    protected:
 
         char*                   mDescriptorString;
 
@@ -462,7 +601,7 @@ class NS_BASE nsDirectoryIterator
 	                            operator nsFileSpec&() { return mCurrent; }
 	private:
 	    nsFileSpec              mCurrent;
-	    bool                    mExists; // MUST be bool.
+	    PRBool                  mExists;
 	      
 #if defined(XP_UNIX)
         DIR*                    mDir;

mozilla/base/public/nsFileStream.h

@@ -35,15 +35,10 @@
 //                the handy << or >> notation can be yours.
 //                
 //          nsInputFileStream, nsOutputFileStream
-//                These are the STATICALLY LINKED versions of the file i/o streams,
-//                which wrap the NSPR file i/o plus console i/o.
-//
-//  Related files:
-//          prio.h             the NSPR file i/o C API), which is wrapped by
-//          THIS FILE          statically linked C++ wrappers, which in turn are wrapped by
-//          nsIFileStream.h    COM wrappers for this file, which are wrapped by
-//          nsAutoFileStream.h more easily used, nicer syntax wrappers for the
-//                             COMified ones.  Wrapper of a wrapper of a wrapper.
+//                These are the STATICALLY LINKED wrappers for the file-related
+//                versions of the above.
+//          nsIOFileStream
+//                An input and output file stream attached to the same file.
 //
 //  This suite provide the following services:
 //
@@ -91,12 +86,14 @@
 #include "prio.h"
 #endif
 
-#include "nsIFileStream.h"
 #include "nsCOMPtr.h"
+#include "nsIFileStream.h"
 
+// Defined elsewhere
 class nsFileSpec;
-class nsInputFileStream;
-class nsOutputFileStream;
+class nsString;
+class nsIInputStream;
+class nsIOutputStream;
 
 //========================================================================================
 //                          Compiler-specific macros, as needed
@@ -174,18 +171,13 @@ public:
                                       {
                                           return mInputStream;
                                       }
-    char                              eof() const { return mEOF; }
+    char                              eof() const { return get_at_eof(); }
     char                              get();
-    PRInt32                           read(void* s, PRInt32 n)
+    void                              close()
                                       {
-                                          if (!mInputStream)
-                                              return 0;
-                                          PRInt32 result = 0;
-                                          mInputStream->Read((char*)s, 0, n, (PRUint32*)&result);
-                                          if (result < n)
-                                              mEOF = PR_TRUE;
-                                          return result;
+                                          mInputStream->Close();
                                       }
+    PRInt32                           read(void* s, PRInt32 n);
 
     // Input streamers.  Add more as needed (int&, unsigned int& etc). (but you have to
     // add delegators to the derived classes, too, because these operators don't inherit).
@@ -196,6 +188,19 @@ public:
                                       {
                                            return pf(*this);
                                       }
+
+protected:
+
+   // These certainly need to be overridden, they give the best shot we can at detecting
+   // eof in a simple nsIInputStream.
+   virtual void                       set_at_eof(PRBool atEnd)
+                                      {
+                                         mEOF = atEnd;
+                                      }
+   virtual PRBool                     get_at_eof() const
+                                      {
+                                          return mEOF;
+                                      }
 private:
 
     nsInputStream&                    operator >> (char* buf); // TOO DANGEROUS. DON'T DEFINE.
@@ -219,7 +224,7 @@ class NS_BASE nsOutputStream
 public:
                                       nsOutputStream() {}
                                       nsOutputStream(nsIOutputStream* inStream)
-                                      :    mOutputStream(do_QueryInterface(inStream))
+                                      :   mOutputStream(do_QueryInterface(inStream))
                                           {}
 
     virtual                          ~nsOutputStream();
@@ -228,15 +233,12 @@ public:
                                       {
                                           return mOutputStream;
                                       }
-    void                              put(char c);
-    PRInt32                           write(const void* s, PRInt32 n)
+    void                              close()
                                       {
-                                          if (!mOutputStream)
-                                              return 0;
-                                          PRInt32 result = 0;
-                                          mOutputStream->Write((char*)s, 0, n, (PRUint32*)&result);
-                                          return result;
+                                          mOutputStream->Close();
                                       }
+    void                              put(char c);
+    PRInt32                           write(const void* s, PRInt32 n);
     virtual void                      flush();
 
     // Output streamers.  Add more as needed (but you have to add delegators to the derived
@@ -247,6 +249,8 @@ public:
     nsOutputStream&                   operator << (unsigned short val);
     nsOutputStream&                   operator << (long val);
     nsOutputStream&                   operator << (unsigned long val);
+    nsOutputStream&                   operator << (int val);
+    nsOutputStream&                   operator << (unsigned int val);
 
     // Support manipulators
     nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
@@ -261,28 +265,41 @@ protected:
 
 typedef nsOutputStream nsBasicOutStream; // Historic support for this name
 
+//========================================================================================
+class NS_BASE nsErrorProne
+// Common (virtual) base class for remembering errors on demand
+//========================================================================================
+{
+public:
+                                      nsErrorProne() // for delayed opening
+                                      :   mResult(NS_OK)
+                                      {
+                                      }
+    PRBool                            failed() const
+                                      {
+                                          return NS_FAILED(mResult);
+                                      }
+
+// DATA
+protected:
+    nsresult                          mResult;
+}; // class nsErrorProne
+
 //========================================================================================
 class NS_BASE nsFileClient
 // Because COM does not allow us to write functions which return a boolean value etc,
 // this class is here to take care of the tedious "declare variable then call with
 // the address of the variable" chores.
 //========================================================================================
+:    public virtual nsErrorProne
 {
 public:
-                                      nsFileClient() // for delayed opening
-                                      :   mResult(NS_OK)
-                                      {
-                                      }
                                       nsFileClient(const nsCOMPtr<nsIFile>& inFile)
                                       :   mFile(do_QueryInterface(inFile))
-                                      ,   mResult(NS_OK)
                                       {
                                       }
-    
-    PRBool                            is_file() const
-                                      {
-                                          return mFile ? PR_TRUE : PR_FALSE;
-                                      }
+    virtual                           ~nsFileClient() {}
+
     void                              open(
                                           const nsFileSpec& inFile,
                                           int nsprMode,
@@ -298,10 +315,39 @@ public:
                                               mFile->GetIsOpen(&result);
                                           return result;
                                       }
-    PRBool                            failed() const
+    PRBool                            is_file() const
                                       {
-                                          return NS_FAILED(mResult);
+                                          return mFile ? PR_TRUE : PR_FALSE;
                                       }
+
+protected:
+
+                                      nsFileClient() // for delayed opening
+                                      {
+                                      }
+// DATA
+protected:
+    nsCOMPtr<nsIFile>                 mFile;
+}; // class nsFileClient
+
+//========================================================================================
+class NS_BASE nsRandomAccessStoreClient
+// Because COM does not allow us to write functions which return a boolean value etc,
+// this class is here to take care of the tedious "declare variable then call with
+// the address of the variable" chores.
+//========================================================================================
+:    public virtual nsErrorProne
+{
+public:
+                                      nsRandomAccessStoreClient() // for delayed opening
+                                      {
+                                      }
+                                      nsRandomAccessStoreClient(const nsCOMPtr<nsIRandomAccessStore>& inStore)
+                                      :   mStore(do_QueryInterface(inStore))
+                                      {
+                                      }
+    virtual                           ~nsRandomAccessStoreClient() {}
+    
     void                              seek(PRInt32 offset)
                                       {
                                           seek(PR_SEEK_SET, offset);
@@ -309,34 +355,110 @@ public:
 
     void                              seek(PRSeekWhence whence, PRInt32 offset)
                                       {
-                                          if (mFile)
-                                              mResult = mFile->Seek(whence, offset);
+                                          set_at_eof(PR_FALSE);
+                                          if (mStore)
+                                              mResult = mStore->Seek(whence, offset);
                                       }
     PRIntn                            tell()
                                       {
                                           PRIntn result = -1;
-                                          if (mFile)
-                                              mResult = mFile->Tell(&result);
+                                          if (mStore)
+                                              mResult = mStore->Tell(&result);
                                           return result;
                                       }
-                                      
+
+protected:
+
+   virtual PRBool                     get_at_eof() const
+                                      {
+                                          PRBool result = PR_TRUE;
+                                          if (mStore)
+                                              mStore->GetAtEOF(&result);
+                                          return result;
+                                      }
+
+   virtual void                       set_at_eof(PRBool atEnd)
+                                      {
+                                          if (mStore)
+                                              mStore->SetAtEOF(atEnd);
+                                      }
+
 // DATA
 protected:
-    nsCOMPtr<nsIFile>                 mFile;
-    PRBool                            mResult;
-}; // class nsFileClient
+    nsCOMPtr<nsIRandomAccessStore>    mStore;
+}; // class nsRandomAccessStoreClient
+
+//========================================================================================
+class NS_BASE nsRandomAccessInputStream
+// Please read the comments at the top of this file
+//========================================================================================
+:	public nsRandomAccessStoreClient
+,	public nsInputStream
+{
+public:
+                                      nsRandomAccessInputStream(nsIInputStream* inStream)
+                                      :   nsRandomAccessStoreClient(do_QueryInterface(inStream))
+                                      ,   nsInputStream(inStream)
+                                      {
+                                      }
+    PRBool                            readline(char* s,  PRInt32 n);
+                                          // Result always null-terminated.
+                                          // Check eof() before each call.
+                                          // CAUTION: false result only indicates line was truncated
+                                          // to fit buffer, or an error occurred (OTHER THAN eof).
+
+    // Input streamers.  Unfortunately, they don't inherit!
+    nsInputStream&                    operator >> (char& ch)
+                                         { return nsInputStream::operator >>(ch); }
+    nsInputStream&                    operator >> (nsInputStream& (*pf)(nsInputStream&))
+                                         { return nsInputStream::operator >>(pf); }
+
+protected:
+                                      nsRandomAccessInputStream()
+                                      :  nsInputStream(nsnull)
+                                      {
+                                      }
+
+   virtual PRBool                     get_at_eof() const
+                                      {
+                                          return nsRandomAccessStoreClient::get_at_eof();
+                                      }
+
+   virtual void                       set_at_eof(PRBool atEnd)
+                                      {
+                                          nsRandomAccessStoreClient::set_at_eof(atEnd);
+                                      }
+
+}; // class nsRandomAccessInputStream
+
+//========================================================================================
+class NS_BASE nsInputStringStream
+//========================================================================================
+: public nsRandomAccessInputStream
+{
+public:
+                                      nsInputStringStream(const char* stringToRead);
+                                      nsInputStringStream(const nsString& stringToRead);
+
+    // Input streamers.  Unfortunately, they don't inherit!
+    nsInputStream&                    operator >> (char& ch)
+                                         { return nsInputStream::operator >>(ch); }
+    nsInputStream&                    operator >> (nsInputStream& (*pf)(nsInputStream&))
+                                         { return nsInputStream::operator >>(pf); }
+
+}; // class nsInputStringStream
 
 //========================================================================================
 class NS_BASE nsInputFileStream
 // Please read the comments at the top of this file
 //========================================================================================
-:	public nsInputStream
-,	public nsFileClient
+:	public nsRandomAccessInputStream
+,   public nsFileClient
 {
 public:
 	enum  { kDefaultMode = PR_RDONLY };
                                       nsInputFileStream(nsIInputStream* inStream)
-                                      :   nsInputStream(inStream)
+                                      :   nsRandomAccessInputStream(inStream)
                                       ,   nsFileClient(do_QueryInterface(inStream))
                                       ,   mFileInputStream(do_QueryInterface(inStream))
                                       {
@@ -344,28 +466,12 @@ public:
                                       nsInputFileStream(
                                           const nsFileSpec& inFile,
                                           int nsprMode = kDefaultMode,
-                                          PRIntn accessMode = 00700) // <- OCTAL
-                                      :  nsInputStream(nsnull)
-                                      {
-                                          nsISupports* stream;
-                                          NS_NewIOFileStream(
-                                              &stream,
-                                              inFile, nsprMode, accessMode);
-                                          mFile = nsQueryInterface(stream);
-                                          mInputStream = nsQueryInterface(stream);
-                                          mFileInputStream = nsQueryInterface(stream);
-                                      }
-
-    PRBool                            readline(char* s,  PRInt32 n);
-                                          // Result always null-terminated.
-                                          // Check eof() before each call.
-                                          // CAUTION: false result only indicates line was truncated
-                                          // to fit buffer, or an error occurred (OTHER THAN eof).
+                                          PRIntn accessMode = 00700); // <- OCTAL
 
     void                              Open(
-                                           const nsFileSpec& inFile,
-                                           int nsprMode = kDefaultMode,
-                                           PRIntn accessMode = 00700) // <- OCTAL
+                                          const nsFileSpec& inFile,
+                                          int nsprMode = kDefaultMode,
+                                          PRIntn accessMode = 00700) // <- OCTAL
                                       {
                                           if (mFile)
                                               mFile->Open(inFile, nsprMode, accessMode);
@@ -382,29 +488,94 @@ protected:
     nsCOMPtr<nsIFileInputStream>      mFileInputStream;
 }; // class nsInputFileStream
 
+//========================================================================================
+class NS_BASE nsRandomAccessOutputStream
+// Please read the comments at the top of this file
+//========================================================================================
+:	public nsRandomAccessStoreClient
+,	public nsOutputStream
+{
+public:
+                                      nsRandomAccessOutputStream(nsIOutputStream* inStream)
+                                      :   nsRandomAccessStoreClient(do_QueryInterface(inStream))
+                                      ,   nsOutputStream(inStream)
+                                      {
+                                      }
+
+    // Output streamers.  Unfortunately, they don't inherit!
+    nsOutputStream&                   operator << (const char* buf)
+                                        { return nsOutputStream::operator << (buf); }
+    nsOutputStream&                   operator << (char ch)
+                                        { return nsOutputStream::operator << (ch); }
+    nsOutputStream&                   operator << (short val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned short val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (long val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned long val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (int val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned int val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
+                                        { return nsOutputStream::operator << (pf); }
+
+protected:
+                                      nsRandomAccessOutputStream()
+                                      :  nsOutputStream(nsnull)
+                                      {
+                                      }
+}; // class nsRandomAccessOutputStream
+
+//========================================================================================
+class NS_BASE nsOutputStringStream
+//========================================================================================
+: public nsRandomAccessOutputStream
+{
+public:
+                                      nsOutputStringStream(char*& stringToChange);
+                                      nsOutputStringStream(nsString& stringToChange);
+
+    // Output streamers.  Unfortunately, they don't inherit!
+    nsOutputStream&                   operator << (const char* buf)
+                                        { return nsOutputStream::operator << (buf); }
+    nsOutputStream&                   operator << (char ch)
+                                        { return nsOutputStream::operator << (ch); }
+    nsOutputStream&                   operator << (short val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned short val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (long val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned long val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (int val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned int val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
+                                        { return nsOutputStream::operator << (pf); }
+
+}; // class nsOutputStringStream
+
 //========================================================================================
 class NS_BASE nsOutputFileStream
 // Please read the comments at the top of this file
 //========================================================================================
-:	public nsOutputStream
+:	public nsRandomAccessOutputStream
 ,	public nsFileClient
 {
 public:
 	enum  { kDefaultMode = (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE) };
 
                                       nsOutputFileStream() {}
-                                      nsOutputFileStream(nsIOutputStream* inStream)
-                                      :   nsOutputStream(inStream)
-                                      ,   nsFileClient(do_QueryInterface(inStream))
-                                      ,   mFileOutputStream(do_QueryInterface(inStream))
-                                      {
-                                      }
                                       nsOutputFileStream(
                                            const nsFileSpec& inFile,
                                            int nsprMode = kDefaultMode,
                                            PRIntn accessMode = 00700) // <- OCTAL
-                                      :  nsOutputStream(nsnull)
-                                      {
+                                       {
                                           nsISupports* stream;
                                           if (NS_FAILED(NS_NewIOFileStream(
                                               &stream,
@@ -412,7 +583,9 @@ public:
                                               return;
                                           mFile = nsQueryInterface(stream);
                                           mOutputStream = nsQueryInterface(stream);
+                                          mStore = nsQueryInterface(stream);
                                           mFileOutputStream = nsQueryInterface(stream);
+                                          NS_RELEASE(stream);
                                       }
  
     virtual void                      flush();
@@ -430,6 +603,10 @@ public:
                                         { return nsOutputStream::operator << (val); }
     nsOutputStream&                   operator << (unsigned long val)
                                         { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (int val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned int val)
+                                        { return nsOutputStream::operator << (val); }
     nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
                                         { return nsOutputStream::operator << (pf); }
 
@@ -454,6 +631,7 @@ public:
                                           mFile = nsQueryInterface(stream);
                                           mOutputStream = nsQueryInterface(stream);
                                           mFileOutputStream = nsQueryInterface(stream);
+                                          NS_RELEASE(stream);
                                       }
 
     // Output streamers.  Unfortunately, they don't inherit!
@@ -469,6 +647,10 @@ public:
                                         { return nsOutputStream::operator << (val); }
     nsOutputStream&                   operator << (unsigned long val)
                                         { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (int val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned int val)
+                                        { return nsOutputStream::operator << (val); }
     nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
                                         { return nsOutputStream::operator << (pf); }
 
@@ -505,12 +687,21 @@ public:
                                               inFile, nsprMode, accessMode)))
                                               return;
                                           mFile = nsQueryInterface(stream);
+                                          mStore = nsQueryInterface(stream);
                                           mInputStream = nsQueryInterface(stream);
                                           mOutputStream = nsQueryInterface(stream);
                                           mFileInputStream = nsQueryInterface(stream);
                                           mFileOutputStream = nsQueryInterface(stream);
+                                          NS_RELEASE(stream);
                                       }
  
+    virtual void                      close()
+                                      {
+                                          // Doesn't matter which of the two we close:
+                                          // they're hooked up to the same file.
+                                          nsInputFileStream::close();
+                                      }
+
      // Output streamers.  Unfortunately, they don't inherit!
     nsOutputStream&                   operator << (const char* buf)
                                         { return nsOutputStream::operator << (buf); }
@@ -524,6 +715,10 @@ public:
                                         { return nsOutputStream::operator << (val); }
     nsOutputStream&                   operator << (unsigned long val)
                                         { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (int val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned int val)
+                                        { return nsOutputStream::operator << (val); }
     nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
                                         { return nsOutputStream::operator << (pf); }
 
@@ -532,6 +727,7 @@ public:
                                          { return nsInputStream::operator >>(ch); }
     nsInputStream&                    operator >> (nsInputStream& (*pf)(nsInputStream&))
                                          { return nsInputStream::operator >>(pf); }
+
     // DATA
 protected:
     nsCOMPtr<nsIFileOutputStream>     mFileOutputStream;

mozilla/base/public/nsIFileStream.h

@@ -31,12 +31,12 @@ class nsFileSpec;
 
 //========================================================================================
 class nsIFile
-// Represents a file, and supports Open, Tell etc.
+// Represents a file, and supports Open.
 //========================================================================================
 : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IFILE_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IFILE_IID; return iid; }
 	NS_IMETHOD                         Open(
                                            const nsFileSpec& inFile,
                                            int nsprMode,
@@ -44,11 +44,31 @@ public:
                                            // Note: Open() is only needed after
                                            // an explicit Close().  All file streams
                                            // are automatically opened on construction.
-    NS_IMETHOD                         Seek(PRSeekWhence whence, PRInt32 offset) = 0;
     NS_IMETHOD                         GetIsOpen(PRBool* outOpen) = 0;
-    NS_IMETHOD                         Tell(PRIntn* outWhere) = 0;
+
 }; // class nsIFile
 
+/* a6cf90e8-15b3-11d2-932e-00805f8add32 */
+#define NS_IRANDOMACCESS_IID \
+{  0xa6cf90eb, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
+
+//========================================================================================
+class nsIRandomAccessStore
+// Supports Seek, Tell etc.
+//========================================================================================
+: public nsISupports
+{
+public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IRANDOMACCESS_IID; return iid; }
+    NS_IMETHOD                         Seek(PRSeekWhence whence, PRInt32 offset) = 0;
+    NS_IMETHOD                         Tell(PRIntn* outWhere) = 0;
+
+/* "PROTECTED" */
+    NS_IMETHOD                         GetAtEOF(PRBool* outAtEOF) = 0;
+    NS_IMETHOD                         SetAtEOF(PRBool inAtEOF) = 0;
+}; // class nsIRandomAccessStore
+
 /* a6cf90e6-15b3-11d2-932e-00805f8add32 */
 #define NS_IFILEINPUTSTREAM_IID \
 { 0xa6cf90e6, 0x15b3, 0x11d2, \
@@ -60,10 +80,10 @@ class nsIFileInputStream
 // nsIInputStream supports.  The current implementation supports both
 // interfaces.
 //========================================================================================
-: public nsISupports
+: public nsIInputStream
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IFILEINPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IFILEINPUTSTREAM_IID; return iid; }
 }; // class nsIFileInputStream
 
 /* a6cf90e7-15b3-11d2-932e-00805f8add32 */
@@ -77,16 +97,16 @@ class nsIFileOutputStream
 // nsIOutputStream supports.  The current implementation supports both
 // interfaces.
 //========================================================================================
-: public nsISupports
+: public nsIOutputStream
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IFILEOUTPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IFILEOUTPUTSTREAM_IID; return iid; }
     NS_IMETHOD                         Flush() = 0;
                                            // Forces a write to disk.
 }; // class nsIFileOutputStream
 
 //----------------------------------------------------------------------------------------
-NS_BASE nsresult NS_NewTypicalInputFileStream(
+extern "C" NS_BASE nsresult NS_NewTypicalInputFileStream(
     nsISupports** aStreamResult,
     const nsFileSpec& inFile
     /*Default nsprMode == PR_RDONLY*/

mozilla/base/public/nsIStringStream.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIStringStream_h___
+#define nsIStringStream_h___
+
+#include "nsIInputStream.h"
+#include "nsIOutputStream.h"
+#include "nsString.h"
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewStringInputStream(
+    nsISupports** aStreamResult,
+    const nsString& aStringToRead);
+    // Factory method to get an nsInputStream from a string.  Result will implement all the
+    // file stream interfaces in nsIFileStream.h
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewStringOutputStream(
+    nsISupports** aStreamResult,
+    nsString& aStringToChange);
+    // Factory method to get an nsOutputStream from a string.  Result will implement all the
+    // file stream interfaces in nsIFileStream.h
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewCharInputStream(
+    nsISupports** aStreamResult,
+    const char* aStringToRead);
+    // Factory method to get an nsInputStream from a string.  Result will implement all the
+    // file stream interfaces in nsIFileStream.h
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewCharOutputStream(
+    nsISupports** aStreamResult,
+    char** aStringToChange);
+    // Factory method to get an nsOutputStream to a string.  Result will implement all the
+    // file stream interfaces in nsIFileStream.h
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewStringIOStream(
+    nsISupports** aStreamResult,
+    nsString& aStringToChange);
+    // Factory method to get an nsOutputStream to a string.  Result will implement all the
+// file stream interfaces in nsIFileStream.h
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewCharIOStream(
+    nsISupports** aStreamResult,
+    char** aStringToChange);
+    // Factory method to get an nsOutputStream to a string.  Result will implement all the
+    // file stream interfaces in nsIFileStream.h
+
+#endif /* nsIStringStream_h___ */

mozilla/base/public/nsSpecialSystemDirectory.h

@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Doug Turner <dougt@netscape.com>
+ */
+
+#ifndef _NSSPECIALSYSTEMDIRECTORY_H_
+#define _NSSPECIALSYSTEMDIRECTORY_H_
+
+#include "nscore.h"
+#include "nsFileSpec.h"
+
+#ifdef XP_MAC
+#include "Types.h"
+#endif
+
+// SEE ALSO:
+//      mozilla/xpfe/appshell/public/nsFileLocations.h
+
+class NS_BASE nsSpecialSystemDirectory : public nsFileSpec
+{
+
+    public:
+        enum SystemDirectories
+        {
+            OS_DriveDirectory         =   1
+        ,   OS_TemporaryDirectory     =   2
+        ,   OS_CurrentProcessDirectory=   3
+
+        ,   Mac_SystemDirectory       =   101
+        ,   Mac_DesktopDirectory      =   102
+        ,   Mac_TrashDirectory        =   103
+        ,   Mac_StartupDirectory      =   104
+        ,   Mac_ShutdownDirectory     =   105
+        ,   Mac_AppleMenuDirectory    =   106
+        ,   Mac_ControlPanelDirectory =   107
+        ,   Mac_ExtensionDirectory    =   108
+        ,   Mac_FontsDirectory        =   109
+        ,   Mac_PreferencesDirectory  =   110
+        ,   Mac_DocumentsDirectory    =   111
+        
+        ,   Win_SystemDirectory       =   201
+        ,   Win_WindowsDirectory      =   202
+        
+        ,   Unix_LocalDirectory       =   301
+        ,   Unix_LibDirectory         =   302    
+        };
+
+                    //nsSpecialSystemDirectory();
+                    nsSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory);
+        
+    virtual         ~nsSpecialSystemDirectory();
+
+    void            operator = (SystemDirectories aSystemSystemDirectory);
+ 
+#ifdef XP_MAC
+    void            operator = (OSType folderType);
+                    nsSpecialSystemDirectory(OSType folderType);
+#endif
+
+private:
+    void            operator = (const char* inPath) { *(nsFileSpec*)this = inPath; }
+
+}; // class NS_BASE nsSpecialSystemDirectory
+
+#endif

mozilla/base/src/Makefile.in

@@ -24,6 +24,8 @@ include $(DEPTH)/config/autoconf.mk
 
 DEFINES +=-D_IMPL_NS_BASE
 
+LOCAL_INCLUDES += -I$(topsrcdir)/base/public
+
 DIRS = $(MOZ_TOOLKIT)
 
 LIBRARY_NAME = raptorbase
@@ -39,14 +41,16 @@ CPPSRCS =                       \
     nsEscape.cpp                \
     nsFileSpec.cpp              \
     nsFileStream.cpp            \
-    nsIFileStream.cpp            \
+    nsIFileStream.cpp           \
+    nsIStringStream.cpp         \
     nsProperties.cpp            \
     nsRBTree.cpp                \
-    nsSizeOfHandler.cpp		\
+    nsSizeOfHandler.cpp		    \
     nsString.cpp                \
     nsUnicharBuffer.cpp         \
     nsUnicharInputStream.cpp    \
     nsVoidArray.cpp             \
+    nsSpecialSystemDirectory.cpp\
     $(NULL)
 
 EXPORTS =                       \

mozilla/base/src/gtk/Makefile.in

@@ -30,10 +30,13 @@ REQUIRES	= xpcom raptor
 
 DEFINES		+= -D_IMPL_NS_WIDGET
 
-CPPSRCS		= nsTimer.cpp
+CPPSRCS		= 									\
+		nsTimer.cpp								\
+		nsCaretProperties.cpp			\
+    $(NULL)
 
 include $(topsrcdir)/config/config.mk
 
-CFLAGS		+= $(TK_CFLAGS)
+CXXFLAGS	+= $(TK_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk

mozilla/base/src/gtk/nsCaretProperties.cpp

@@ -29,7 +29,7 @@ nsCaretProperties::nsCaretProperties()
 {
 	// in your platform-specific class, get data from the OS in your constructor
 	
-	mBlinkRate = 0;			// don't blink the caret
+	//mBlinkRate = 0;			// don't blink the caret
 }
 
 

mozilla/base/src/gtk/nsTimer.cpp

@@ -131,6 +131,7 @@ TimerImpl::Init(nsITimerCallback *aCallback,
 {
   //printf("TimerImpl::Init called with callback only for %p\n", this);
     mCallback = aCallback;
+    NS_ADDREF(mCallback);
     // mRepeat = aRepeat;
   if ((aDelay > 10000) || (aDelay < 0)) {
     printf("Timer::Init() called with bogus value \"%d\"!  Not enabling timer.\n",
@@ -149,7 +150,7 @@ TimerImpl::Init(PRUint32 aDelay)
   //printf("TimerImpl::Init called with delay %d only for %p\n", aDelay, this);
 
     mDelay = aDelay;
-    NS_ADDREF(this);
+    //    NS_ADDREF(this);
 
     return NS_OK;
 }

mozilla/base/src/mac/nsFileSpecMac.cpp

@@ -22,7 +22,6 @@
 #include "FullPath.h"
 #include "FileCopy.h"
 #include "MoreFilesExtras.h"
-#include "nsEscape.h"
 
 #include <Aliases.h>
 #include <Folders.h>
@@ -45,20 +44,23 @@ namespace MacFileHelpers
 	void			                PLstrncpy(Str255 dst, const char* src, int inMaxLen);
 
 	void							SwapSlashColon(char * s);
-	OSErr							FSSpecFromFullUnixPath(
+	OSErr							FSSpecFromUnixPath(
 										const char * unixPath,
-										FSSpec& outSpec,
+										FSSpec& ioSpec,
+										Boolean hexDecode,
 										Boolean resolveAlias,
 										Boolean allowPartial = false,
 										Boolean createDirs = false);
-	char*							MacPathFromUnixPath(const char* unixPath);
+	char*							MacPathFromUnixPath(
+										const char* unixPath,
+										Boolean hexDecode);
 	char*							EncodeMacPath(
 										char* inPath, // NOT const - gets clobbered
 										Boolean prependSlash,
 										Boolean doEscape );
 	OSErr							FSSpecFromPathname(
 										const char* inPathNamePtr,
-										FSSpec& outSpec,
+										FSSpec& ioSpec,
 										Boolean inCreateDirs);
 	char*							PathNameFromFSSpec(
 										const FSSpec& inSpec,
@@ -212,7 +214,7 @@ OSErr MacFileHelpers::MakeAliasSafe(FSSpec& inOutSpec)
 } // MacFileHelpers::MakeAliasSafe
 
 //----------------------------------------------------------------------------------------
-char* MacFileHelpers::MacPathFromUnixPath(const char* unixPath)
+char* MacFileHelpers::MacPathFromUnixPath(const char* unixPath, Boolean hexDecode)
 //----------------------------------------------------------------------------------------
 {
 	// Relying on the fact that the unix path is always longer than the mac path:
@@ -227,7 +229,8 @@ char* MacFileHelpers::MacPathFromUnixPath(const char* unixPath)
 		else if (strchr(src, '/'))	// * partial path, and not just a leaf name
 			*dst++ = ':';
 		strcpy(dst, src);
-		nsUnescape(dst);	// Hex Decode
+		if (hexDecode)
+			nsUnescape(dst);	// Hex Decode
 		MacFileHelpers::SwapSlashColon(dst);
 	}
 	return result;
@@ -236,7 +239,7 @@ char* MacFileHelpers::MacPathFromUnixPath(const char* unixPath)
 //----------------------------------------------------------------------------------------
 OSErr MacFileHelpers::FSSpecFromPathname(
 	const char* inPathNamePtr,
-	FSSpec& outSpec,
+	FSSpec& ioSpec, // used as in-parameter for a relative path.
 	Boolean inCreateDirs)
 // FSSpecFromPathname reverses PathNameFromFSSpec.
 // It returns a FSSpec given a c string which is a mac pathname.
@@ -247,20 +250,26 @@ OSErr MacFileHelpers::FSSpecFromPathname(
 	// routine FSpLocationFromFullPath, which allocates memory, to handle longer pathnames. 
 	
 	size_t inLength = strlen(inPathNamePtr);
+	bool isRelative = (strchr(inPathNamePtr, ':') == 0 || *inPathNamePtr == ':');
 	if (inLength < 255)
 	{
 		Str255 ppath;
 		MacFileHelpers::PLstrcpy(ppath, inPathNamePtr);
-		err = ::FSMakeFSSpec(0, 0, ppath, &outSpec);
+		if (isRelative)
+		    err = ::FSMakeFSSpec(ioSpec.vRefNum, ioSpec.parID, ppath, &ioSpec);
+		else
+		    err = ::FSMakeFSSpec(0, 0, ppath, &ioSpec);
 	}
-	else
-		err = FSpLocationFromFullPath(inLength, inPathNamePtr, &outSpec);
+	else if (!isRelative)
+		err = FSpLocationFromFullPath(inLength, inPathNamePtr, &ioSpec);
+    else
+        err = bdNamErr;
 
-	if (err == dirNFErr && inCreateDirs)
+	if ((err == dirNFErr || err == bdNamErr) && inCreateDirs)
 	{
 		const char* path = inPathNamePtr;
-		outSpec.vRefNum = 0;
-		outSpec.parID = 0;
+		ioSpec.vRefNum = 0;
+		ioSpec.parID = 0;
 		do {
 			// Locate the colon that terminates the node.
 			// But if we've a partial path (starting with a colon), find the second one.
@@ -276,7 +285,7 @@ OSErr MacFileHelpers::FSSpecFromPathname(
 			
 			// Use this string as a relative path using the directory created
 			// on the previous round (or directory 0,0 on the first round).
-			err = ::FSMakeFSSpec(outSpec.vRefNum, outSpec.parID, ppath, &outSpec);
+			err = ::FSMakeFSSpec(ioSpec.vRefNum, ioSpec.parID, ppath, &ioSpec);
 
 			// If this was the leaf node, then we are done.
 			if (!*nextColon)
@@ -285,7 +294,7 @@ OSErr MacFileHelpers::FSSpecFromPathname(
 			// If we got "file not found", then
 			// we need to create a directory.
 			if (err == fnfErr && *nextColon)
-				err = FSpDirCreate(&outSpec, smCurrentScript, &outSpec.parID);
+				err = FSpDirCreate(&ioSpec, smCurrentScript, &ioSpec.parID);
 			// For some reason, this usually returns fnfErr, even though it works.
 			if (err != noErr && err != fnfErr)
 				return err;
@@ -368,9 +377,10 @@ OSErr MacFileHelpers::ResolveAliasFile(FSSpec& inOutSpec, Boolean& wasAliased)
 } // MacFileHelpers::ResolveAliasFile
 
 //-----------------------------------
-OSErr MacFileHelpers::FSSpecFromFullUnixPath(
+OSErr MacFileHelpers::FSSpecFromUnixPath(
 	const char * unixPath,
-	FSSpec& outSpec,
+	FSSpec& ioSpec,
+	Boolean hexDecode,
 	Boolean resolveAlias,
 	Boolean allowPartial,
 	Boolean createDirs)
@@ -382,7 +392,7 @@ OSErr MacFileHelpers::FSSpecFromFullUnixPath(
 {
 	if (unixPath == nsnull)
 		return badFidErr;
-	char* macPath = MacPathFromUnixPath(unixPath);
+	char* macPath = MacPathFromUnixPath(unixPath, hexDecode);
 	if (!macPath)
 		return memFullErr;
 
@@ -391,12 +401,12 @@ OSErr MacFileHelpers::FSSpecFromFullUnixPath(
 	{
 		NS_ASSERTION(*unixPath == '/' /*full path*/, "Not a full Unix path!");
 	}
-	err = FSSpecFromPathname(macPath, outSpec, createDirs);
+	err = FSSpecFromPathname(macPath, ioSpec, createDirs);
 	if (err == fnfErr)
 		err = noErr;
 	Boolean dummy;	
 	if (err == noErr && resolveAlias)	// Added 
-		err = MacFileHelpers::ResolveAliasFile(outSpec, dummy);
+		err = MacFileHelpers::ResolveAliasFile(ioSpec, dummy);
 	delete [] macPath;
 	NS_ASSERTION(err==noErr||err==fnfErr||err==dirNFErr||err==nsvErr, "Not a path!");
 	return err;
@@ -508,6 +518,7 @@ Clean:
 nsFileSpec::nsFileSpec()
 //----------------------------------------------------------------------------------------
 :	mError(NS_OK)
+,   mPath(nsnull)
 {
 	mSpec.name[0] = '\0';
 }
@@ -516,6 +527,7 @@ nsFileSpec::nsFileSpec()
 nsFileSpec::nsFileSpec(const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 :	mSpec(inSpec.mSpec)
+,   mPath(nsnull)
 ,	mError(inSpec.Error())
 {
 }
@@ -523,55 +535,73 @@ nsFileSpec::nsFileSpec(const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 nsFileSpec::nsFileSpec(const char* inString, PRBool inCreateDirs)
 //----------------------------------------------------------------------------------------
+:   mPath(nsnull)
 {
-	mError = NS_FILE_RESULT(MacFileHelpers::FSSpecFromFullUnixPath(
-								inString, mSpec, false, true, inCreateDirs));
-		// allow a partial path, create as necessary
+	mSpec.vRefNum = 0;
+	mSpec.parID = 0;
+	// Convert unix (non-encoded) path to a spec.
+	mError = NS_FILE_RESULT(
+	    MacFileHelpers::FSSpecFromUnixPath(
+	    	inString,
+	    	mSpec, false, false, true, inCreateDirs));
 	if (mError == NS_FILE_RESULT(fnfErr))
 		mError = NS_OK;
 } // nsFileSpec::nsFileSpec
 
 //----------------------------------------------------------------------------------------
-nsFileSpec::nsFileSpec(
-	short vRefNum,
-	long parID,
-	ConstStr255Param name)
+nsFileSpec::nsFileSpec(const nsString& inString, PRBool inCreateDirs)
 //----------------------------------------------------------------------------------------
+:   mPath(nsnull)
+{
+	mSpec.vRefNum = 0;
+	mSpec.parID = 0;
+	// Convert unix (non-encoded) path to a spec.
+	mError = NS_FILE_RESULT(
+	    MacFileHelpers::FSSpecFromUnixPath(
+	    	nsAutoCString(inString),
+	    	mSpec, false, false, true, inCreateDirs));
+	if (mError == NS_FILE_RESULT(fnfErr))
+		mError = NS_OK;
+} // nsFileSpec::nsFileSpec
+
+//----------------------------------------------------------------------------------------
+nsFileSpec::nsFileSpec(short vRefNum, long parID, ConstStr255Param name)
+//----------------------------------------------------------------------------------------
+:   mPath(nsnull)
 {
 	mError = NS_FILE_RESULT(::FSMakeFSSpec(vRefNum, parID, name, &mSpec));
 	if (mError == NS_FILE_RESULT(fnfErr))
-		mError = noErr;
+		mError = NS_OK;
 }
 
 //----------------------------------------------------------------------------------------
 nsFileSpec::nsFileSpec(const nsFilePath& inPath)
 //----------------------------------------------------------------------------------------
+:   mPath(nsnull)
 {
 	*this = inPath.GetFileSpec();
 }
 
-#if DEBUG
-//----------------------------------------------------------------------------------------
-nsOutputStream& operator << (nsOutputStream& s, const nsFileSpec& spec)
-//----------------------------------------------------------------------------------------
-{
-	s << spec.mSpec.vRefNum << ", " << spec.mSpec.parID << ", \"";
-	s.write((const char*)&spec.mSpec.name[1], spec.mSpec.name[0]);
-	return s << "\"";	
-} // nsOutputStream& operator << (nsOutputStream&, const nsFileSpec&)
-#endif
-
 //----------------------------------------------------------------------------------------
 void nsFileSpec::operator = (const char* inString)
 //----------------------------------------------------------------------------------------
 {
-	mError = NS_FILE_RESULT(MacFileHelpers::FSSpecFromFullUnixPath(inString, mSpec, false));
+	nsFileSpecHelpers::StringAssign(mPath, nsnull);
+
+	mSpec.vRefNum = 0;
+	mSpec.parID = 0;
+	// Convert unix (non-encoded) path to a spec.
+	mError = NS_FILE_RESULT(
+	    MacFileHelpers::FSSpecFromUnixPath(inString, mSpec, false, false, true));
+	if (mError == NS_FILE_RESULT(fnfErr))
+		mError = NS_OK;
 } // nsFileSpec::operator =
 
 //----------------------------------------------------------------------------------------
 void nsFileSpec::operator = (const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 {
+	nsFileSpecHelpers::StringAssign(mPath, nsnull);
 	mSpec = inSpec.mSpec;
 	mError = inSpec.Error();
 } // nsFileSpec::operator =
@@ -583,24 +613,64 @@ void nsFileSpec::operator = (const nsFilePath& inPath)
 	*this = inPath.GetFileSpec();
 } // nsFileSpec::operator =
 
+#if DEBUG
+//----------------------------------------------------------------------------------------
+nsOutputStream& operator << (nsOutputStream& s, const nsFileSpec& spec)
+//----------------------------------------------------------------------------------------
+{
+#if 0
+	s << spec.mSpec.vRefNum << ", " << spec.mSpec.parID << ", \"";
+	s.write((const char*)&spec.mSpec.name[1], spec.mSpec.name[0]);
+	return s << "\"";	
+#else
+    return s << "\"" << spec.GetCString() << "\"";
+#endif
+} // nsOutputStream& operator << (nsOutputStream&, const nsFileSpec&)
+#endif
+
 //----------------------------------------------------------------------------------------
 PRBool nsFileSpec::Exists() const
 //----------------------------------------------------------------------------------------
 {
 	FSSpec temp;
 	return ::FSMakeFSSpec(mSpec.vRefNum, mSpec.parID, mSpec.name, &temp) == noErr;
-} // nsFileSpec::operator =
+} // nsFileSpec::Exists()
+
+//----------------------------------------------------------------------------------------
+void nsFileSpec::GetModDate(TimeStamp& outStamp) const
+//----------------------------------------------------------------------------------------
+{
+	CInfoPBRec pb;
+    if (GetCatInfo(pb) == noErr)
+        outStamp = ((DirInfo*)&pb)->ioDrMdDat; // The mod date is in the same spot for files and dirs.
+    else
+        outStamp = 0;
+} // nsFileSpec::GetModDate
+
+//----------------------------------------------------------------------------------------
+PRUint32 nsFileSpec::GetFileSize() const
+//----------------------------------------------------------------------------------------
+{
+	CInfoPBRec pb;
+    if (noErr == GetCatInfo(pb))
+        return (PRUint32)((HFileInfo*)&pb)->ioFlLgLen;
+    return 0;
+} // nsFileSpec::GetFileSize
 
 //----------------------------------------------------------------------------------------
 void nsFileSpec::SetLeafName(const char* inLeafName)
 // In leaf name can actually be a partial path...
 //----------------------------------------------------------------------------------------
 {
-	// what about long relative paths?  Hmm?
+	nsFileSpecHelpers::StringAssign(mPath, nsnull);
+
+	// what about long relative paths?  Hmm?  We don't have a routine for this anywhere.
 	Str255 partialPath;
 	MacFileHelpers::PLstrcpy(partialPath, inLeafName);
 	mError = NS_FILE_RESULT(
 	    ::FSMakeFSSpec(mSpec.vRefNum, mSpec.parID, partialPath, &mSpec));
+	if (mError == NS_FILE_RESULT(fnfErr))
+		mError = NS_OK;
 } // nsFileSpec::SetLeafName
 
 //----------------------------------------------------------------------------------------
@@ -618,6 +688,7 @@ char* nsFileSpec::GetLeafName() const
 void nsFileSpec::MakeAliasSafe()
 //----------------------------------------------------------------------------------------
 {
+	nsFileSpecHelpers::StringAssign(mPath, nsnull);
 	mError = NS_FILE_RESULT(MacFileHelpers::MakeAliasSafe(mSpec));
 } // nsFileSpec::MakeAliasSafe
 
@@ -625,6 +696,7 @@ void nsFileSpec::MakeAliasSafe()
 void nsFileSpec::MakeUnique(ConstStr255Param inSuggestedLeafName)
 //----------------------------------------------------------------------------------------
 {
+	nsFileSpecHelpers::StringAssign(mPath, nsnull);
 	if (inSuggestedLeafName[0] > 0)
 		MacFileHelpers::PLstrcpy(mSpec.name, inSuggestedLeafName);
 
@@ -676,11 +748,14 @@ void nsFileSpec::operator += (const char* inRelativePath)
 	mError = NS_FILE_RESULT(::FSpGetDirectoryID(&mSpec, &dirID, &isDirectory));
 	if (NS_SUCCEEDED(mError) && isDirectory)
 	{
-		Str255 partialPath;
-		MacFileHelpers::PLstrcpy(partialPath, inRelativePath);
-		mError = NS_FILE_RESULT(::FSMakeFSSpec(mSpec.vRefNum, dirID, partialPath, *this));
-		//if (NS_SUCCEEDED(mError))
-		//	SetLeafName(inRelativePath);
+        mSpec.parID = dirID;
+        // mSpec.vRefNum is already correct.
+        // Convert unix path (which is unencoded) to a spec
+        mError = NS_FILE_RESULT(
+            MacFileHelpers::FSSpecFromUnixPath(
+            	inRelativePath, mSpec, false, false, true, true));
+        if (mError == NS_FILE_RESULT(fnfErr))
+	        mError = NS_OK;
 	}
 } // nsFileSpec::operator +=
 
@@ -689,23 +764,24 @@ void nsFileSpec::CreateDirectory(int /* unix mode */)
 //----------------------------------------------------------------------------------------
 {
 	long ignoredDirID;
-	FSpDirCreate(&mSpec, smCurrentScript, &ignoredDirID);
+	mError = NS_FILE_RESULT(FSpDirCreate(&mSpec, smCurrentScript, &ignoredDirID));
 } // nsFileSpec::CreateDirectory
 
 //----------------------------------------------------------------------------------------
-void nsFileSpec::Delete(PRBool inRecursive)
+void nsFileSpec::Delete(PRBool inRecursive) const
 //----------------------------------------------------------------------------------------
 {
+	nsresult& mutableError = const_cast<nsFileSpec*>(this)->mError;
 	if (inRecursive)
 	{
 		// MoreFilesExtras
-		mError = NS_FILE_RESULT(::DeleteDirectory(
+		mutableError = NS_FILE_RESULT(::DeleteDirectory(
 					mSpec.vRefNum,
 					mSpec.parID,
 					const_cast<unsigned char*>(mSpec.name)));
 	}
 	else
-		mError = NS_FILE_RESULT(FSpDelete(&mSpec));
+		mutableError = NS_FILE_RESULT(FSpDelete(&mSpec));
 } // nsFileSpec::Delete
 
 //----------------------------------------------------------------------------------------
@@ -781,6 +857,54 @@ nsresult nsFileSpec::Execute(const char* /*args - how can this be cross-platform
   
 } // nsFileSpec::Execute
 
+//----------------------------------------------------------------------------------------
+OSErr nsFileSpec::GetCatInfo(CInfoPBRec& outInfo) const
+//----------------------------------------------------------------------------------------
+{
+	DirInfo	*dipb=(DirInfo *)&outInfo;
+    dipb->ioCompletion = nsnull;
+	dipb->ioFDirIndex = 0; // use dirID and name
+	dipb->ioVRefNum = mSpec.vRefNum;
+	dipb->ioDrDirID = mSpec.parID;
+	dipb->ioNamePtr = const_cast<nsFileSpec*>(this)->mSpec.name;
+	return PBGetCatInfoSync(&outInfo);
+} // nsFileSpec::GetCatInfo()
+
+//----------------------------------------------------------------------------------------
+PRUint32 nsFileSpec::GetDiskSpaceAvailable() const
+//----------------------------------------------------------------------------------------
+{
+	HVolumeParam	pb;
+	pb.ioCompletion = NULL;
+	pb.ioVolIndex = 0;
+	pb.ioNamePtr = NULL;
+	pb.ioVRefNum = mSpec.vRefNum;
+	
+	OSErr err = PBHGetVInfoSync( (HParmBlkPtr)&pb );
+	
+	if ( err == noErr )
+		return pb.ioVFrBlk * pb.ioVAlBlkSiz;
+	return ULONG_MAX;
+} // nsFileSpec::GetDiskSpace()
+
+//----------------------------------------------------------------------------------------
+const char* nsFileSpec::GetCString() const
+// This is the only conversion to const char* that is provided, and it allows the
+// path to be "passed" to NSPR file routines.  This practice is VERY EVIL and should only
+// be used to support legacy code.  Using it guarantees bugs on Macintosh. The string is
+// cached and freed by the nsFileSpec destructor, so do not delete (or free) it.
+//----------------------------------------------------------------------------------------
+{
+    if (!mPath)
+    {
+        const_cast<nsFileSpec*>(this)->mPath
+            = MacFileHelpers::PathNameFromFSSpec(mSpec, true);
+        if (!mPath)
+            const_cast<nsFileSpec*>(this)->mError = NS_ERROR_OUT_OF_MEMORY;
+    }
+    return mPath;
+}
+
 //========================================================================================
 //					Macintosh nsFilePath implementation
 //========================================================================================
@@ -792,28 +916,54 @@ nsFilePath::nsFilePath(const char* inString, PRBool inCreateDirs)
 ,    mFileSpec(inString, inCreateDirs)
 {
     // Make canonical and absolute.
-	char * path = MacFileHelpers::PathNameFromFSSpec( mFileSpec, TRUE );
-	mPath = MacFileHelpers::EncodeMacPath(path, true, true);
+	char * path = MacFileHelpers::PathNameFromFSSpec( mFileSpec, true );
+	mPath = MacFileHelpers::EncodeMacPath(path, true, false);
 }
+
+//----------------------------------------------------------------------------------------
+nsFilePath::nsFilePath(const nsString& inString, PRBool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mPath(nsnull)
+,    mFileSpec(nsAutoCString(inString), inCreateDirs)
+{
+    // Make canonical and absolute.
+	char * path = MacFileHelpers::PathNameFromFSSpec( mFileSpec, true );
+	mPath = MacFileHelpers::EncodeMacPath(path, true, false);
+}
+
 //----------------------------------------------------------------------------------------
 nsFilePath::nsFilePath(const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
-:	mFileSpec(inSpec)
+:    mPath(nsnull)
 {
-	char * path = MacFileHelpers::PathNameFromFSSpec( inSpec.mSpec, TRUE );
-	mPath = MacFileHelpers::EncodeMacPath(path, true, true);
+	*this = inSpec;
+}
+
+//----------------------------------------------------------------------------------------
+nsFilePath::nsFilePath(const nsFileURL& inOther)
+//----------------------------------------------------------------------------------------
+:    mPath(nsnull)
+{
+	*this = inOther.GetFileSpec();
 }
 
 //----------------------------------------------------------------------------------------
 void nsFilePath::operator = (const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 {
+	char * path = MacFileHelpers::PathNameFromFSSpec( inSpec.mSpec, true );
 	delete [] mPath;
-	char * path = MacFileHelpers::PathNameFromFSSpec( inSpec.mSpec, TRUE );
-	mPath = MacFileHelpers::EncodeMacPath(path, true, true);
+	mPath = MacFileHelpers::EncodeMacPath(path, true, false);
 	mFileSpec = inSpec;
 } // nsFilePath::operator =
 
+//----------------------------------------------------------------------------------------
+void nsFilePath::operator = (const nsFileURL& inOther)
+//----------------------------------------------------------------------------------------
+{
+    *this = inOther.GetFileSpec();
+}
+
 //========================================================================================
 //                                nsFileURL implementation
 //========================================================================================
@@ -821,18 +971,96 @@ void nsFilePath::operator = (const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 nsFileURL::nsFileURL(const char* inString, PRBool inCreateDirs)
 //----------------------------------------------------------------------------------------
-:    mURL(nsnull)
-,    mFileSpec(inString + kFileURLPrefixLength, inCreateDirs)
-{
-    NS_ASSERTION(strstr(inString, kFileURLPrefix) == inString, "Not a URL!");
-    // Make canonical and absolute.
-	char* path = MacFileHelpers::PathNameFromFSSpec( mFileSpec, TRUE );
-	char* escapedPath = MacFileHelpers::EncodeMacPath(path, true, true);
-	mURL = nsFileSpecHelpers::StringDup(kFileURLPrefix, kFileURLPrefixLength + strlen(escapedPath));
-	strcat(mURL, escapedPath);
-	delete [] escapedPath;
+:    mURL(nsFileSpecHelpers::StringDup(inString))
+{    
+    NS_ASSERTION(strstr(mURL, kFileURLPrefix) == mURL, "Not a URL!");
+    mFileSpec.mError = NS_FILE_RESULT(MacFileHelpers::FSSpecFromUnixPath(
+    	mURL + kFileURLPrefixLength,
+    	mFileSpec.mSpec,
+    	true, // need to decode
+    	false, // don't resolve alias
+    	false, // must be a full path
+    	inCreateDirs));
+    if (mFileSpec.mError == NS_FILE_RESULT(fnfErr))
+        mFileSpec.mError = NS_OK;
 } // nsFileURL::nsFileURL
 
+//----------------------------------------------------------------------------------------
+nsFileURL::nsFileURL(const nsString& inString, PRBool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mURL(nsFileSpecHelpers::StringDup(nsAutoCString(inString)))
+{
+    NS_ASSERTION(strstr(mURL, kFileURLPrefix) == mURL, "Not a URL!");
+    mFileSpec.mError = NS_FILE_RESULT(MacFileHelpers::FSSpecFromUnixPath(
+    	mURL + kFileURLPrefixLength,
+    	mFileSpec.mSpec,
+    	true, // need to decode
+    	false, // don't resolve alias
+    	false, // must be a full path
+    	inCreateDirs));
+    if (mFileSpec.mError == NS_FILE_RESULT(fnfErr))
+        mFileSpec.mError = NS_OK;
+} // nsFileURL::nsFileURL
+
+//----------------------------------------------------------------------------------------
+nsFileURL::nsFileURL(const nsFilePath& inOther)
+//----------------------------------------------------------------------------------------
+:    mURL(nsnull)
+{
+	*this = inOther.GetFileSpec();
+} // nsFileURL::nsFileURL
+
+//----------------------------------------------------------------------------------------
+nsFileURL::nsFileURL(const nsFileSpec& inOther)
+:    mURL(nsnull)
+//----------------------------------------------------------------------------------------
+{
+	*this = inOther;
+} // nsFileURL::nsFileURL
+
+//----------------------------------------------------------------------------------------
+void nsFileURL::operator = (const nsFilePath& inOther)
+//----------------------------------------------------------------------------------------
+{
+    *this = inOther.GetFileSpec();
+} // nsFileURL::operator =
+
+//----------------------------------------------------------------------------------------
+void nsFileURL::operator = (const nsFileSpec& inOther)
+//----------------------------------------------------------------------------------------
+{
+    mFileSpec  = inOther;
+    delete [] mURL;
+	char* path = MacFileHelpers::PathNameFromFSSpec( mFileSpec, true );
+	char* encodedPath = MacFileHelpers::EncodeMacPath(path, true, true);
+	char* encodedURL = nsFileSpecHelpers::AllocCat(kFileURLPrefix, encodedPath);
+	delete [] encodedPath;
+	if (encodedURL[strlen(encodedURL) - 1] != '/' && inOther.IsDirectory())
+	{
+	    mURL = nsFileSpecHelpers::AllocCat(encodedURL, "/");
+	    delete [] encodedURL;
+	}
+	else
+	    mURL = encodedURL;
+} // nsFileURL::operator =
+
+//----------------------------------------------------------------------------------------
+void nsFileURL::operator = (const char* inString)
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpecHelpers::StringAssign(mURL, inString);
+    NS_ASSERTION(strstr(inString, kFileURLPrefix) == inString, "Not a URL!");
+    mFileSpec.mError = NS_FILE_RESULT(MacFileHelpers::FSSpecFromUnixPath(
+    	inString + kFileURLPrefixLength,
+    	mFileSpec.mSpec,
+    	true, // need to decode
+    	false, // don't resolve alias
+    	false, // must be a full path
+    	false)); // don't create dirs.
+    if (mFileSpec.mError == NS_FILE_RESULT(fnfErr))
+        mFileSpec.mError = NS_OK;
+} // nsFileURL::operator =
+
 //========================================================================================
 //								nsDirectoryIterator
 //========================================================================================
@@ -847,24 +1075,15 @@ nsDirectoryIterator::nsDirectoryIterator(
 	, mIndex(-1)
 {
 	CInfoPBRec pb;
-	DirInfo* dipb = (DirInfo*)&pb;
-	// Sorry about this, there seems to be a bug in CWPro 4:
-	const FSSpec& inSpec = inDirectory.nsFileSpec::operator const FSSpec&();
-    Str255 outName;
-    MacFileHelpers::PLstrcpy(outName, inSpec.name);
-	pb.hFileInfo.ioNamePtr = outName;
-	pb.hFileInfo.ioVRefNum = inSpec.vRefNum;
-	pb.hFileInfo.ioDirID = inSpec.parID;
-	pb.hFileInfo.ioFDirIndex = 0;	// use ioNamePtr and ioDirID
-
-	OSErr err = PBGetCatInfoSync( &pb );
-
+    OSErr err = inDirectory.GetCatInfo(pb);
+    
 	// test that we have got a directory back, not a file
-	if ( (err != noErr ) || !( dipb->ioFlAttrib & 0x0010 ) )
+	DirInfo* dipb = (DirInfo*)&pb;
+	if (err != noErr  || !( dipb->ioFlAttrib & 0x0010))
 		return;
 	// Sorry about this, there seems to be a bug in CWPro 4:
 	FSSpec& currentSpec = mCurrent.nsFileSpec::operator FSSpec&();
-	currentSpec.vRefNum = inSpec.vRefNum;
+	currentSpec.vRefNum = currentSpec.vRefNum;
 	currentSpec.parID = dipb->ioDrDirID;
 	mMaxIndex = pb.dirInfo.ioDrNmFls;
 	if (inIterateDirection > 0)
@@ -928,3 +1147,4 @@ nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
 		}
 	return *this;
 } // nsDirectoryIterator::operator ++
+

mozilla/base/src/mac/nsTimerMac.cpp

@@ -133,8 +133,7 @@ class TimerPeriodical  : public Repeater
 // TimerImpl implementation
 //========================================================================================
 
-static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
-NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
+NS_IMPL_ISUPPORTS(TimerImpl, nsITimer::GetIID())
 
 //----------------------------------------------------------------------------------------
 TimerImpl::TimerImpl()
@@ -361,5 +360,5 @@ NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
         return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
+    return timer->QueryInterface(nsITimer::GetIID(), (void **) aInstancePtrResult);
 }

mozilla/base/src/makefile.win

@@ -40,8 +40,10 @@ CPPSRCS =				\
 	nsVoidArray.cpp			\
 	nsFileSpec.cpp \
 	nsFileStream.cpp \
+	nsStringStream.cpp \
 	nsEscape.cpp				\
     nsIFileStream.cpp \
+    nsSpecialSystemDirectory.cpp \
 	$(NULL)
 
 CPP_OBJS =					\
@@ -63,6 +65,8 @@ CPP_OBJS =					\
 	.\$(OBJDIR)\nsFileStream.obj \
 	.\$(OBJDIR)\nsEscape.obj			\
     .\$(OBJDIR)\nsIFileStream.obj       \
+    .\$(OBJDIR)\nsIStringStream.obj       \
+    .\$(OBJDIR)\nsSpecialSystemDirectory.obj \
 	$(NULL)
 
 EXPORTS=nscore.h nsIArena.h nsIAtom.h nsIByteBuffer.h \
@@ -84,7 +88,7 @@ MAKE_OBJ_TYPE = DLL
 DLLNAME = raptorbase
 DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
-OBJS = $(OBJS) .\$(OBJDIR)\nsTimer.obj
+OBJS = $(OBJS) .\$(OBJDIR)\nsTimer.obj .\$(OBJDIR)\nsCaretProperties.obj
 
 LCFLAGS = \
         $(LCFLAGS) \
@@ -94,7 +98,7 @@ LCFLAGS = \
 # These are the libraries we need to link with to create the dll
 LLIBS=				\
  $(DIST)\lib\xpcom32.lib	\
- $(DIST)\lib\libplc21.lib       \
+ $(DIST)\lib\plc3.lib       \
  $(LIBNSPR)  
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
 LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib

mozilla/base/src/motif/Makefile.in

@@ -30,7 +30,10 @@ REQUIRES	= xpcom raptor
 
 DEFINES		+= -D_IMPL_NS_WIDGET 
 
-CPPSRCS		= nsTimer.cpp
+CPPSRCS		= 									\
+		nsTimer.cpp								\
+		nsCaretProperties.cpp			\
+    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

mozilla/base/src/nsAtomTable.cpp

@@ -36,6 +36,10 @@ public:
 
   void* operator new(size_t size, const PRUnichar* us, PRInt32 uslen);
 
+  void operator delete(void* ptr) {
+    ::operator delete(ptr);
+  }
+
   virtual void ToString(nsString& aBuf) const;
 
   virtual const PRUnichar* GetUnicode() const;
@@ -75,7 +79,7 @@ NS_IMPL_ISUPPORTS(AtomImpl, kIAtomIID);
 void* AtomImpl::operator new(size_t size, const PRUnichar* us, PRInt32 uslen)
 {
   size = size + uslen * sizeof(PRUnichar);
-  AtomImpl* ii = (AtomImpl*) new char[size];
+  AtomImpl* ii = (AtomImpl*) ::operator new(size);
   nsCRT::memcpy(ii->mString, us, uslen * sizeof(PRUnichar));
   ii->mString[uslen] = 0;
   return ii;

mozilla/base/src/nsBaseDLL.cpp

@@ -20,41 +20,63 @@
 #include "nscore.h"
 #include "nsIProperties.h"
 #include "nsProperties.h"
-#include "nsRepository.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsCOMPtr.h"
+
+static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 
 PRInt32 gLockCount = 0;
 
 NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
 
 extern "C" NS_EXPORT nsresult
-NSRegisterSelf(const char* path)
+NSRegisterSelf(nsISupports* aServMgr, const char* path)
 {
-  nsresult ret;
+  nsresult rv;
 
-  ret = nsRepository::RegisterFactory(kPropertiesCID, path, PR_TRUE,
-    PR_TRUE);
-  if (NS_FAILED(ret)) {
-    return ret;
-  }
+  nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
+  if (NS_FAILED(rv)) return rv;
 
-  return ret;
+  nsIComponentManager* compMgr;
+  rv = servMgr->GetService(kComponentManagerCID, 
+                           nsIComponentManager::GetIID(), 
+                           (nsISupports**)&compMgr);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = compMgr->RegisterComponent(kPropertiesCID, NULL, NULL,
+                                  path, PR_TRUE, PR_TRUE);
+
+  (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
+  return rv;
 }
 
 extern "C" NS_EXPORT nsresult
-NSUnregisterSelf(const char* path)
+NSUnregisterSelf(nsISupports* aServMgr, const char* path)
 {
-  nsresult ret;
+  nsresult rv;
 
-  ret = nsRepository::UnregisterFactory(kPropertiesCID, path);
-  if (NS_FAILED(ret)) {
-    return ret;
-  }
+  nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
+  if (NS_FAILED(rv)) return rv;
 
-  return ret;
+  nsIComponentManager* compMgr;
+  rv = servMgr->GetService(kComponentManagerCID, 
+                           nsIComponentManager::GetIID(), 
+                           (nsISupports**)&compMgr);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = compMgr->UnregisterFactory(kPropertiesCID, path);
+
+  (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
+  return rv;
 }
 
 extern "C" NS_EXPORT nsresult
-NSGetFactory(const nsCID& aClass, nsISupports* aServMgr, nsIFactory** aFactory)
+NSGetFactory(nsISupports* aServMgr, 
+             const nsCID& aClass,
+             const char *aClassName,
+             const char *aProgID,
+             nsIFactory** aFactory)
 {
   nsresult  res;
 
@@ -78,3 +100,9 @@ NSGetFactory(const nsCID& aClass, nsISupports* aServMgr, nsIFactory** aFactory)
 
   return NS_NOINTERFACE;
 }
+
+extern "C" NS_EXPORT PRBool
+NSCanUnload(nsISupports* serviceMgr)
+{
+  return PR_FALSE;      // XXX can we unload this?
+}

mozilla/base/src/nsByteBuffer.cpp

@@ -56,7 +56,7 @@ NS_IMPL_ISUPPORTS(ByteBufferImpl,kByteBufferIID)
 ByteBufferImpl::~ByteBufferImpl()
 {
   if (nsnull != mBuffer) {
-    delete mBuffer;
+    delete[] mBuffer;
     mBuffer = nsnull;
   }
   mLength = 0;
@@ -87,7 +87,7 @@ PRBool ByteBufferImpl::Grow(PRUint32 aNewSize)
     if (0 != mLength) {
       nsCRT::memcpy(newbuf, mBuffer, mLength);
     }
-    delete mBuffer;
+    delete[] mBuffer;
     mBuffer = newbuf;
     return PR_TRUE;
   }
@@ -112,9 +112,8 @@ PRInt32 ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
 
   // Read in some new data
   mLength = aKeep;
-  PRUint32 amount = mSpace - aKeep;
   PRUint32 nb;
-  *aErrorCode = aStream->Read(mBuffer, aKeep, amount, &nb);
+  *aErrorCode = aStream->Read(mBuffer + aKeep, mSpace - aKeep, &nb);
   if (NS_SUCCEEDED(*aErrorCode)) {
     mLength += nb;
   }

mozilla/base/src/nsCRT.cpp

@@ -198,6 +198,16 @@ PRUnichar nsCRT::ToLower(PRUnichar aChar)
   return TOLOWER(aChar);
 }
 
+PRBool nsCRT::IsUpper(PRUnichar aChar)
+{
+  return aChar != nsCRT::ToLower(aChar);
+}
+
+PRBool nsCRT::IsLower(PRUnichar aChar)
+{
+  return aChar != nsCRT::ToUpper(aChar);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // My lovely strtok routine
 

mozilla/base/src/nsCRT.h

@@ -31,6 +31,37 @@
 #define CRLF "\015\012"     /* A CR LF equivalent string */
 
 
+// This macro can be used in a class declaration for classes that want
+// to ensure that their instance memory is zeroed.
+#define NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW \
+  void* operator new(size_t sz) {             \
+    void* rv = ::operator new(sz);            \
+    if (rv) {                                 \
+      nsCRT::zero(rv, sz);                    \
+    }                                         \
+    return rv;                                \
+  }                                           \
+  void operator delete(void* ptr) {           \
+    ::operator delete(ptr);                   \
+  }
+
+// This macro works with the next macro to declare a non-inlined
+// version of the above.
+#define NS_DECL_ZEROING_OPERATOR_NEW \
+  void* operator new(size_t sz);     \
+  void operator delete(void* ptr);
+
+#define NS_IMPL_ZEROING_OPERATOR_NEW(_class) \
+  void* _class::operator new(size_t sz) {    \
+    void* rv = ::operator new(sz);           \
+    if (rv) {                                \
+      nsCRT::zero(rv, sz);                   \
+    }                                        \
+    return rv;                               \
+  }                                          \
+  void _class::operator delete(void* ptr) {  \
+    ::operator delete(ptr);                  \
+  }
 
 /// This is a wrapper class around all the C runtime functions. 
 
@@ -156,6 +187,10 @@ public:
   static PRUnichar ToUpper(PRUnichar aChar);
 
   static PRUnichar ToLower(PRUnichar aChar);
+  
+  static PRBool IsUpper(PRUnichar aChar);
+
+  static PRBool IsLower(PRUnichar aChar);
 };
 
 #endif /* nsCRT_h___ */

mozilla/base/src/nsDeque.cpp

@@ -28,8 +28,8 @@
  * @update	gess4/18/98
  * @return  new deque
  */
-nsDeque::nsDeque(nsDequeFunctor& aMemDestroyer) : mMemDestroyer(aMemDestroyer) {
-  mMemDestroyer=aMemDestroyer;
+nsDeque::nsDeque(nsDequeFunctor* aDeallocator) {
+  mDeallocator=aDeallocator;
   mCapacity=eGrowthDelta;
   mOrigin=mSize=0;
   mData=new void*[mCapacity];
@@ -44,6 +44,10 @@ nsDeque::~nsDeque() {
   Erase();
   delete [] mData;
   mData=0;
+  if(mDeallocator) {
+    delete mDeallocator;
+  }
+  mDeallocator=0;
 }
 
 
@@ -59,6 +63,13 @@ PRInt32 nsDeque::GetSize(void) const {
   return mSize;
 }
 
+void nsDeque::SetDeallocator(nsDequeFunctor* aDeallocator){
+  if(mDeallocator) {
+    delete mDeallocator;
+  }
+  mDeallocator=aDeallocator;
+}
+
 /**
  * Remove all items from container without destroying them.
  *
@@ -82,7 +93,9 @@ nsDeque& nsDeque::Empty() {
  * @return  this
  */
 nsDeque& nsDeque::Erase() {
-  ForEach(mMemDestroyer);
+  if(mDeallocator) {
+    ForEach(*mDeallocator);
+  }
   return Empty();
 }
 

mozilla/base/src/nsDeque.h

@@ -71,7 +71,7 @@ public:
 class NS_BASE nsDeque {
 friend class nsDequeIterator;
   public:
-                       nsDeque(nsDequeFunctor& aMemDestroyer);
+                       nsDeque(nsDequeFunctor* aDeallocator);
                       ~nsDeque();
             
   /**
@@ -201,6 +201,8 @@ friend class nsDequeIterator;
    */
   const void* FirstThat(nsDequeFunctor& aFunctor) const;
 
+  void SetDeallocator(nsDequeFunctor* aDeallocator);
+
   /**
    * Perform automated selftest on the deque
    *
@@ -215,7 +217,7 @@ protected:
   PRInt32         mSize;
   PRInt32         mCapacity;
   PRInt32         mOrigin;
-  nsDequeFunctor& mMemDestroyer;
+  nsDequeFunctor* mDeallocator;
   void**          mData;
 
 

mozilla/base/src/nsEscape.cpp

@@ -62,45 +62,64 @@ NS_BASE char* nsEscape(const char * str, nsEscapeMask mask)
 }
 
 //----------------------------------------------------------------------------------------
-NS_BASE char* nsEscapeCount(const char * str, PRInt32 len, nsEscapeMask mask, PRInt32 * out_len)
+NS_BASE char* nsEscapeCount(
+    const char * str,
+    PRInt32 len,
+    nsEscapeMask mask,
+    PRInt32* out_len)
 //----------------------------------------------------------------------------------------
 {
-    int32       i, extra = 0;
-    char        *hexChars = "0123456789ABCDEF";
+	if (!str)
+		return 0;
 
-	if(!str)
-		return(0);
+    int i, extra = 0;
+    char* hexChars = "0123456789ABCDEF";
 
-	register const unsigned char* src = (unsigned char *) str;
+	register const unsigned char* src = (const unsigned char *) str;
     for (i = 0; i < len; i++)
-	  {
-        if (!IS_OK(src[i]))
-            extra+=2; /* the escape, plus an extra byte for each nibble */
-	  }
+	{
+        if (!IS_OK(*src++))
+            extra += 2; /* the escape, plus an extra byte for each nibble */
+	}
 
 	char* result = new char[len + extra + 1];
     if (!result)
-        return(0);
+        return 0;
 
     register unsigned char* dst = (unsigned char *) result;
-    for (i = 0; i < len; i++)
-	  {
-		unsigned char c = src[i];
-		if (IS_OK(c))
-		  {
-			*dst++ = c;
-		  }
-		else if (mask == url_XPAlphas && c == ' ')
-		  {
-			*dst++ = '+'; /* convert spaces to pluses */
-		  }
-		else 
-		  {
-			*dst++ = HEX_ESCAPE;
-			*dst++ = hexChars[c >> 4];		/* high nibble */
-			*dst++ = hexChars[c & 0x0f];	/* low nibble */
-		  }
-	  }
+	src = (const unsigned char *) str;
+	if (mask == url_XPAlphas)
+	{
+	    for (i = 0; i < len; i++)
+		{
+			unsigned char c = *src++;
+			if (IS_OK(c))
+				*dst++ = c;
+			else if (c == ' ')
+				*dst++ = '+'; /* convert spaces to pluses */
+			else 
+			{
+				*dst++ = HEX_ESCAPE;
+				*dst++ = hexChars[c >> 4];		/* high nibble */
+				*dst++ = hexChars[c & 0x0f];	/* low nibble */
+			}
+		}
+	}
+	else
+	{
+	    for (i = 0; i < len; i++)
+		{
+			unsigned char c = *src++;
+			if (IS_OK(c))
+				*dst++ = c;
+			else 
+			{
+				*dst++ = HEX_ESCAPE;
+				*dst++ = hexChars[c >> 4];		/* high nibble */
+				*dst++ = hexChars[c & 0x0f];	/* low nibble */
+			}
+		}
+	}
 
     *dst = '\0';     /* tack on eos */
 	if(out_len)
@@ -125,27 +144,24 @@ NS_BASE PRInt32 nsUnescapeCount(char * str)
 
     while (*src)
         if (*src != HEX_ESCAPE)
-		  {
         	*dst++ = *src++;
-		  }
         else 	
-		  {
+		{
         	src++; /* walk over escape */
         	if (*src)
-              {
+            {
             	*dst = UNHEX(*src) << 4;
             	src++;
-              }
+            }
         	if (*src)
-              {
+            {
             	*dst = (*dst + UNHEX(*src));
             	src++;
-              }
+            }
         	dst++;
-          }
+        }
 
     *dst = 0;
-
     return (int)(dst - str);
 
 } /* NET_UnEscapeCnt */

mozilla/base/src/nsFileSpec.cpp

@@ -20,6 +20,7 @@
 
 #include "nsFileStream.h"
 #include "nsDebug.h"
+#include "nsEscape.h"
 
 #include "prtypes.h"
 #include "plstr.h"
@@ -187,7 +188,7 @@ char* nsFileSpecHelpers::GetLeaf(const char* inPath, char inSeparator)
     // So now, separator was the last character. Poke in a null instead.
     *(char*)lastSeparator = '\0'; // Should use const_cast, but Unix has old compiler.
     leafPointer = strrchr(inPath, inSeparator);
-    char* result = leafPointer ? StringDup(leafPointer++) : StringDup(inPath);
+    char* result = leafPointer ? StringDup(++leafPointer) : StringDup(inPath);
     // Restore the poked null before returning.
     *(char*)lastSeparator = inSeparator;
 #ifdef XP_PC
@@ -225,9 +226,33 @@ void nsFileSpecHelpers::MakeAllDirectories(const char* inPath, int mode)
     char* currentEnd = strchr(currentStart + kSkipFirst, kSeparator);
     if (currentEnd)
     {
+        nsFileSpec spec;
+
 		*currentEnd = '\0';
-		nsFileSpec spec(nsFilePath(pathCopy, PR_FALSE));
-		do
+        
+#ifdef XP_PC
+        /* 
+           if we have a drive letter path, we must make sure that the inital path has a '/' on it, or
+           Canonify will turn "/c|" into a path relative to the running executable.
+        */
+        if (pathCopy[0] == '/' && pathCopy[2] == '|')
+        {
+            char* startDir = nsFileSpecHelpers::StringDup( pathCopy, (strlen(pathCopy) + 1) );
+            strcat(startDir, "/");
+
+            spec = nsFilePath(startDir, PR_FALSE);
+		    
+            delete [] startDir;
+        }
+        else
+        {
+            spec = nsFilePath(pathCopy, PR_FALSE);
+
+        }
+#else
+        spec = nsFilePath(pathCopy, PR_FALSE);
+#endif        
+        do
 		{
 			// If the node doesn't exist, and it is not the initial node in a full path,
 			// then make a directory (We cannot make the initial (volume) node).
@@ -242,6 +267,9 @@ void nsFileSpecHelpers::MakeAllDirectories(const char* inPath, int mode)
 			currentEnd = strchr(currentStart, kSeparator);
 			if (!currentEnd)
 				break;
+            
+            *currentEnd = '\0';
+
 			spec += currentStart; // "lengthen" the path, adding the next node.
 		} while (currentEnd);
     }
@@ -287,6 +315,23 @@ nsFileURL::nsFileURL(const char* inString, PRBool inCreateDirs)
 } // nsFileURL::nsFileURL
 #endif
 
+#ifndef XP_MAC
+//----------------------------------------------------------------------------------------
+nsFileURL::nsFileURL(const nsString& inString, PRBool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mURL(nsnull)
+{
+    const nsAutoCString aString(inString);
+    const char* aCString = (const char*) aString;
+    if (!inString)
+    	return;
+    NS_ASSERTION(strstr(aCString, kFileURLPrefix) == aCString, "Not a URL!");
+    // Make canonical and absolute.
+	nsFilePath path(aCString + kFileURLPrefixLength, inCreateDirs);
+	*this = path;
+} // nsFileURL::nsFileURL
+#endif
+
 //----------------------------------------------------------------------------------------
 nsFileURL::nsFileURL(const nsFileURL& inOther)
 //----------------------------------------------------------------------------------------
@@ -297,25 +342,25 @@ nsFileURL::nsFileURL(const nsFileURL& inOther)
 {
 } // nsFileURL::nsFileURL
 
+#ifndef XP_MAC
 //----------------------------------------------------------------------------------------
 nsFileURL::nsFileURL(const nsFilePath& inOther)
 //----------------------------------------------------------------------------------------
-:    mURL(nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)inOther))
-#ifdef XP_MAC
-,    mFileSpec(inOther.GetFileSpec())
-#endif
+:    mURL(nsnull)
 {
+    *this = inOther;
 } // nsFileURL::nsFileURL
+#endif
 
+#ifndef XP_MAC
 //----------------------------------------------------------------------------------------
 nsFileURL::nsFileURL(const nsFileSpec& inOther)
-:    mURL(nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)nsFilePath(inOther)))
-#ifdef XP_MAC
-,    mFileSpec(inOther)
-#endif
+:    mURL(nsnull)
 //----------------------------------------------------------------------------------------
 {
+    *this = inOther;
 } // nsFileURL::nsFileURL
+#endif
 
 //----------------------------------------------------------------------------------------
 nsFileURL::~nsFileURL()
@@ -324,16 +369,15 @@ nsFileURL::~nsFileURL()
     delete [] mURL;
 }
 
+#ifndef XP_MAC
 //----------------------------------------------------------------------------------------
 void nsFileURL::operator = (const char* inString)
 //----------------------------------------------------------------------------------------
 {
     nsFileSpecHelpers::StringAssign(mURL, inString);
     NS_ASSERTION(strstr(inString, kFileURLPrefix) == inString, "Not a URL!");
-#ifdef XP_MAC
-    mFileSpec = inString + kFileURLPrefixLength;
-#endif
 } // nsFileURL::operator =
+#endif
 
 //----------------------------------------------------------------------------------------
 void nsFileURL::operator = (const nsFileURL& inOther)
@@ -345,36 +389,44 @@ void nsFileURL::operator = (const nsFileURL& inOther)
 #endif
 } // nsFileURL::operator =
 
+#ifndef XP_MAC
 //----------------------------------------------------------------------------------------
 void nsFileURL::operator = (const nsFilePath& inOther)
 //----------------------------------------------------------------------------------------
 {
     delete [] mURL;
-    mURL = nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)inOther);
-#ifdef XP_MAC
-    mFileSpec  = inOther.GetFileSpec();
+	char* original = (char*)(const char*)inOther; // we shall modify, but restore.
+#ifdef XP_PC
+	// because we don't want to escape the '|' character, change it to a letter.
+    NS_ASSERTION(original[2] == '|', "No drive letter part!");
+    original[2] = 'x';
+    char* escapedPath = nsEscape(original, url_Path);
+    original[2] = '|'; // restore it
+    escapedPath[2] = '|';
+#else
+    char* escapedPath = nsEscape(original, url_Path);
 #endif
+    if (escapedPath)
+	    mURL = nsFileSpecHelpers::AllocCat(kFileURLPrefix, escapedPath);
+    delete [] escapedPath;
 } // nsFileURL::operator =
+#endif
 
+#ifndef XP_MAC
 //----------------------------------------------------------------------------------------
 void nsFileURL::operator = (const nsFileSpec& inOther)
 //----------------------------------------------------------------------------------------
 {
-    delete [] mURL;
-    mURL = nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)nsFilePath(inOther));
-#ifdef XP_MAC
-    mFileSpec  = inOther;
-#endif
+    *this = nsFilePath(inOther);
 } // nsFileURL::operator =
+#endif
 
-#if DEBUG
 //----------------------------------------------------------------------------------------
 nsOutputStream& operator << (nsOutputStream& s, const nsFileURL& url)
 //----------------------------------------------------------------------------------------
 {
     return (s << url.mURL);
 }
-#endif
 
 //========================================================================================
 //                                nsFilePath implementation
@@ -408,15 +460,34 @@ nsFilePath::nsFilePath(const char* inString, PRBool inCreateDirs)
 }
 #endif
 
+#ifndef XP_MAC
+//----------------------------------------------------------------------------------------
+nsFilePath::nsFilePath(const nsString& inString, PRBool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mPath(inString.ToNewCString())
+{
+    NS_ASSERTION(strstr(mPath, kFileURLPrefix) != mPath, "URL passed as path");
+
+#ifdef XP_PC
+    nsFileSpecHelpers::UnixToNative(mPath);
+#endif
+    // Make canonical and absolute.
+    nsFileSpecHelpers::Canonify(mPath, inCreateDirs);
+#ifdef XP_PC
+    NS_ASSERTION( mPath[1] == ':', "unexpected canonical path" );
+    nsFileSpecHelpers::NativeToUnix(mPath);
+#endif
+}
+#endif
+
+#ifndef XP_MAC
 //----------------------------------------------------------------------------------------
 nsFilePath::nsFilePath(const nsFileURL& inOther)
 //----------------------------------------------------------------------------------------
 :    mPath(nsFileSpecHelpers::StringDup(inOther.mURL + kFileURLPrefixLength))
-#ifdef XP_MAC
-,    mFileSpec(inOther.GetFileSpec())
-#endif
 {
 }
+#endif
 
 #ifdef XP_UNIX
 //----------------------------------------------------------------------------------------
@@ -452,6 +523,7 @@ void nsFilePath::operator = (const char* inString)
     mFileSpec = inString;
 	nsFileSpecHelpers::StringAssign(mPath, (const char*)nsFilePath(mFileSpec));
 #else
+	nsFileSpecHelpers::StringAssign(mPath, inString);
 #ifdef XP_PC
 	nsFileSpecHelpers::UnixToNative(mPath);
 #endif
@@ -463,11 +535,20 @@ void nsFilePath::operator = (const char* inString)
 #endif // XP_MAC
 }
 
+#ifndef XP_MAC
 //----------------------------------------------------------------------------------------
 void nsFilePath::operator = (const nsFileURL& inOther)
 //----------------------------------------------------------------------------------------
 {
     nsFileSpecHelpers::StringAssign(mPath, (const char*)nsFilePath(inOther));
+}
+#endif
+
+//----------------------------------------------------------------------------------------
+void nsFilePath::operator = (const nsFilePath& inOther)
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpecHelpers::StringAssign(mPath, inOther.mPath);
 #ifdef XP_MAC
     mFileSpec = inOther.GetFileSpec();
 #endif
@@ -490,9 +571,7 @@ nsFileSpec::nsFileSpec()
 //----------------------------------------------------------------------------------------
 nsFileSpec::nsFileSpec(const nsPersistentFileDescriptor& inDescriptor)
 //----------------------------------------------------------------------------------------
-#ifndef XP_MAC
 :    mPath(nsnull)
-#endif
 {
 	*this = inDescriptor;
 }
@@ -500,9 +579,7 @@ nsFileSpec::nsFileSpec(const nsPersistentFileDescriptor& inDescriptor)
 //----------------------------------------------------------------------------------------
 nsFileSpec::nsFileSpec(const nsFileURL& inURL)
 //----------------------------------------------------------------------------------------
-#ifndef XP_MAC
 :    mPath(nsnull)
-#endif
 {
     *this = nsFilePath(inURL); // convert to unix path first
 }
@@ -537,7 +614,7 @@ void nsFileSpec::MakeUnique()
     }
     const int kMaxRootLength
         = nsFileSpecHelpers::kMaxCoreLeafNameLength - strlen(suffix) - 1;
-    if (strlen(leafName) > kMaxRootLength)
+    if ((int)strlen(leafName) > (int)kMaxRootLength)
         leafName[kMaxRootLength] = '\0';
     for (short index = 1; index < 1000 && Exists(); index++)
     {
@@ -579,6 +656,7 @@ void nsFileSpec::operator = (const nsPersistentFileDescriptor& inDescriptor)
 	Boolean changed;
 	mError = NS_FILE_RESULT(::ResolveAlias(nsnull, aliasH, &mSpec, &changed));
 	DisposeHandle((Handle) aliasH);
+	delete [] mPath;
 #else
     nsFileSpecHelpers::StringAssign(mPath, (char*)data);
     mError = NS_OK;
@@ -631,13 +709,23 @@ nsFileSpec::nsFileSpec(const char* inString, PRBool inCreateDirs)
 }
 #endif //XP_UNIX,PC
 
+#if defined(XP_UNIX) || defined(XP_PC)
+//----------------------------------------------------------------------------------------
+nsFileSpec::nsFileSpec(const nsString& inString, PRBool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mPath(inString.ToNewCString())
+,    mError(NS_OK)
+{
+    // Make canonical and absolute.
+    nsFileSpecHelpers::Canonify(mPath, inCreateDirs);
+}
+#endif //XP_UNIX,PC
+
 //----------------------------------------------------------------------------------------
 nsFileSpec::~nsFileSpec()
 //----------------------------------------------------------------------------------------
 {
-#ifndef XP_MAC
     delete [] mPath;
-#endif
 }
 
 #if defined(XP_UNIX) || defined(XP_PC)
@@ -658,21 +746,27 @@ void nsFileSpec::operator = (const char* inString)
 {
     mPath = nsFileSpecHelpers::StringAssign(mPath, inString);
     // Make canonical and absolute.
-    nsFileSpecHelpers::Canonify(mPath, PR_TRUE /* XXX? */);
+    nsFileSpecHelpers::Canonify(mPath, PR_FALSE /* XXX? */);
     mError = NS_OK;
 }
 #endif //XP_UNIX
 
-#if DEBUG
 #if (defined(XP_UNIX) || defined(XP_PC))
 //----------------------------------------------------------------------------------------
 nsOutputStream& operator << (nsOutputStream& s, const nsFileSpec& spec)
 //----------------------------------------------------------------------------------------
 {
-    return (s << (const char*)spec.mPath);
+#ifdef NS_DEBUG
+    static PRBool warnedOnce = PR_FALSE;
+    if (!warnedOnce)
+    {
+        NS_WARNING("This is for debugging only.  Do not call this in shipped version!");
+        warnedOnce = PR_TRUE;
+    }
+#endif // NS_DEBUG
+    return (s << spec.GetCString());
 }
-#endif // DEBUG && XP_UNIX
-#endif
+#endif // DEBUG ONLY!
 
 //----------------------------------------------------------------------------------------
 nsFileSpec nsFileSpec::operator + (const char* inRelativePath) const
@@ -683,6 +777,57 @@ nsFileSpec nsFileSpec::operator + (const char* inRelativePath) const
     return result;
 } // nsFileSpec::operator +
 
+//----------------------------------------------------------------------------------------
+PRBool nsFileSpec::operator == (const nsFileSpec& inOther) const
+//----------------------------------------------------------------------------------------
+{
+
+#ifdef XP_MAC
+    if ( inOther.mSpec.vRefNum == mSpec.vRefNum &&
+        inOther.mSpec.parID   == mSpec.parID &&
+        EqualString(inOther.mSpec.name, mSpec.name, false, true))
+        return PR_TRUE;
+#else
+    PRBool amEmpty = !mPath || !*mPath;
+    PRBool heEmpty = !inOther.mPath || !*inOther.mPath;
+    if (amEmpty) // we're the same if he's empty...
+        return heEmpty;
+    if (heEmpty) // ('cuz I'm not...)
+        return PR_FALSE;
+	#if defined(XP_PC)
+	   // windows does not care about case.
+	   if (_stricmp(mPath, inOther.mPath ) == 0)
+	       return PR_TRUE;
+	#else
+	   if (strcmp(mPath, inOther.mPath ) == 0)
+	       return PR_TRUE;
+	#endif
+#endif
+   return PR_FALSE;
+}
+
+//----------------------------------------------------------------------------------------
+PRBool nsFileSpec::operator != (const nsFileSpec& inOther) const
+//----------------------------------------------------------------------------------------
+{
+    return (! (*this == inOther) );
+}
+
+#ifndef XP_MAC
+//----------------------------------------------------------------------------------------
+const char* nsFileSpec::GetCString() const
+// This is the only automatic conversion to const char*
+// that is provided, and it allows the
+// path to be "passed" to NSPR file routines.  This practice
+// is VERY EVIL and should only be used to support legacy
+// code.  Using it guarantees bugs on Macintosh. The path is NOT allocated, so do
+// not even think of deleting (or freeing) it.
+//----------------------------------------------------------------------------------------
+{
+    return mPath;
+}
+#endif
+
 //========================================================================================
 //	class nsPersistentFileDescriptor
 //========================================================================================
@@ -717,7 +862,7 @@ void nsPersistentFileDescriptor::operator = (const nsFileSpec& inSpec)
     if (inSpec.Error())
     	return;
 	AliasHandle	aliasH;
-	OSErr err = NewAlias(nil, inSpec.operator const FSSpec* const (), &aliasH);
+	OSErr err = NewAlias(nil, inSpec.GetFSSpecPtr(), &aliasH);
 	if (err != noErr)
 		return;
 
@@ -729,7 +874,7 @@ void nsPersistentFileDescriptor::operator = (const nsFileSpec& inSpec)
     nsFileSpecHelpers::StringAssign(mDescriptorString, buf);
     PR_Free(buf);
 #else
-    nsFileSpecHelpers::StringAssign(mDescriptorString, inSpec);
+    nsFileSpecHelpers::StringAssign(mDescriptorString, inSpec.GetCString());
 #endif // XP_MAC
 } // nsPersistentFileDescriptor::operator =
 
@@ -762,6 +907,24 @@ void nsPersistentFileDescriptor::SetData(const void* inData, PRInt32 inSize)
 
 #define MAX_PERSISTENT_DATA_SIZE 1000
 
+//----------------------------------------------------------------------------------------
+nsresult nsPersistentFileDescriptor::Read(nsIInputStream* aStream)
+//----------------------------------------------------------------------------------------
+{
+    nsInputStream inputStream(aStream);
+    inputStream >> *this;
+    return NS_OK;
+}
+
+//----------------------------------------------------------------------------------------
+nsresult nsPersistentFileDescriptor::Write(nsIOutputStream* aStream)
+//----------------------------------------------------------------------------------------
+{
+    nsOutputStream outputStream(aStream);
+    outputStream << *this;
+    return NS_OK;
+}
+
 //----------------------------------------------------------------------------------------
 nsInputStream& operator >> (nsInputStream& s, nsPersistentFileDescriptor& d)
 // reads the data from a file
@@ -772,15 +935,15 @@ nsInputStream& operator >> (nsInputStream& s, nsPersistentFileDescriptor& d)
 	PRInt32 bytesRead = 8;
 	bytesRead = s.read(bigBuffer, bytesRead);
 	if (bytesRead != 8)
-		return (nsInputFileStream&)s;
+		return s;
 	bigBuffer[8] = '\0';
-	sscanf(bigBuffer, "%lx", &bytesRead);
+	sscanf(bigBuffer, "%lx", (PRUint32*)&bytesRead);
 	if (bytesRead > MAX_PERSISTENT_DATA_SIZE)
-		return (nsInputFileStream&)s; // preposterous.
+		return s; // preposterous.
 	// Now we know how many bytes to read, do it.
 	s.read(bigBuffer, bytesRead);
 	d.SetData(bigBuffer, bytesRead);
-	return (nsInputFileStream&)s;
+	return s;
 }
 
 //----------------------------------------------------------------------------------------
@@ -799,3 +962,14 @@ nsOutputStream& operator << (nsOutputStream& s, const nsPersistentFileDescriptor
 	s << d.mDescriptorString;
 	return s;
 }
+
+//========================================================================================
+//	class nsAutoCString
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsAutoCString::~nsAutoCString()
+//----------------------------------------------------------------------------------------
+{
+	delete [] (char*)mCString;
+}

mozilla/base/src/nsFileStream.cpp

@@ -22,6 +22,7 @@
 
 #include "nsFileStream.h"
 
+#include "nsIStringStream.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -35,7 +36,6 @@
 nsInputStream::~nsInputStream()
 //----------------------------------------------------------------------------------------
 {
-    mInputStream->Close();
 }
 
 //----------------------------------------------------------------------------------------
@@ -47,6 +47,19 @@ char nsInputStream::get()
     return c;
 }
 
+//----------------------------------------------------------------------------------------
+PRInt32 nsInputStream::read(void* s, PRInt32 n)
+//----------------------------------------------------------------------------------------
+{
+  if (!mInputStream)
+      return 0;
+  PRInt32 result = 0;
+  mInputStream->Read((char*)s, n, (PRUint32*)&result);
+  if (result < n)
+      set_at_eof(PR_TRUE);
+  return result;
+} // nsInputStream::read
+
 //----------------------------------------------------------------------------------------
 static void TidyEndOfLine(char*& cp)
 // Assumes that cp is pointing at \n or \r.  Nulls out the character, checks for
@@ -76,7 +89,6 @@ nsInputStream& nsInputStream::operator >> (char& c)
 nsOutputStream::~nsOutputStream()
 //----------------------------------------------------------------------------------------
 {
-    mOutputStream->Close();
 }
 
 //----------------------------------------------------------------------------------------
@@ -86,6 +98,17 @@ void nsOutputStream::put(char c)
     write(&c, sizeof(c));
 }
 
+//----------------------------------------------------------------------------------------
+PRInt32 nsOutputStream::write(const void* s, PRInt32 n)
+//----------------------------------------------------------------------------------------
+{
+  if (!mOutputStream)
+      return 0;
+  PRInt32 result = 0;
+  mOutputStream->Write((char*)s, n, (PRUint32*)&result);
+  return result;
+} // nsOutputStream::write
+
 //----------------------------------------------------------------------------------------
 void nsOutputStream::flush()
 //----------------------------------------------------------------------------------------
@@ -113,7 +136,7 @@ nsOutputStream& nsOutputStream::operator << (short val)
 //----------------------------------------------------------------------------------------
 {
 	char buf[30];
-	sprintf(buf, "%d", val);
+	sprintf(buf, "%hd", val);
 	return (*this << buf);
 }
 
@@ -122,7 +145,7 @@ nsOutputStream& nsOutputStream::operator << (unsigned short val)
 //----------------------------------------------------------------------------------------
 {
 	char buf[30];
-	sprintf(buf, "%ud", val);
+	sprintf(buf, "%hu", val);
 	return (*this << buf);
 }
 
@@ -140,16 +163,34 @@ nsOutputStream& nsOutputStream::operator << (unsigned long val)
 //----------------------------------------------------------------------------------------
 {
 	char buf[30];
-	sprintf(buf, "%uld", val);
+	sprintf(buf, "%lu", val);
+	return (*this << buf);
+}
+
+//----------------------------------------------------------------------------------------
+nsOutputStream& nsOutputStream::operator << (int val)
+//----------------------------------------------------------------------------------------
+{
+	char buf[30];
+	sprintf(buf, "%d", val);
+	return (*this << buf);
+}
+
+//----------------------------------------------------------------------------------------
+nsOutputStream& nsOutputStream::operator << (unsigned int val)
+//----------------------------------------------------------------------------------------
+{
+	char buf[30];
+	sprintf(buf, "%u", val);
 	return (*this << buf);
 }
 
 //========================================================================================
-//          nsInputFileStream
+//          nsRandomAccessInputStream
 //========================================================================================
 
 //----------------------------------------------------------------------------------------
-PRBool nsInputFileStream::readline(char* s, PRInt32 n)
+PRBool nsRandomAccessInputStream::readline(char* s, PRInt32 n)
 // This will truncate if the buffer is too small.  Result will always be null-terminated.
 //----------------------------------------------------------------------------------------
 {
@@ -175,7 +216,84 @@ PRBool nsInputFileStream::readline(char* s, PRInt32 n)
     position += bytesRead;
     seek(position);
     return bufferLargeEnough;
-} // nsInputStream::readline
+} // nsRandomAccessInputStream::readline
+
+//========================================================================================
+//          nsInputStringStream
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsInputStringStream::nsInputStringStream(const char* stringToRead)
+//----------------------------------------------------------------------------------------
+{
+	nsISupports* stream;
+	if (NS_FAILED(NS_NewCharInputStream(&stream, stringToRead)))
+		return;
+	mInputStream = nsQueryInterface(stream);
+	mStore = nsQueryInterface(stream);
+	NS_RELEASE(stream);
+}
+
+//----------------------------------------------------------------------------------------
+nsInputStringStream::nsInputStringStream(const nsString& stringToRead)
+//----------------------------------------------------------------------------------------
+{
+	nsISupports* stream;
+	if (NS_FAILED(NS_NewStringInputStream(&stream, stringToRead)))
+		return;
+	mInputStream = nsQueryInterface(stream);
+	mStore = nsQueryInterface(stream);
+	NS_RELEASE(stream);
+}
+
+//========================================================================================
+//          nsOutputStringStream
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsOutputStringStream::nsOutputStringStream(char*& stringToChange)
+//----------------------------------------------------------------------------------------
+{
+	nsISupports* stream;
+	if (NS_FAILED(NS_NewCharOutputStream(&stream, &stringToChange)))
+		return;
+	mOutputStream = nsQueryInterface(stream);
+	mStore = nsQueryInterface(stream);
+	NS_RELEASE(stream);
+}
+
+//----------------------------------------------------------------------------------------
+nsOutputStringStream::nsOutputStringStream(nsString& stringToChange)
+//----------------------------------------------------------------------------------------
+{
+	nsISupports* stream;
+	if (NS_FAILED(NS_NewStringOutputStream(&stream, stringToChange)))
+		return;
+	mOutputStream = nsQueryInterface(stream);
+	mStore = nsQueryInterface(stream);
+	NS_RELEASE(stream);
+}
+
+//========================================================================================
+//          nsInputFileStream
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsInputFileStream::nsInputFileStream(
+	const nsFileSpec& inFile,
+	int nsprMode,
+	PRIntn accessMode)
+//----------------------------------------------------------------------------------------
+{
+	nsISupports* stream;
+	if (NS_FAILED(NS_NewIOFileStream(&stream, inFile, nsprMode, accessMode)))
+        return;
+	mFile = nsQueryInterface(stream);
+	mInputStream = nsQueryInterface(stream);
+	mStore = nsQueryInterface(stream);
+	mFileInputStream = nsQueryInterface(stream);
+	NS_RELEASE(stream);
+} // nsInputFileStream::nsInputFileStream
 
 //========================================================================================
 //          nsOutputFileStream

mozilla/base/src/nsIAtom.h

@@ -35,7 +35,7 @@ class nsISizeOfHandler;
  */
 class nsIAtom : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IATOM_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IATOM_IID; return iid; }
 
   /**
    * Translate the unicode string into the stringbuf.

mozilla/base/src/nsIBaseStream.h

@@ -31,7 +31,7 @@
 class nsIBaseStream : public nsISupports {
 public:
 
-    static const nsIID& IID() { static nsIID iid = NS_IBASESTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IBASESTREAM_IID; return iid; }
 
     /** Close the stream. */
     NS_IMETHOD

mozilla/base/src/nsIFileStream.cpp

@@ -16,8 +16,7 @@
 
 //========================================================================================
 class FileImpl
-    : public nsIOutputStream
-    , public nsIInputStream
+    : public nsIRandomAccessStore
     , public nsIFileOutputStream
     , public nsIFileInputStream
     , public nsIFile
@@ -78,7 +77,6 @@ class FileImpl
                                             return NS_OK;
                                         }
 		NS_IMETHOD                      Read(char* aBuf,
-					                        PRUint32 aOffset,
 			                                PRUint32 aCount,
 					                        PRUint32 *aReadCount)
 								        {
@@ -92,8 +90,6 @@ class FileImpl
 								                return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
 								            if (mFailed)
 								                return NS_ERROR_FAILURE;
-								            if (aOffset)
-								                PR_Seek(mFileDesc, aOffset, PR_SEEK_CUR);
 								            PRInt32 bytesRead = PR_Read(mFileDesc, aBuf, aCount);
 								            if (bytesRead < 0)
 								            {
@@ -106,7 +102,6 @@ class FileImpl
 								        }
 		// nsIOutputStream interface
 		NS_IMETHOD                      Write(const char* aBuf,
-					                        PRUint32 aOffset,
 			                                PRUint32 aCount,
 					                        PRUint32 *aWriteCount)
 								        {
@@ -127,10 +122,8 @@ class FileImpl
 								                return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
 								            if (mFailed)
 								               return NS_ERROR_FAILURE;
-								            if (aOffset)
-								                PR_Seek(mFileDesc, aOffset, PR_SEEK_CUR);
 								            PRInt32 bytesWrit = PR_Write(mFileDesc, aBuf, aCount);
-								            if (bytesWrit != aCount)
+								            if (bytesWrit != (PRInt32)aCount)
 								            {
 								                mFailed = PR_TRUE;
 								                *aWriteCount = 0;
@@ -141,21 +134,32 @@ class FileImpl
 								        }
         NS_IMETHOD                      Flush();
 
+        NS_IMETHOD                      GetAtEOF(PRBool* outAtEOF)
+        						        {
+        						            *outAtEOF = mEOF;
+        						            return NS_OK;
+        						        }
+        NS_IMETHOD                      SetAtEOF(PRBool inAtEOF)
+        						        {
+        						            mEOF = inAtEOF;
+        						            return NS_OK;
+        						        }
+
     protected:
     
-        PRFileDesc*                             mFileDesc;
-        int                                     mNSPRMode;
-        PRBool                                  mFailed;
-        PRBool                                  mEOF;
-        PRInt32                                 mLength;
+        PRFileDesc*                     mFileDesc;
+        int                             mNSPRMode;
+        PRBool                          mFailed;
+        PRBool                          mEOF;
+        PRInt32                         mLength;
 }; // class FileImpl
 
-#define SAY_I_IMPLEMENT(classname)        \
-  if (aIID.Equals(classname::IID()))                  \
-  {                                            \
+#define SAY_I_IMPLEMENT(classname)               \
+  if (aIID.Equals(classname::GetIID()))          \
+  {                                              \
       *aInstancePtr = (void*)((classname*)this); \
-      NS_ADDREF_THIS();                        \
-      return NS_OK;                            \
+      NS_ADDREF_THIS();                          \
+      return NS_OK;                              \
   }
 
 NS_IMPL_RELEASE(FileImpl)
@@ -171,6 +175,7 @@ NS_IMETHODIMP FileImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   *aInstancePtr = nsnull;
 
   SAY_I_IMPLEMENT(nsIFile)
+  SAY_I_IMPLEMENT(nsIRandomAccessStore)
   SAY_I_IMPLEMENT(nsIOutputStream)
   SAY_I_IMPLEMENT(nsIInputStream)
   SAY_I_IMPLEMENT(nsIFileInputStream)
@@ -179,13 +184,13 @@ NS_IMETHODIMP FileImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   // of nsISupports), one through
   // nsIOutputStream, the other through nsIInputStream.  Resolve this
   // by giving them a specific one
-  if (aIID.Equals(((nsIBaseStream*)(nsIOutputStream*)this)->IID()))
+  if (aIID.Equals(((nsIBaseStream*)(nsIOutputStream*)this)->GetIID()))
   {
       *aInstancePtr = (void*)((nsIBaseStream*)(nsIOutputStream*)this);
       NS_ADDREF_THIS();
       return NS_OK;
   }
-  if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->IID()))
+  if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->GetIID()))
   {
       *aInstancePtr = (void*)((nsISupports*)(nsIOutputStream*)this);
       NS_ADDREF_THIS();
@@ -296,7 +301,7 @@ NS_IMETHODIMP FileImpl::Seek(PRSeekWhence whence, PRInt32 offset)
     PRInt32 position = PR_Seek(mFileDesc, 0, PR_SEEK_CUR);
     PRInt32 available = PR_Available(mFileDesc);
     PRInt32 fileSize = position + available;
-    PRInt32 newPosition;
+    PRInt32 newPosition = 0;
     switch (whence)
     {
         case PR_SEEK_CUR: newPosition = position + offset; break;
@@ -308,7 +313,7 @@ NS_IMETHODIMP FileImpl::Seek(PRSeekWhence whence, PRInt32 offset)
         newPosition = 0;
         mFailed = PR_TRUE;
     }
-    else if (newPosition >= fileSize)
+    if (newPosition >= fileSize) // nb: not "else if".
     {
         newPosition = fileSize;
         mEOF = PR_TRUE;

mozilla/base/src/nsIInputStream.h

@@ -28,7 +28,7 @@
 class nsIInputStream : public nsIBaseStream {
 public:
 
-    static const nsIID& IID() { static nsIID iid = NS_IINPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IINPUTSTREAM_IID; return iid; }
 
     /** Return the number of bytes in the stream
      *  @param aLength out parameter to hold the length
@@ -42,7 +42,6 @@ public:
     /** Read data from the stream.
      *  @param aErrorCode the error code if an error occurs
      *  @param aBuf the buffer into which the data is read
-     *  @param aOffset the start offset of the data
      *  @param aCount the maximum number of bytes to read
      *  @param aReadCount out parameter to hold the number of
      *         bytes read, eof if 0. if an error occurs, the
@@ -50,7 +49,7 @@ public:
      *  @return error status
      */   
     NS_IMETHOD
-    Read(char* aBuf, PRUint32 aOffset, PRUint32 aCount, PRUint32 *aReadCount) = 0; 
+    Read(char* aBuf, PRUint32 aCount, PRUint32 *aReadCount) = 0; 
 };
 
 #endif /* nsInputStream_h___ */

mozilla/base/src/nsIOutputStream.h

@@ -29,11 +29,10 @@
 class nsIOutputStream : public nsIBaseStream {
 public:
 
-    static const nsIID& IID() { static nsIID iid = NS_IOUTPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IOUTPUTSTREAM_IID; return iid; }
 
     /** Write data into the stream.
      *  @param aBuf the buffer into which the data is read
-     *  @param aOffset the start offset of the data
      *  @param aCount the maximum number of bytes to read
      *  @param aWriteCount out parameter to hold the number of
      *         bytes written. if an error occurs, the writecount
@@ -41,7 +40,7 @@ public:
      *  @return error status
      */   
     NS_IMETHOD
-    Write(const char* aBuf, PRUint32 aOffset, PRUint32 aCount, PRUint32 *aWriteCount) = 0; 
+    Write(const char* aBuf, PRUint32 aCount, PRUint32 *aWriteCount) = 0; 
 };
 
 

mozilla/base/src/nsIStringStream.cpp

@@ -0,0 +1,463 @@
+#include "nsIStringStream.h"
+#include "nsIFileStream.h"
+
+#include "prerror.h"
+#include "nsFileSpec.h"
+#include "plstr.h"
+
+//========================================================================================
+class BasicStringImpl
+    : public nsIOutputStream
+    , public nsIInputStream
+    , public nsIRandomAccessStore
+//========================================================================================
+{
+    public:
+                                        BasicStringImpl()
+                                            : mResult(NS_OK)
+                                            , mEOF(PR_FALSE)
+                                            , mOffset(0)
+                                        {
+                                            NS_INIT_REFCNT();
+                                        }
+        virtual                         ~BasicStringImpl()
+                                        {
+                                        }
+        NS_IMETHOD                      Seek(PRSeekWhence whence, PRInt32 offset);
+
+        NS_IMETHOD                      Tell(PRIntn* outWhere)
+                                        {
+                                            *outWhere = mOffset;
+                                            return NS_OK;
+                                        }
+
+        NS_IMETHOD                      GetAtEOF(PRBool* outAtEOF)
+        						        {
+        						            *outAtEOF = mEOF;
+        						            return NS_OK;
+        						        }
+        NS_IMETHOD                      SetAtEOF(PRBool inAtEOF)
+        						        {
+        						            mEOF = inAtEOF;
+        						            return NS_OK;
+        						        }
+
+        NS_IMETHOD                      GetLength(PRUint32 *aLength)
+                                        {
+                                            NS_PRECONDITION(aLength != nsnull, "null ptr");
+                                            if (!aLength)
+                                                return NS_ERROR_NULL_POINTER;
+                                            *aLength = length();
+                                            return NS_OK;
+                                        }
+		NS_IMETHOD                      Read(char* aBuf,
+			                                PRUint32 aCount,
+					                        PRUint32 *aReadCount)
+								        {
+								            NS_PRECONDITION(aBuf != nsnull, "null ptr");
+								            if (!aBuf)
+								                return NS_ERROR_NULL_POINTER;
+								            NS_PRECONDITION(aReadCount != nsnull, "null ptr");
+								            if (!aReadCount)
+								                return NS_ERROR_NULL_POINTER;
+								            if (NS_FAILED(mResult))
+								                return mResult;
+								            PRInt32 bytesRead = read(aBuf, aCount);
+								            if (NS_FAILED(mResult))
+								            {
+								                *aReadCount = 0;
+								                return mResult;
+								            }
+								            *aReadCount = bytesRead;
+								            if (bytesRead < aCount)
+								                SetAtEOF(PR_TRUE);
+								            return NS_OK;
+								        }
+		// nsIOutputStream interface
+		NS_IMETHOD                      Write(const char* aBuf,
+			                                PRUint32 aCount,
+					                        PRUint32 *aWriteCount)
+								        {
+								            NS_PRECONDITION(aBuf != nsnull, "null ptr");
+								            NS_PRECONDITION(aWriteCount != nsnull, "null ptr");
+
+								            if (NS_FAILED(mResult))
+								                return mResult;
+								            PRInt32 bytesWrit = write(aBuf, aCount);
+								            if (NS_FAILED(mResult))
+								            {
+								                *aWriteCount = 0;
+								                return mResult;
+								            }
+								            *aWriteCount = bytesWrit;
+								            return NS_OK;
+								        }
+    public:
+        
+        // nsISupports interface
+                                        NS_DECL_ISUPPORTS
+
+        NS_IMETHOD                      Close() { return NS_OK; }
+
+		// nsIInputStream interface
+        NS_IMETHOD                      Flush() { return NS_OK; }
+
+    
+    public:
+        nsresult                        get_result() const { return mResult; }
+        
+    protected:
+    
+        virtual PRInt32                 length() const = 0;
+        virtual PRInt32                 read(char* buf, PRUint32 count) = 0;
+        virtual PRInt32                 write(const char*, PRUint32)
+                                        {
+                                            NS_ASSERTION(PR_FALSE, "Write to a const string");
+                                            mResult = NS_FILE_RESULT(PR_ILLEGAL_ACCESS_ERROR);
+                                            return -1;
+                                        }
+        
+    protected:
+ 
+        PRUint32                        mOffset;
+        nsresult                        mResult;
+        PRBool                          mEOF;
+}; // class BasicStringImpl
+
+//========================================================================================
+class ConstCharImpl
+    : public BasicStringImpl
+//========================================================================================
+{
+    public:
+                                        ConstCharImpl(const char* inString)
+                                            : mConstString(inString)
+                                            , mLength(inString ? strlen(inString) : 0)
+                                        {
+                                        }
+                                       
+    protected:
+    
+        virtual PRInt32                 length() const
+                                        {
+                                            return mLength;
+                                        }
+
+        virtual PRInt32                 read(char* buf, PRUint32 aCount)
+                                        {
+                                            PRInt32 maxCount = mLength - mOffset;
+                                            if (aCount > maxCount)
+                                                aCount = maxCount;
+                                            memcpy(buf, mConstString + mOffset, aCount);
+                                            mOffset += aCount;
+                                            return aCount;
+                                        }
+        
+
+    protected:
+    
+        const char*                     mConstString;
+        size_t                          mLength;
+        
+}; // class ConstCharImpl
+
+//========================================================================================
+class CharImpl
+    : public ConstCharImpl
+//========================================================================================
+{
+    enum { kAllocQuantum = 256 };
+    
+    public:
+                                        CharImpl(char** inString)
+                                            : ConstCharImpl(*inString)
+                                            , mString(*inString)
+                                            , mAllocLength(mLength + 1)
+                                            , mOriginalLength(mLength)
+                                        {
+                                            if (!mString)
+                                            {
+                                                mAllocLength += kAllocQuantum;
+                                                mString = new char[mAllocLength];
+	                                            if (!mString)
+	                                            {
+	                                                mResult = NS_ERROR_OUT_OF_MEMORY;
+	                                                return;
+	                                            }
+	                                            mConstString = mString;
+	                                            *mString = '\0';
+	                                            
+                                            }
+                                        }
+
+        virtual PRInt32                 write(const char* buf, PRUint32 aCount)
+                                        {
+                                            PRInt32 maxCount = mAllocLength - 1 - mOffset;
+                                            if (aCount > maxCount)
+                                            {
+                                                
+                                                do {
+                                                    maxCount += kAllocQuantum;
+                                                } while (aCount > maxCount);
+                                                mAllocLength = maxCount + 1 + mOffset;
+                                                char* newString = new char[mAllocLength];
+	                                            if (!newString)
+	                                            {
+	                                                mResult = NS_ERROR_OUT_OF_MEMORY;
+	                                                return 0;
+	                                            }
+                                                strcpy(newString, mString);
+                                                delete [] mString;
+                                                mString = newString;
+                                                mConstString = newString;
+                                            }
+                                            memcpy(mString + mOffset, buf, aCount);
+                                            mOffset += aCount;
+                                            if (mOffset > mOriginalLength)
+                                                mString[mOffset] = 0;
+                                            return aCount;
+                                        }
+    protected:
+    
+        char*&                          mString;
+        size_t                          mOriginalLength;
+        size_t                          mAllocLength;
+        
+}; // class CharImpl
+                                       
+//========================================================================================
+class ConstStringImpl
+    : public ConstCharImpl
+//========================================================================================
+{
+    public:
+                                        ConstStringImpl(const nsString& inString)
+                                            : ConstCharImpl(inString.ToNewCString())
+                                        {
+                                        }
+
+                                        ~ConstStringImpl()
+                                        {
+                                            delete [] (char*)mConstString;
+                                        }
+
+    protected:
+    
+    protected:
+    
+}; // class ConstStringImpl
+
+
+//========================================================================================
+class StringImpl
+    : public ConstStringImpl
+//========================================================================================
+{
+    public:
+                                        StringImpl(nsString& inString)
+                                            : ConstStringImpl(inString)
+                                            , mString(inString)
+                                        {
+                                        }
+
+    protected:
+    
+        virtual PRInt32                 write(const char* buf, PRUint32 count)
+                                        {
+                                            // Clone our string as chars
+                                            char* cstring = mString.ToNewCString();
+                                            // Make a CharImpl and do the write
+                                            CharImpl chars(&cstring);
+                                            chars.Seek(PR_SEEK_SET, mOffset);
+                                            // Get the bytecount and result from the CharImpl
+                                            PRInt32 result = chars.write(buf,count);
+                                            mResult = chars.get_result();
+                                            // Set our string to match the new chars
+                                            mString = cstring;
+                                            // Set our const string also...
+                                            delete [] (char*)mConstString;
+                                            mConstString = cstring;
+                                            return result;
+                                        }
+    protected:
+    
+        nsString&                        mString;
+        
+}; // class StringImpl
+
+#define SAY_I_IMPLEMENT(classname)               \
+  if (aIID.Equals(classname::GetIID()))          \
+  {                                              \
+      *aInstancePtr = (void*)((classname*)this); \
+      NS_ADDREF_THIS();                          \
+      return NS_OK;                              \
+  }
+
+NS_IMPL_RELEASE(BasicStringImpl)
+NS_IMPL_ADDREF(BasicStringImpl)
+
+//----------------------------------------------------------------------------------------
+NS_IMETHODIMP BasicStringImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
+//----------------------------------------------------------------------------------------
+{
+  if (!aInstancePtr)
+    return NS_ERROR_NULL_POINTER;
+
+  *aInstancePtr = nsnull;
+
+  SAY_I_IMPLEMENT(nsIRandomAccessStore)
+  SAY_I_IMPLEMENT(nsIOutputStream)
+  SAY_I_IMPLEMENT(nsIInputStream)
+  // Note that we derive from two copies of nsIBaseStream (and hence
+  // of nsISupports), one through
+  // nsIOutputStream, the other through nsIInputStream.  Resolve this
+  // by giving them a specific one
+  if (aIID.Equals(((nsIBaseStream*)(nsIOutputStream*)this)->GetIID()))
+  {
+      *aInstancePtr = (void*)((nsIBaseStream*)(nsIOutputStream*)this);
+      NS_ADDREF_THIS();
+      return NS_OK;
+  }
+  if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->GetIID()))
+  {
+      *aInstancePtr = (void*)((nsISupports*)(nsIOutputStream*)this);
+      NS_ADDREF_THIS();
+      return NS_OK;
+  }
+  return NS_NOINTERFACE;
+} // StringImpl::QueryInterface
+
+//----------------------------------------------------------------------------------------
+NS_IMETHODIMP BasicStringImpl::Seek(PRSeekWhence whence, PRInt32 offset)
+//----------------------------------------------------------------------------------------
+{
+    mResult = NS_OK; // reset on a seek.
+    mEOF = PR_FALSE; // reset on a seek.
+    PRInt32 fileSize = length();
+    PRInt32 newPosition;
+    switch (whence)
+    {
+        case PR_SEEK_CUR: newPosition = mOffset + offset; break;
+        case PR_SEEK_SET: newPosition = offset; break;
+        case PR_SEEK_END: newPosition = fileSize + offset; break;
+    }
+    if (newPosition < 0)
+    {
+        newPosition = 0;
+        mResult = NS_FILE_RESULT(PR_FILE_SEEK_ERROR);
+    }
+    if (newPosition >= fileSize)
+    {
+        newPosition = fileSize;
+        mEOF = PR_TRUE;
+    }
+    mOffset = newPosition;
+    return NS_OK;
+} // StringImpl::Seek
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewStringInputStream(
+    nsISupports** aStreamResult,
+    const nsString& aStringToRead)
+    // Factory method to get an nsInputStream from a string.  Result will implement all the
+    // file stream interfaces in nsIFileStream.h
+//----------------------------------------------------------------------------------------
+{
+    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
+    if (! aStreamResult)
+        return NS_ERROR_NULL_POINTER;
+
+    ConstStringImpl* stream = new ConstStringImpl(aStringToRead);
+    if (! stream)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(stream);
+    *aStreamResult = (nsISupports*)(void*)stream;
+    return NS_OK;
+}
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewStringOutputStream(
+    nsISupports** aStreamResult,
+    nsString& aStringToChange)
+    // Factory method to get an nsOutputStream from a string.  Result will implement all the
+    // file stream interfaces in nsIFileStream.h
+//----------------------------------------------------------------------------------------
+{
+    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
+    if (! aStreamResult)
+        return NS_ERROR_NULL_POINTER;
+
+    StringImpl* stream = new StringImpl(aStringToChange);
+    if (! stream)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(stream);
+    *aStreamResult = (nsISupports*)(void*)stream;
+    return NS_OK;
+}
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewCharInputStream(
+    nsISupports** aStreamResult,
+    const char* aStringToRead)
+    // Factory method to get an nsInputStream from a string.  Result will implement all the
+    // file stream interfaces in nsIFileStream.h
+//----------------------------------------------------------------------------------------
+{
+    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
+    if (! aStreamResult)
+        return NS_ERROR_NULL_POINTER;
+
+    ConstCharImpl* stream = new ConstCharImpl(aStringToRead);
+    if (! stream)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(stream);
+    *aStreamResult = (nsISupports*)(void*)stream;
+    return NS_OK;
+}
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewCharOutputStream(
+    nsISupports** aStreamResult,
+    char** aStringToChange)
+    // Factory method to get an nsOutputStream to a string.  Result will implement all the
+    // file stream interfaces in nsIFileStream.h
+//----------------------------------------------------------------------------------------
+{
+    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
+    NS_PRECONDITION(aStringToChange != nsnull, "null ptr");
+    if (!aStreamResult || !aStringToChange)
+        return NS_ERROR_NULL_POINTER;
+
+    CharImpl* stream = new CharImpl(aStringToChange);
+    if (! stream)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(stream);
+    *aStreamResult = (nsISupports*)(void*)stream;
+    return NS_OK;
+}
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewStringIOStream(
+    nsISupports** aStreamResult,
+    nsString& aStringToChange)
+    // Factory method to get an nsOutputStream to a string.  Result will implement all the
+// file stream interfaces in nsIFileStream.h
+//----------------------------------------------------------------------------------------
+{
+    return NS_NewStringOutputStream(aStreamResult, aStringToChange);
+}
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewCharIOStream(
+    nsISupports** aStreamResult,
+    char** aStringToChange)
+    // Factory method to get an nsOutputStream to a string.  Result will implement all the
+    // file stream interfaces in nsIFileStream.h
+//----------------------------------------------------------------------------------------
+{
+    return NS_NewCharOutputStream(aStreamResult, aStringToChange);
+}

mozilla/base/src/nsITimer.h

@@ -45,6 +45,8 @@ typedef void
  */
 class nsITimer : public nsISupports {
 public:  
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITIMER_IID)
+  
   /**
    * Initialize a timer to fire after the given millisecond interval.
    * This version takes a function to call and a closure to pass to

mozilla/base/src/nsITimerCallback.h

@@ -35,7 +35,9 @@ class nsITimer;
  */
 class nsITimerCallback : public nsISupports {
 public:  
-  virtual void Notify(nsITimer *timer)=0;
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITIMERCALLBACK_IID)
+
+  virtual void Notify(nsITimer *timer) = 0;
 };
 
 #endif

mozilla/base/src/nsProperties.cpp

@@ -61,7 +61,7 @@ nsProperties::nsProperties()
   mTable = nsnull;
 }
 
-PR_CALLBACK PRIntn
+PR_STATIC_CALLBACK(PRIntn)
 FreeHashEntries(PLHashEntry* he, PRIntn i, void* arg)
 {
   delete[] (PRUnichar*)he->key;

mozilla/base/src/nsSpecialSystemDirectory.cpp

@@ -0,0 +1,369 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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/NPL/
+ *
+ * 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 Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Doug Turner <dougt@netscape.com>
+ */
+
+#include "nsSpecialSystemDirectory.h"
+#include "nsDebug.h"
+
+#ifdef XP_MAC
+#include <Folders.h>
+#include <Files.h>
+#include <Memory.h>
+#include <Processes.h>
+#elif defined(XP_PC)
+#include <windows.h>
+#include <stdlib.h>
+#include <stdio.h>
+#elif defined(XP_UNIX)
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/param.h>
+#endif
+
+#include "plstr.h"
+
+#if XP_PC
+//----------------------------------------------------------------------------------------
+static char* MakeUpperCase(char* aPath)
+//----------------------------------------------------------------------------------------
+{
+  // windows does not care about case.  push to uppercase:
+  int length = strlen(aPath);
+  for (int i = 0; i < length; i++)
+      if (islower(aPath[i]))
+        aPath[i] = _toupper(aPath[i]);
+    
+  return aPath;
+}
+#endif
+
+//----------------------------------------------------------------------------------------
+static void GetCurrentProcessDirectory(nsFileSpec& aFileSpec)
+//----------------------------------------------------------------------------------------
+{
+#ifdef XP_PC
+    char buf[MAX_PATH];
+    if ( ::GetModuleFileName(0, buf, sizeof(buf)) ) {
+        // chop of the executable name by finding the rightmost backslash
+        char* lastSlash = PL_strrchr(buf, '\\');
+        if (lastSlash)
+            *(lastSlash + 1) = '\0';
+
+        aFileSpec = buf;
+        return;
+    }
+
+#elif defined(XP_MAC)
+    // get info for the the current process to determine the directory
+    // its located in
+    OSErr err;
+    ProcessSerialNumber psn;
+    if (!(err = GetCurrentProcess(&psn)))
+    {
+        ProcessInfoRec pInfo;
+        FSSpec         tempSpec;
+
+        // initialize ProcessInfoRec before calling
+        // GetProcessInformation() or die horribly.
+        pInfo.processName = nil;
+        pInfo.processAppSpec = &tempSpec;
+        pInfo.processInfoLength = sizeof(ProcessInfoRec);
+
+        if (!(err = GetProcessInformation(&psn, &pInfo)))
+        {
+            FSSpec appFSSpec = *(pInfo.processAppSpec);
+            long theDirID = appFSSpec.parID;
+
+            Str255 name;
+            CInfoPBRec catInfo;
+            catInfo.dirInfo.ioCompletion = NULL;
+            catInfo.dirInfo.ioNamePtr = (StringPtr)&name;
+            catInfo.dirInfo.ioVRefNum = appFSSpec.vRefNum;
+            catInfo.dirInfo.ioDrDirID = theDirID;
+            catInfo.dirInfo.ioFDirIndex = -1; // -1 = query dir in ioDrDirID
+
+            if (!(err = PBGetCatInfoSync(&catInfo)))
+            {
+                aFileSpec = nsFileSpec(appFSSpec.vRefNum,
+                                       catInfo.dirInfo.ioDrParID,
+                                       name);
+                return;
+            }
+        }
+    }
+
+#elif defined(XP_UNIX)
+
+    // In the absence of a good way to get the executable directory let
+    // us try this for unix:
+    //	- if MOZILLA_FIVE_HOME is defined, that is it
+    //	- else give the current directory
+    char buf[MAXPATHLEN];
+    char *moz5 = getenv("MOZILLA_FIVE_HOME");
+    if (moz5)
+    {
+        aFileSpec = moz5;
+        return;
+    }
+    else
+    {
+        if (getcwd(buf, sizeof(buf)))
+        {
+            aFileSpec = buf;
+            return;
+        }
+    }
+
+#endif
+
+    NS_ERROR("unable to get current process directory");
+}
+
+//nsSpecialSystemDirectory::nsSpecialSystemDirectory()
+//:    nsFileSpec(nsnull)
+//{
+//}
+
+//----------------------------------------------------------------------------------------
+nsSpecialSystemDirectory::nsSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory)
+//----------------------------------------------------------------------------------------
+:    nsFileSpec(nsnull)
+{
+    *this = aSystemSystemDirectory;
+}
+
+//----------------------------------------------------------------------------------------
+nsSpecialSystemDirectory::~nsSpecialSystemDirectory()
+//----------------------------------------------------------------------------------------
+{
+}
+
+//----------------------------------------------------------------------------------------
+void nsSpecialSystemDirectory::operator = (SystemDirectories aSystemSystemDirectory)
+//----------------------------------------------------------------------------------------
+{
+    *this = (const char*)nsnull;
+    switch (aSystemSystemDirectory)
+    {
+        
+        case OS_DriveDirectory:
+#ifdef XP_PC
+        {
+            char path[_MAX_PATH];
+            PRInt32 len = GetWindowsDirectory( path, _MAX_PATH );
+            if (len)
+            {
+                if ( path[1] == ':' && path[2] == '\\' )
+                    path[3] = 0;
+            }
+            *this = MakeUpperCase(path);
+        }
+#elif defined(XP_MAC)
+        {
+            *this = kVolumeRootFolderType;
+        }
+#else
+        *this = "/";
+#endif
+        break;
+
+            
+        case OS_TemporaryDirectory:
+#ifdef XP_PC
+            char path[_MAX_PATH];
+            if ( GetEnvironmentVariable(TEXT("TMP"), path, _MAX_PATH) == 0 ) 
+                if (GetEnvironmentVariable(TEXT("TEMP"), path, _MAX_PATH))
+                {
+                    // still not set!
+                    PRInt32 len = GetWindowsDirectory( path, _MAX_PATH );
+                    if (len)
+                    {
+                        strcat( path, "temp" );
+                    }
+                }
+
+            strcat( path, "\\" );
+            *this = MakeUpperCase(path);
+#elif defined(XP_MAC)
+            *this = kTemporaryFolderType;
+        
+#elif defined(XP_UNIX)
+            *this = "/tmp/";
+#endif
+        break;
+
+        case OS_CurrentProcessDirectory:
+            GetCurrentProcessDirectory(*this);
+            break;
+
+#ifdef XP_MAC
+        case Mac_SystemDirectory:
+            *this = kSystemFolderType;
+            break;
+
+        case Mac_DesktopDirectory:
+            *this = kDesktopFolderType;
+            break;
+
+        case Mac_TrashDirectory:
+            *this = kTrashFolderType;
+            break;
+
+        case Mac_StartupDirectory:
+            *this = kStartupFolderType;
+            break;
+
+        case Mac_ShutdownDirectory:
+            *this = kShutdownFolderType;
+            break;
+
+        case Mac_AppleMenuDirectory:
+            *this = kAppleMenuFolderType;
+            break;
+
+        case Mac_ControlPanelDirectory:
+            *this = kControlPanelFolderType;
+            break;
+
+        case Mac_ExtensionDirectory:
+            *this = kExtensionFolderType;
+            break;
+
+        case Mac_FontsDirectory:
+            *this = kFontsFolderType;
+            break;
+
+        case Mac_PreferencesDirectory:
+            *this = kPreferencesFolderType;
+            break;
+
+        case Mac_DocumentsDirectory:
+            *this = kDocumentsFolderType;
+            break;
+#endif
+            
+#ifdef XP_PC
+        case Win_SystemDirectory:
+        {    
+            char path[_MAX_PATH];
+            PRInt32 len = GetSystemDirectory( path, _MAX_PATH );
+        
+            // Need enough space to add the trailing backslash
+            if (len > _MAX_PATH-2)
+                break;
+            path[len]   = '\\';
+            path[len+1] = '\0';
+
+            *this = MakeUpperCase(path);
+
+            break;
+        }
+
+        case Win_WindowsDirectory:
+        {    
+            char path[_MAX_PATH];
+            PRInt32 len = GetWindowsDirectory( path, _MAX_PATH );
+            
+            // Need enough space to add the trailing backslash
+            if (len > _MAX_PATH-2)
+                break;
+            
+            path[len]   = '\\';
+            path[len+1] = '\0';
+
+            *this = MakeUpperCase(path);
+            break;
+        }
+
+#endif        
+
+#ifdef XP_UNIX
+        case Unix_LocalDirectory:
+            *this = "/usr/local/netscape/";
+            break;
+
+        case Unix_LibDirectory:
+            *this = "/usr/local/lib/netscape/";
+            break;
+#endif        
+
+        default:
+            break;    
+    }
+}
+
+
+
+#ifdef XP_MAC
+//----------------------------------------------------------------------------------------
+nsSpecialSystemDirectory::nsSpecialSystemDirectory(OSType folderType)
+//----------------------------------------------------------------------------------------
+{
+	*this = folderType;
+}
+
+//----------------------------------------------------------------------------------------
+void nsSpecialSystemDirectory::operator = (OSType folderType)
+//----------------------------------------------------------------------------------------
+{
+    CInfoPBRec cinfo;
+    DirInfo *dipb=(DirInfo *)&cinfo;
+    
+    // Call FindFolder to fill in the vrefnum and dirid
+    for (int attempts = 0; attempts < 2; attempts++)
+    {
+        mError = NS_FILE_RESULT(
+            FindFolder(
+                kOnSystemDisk,
+                folderType,
+                true,
+                &dipb->ioVRefNum,
+                &dipb->ioDrDirID));
+        if (NS_SUCCEEDED(mError))
+            break;
+        if (attempts > 0)
+		    return;
+		switch (folderType)
+		{
+	    case kDocumentsFolderType:
+	        // Find folder will find this, as long as it exists.
+	        // The "create" parameter, however, is sadly ignored.
+	        // How do we internationalize this?
+	        *this = kVolumeRootFolderType;
+	        *this += "Documents";
+	        CreateDirectory();
+	        break;
+		} // switch
+    } // for
+    StrFileName filename;
+    filename[0] = '\0';
+    dipb->ioNamePtr = (StringPtr)&filename;
+    dipb->ioFDirIndex = -1;
+    
+    mError = NS_FILE_RESULT(PBGetCatInfoSync(&cinfo));
+    if (NS_SUCCEEDED(mError))
+    {
+	    mError = NS_FILE_RESULT(FSMakeFSSpec(dipb->ioVRefNum, dipb->ioDrParID, filename, &mSpec));
+    }
+}
+#endif // XP_MAC

mozilla/base/src/nsString.cpp

@@ -148,7 +148,7 @@ static void CheckCaseConversion()
     if(NULL == gCaseConv )
       StartUpCaseConversion();
 
-    NS_ASSERTION( gCaseConv != NULL , "cannot obtain UnicharUtil");
+    // NS_ASSERTION( gCaseConv != NULL , "cannot obtain UnicharUtil");
    
 }
 
@@ -489,9 +489,11 @@ void nsString::ToLowerCase()
 {
   // I18N code begin
   CheckCaseConversion();
-  nsresult err = gCaseConv->ToLower(mStr, mStr, mLength);
-  if( NS_SUCCEEDED(err))
-    return;
+  if(gCaseConv) {
+    nsresult err = gCaseConv->ToLower(mStr, mStr, mLength);
+    if( NS_SUCCEEDED(err))
+      return;
+  }
   // I18N code end
 
   // somehow UnicharUtil return failed, fallback to the old ascii only code
@@ -514,9 +516,11 @@ void nsString::ToUpperCase()
 {
   // I18N code begin
   CheckCaseConversion();
-  nsresult err = gCaseConv->ToUpper(mStr, mStr, mLength);
-  if( NS_SUCCEEDED(err))
-    return;
+  if(gCaseConv) {
+    nsresult err = gCaseConv->ToUpper(mStr, mStr, mLength);
+    if( NS_SUCCEEDED(err))
+      return;
+  }
   // I18N code end
 
   // somehow UnicharUtil return failed, fallback to the old ascii only code
@@ -562,10 +566,12 @@ void nsString::ToLowerCase(nsString& aOut) const
 
   // I18N code begin
   CheckCaseConversion();
-  nsresult err = gCaseConv->ToLower(mStr, aOut.mStr, mLength);
-  (*(aOut.mStr+mLength)) = 0;
-  if( NS_SUCCEEDED(err))
-    return;
+  if(gCaseConv) {
+    nsresult err = gCaseConv->ToLower(mStr, aOut.mStr, mLength);
+    (*(aOut.mStr+mLength)) = 0;
+    if( NS_SUCCEEDED(err))
+      return;
+  }
   // I18N code end
 
   // somehow UnicharUtil return failed, fallback to the old ascii only code
@@ -596,10 +602,12 @@ void nsString::ToUpperCase(nsString& aOut) const
 
   // I18N code begin
   CheckCaseConversion();
-  nsresult err = gCaseConv->ToUpper(mStr, aOut.mStr, mLength);
-  (*(aOut.mStr+mLength)) = 0;
-  if( NS_SUCCEEDED(err))
-    return;
+  if(gCaseConv) {
+    nsresult err = gCaseConv->ToUpper(mStr, aOut.mStr, mLength);
+    (*(aOut.mStr+mLength)) = 0;
+    if( NS_SUCCEEDED(err))
+      return;
+  }
   // I18N code end
 
   // somehow UnicharUtil return failed, fallback to the old ascii only code
@@ -758,10 +766,11 @@ PRInt32 nsString::ToInteger(PRInt32* aErrorCode,PRInt32 aRadix) const {
       result=-result;
       break;
     }
-    else if('+'==theChar) { //stop in a good state if you see this...
+    else if(('+'==theChar) || (' '==theChar)) { //stop in a good state if you see this...
       break;
     }
-    else if(' '==theChar){ //stop in a good state if you see this...
+    else if((('x'==theChar) || ('X'==theChar)) && (16==aRadix)) {  
+      //stop in a good state.
       break;
     }
     else{
@@ -1691,7 +1700,7 @@ PRInt32 nsString::RFind(const char* anAsciiSet,PRBool aIgnoreCase) const{
  */
 PRInt32 nsString::RFind(PRUnichar aChar,PRBool aIgnoreCase) const{
   chartype uc=nsCRT::ToUpper(aChar);
-  for(PRInt32 offset=mLength-1;offset>0;offset--) 
+  for(PRInt32 offset=mLength-1;offset>=0;offset--) 
     if(aIgnoreCase) {
       if(nsCRT::ToUpper(mStr[offset])==uc)
         return offset;
@@ -2150,7 +2159,6 @@ ostream& operator<<(ostream& os,nsAutoString& aString){
 }
 
 
-
 /**
  * 
  * @update	gess 7/27/98
@@ -2170,7 +2178,7 @@ NS_BASE int fputs(const nsString& aString, FILE* out)
   if(len>0)
     ::fwrite(cp, 1, len, out);
   if (cp != buf) {
-    delete cp;
+    delete [] cp;
   }
   return (int) len;
 }

mozilla/base/src/nsTime.h

@@ -44,6 +44,18 @@ public:
     nsTime(void) : mValue(PR_Now()) {
     }
 
+    /**
+     * Construct the time from a string.
+     */
+    nsTime(const char* dateStr, PRBool defaultToGMT) {
+        PRInt64 time;
+        PRStatus status = PR_ParseTimeString(dateStr, defaultToGMT, &time);
+        if (status == PR_SUCCESS)
+            mValue = time;
+        else
+            mValue = LL_ZERO;
+    }
+
     /**
      * Construct a time from a PRTime.
      */

mozilla/base/src/nsUnicharBuffer.cpp

@@ -56,7 +56,7 @@ NS_IMPL_ISUPPORTS(UnicharBufferImpl,kUnicharBufferIID)
 UnicharBufferImpl::~UnicharBufferImpl()
 {
   if (nsnull != mBuffer) {
-    delete mBuffer;
+    delete[] mBuffer;
     mBuffer = nsnull;
   }
   mLength = 0;
@@ -87,7 +87,7 @@ PRBool UnicharBufferImpl::Grow(PRInt32 aNewSize)
     if (0 != mLength) {
       nsCRT::memcpy(newbuf, mBuffer, mLength * sizeof(PRUnichar));
     }
-    delete mBuffer;
+    delete[] mBuffer;
     mBuffer = newbuf;
     return PR_TRUE;
   }

mozilla/base/src/nsUnicharInputStream.cpp

@@ -125,6 +125,8 @@ NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
  * changing it right now into a module private visibility because there are
  * better and more xpcom-like ways to get a Converter.
  */
+
+nsresult NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult, nsISupports* aOuter, nsString* aCharSet);
 nsresult
 NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult,
                    nsISupports* aOuter,

mozilla/base/src/nscore.h

@@ -146,12 +146,12 @@ typedef PRUcs2 PRUnichar;
 /* ------------------------------------------------------------------------ */
 // Casting macros for hiding C++ features from older compilers
 
-#define HAS_C_PLUS_PLUS_CASTS // we'll be optimistic.
-#if defined(__sgi) && !defined(__GNUC__)
-#undef HAS_C_PLUS_PLUS_CASTS
+// unix now determines this automatically
+#ifndef XP_UNIX
+#define HAVE_CPP_NEW_CASTS // we'll be optimistic.
 #endif
 
-#if defined(HAS_C_PLUS_PLUS_CASTS)
+#if defined(HAVE_CPP_NEW_CASTS)
 #define NS_STATIC_CAST(__type, __ptr)      static_cast<__type>(__ptr)
 #define NS_CONST_CAST(__type, __ptr)       const_cast<__type>(__ptr)
 #define NS_REINTERPRET_CAST(__type, __ptr) reinterpret_cast<__type>(__ptr)

mozilla/base/src/unix/nsFileSpecUnix.cpp

@@ -25,9 +25,42 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <limits.h>
 #include "nsError.h"
 
-//----------------------------------------------------------------------------------------
+#if defined(IRIX) || defined(OSF1) || defined(SOLARIS) || defined(UNIXWARE) || defined(SNI) || defined(NCR) || defined(NEC) || defined(DGUX)
+#include <sys/statvfs.h> /* for statvfs() */
+#define STATFS statvfs
+#elif defined(SCO_SV)
+#define _SVID3/* for statvfs.h */
+#include <sys/statvfs.h>  /* for statvfs() */
+#define STATFS statvfs
+#elif defined(HPUX) 
+#include <sys/vfs.h>      /* for statfs() */
+#define STATFS statfs
+#elif defined(LINUX)
+#include <sys/vfs.h>      /* for statfs() */
+#define STATFS statfs
+#elif defined(SUNOS4)
+#include <sys/vfs.h>      /* for statfs() */
+extern "C" int statfs(char *, struct statfs *);
+#define STATFS statfs
+#else
+#if defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(RHAPSODY) || defined(FREEBSD)
+#include <sys/mount.h>/* for statfs() */
+#define STATFS statfs
+#else
+#include <sys/statfs.h>  /* for statfs() */
+#define STATFS statfs
+extern "C" int statfs(char *, struct statfs *);
+#endif
+#endif
+
+#if defined(OSF1)
+extern "C" int statvfs(const char *, struct statvfs *);
+#endif
+ 
+ //----------------------------------------------------------------------------------------
 void nsFileSpecHelpers::Canonify(char*& ioPath, PRBool inMakeDirs)
 // Canonify, make absolute, and check whether directories exist
 //----------------------------------------------------------------------------------------
@@ -98,6 +131,27 @@ PRBool nsFileSpec::Exists() const
     return 0 == stat(mPath, &st); 
 } // nsFileSpec::Exists
 
+//----------------------------------------------------------------------------------------
+void nsFileSpec::GetModDate(TimeStamp& outStamp) const
+//----------------------------------------------------------------------------------------
+{
+	struct stat st;
+    if (stat(mPath, &st) == 0) 
+        outStamp = st.st_mtime; 
+    else
+        outStamp = 0;
+} // nsFileSpec::GetModDate
+
+//----------------------------------------------------------------------------------------
+PRUint32 nsFileSpec::GetFileSize() const
+//----------------------------------------------------------------------------------------
+{
+	struct stat st;
+    if (stat(mPath, &st) == 0) 
+        return (PRUint32)st.st_size; 
+    return 0;
+} // nsFileSpec::GetFileSize
+
 //----------------------------------------------------------------------------------------
 PRBool nsFileSpec::IsFile() const
 //----------------------------------------------------------------------------------------
@@ -148,7 +202,7 @@ void nsFileSpec::CreateDirectory(int mode)
 } // nsFileSpec::CreateDirectory
 
 //----------------------------------------------------------------------------------------
-void nsFileSpec::Delete(PRBool inRecursive)
+void nsFileSpec::Delete(PRBool inRecursive) const
 // To check if this worked, call Exists() afterwards, see?
 //----------------------------------------------------------------------------------------
 {
@@ -186,7 +240,9 @@ nsresult nsFileSpec::Rename(const char* inNewName)
     return NS_OK;
 } // nsFileSpec::Rename
 
+//----------------------------------------------------------------------------------------
 static int CrudeFileCopy(const char* in, const char* out)
+//----------------------------------------------------------------------------------------
 {
 	struct stat in_stat;
 	int stat_result = -1;
@@ -248,12 +304,14 @@ nsresult nsFileSpec::Copy(const nsFileSpec& inParentDirectory) const
     if (inParentDirectory.IsDirectory() && (! IsDirectory() ) )
     {
         char *leafname = GetLeafName();
-        char* destPath = nsFileSpecHelpers::StringDup(inParentDirectory,  ( strlen(inParentDirectory) + 1 + strlen(leafname) ) );
+        char* destPath = nsFileSpecHelpers::StringDup(
+            inParentDirectory.GetCString(),
+            strlen(inParentDirectory.GetCString()) + 1 + strlen(leafname));
         strcat(destPath, "/");
         strcat(destPath, leafname);
         delete [] leafname;
 
-        result = NS_FILE_RESULT(CrudeFileCopy(*this, destPath));
+        result = NS_FILE_RESULT(CrudeFileCopy(GetCString(), destPath));
         
         delete [] destPath;
     }
@@ -272,16 +330,17 @@ nsresult nsFileSpec::Move(const nsFileSpec& inNewParentDirectory) const
         char *leafname = GetLeafName();
         char* destPath
             = nsFileSpecHelpers::StringDup(
-                inNewParentDirectory,
-                strlen(inNewParentDirectory) + 1 + strlen(leafname));
+                inNewParentDirectory.GetCString(),
+                strlen(inNewParentDirectory.GetCString()) + 1 + strlen(leafname));
         strcat(destPath, "/");
         strcat(destPath, leafname);
         delete [] leafname;
 
-        result = NS_FILE_RESULT(CrudeFileCopy(*this, destPath));
+        result = NS_FILE_RESULT(CrudeFileCopy(GetCString(), destPath));
         if (result == NS_OK)
 	{
-		Delete(PR_FALSE);
+    // cast to fix const-ness
+		((nsFileSpec*)this)->Delete(PR_FALSE);
 	}
 	delete [] destPath;
     }
@@ -309,6 +368,31 @@ nsresult nsFileSpec::Execute(const char* inArgs ) const
 
 } // nsFileSpec::Execute
 
+//----------------------------------------------------------------------------------------
+PRUint32 nsFileSpec::GetDiskSpaceAvailable() const
+//----------------------------------------------------------------------------------------
+{
+    char curdir [MAXPATHLEN];
+    if (!mPath || !*mPath)
+    {
+        (void) getcwd(curdir, MAXPATHLEN);
+        if (!curdir)
+            return ULONG_MAX;  /* hope for the best as we did in cheddar */
+    }
+    else
+        sprintf(curdir, "%.200s", mPath);
+ 
+    struct STATFS fs_buf;
+    if (STATFS(curdir, &fs_buf) < 0)
+        return ULONG_MAX; /* hope for the best as we did in cheddar */
+ 
+#ifdef DEBUG_DISK_SPACE
+    printf("DiskSpaceAvailable: %d bytes\n", 
+       fs_buf.f_bsize * (fs_buf.f_bavail - 1));
+#endif
+    return fs_buf.f_bsize * (fs_buf.f_bavail - 1);
+} // nsFileSpec::GetDiskSpace()
+
 //========================================================================================
 //                                nsDirectoryIterator
 //========================================================================================
@@ -316,11 +400,11 @@ nsresult nsFileSpec::Execute(const char* inArgs ) const
 //----------------------------------------------------------------------------------------
 nsDirectoryIterator::nsDirectoryIterator(
     const nsFileSpec& inDirectory
-,    int inIterateDirection)
+,   int /*inIterateDirection*/)
 //----------------------------------------------------------------------------------------
     : mCurrent(inDirectory)
+    , mExists(PR_FALSE)
     , mDir(nsnull)
-    , mExists(false)
 {
     mCurrent += "sysygy"; // prepare the path for SetLeafName
     mDir = opendir((const char*)nsFilePath(inDirectory));
@@ -339,7 +423,7 @@ nsDirectoryIterator::~nsDirectoryIterator()
 nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
 //----------------------------------------------------------------------------------------
 {
-    mExists = false;
+    mExists = PR_FALSE;
     if (!mDir)
         return *this;
     char* dot    = ".";
@@ -351,7 +435,7 @@ nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
         entry = readdir(mDir);
     if (entry)
     {
-        mExists = true;
+        mExists = PR_TRUE;
         mCurrent.SetLeafName(entry->d_name);
     }
     return *this;

mozilla/base/src/windows/makefile.win

@@ -23,9 +23,13 @@ LIBRARY_NAME=gmbase
 MODULE=raptor 
 REQUIRES=xpcom raptor 
 
-CPPSRCS=nsTimer.cpp 
-
-CPP_OBJS=.\$(OBJDIR)\nsTimer.obj 
+CPPSRCS=	nsTimer.cpp 						\
+					nsCaretProperties.cpp		\
+					$(NULL)
+					
+CPP_OBJS=	.\$(OBJDIR)\nsTimer.obj 						\
+					.\$(OBJDIR)\nsCaretProperties.obj 	\
+					$(NULL)
 
 LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor 
 
@@ -38,3 +42,4 @@ include <$(DEPTH)\config\rules.mak>
 
 libs:: $(OBJS)
 	$(MAKE_INSTALL) $(OBJDIR)\nsTimer.obj ..\$(OBJDIR)
+	$(MAKE_INSTALL) $(OBJDIR)\nsCaretProperties.obj ..\$(OBJDIR)

mozilla/base/src/windows/nsCaretProperties.cpp

@@ -29,7 +29,7 @@ nsCaretProperties::nsCaretProperties()
 ,	mBlinkRate(eDefaulBlinkRate)
 {
 	// in your platform-specific class, get data from the OS in your constructor
-	mCaretWidth = 2;			// 2 pixel caret on Windows
+	mCaretWidth = 30;			// 2 pixel caret on Windows
 }
 
 

mozilla/base/src/windows/nsFileSpecWin.cpp

@@ -21,6 +21,7 @@
 
 #include <sys/stat.h>
 #include <direct.h>
+#include <limits.h>
 #include <stdlib.h>
 #include "prio.h"
 #include "nsError.h"
@@ -41,13 +42,15 @@ void nsFileSpecHelpers::Canonify(char*& ioPath, PRBool inMakeDirs)
 //----------------------------------------------------------------------------------------
 {
   if (!ioPath)
-    return;
-  if (inMakeDirs) {
-    const int mode = 0700;
-    char* unixStylePath = nsFileSpecHelpers::StringDup(ioPath);
-    nsFileSpecHelpers::NativeToUnix(unixStylePath);
-    nsFileSpecHelpers::MakeAllDirectories(unixStylePath, mode);
-    delete[] unixStylePath;
+      return;
+  
+  if (inMakeDirs)
+  {
+      const int mode = 0700;
+      char* unixStylePath = nsFileSpecHelpers::StringDup(ioPath);
+      nsFileSpecHelpers::NativeToUnix(unixStylePath);
+      nsFileSpecHelpers::MakeAllDirectories(unixStylePath, mode);
+      delete[] unixStylePath;
   }
   char buffer[_MAX_PATH];
   errno = 0;
@@ -56,7 +59,7 @@ void nsFileSpecHelpers::Canonify(char*& ioPath, PRBool inMakeDirs)
 
   NS_ASSERTION( canonicalPath[0] != '\0', "Uh oh...couldn't convert" );
   if (canonicalPath[0] == '\0')
-    return;
+      return;
 
   nsFileSpecHelpers::StringAssign(ioPath, canonicalPath);
 }
@@ -188,6 +191,27 @@ PRBool nsFileSpec::Exists() const
 	return 0 == stat(mPath, &st); 
 } // nsFileSpec::Exists
 
+//----------------------------------------------------------------------------------------
+void nsFileSpec::GetModDate(TimeStamp& outStamp) const
+//----------------------------------------------------------------------------------------
+{
+	struct stat st;
+    if (stat(mPath, &st) == 0) 
+        outStamp = st.st_mtime; 
+    else
+        outStamp = 0;
+} // nsFileSpec::GetModDate
+
+//----------------------------------------------------------------------------------------
+PRUint32 nsFileSpec::GetFileSize() const
+//----------------------------------------------------------------------------------------
+{
+	struct stat st;
+    if (stat(mPath, &st) == 0) 
+        return (PRUint32)st.st_size; 
+    return 0;
+} // nsFileSpec::GetFileSize
+
 //----------------------------------------------------------------------------------------
 PRBool nsFileSpec::IsFile() const
 //----------------------------------------------------------------------------------------
@@ -225,7 +249,12 @@ void nsFileSpec::operator += (const char* inRelativePath)
 		nsFileSpecHelpers::ReallocCat(mPath, "x");
 	else
 		nsFileSpecHelpers::ReallocCat(mPath, "\\x");
-	SetLeafName(inRelativePath);
+	
+	// If it's a (unix) relative path, make it native
+	char* dosPath = nsFileSpecHelpers::StringDup(inRelativePath);
+	nsFileSpecHelpers::UnixToNative(dosPath);
+	SetLeafName(dosPath);
+	delete [] dosPath;
 } // nsFileSpec::operator +=
 
 //----------------------------------------------------------------------------------------
@@ -237,24 +266,24 @@ void nsFileSpec::CreateDirectory(int /*mode*/)
 } // nsFileSpec::CreateDirectory
 
 //----------------------------------------------------------------------------------------
-void nsFileSpec::Delete(PRBool inRecursive)
+void nsFileSpec::Delete(PRBool inRecursive) const
 //----------------------------------------------------------------------------------------
 {
-  if (IsDirectory())
+    if (IsDirectory())
     {
 	    if (inRecursive)
         {
-          for (nsDirectoryIterator i(*this); i.Exists(); i++)
-            {
-              nsFileSpec& child = (nsFileSpec&)i;
-              child.Delete(inRecursive);
-            }		
+            for (nsDirectoryIterator i(*this); i.Exists(); i++)
+                {
+                    nsFileSpec& child = (nsFileSpec&)i;
+                    child.Delete(inRecursive);
+                }		
         }
 	    rmdir(mPath);
     }
 	else
     {
-      remove(mPath);
+        remove(mPath);
     }
 } // nsFileSpec::Delete
 
@@ -357,6 +386,49 @@ nsresult nsFileSpec::Execute(const char* inArgs ) const
     return NS_FILE_FAILURE;
 } // nsFileSpec::Execute
 
+//----------------------------------------------------------------------------------------
+PRUint32 nsFileSpec::GetDiskSpaceAvailable() const
+//----------------------------------------------------------------------------------------
+{
+	char aDrive[_MAX_DRIVE + 2];
+	_splitpath( mPath, aDrive, NULL, NULL, NULL);
+
+	if (aDrive[0] == '\0')
+	{
+        // The back end is always trying to pass us paths that look
+        //   like /c|/netscape/mail.  See if we've got one of them
+        if (strlen(mPath) > 2 && mPath[0] == '/' && mPath[2] == '|')
+        {
+            aDrive[0] = mPath[1];
+            aDrive[1] = ':';
+            aDrive[2] = '\0';
+        }
+        else
+        {
+            // Return bogus large number and hope for the best
+            return ULONG_MAX; 
+        }
+    }
+
+	strcat(aDrive, "\\");
+
+	DWORD dwSectorsPerCluster = 0;
+	DWORD dwBytesPerSector = 0;
+	DWORD dwFreeClusters = 0;
+	DWORD dwTotalClusters = 0;
+	if (!GetDiskFreeSpace(aDrive, 
+						&dwSectorsPerCluster, 
+						&dwBytesPerSector, 
+						&dwFreeClusters, 
+						&dwTotalClusters))
+	{
+		return ULONG_MAX; // Return bogus large number and hope for the best
+	}
+
+	//	We can now figure free disk space.
+	return dwFreeClusters * dwSectorsPerCluster * dwBytesPerSector;
+} // nsFileSpec::GetDiskSpaceAvailable()
+
 //========================================================================================
 //								nsDirectoryIterator
 //========================================================================================
@@ -368,7 +440,7 @@ nsDirectoryIterator::nsDirectoryIterator(
 //----------------------------------------------------------------------------------------
 	: mCurrent(inDirectory)
 	, mDir(nsnull)
-	, mExists(false)
+	, mExists(PR_FALSE)
 {
     mDir = PR_OpenDir(inDirectory);
 	mCurrent += "dummy";
@@ -387,13 +459,13 @@ nsDirectoryIterator::~nsDirectoryIterator()
 nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
 //----------------------------------------------------------------------------------------
 {
-	mExists = false;
+	mExists = PR_FALSE;
 	if (!mDir)
 		return *this;
-  PRDirEntry* entry = PR_ReadDir(mDir, PR_SKIP_BOTH); // Ignore '.' && '..'
+    PRDirEntry* entry = PR_ReadDir(mDir, PR_SKIP_BOTH); // Ignore '.' && '..'
 	if (entry)
     {
-      mExists = true;
+      mExists = PR_TRUE;
       mCurrent.SetLeafName(entry->name);
     }
 	return *this;

mozilla/base/tests/Makefile.in

@@ -42,7 +42,7 @@ LIBS		= \
 	$(TK_LIBS) \
 	-lpref \
 	-lsecfree \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxp \
 	-lraptorbase \
 	-lxpcom \

mozilla/base/tests/PropertiesTest.cpp

@@ -24,7 +24,7 @@
 #include "nsIProperties.h"
 #include "nsIServiceManager.h"
 #include "nsIURL.h"
-#include "nsRepository.h"
+#include "nsIComponentManager.h"
 #ifdef XP_PC
 #include "plevent.h"
 #endif
@@ -60,9 +60,9 @@ extern "C" void NS_SetupRegistry();
 int
 main(int argc, char *argv[])
 {
-  nsRepository::RegisterFactory(kNetServiceCID, NETLIB_DLL, PR_FALSE,
-    PR_FALSE);
-  nsRepository::RegisterFactory(kEventQueueServiceCID, XPCOM_DLL,
+  nsComponentManager::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL,
+    PR_FALSE, PR_FALSE);
+  nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL,
     PR_FALSE, PR_FALSE);
 #ifdef XP_MAC    // have not build this on PC and UNIX yet so make it #ifdef XP_MAC
   NS_SetupRegistry(); 
@@ -102,7 +102,7 @@ main(int argc, char *argv[])
     return 1;
   }
   nsIProperties *props = nsnull;
-  ret = nsRepository::CreateInstance(kPropertiesCID, NULL,
+  ret = nsComponentManager::CreateInstance(kPropertiesCID, NULL,
     kIPropertiesIID, (void**) &props);
   if (NS_FAILED(ret)) {
     printf("create nsIProperties failed\n");

mozilla/base/tests/makefile.win

@@ -45,7 +45,7 @@ LLIBS=				\
  $(DIST)\lib\netlib.lib         \
 !endif
  $(LIBNSPR)			\
- $(DIST)\lib\libplc21.lib	\
+ $(DIST)\lib\plc3.lib	\
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
  $(GLOWDIR)\glowcode.lib	\
 !endif

mozilla/build/autoconf/altoptions.m4

@@ -0,0 +1,104 @@
+dnl The contents of this file are subject to the Netscape Public License
+dnl Version 1.0 (the "NPL"); you may not use this file except in
+dnl compliance with the NPL.  You may obtain a copy of the NPL at
+dnl http://www.mozilla.org/NPL/
+dnl
+dnl Software distributed under the NPL is distributed on an "AS IS" basis,
+dnl WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+dnl for the specific language governing rights and limitations under the
+dnl NPL.
+dnl
+dnl The Initial Developer of this code under the NPL is Netscape
+dnl Communications Corporation.  Portions created by Netscape are
+dnl Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+dnl Reserved.
+dnl
+
+dnl altoptions.m4 - An alternative way of specifying command-line options.
+dnl    These macros are needed to support a menu-based configurator.
+dnl    This file also includes the macro, AM_READ_MYCONFIG, for reading
+dnl    the 'myconfig.m4' file.
+
+dnl Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
+
+
+dnl MOZ_ARG_ENABLE_BOOL(           NAME, HELP, IF-YES [, IF-NO [, ELSE]])
+dnl MOZ_ARG_DISABLE_BOOL(          NAME, HELP, IF-NO [, IF-YES [, ELSE]])
+dnl MOZ_ARG_ENABLE_STRING(         NAME, HELP, IF-SET [, ELSE])
+dnl MOZ_ARG_ENABLE_BOOL_OR_STRING( NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
+dnl MOZ_ARG_WITH_BOOL(             NAME, HELP, IF-YES [, IF-NO [, ELSE])
+dnl MOZ_ARG_WITHOUT_BOOL(          NAME, HELP, IF-NO [, IF-YES [, ELSE])
+dnl MOZ_ARG_WITH_STRING(           NAME, HELP, IF-SET [, ELSE])
+dnl MOZ_ARG_HEADER(Comment)
+dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
+
+
+dnl MOZ_TWO_STRING_TEST(NAME, STR1, IF-STR1, STR2, IF-STR2 [, ELSE])
+AC_DEFUN(MOZ_TWO_STRING_TEST,
+[if test "$enableval" = "[$2]"; then
+    ifelse([$3], , :, [$3])
+  elif test "$enableval" = "[$4]"; then
+    ifelse([$5], , :, [$5])
+  else
+    ifelse([$6], ,
+      [AC_MSG_ERROR([Option, [$1], does not take an argument ($enableval).])],
+      [$6])
+  fi])
+
+dnl MOZ_ARG_ENABLE_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]])
+AC_DEFUN(MOZ_ARG_ENABLE_BOOL,
+[AC_ARG_ENABLE([$1], [$2], 
+ [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_DISABLE_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]])
+AC_DEFUN(MOZ_ARG_DISABLE_BOOL,
+[AC_ARG_ENABLE([$1], [$2],
+ [MOZ_TWO_STRING_TEST([$1], no, [$3], yes, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_ENABLE_STRING(NAME, HELP, IF-SET [, ELSE])
+AC_DEFUN(MOZ_ARG_ENABLE_STRING,
+[AC_ARG_ENABLE([$1], [$2], [$3], [$4])])
+
+dnl MOZ_ARG_ENABLE_BOOL_OR_STRING(NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
+AC_DEFUN(MOZ_ARG_ENABLE_BOOL_OR_STRING,
+[ifelse([$5], , 
+ [errprint([Option, $1, needs an "IF-SET" argument.
+])
+  m4exit(1)],
+ [AC_ARG_ENABLE([$1], [$2],
+  [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4], [$5])],
+  [$6])])])
+
+dnl MOZ_ARG_WITH_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE])
+AC_DEFUN(MOZ_ARG_WITH_BOOL,
+[AC_ARG_WITH([$1], [$2],
+ [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_WITHOUT_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE])
+AC_DEFUN(MOZ_ARG_WITHOUT_BOOL,
+[AC_ARG_WITH([$1], [$2],
+ [MOZ_TWO_STRING_TEST([$1], no, [$3], yes, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_WITH_STRING(NAME, HELP, IF-SET [, ELSE])
+AC_DEFUN(MOZ_ARG_WITH_STRING,
+[AC_ARG_WITH([$1], [$2], [$3], [$4])])
+
+dnl MOZ_ARG_HEADER(Comment)
+dnl This is used by webconfig to group options
+define(MOZ_ARG_HEADER, [# $1])
+
+dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
+AC_DEFUN(MOZ_READ_MOZCONFIG,
+[AC_REQUIRE([AC_INIT_BINSH])dnl
+# Read in 'mozconfig.sh' script to set the initial options.
+# See the load-mozconfig.sh script for more details.
+TOPSRCDIR=`dirname [$]0`
+PATH="$TOPSRCDIR/build/autoconf:$PATH"
+. load-mozconfig.sh])
+
+dnl This gets inserted at the top of the configure script
+MOZ_READ_MOZCONFIG

mozilla/build/autoconf/clean-config.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# clean-config.sh - Removes all files generated by mozilla configure.
+#    Only removes files from the topsrcdir. To clean up an objdir,
+#    simply remove the directory and start over.
+#
+# Usage:
+#    1. cd <topsrcdir>
+#    2. build/autoconf/clean-config.sh
+#
+# Send comments, improvements, bugs to slamm@netscape.com
+
+topsrcdir=`cd \`dirname $0\`/../..; pwd`
+
+if [ ! -f configure.in ]; then
+  echo "clean-config.sh only cleans the source tree. To run," 2>&1
+  echo "  cd $topsrcdir; build/autoconf/clean-config.sh" 2>&1
+  echo "  (To clean a separate objdir, simple remove the directory.)" 2>&1
+  exit 1
+fi
+
+MOZ_EDITOR=1 MOZ_MAILNEWS=1 . allmakefiles.sh
+rm -fr $MAKEFILES \
+    config-defs.h \
+    config.cache \
+    config.log \
+    config.status \
+    $NULL
+
+echo "Removed all files generated by configure." 2>&1

mozilla/build/autoconf/config.guess

@@ -0,0 +1,893 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 8/24/94.)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	cat <<EOF >dummy.s
+	.globl main
+	.ent main
+main:
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
+	.end main
+EOF
+	${CC-cc} dummy.s -o dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./dummy
+		case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+		esac
+	fi
+	rm -f dummy.s dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-cbm-sysv4
+	exit 0;;
+    amiga:NetBSD:*:*)
+      echo m68k-cbm-netbsd${UNAME_RELEASE}
+      exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    SR2?01:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:NetBSD:*:*)
+	echo m68k-atari-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:NetBSD:*:*)
+	echo m68k-sun-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:NetBSD:*:*)
+	echo m68k-apple-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	sed 's/^	//' << EOF >dummy.c
+	int main (argc, argv) int argc; char **argv; {
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	${CC-cc} dummy.c -o dummy \
+	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	fi
+        else echo i586-dg-dgux${UNAME_RELEASE}
+        fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i?86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		sed 's/^		//' << EOF >dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+		rm -f dummy.c dummy
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:4)
+	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=4.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[3478]??:HP-UX:*:*)
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
+	    9000/8?? )            HP_ARCH=hppa1.0 ;;
+	esac
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	sed 's/^	//' << EOF >dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i?86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*X-MP:*:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
+    F300:UNIX_System_V:*:*)
+        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
+    hp3[0-9][05]:NetBSD:*:*)
+	echo m68k-hp-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:NetBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin32
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin32
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    *:Linux:*:*)
+	# uname on the ARM produces all sorts of strangeness, and we need to
+	# filter it out.
+	case "$UNAME_MACHINE" in
+	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
+	esac
+
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us.
+	ld_help_string=`ld --help 2>&1`
+	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	esac
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		${CC-cc} dummy.s -o dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			esac	
+
+			objdump --private-headers dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi	
+		rm -f dummy.s dummy
+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+	elif test "${UNAME_MACHINE}" = "mips" ; then
+	  cat >dummy.c <<EOF
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	else
+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+	  # or one that does not give us useful --help.
+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  # If ld does not provide *any* "supported emulations:"
+	  # that means it is gnuoldld.
+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
+	  # Determine whether the default compiler is a.out or elf
+	  cat >dummy.c <<EOF
+#include <features.h>
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	fi ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+    i?86:DYNIX/ptx:4*:*)
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i?86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
+	exit 0 ;;
+    i?86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    i?86:LynxOS:2.*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:*:6*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    *:QNX:*:*)
+	echo i386-pc-qnx`${UNAME_VERSION} | cut -c1-1`
+	exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+cat >dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+  printf ("vax-dec-bsd\n"); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
+rm -f dummy.c dummy
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+#echo '(Unable to guess system type)' 1>&2
+
+exit 1

mozilla/build/autoconf/config.sub

@@ -0,0 +1,962 @@
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi
+
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple)
+		os=
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-qnx*)
+		basic_machine=i386-pc
+		os=-qnx`uname -v | cut -c1-1`
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 \
+		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | v850)
+		basic_machine=$basic_machine-unknown
+		;;
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i[34567]86)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-cbm
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-cbm
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-cbm
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i[34567]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i[34567]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i[34567]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i[34567]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+        pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | nexen-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=rs6000-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+	        ;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+	        ;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	*qnx*)
+		basic_machine=i386-pc
+		os=-qnx`uname -v | cut -c1-1`
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	mips)
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sparc)
+		basic_machine=sparc-sun
+		;;
+        cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-ns2 )
+	        os=-nextstep2
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-qnx*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+        *-gould)
+		os=-sysv
+		;;
+        *-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+        *-sgi)
+		os=-irix
+		;;
+        *-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f301-fujitsu)
+		os=-uxpv
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os

mozilla/build/autoconf/find-mozconfig.sh

@@ -0,0 +1,41 @@
+#! /bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# find-mozconfig.sh - Loads options from mozconfig.sh onto configure's
+#    command-line. The mozconfig.sh file is searched for in the 
+#    order:
+#       if $MOZCONFIG is set, use that.
+#       Otherwise, use $TOPSRCDIR/mozconfig.sh
+#       Otherwise, use $HOME/.mozconfig.sh
+#
+topsrcdir=`cd \`dirname $0\`/../..; pwd`
+
+for _config in $MOZCONFIG \
+               $MOZ_MYCONFIG \
+               $topsrcdir/mozconfig \
+               $topsrcdir/mozconfig.sh \
+               $topsrcdir/myconfig.sh \
+               $HOME/.mozconfig \
+               $HOME/.mozconfig.sh \
+               $HOME/.mozmyconfig.sh
+do
+  if test -f $_config; then
+    echo $_config;
+    exit 0
+  fi
+done

mozilla/build/autoconf/gtk.m4

@@ -0,0 +1,186 @@
+# Configure paths for GTK+
+# Owen Taylor     97-11-3
+# (copy of gtk.m4 (public domain))
+
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+dnl
+AC_DEFUN(AM_PATH_GTK,
+[dnl 
+dnl Get the cflags and libraries from the gtk-config script
+dnl
+AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
+            gtk_config_prefix="$withval", gtk_config_prefix="")
+AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
+            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
+		    , enable_gtktest=yes)
+
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+     fi
+  fi
+
+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+  min_gtk_version=ifelse([$1], ,0.99.7,$1)
+  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+  no_gtk=""
+  if test "$GTK_CONFIG" = "no" ; then
+    no_gtk=yes
+  else
+    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$LIBS $GTK_LIBS"
+dnl
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
+dnl checks the results of gtk-config to some extent
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtktest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If gtk-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$GTK_CONFIG" = "no" ; then
+       echo "*** The gtk-config script installed by GTK could not be found"
+       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GTK_CONFIG environment variable to the"
+       echo "*** full path to gtk-config."
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK test program, checking why..."
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK or finding the wrong"
+          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
+])

mozilla/build/autoconf/install-sh

@@ -0,0 +1,119 @@
+#!/bin/sh
+
+#
+# install - install a program, script, or datafile
+# This comes from X11R5; it is not part of GNU.
+#
+# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+#
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+
+instcmd="$mvprog"
+chmodcmd=""
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:  no input file specified"
+	exit 1
+fi
+
+if [ x"$dst" = x ]
+then
+	echo "install:  no destination specified"
+	exit 1
+fi
+
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+if [ -d $dst ]
+then
+	dst="$dst"/`basename $src`
+fi
+
+# Make a temp file name in the proper directory.
+
+dstdir=`dirname $dst`
+dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+$doit $instcmd $src $dsttmp
+
+# and set any options; do chmod last to preserve setuid bits
+
+if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
+if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
+if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
+if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
+
+# Now rename the file to the real destination.
+
+$doit $rmcmd $dst
+$doit $mvcmd $dsttmp $dst
+
+
+exit 0

mozilla/build/autoconf/load-mozconfig.sh

@@ -0,0 +1,97 @@
+# sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# load-mozconfig.sh - Loads options from mozconfig.sh onto configure's
+#    command-line. See find-mozconfig.sh for how the config file is
+#    found
+#
+#    The options from mozconfig.sh are inserted into the command-line
+#    before the real command-line options. This way the real options
+#    will override any mozconfig.sh options.
+#
+# mozconfig.sh is a shell script. To add an option to configure's
+#    command-line use the pre-defined function, ac_add_options,
+#
+#       ac_add_options  <configure-option> [<configure-option> ... ]
+#
+#    For example,
+#
+#       ac_add_options --with-pthreads --enable-debug
+#
+# ac_add_options can be called multiple times in mozconfig.sh.
+#    Each call adds more options to configure's command-line.
+#
+# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
+
+
+ac_add_options() {
+  for _opt
+  do
+    # Escape shell characters, space, tab, dollar, quote, backslash.
+    _opt=`echo $_opt | sed -e 's/\([\ \	\$\"\\]\)/\\\\\1/g;s/@\([^@]*\)@/\$\1/g;'`
+    _opt=`echo $_opt | sed -e 's/@\([^@]*\)@/\$(\1)/g'`
+
+    # Avoid adding duplicates
+    case "$ac_options" in
+      *"$_opt"* ) ;;
+      * ) mozconfig_ac_options="$mozconfig_ac_options $_opt" ;;
+    esac
+  done
+}
+
+mk_add_options() {
+  # These options are for client.mk
+  # configure can safely ignore them.
+  :
+}
+
+ac_echo_options() {
+  echo "Adding options from $MOZCONFIG:"
+  eval "set -- $mozconfig_ac_options"
+  for _opt
+  do
+    echo "  $_opt"
+  done
+}
+
+#
+# Define load the options
+#
+ac_options=
+mozconfig_ac_options=
+
+# Save the real command-line options
+for _opt
+do
+  # Escape shell characters, space, tab, dollar, quote, backslash.
+  _opt=`echo $_opt | sed -e 's/\([\ \	\$\"\\]\)/\\\\\1/g;'`
+
+  ac_options="$ac_options \"$_opt\""
+done
+
+# Call find-mozconfig.sh 
+#   In params:   $MOZCONFIG $HOME (old:$MOZ_MYCONFIG)
+MOZCONFIG=`$TOPSRCDIR/build/autoconf/find-mozconfig.sh`
+
+if [ "$MOZCONFIG" ]; then
+  . $MOZCONFIG
+  ac_echo_options 1>&2
+fi
+
+eval "set -- $mozconfig_ac_options $ac_options"
+

mozilla/build/autoconf/match-dir.sh

@@ -0,0 +1,93 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# This script will match a dir with a set of dirs.
+#
+# Usage: match-dir.sh match [dir1 dir2 ... dirn]
+#
+# Send comments, improvements, bugs to ramiro@netscape.com
+# 
+
+# Make sure a Makefile.in exists
+#if [ $# -lt 1 ]
+#then
+#	echo
+#	echo "Usage: `basename $0` match [dir1 dir2 ... dirn]"
+#	echo
+#
+#	exit 1
+#fi
+
+# Make sure a Makefile.in exists
+if [ ! -f Makefile.in ]
+then
+	echo
+	echo "There ain't no 'Makefile.in' over here: $pwd, dude."
+	echo
+
+	exit 1
+fi
+
+# Use DEPTH in the Makefile.in to determine the depth
+depth=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`
+
+# Determine the depth count
+n=`echo $depth | tr '/' ' ' | wc -w`
+
+# Determine the path (strip anything before the mozilla/ root)
+path=`pwd | awk -v count=$n -F"/" '\
+{ for(i=NF-count+0; i <= NF ; i++) \
+{ \
+if (i!=NF) \
+  { printf "%s/", $i } \
+else \
+  { printf "%s", $i } \
+} \
+}'`
+
+match=$path
+
+for i in $*
+do
+#	echo "Looking for $match in $i"
+
+	echo $i | grep -q -x $match
+
+	if [ $? -eq 0 ]
+	then
+		echo "1"
+
+		exit 0
+	fi
+
+#	echo "Looking for $i in $match"
+
+	echo $match | grep -q $i
+
+	if [ $? -eq 0 ]
+	then
+		echo "1"
+
+		exit 0
+	fi
+done
+
+echo "0"
+
+exit 0

mozilla/build/autoconf/mozconfig2defs.sh

@@ -0,0 +1,81 @@
+#! /bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# mozconfig2defs.sh - Translates mozconfig.sh into options for client.mk.
+#    Prints defines to stdout.
+#
+# See load-mozconfig.sh for more details
+#
+# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
+
+print_header() {
+  echo "# gmake"
+  echo "# This file is automatically generated for client.mk."
+  echo "# Do not edit. Edit $MOZCONFIG instead."
+  echo
+}
+
+ac_add_options() {
+  for _opt
+  do
+    # Escape shell characters, space, tab, dollar, quote, backslash,
+    # and substitute '@<word>@' with '$(<word)'.
+    _opt=`echo $_opt | sed -e 's/\([\ \	\$\"\\]\)/\\\\\1/g; s/@\([^@]*\)@/\$(\1)/g;'`
+    case "$_opt" in
+      --with-nspr=* )     echo MOZ_WITH_NSPR=`expr $_opt : ".*=\(.*\)"` ;;
+      --with-pthreads* )  echo MOZ_WITH_PTHREADS=1 ;;
+      --*-* )             echo "# $_opt is not used by client.mk" ;;
+    esac
+  done
+}
+
+mk_add_options() {
+  for _opt
+  do
+    # Escape shell characters, space, tab, dollar, quote, backslash,
+    # and substitute '@<word>@' with '$(<word)'.
+    echo $_opt | sed -e 's/\([\ \	\$\"\\]\)/\\\\\1/g; s/@\([^@]*\)@/\$(\1)/g;'
+  done
+}
+
+#
+# main
+#
+out_file=$1
+tmp_file="$out_file-tmp$$"
+
+trap "rm -f $tmp_file; exit 1" 1 2 15
+
+# find-mozconfig.sh 
+#   In params:   $MOZCONFIG $HOME ($MOZ_MYCONFIG)
+MOZCONFIG=`\`dirname $0\`/find-mozconfig.sh`
+
+if [ "$MOZCONFIG" ]
+then
+  print_header >$tmp_file
+  . $MOZCONFIG >> $tmp_file
+
+  if cmp -s $tmp_file $out_file; then
+    rm $tmp_file
+  else
+    mv -f $tmp_file $out_file
+  fi
+else
+  echo "# This file is automatically generated for client.mk." > $out_file
+fi
+

mozilla/build/autoconf/mozconfig2url.sh

@@ -0,0 +1,63 @@
+#! /bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# mozconfig2defs.sh - Translates mozconfig.sh into options for client.mk.
+#    Prints defines to stdout.
+#
+# See load-mozconfig.sh for more details
+#
+# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
+
+ac_add_options() {
+  for _opt
+  do
+    # Escape shell characters, space, tab, dollar, quote, backslash,
+    # and substitute '@<word>@' with '$(<word)'.
+    _opt=`echo $_opt | sed -e 's/\([\ \	\$\"\\]\)/\\\\\1/g;'`
+    case "$_opt" in
+      --*-*= ) query_string="$query_string$_opt&"     ;;
+      --*-* )  query_string="$query_string$_opt=yes&" ;;
+    esac
+  done
+}
+
+mk_add_options() {
+  for _opt
+  do
+    # Escape shell characters, space, tab, dollar, quote, backslash,
+    # and substitute '@<word>@' with '$(<word)'.
+    query_string=$query_string`echo "$_opt&" | sed -e 's/\([\ \	\$\"\\]\)/\\\\\1/g;'`
+  done
+}
+
+#
+# main
+#
+
+# find-mozconfig.sh 
+#   In params:   $MOZCONFIG $HOME ($MOZ_MYCONFIG)
+MOZCONFIG=`\`dirname $0\`/find-mozconfig.sh`
+
+if [ "$MOZCONFIG" ]
+then
+  query_string="?"
+  . $MOZCONFIG
+  echo `expr "$query_string" : "\(.*\)."`
+
+fi
+

mozilla/build/autoconf/print-depth-path.sh

@@ -0,0 +1,59 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# This script will print the depth path for a mozilla directory based
+# on the info in Makefile.in
+#
+# Its a hack.  Its brute force.  Its horrible.  
+# It dont use Artificial Intelligence.  It dont use Virtual Reality.
+# Its not perl.  Its not python.   But it works.
+#
+# Usage: print-depth-path.sh
+#
+# Send comments, improvements, bugs to ramiro@netscape.com
+# 
+
+# Make sure a Makefile.in exists
+if [ ! -f Makefile.in ]
+then
+	echo
+	echo "There ain't no 'Makefile.in' over here: $pwd, dude."
+	echo
+
+	exit
+fi
+
+# Use DEPTH in the Makefile.in to determine the depth
+depth=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`
+
+# Determine the depth count
+n=`echo $depth | tr '/' ' ' | wc -w`
+
+# Determine the path (strip anything before the mozilla/ root)
+path=`pwd | awk -v count=$n -F"/" '\
+{ for(i=NF-count+0; i <= NF ; i++) \
+{ \
+if (i!=NF) \
+  { printf "%s/", $i } \
+else \
+  { printf "%s", $i } \
+} \
+}'`
+
+echo $path

mozilla/build/autoconf/update-makefile.sh

@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# This script will generate a single Makefile from a Makefile.in using
+# the config.status script.
+#
+# The config.status script is generated the first time you run 
+# ./configure.
+#
+#
+# Usage: update-makefile.sh
+#
+# Send comments, improvements, bugs to ramiro@netscape.com
+# 
+
+# Make sure a Makefile exists
+if [ ! -f Makefile ]
+then
+	echo
+	echo "There ain't no 'Makefile' over here: $pwd"
+	echo
+
+	exit
+fi
+
+# Use DEPTH in the Makefile to determine the depth
+depth=`egrep '^DEPTH[ 	]*=[ 	]*\.' Makefile | awk -F= '{ print $2; }'`
+
+# Get the full path to the Makefile
+makefile=`pwd`/Makefile
+
+# 'cd' to the root of the tree
+echo depth=$depth
+cd $depth
+
+# Strip the tree root off the Makefile's path
+root_path=`pwd`
+makefile=`expr $makefile : $root_path'/\(.*\)'`
+
+# Make sure config.status exists
+if [ -f config.status ]
+then
+	CONFIG_FILES=$makefile ./config.status
+else
+	echo
+	echo "There ain't no 'config.status' over here: $pwd"
+	echo
+fi

mozilla/build/build_number

@@ -0,0 +1 @@
+98091517

mozilla/build/genrc.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DATATYPE="$1"
+INFILE="$2"
+
+echo "${DATATYPE} RCDATA"
+sed 's/"/""/g' ${INFILE} | awk 'BEGIN { printf("BEGIN\n") } { printf("\"%s\\r\\n\",\n", $0) } END { printf("\"\\0\"\nEND\n") }'
+
+exit 0

mozilla/build/hcc

@@ -0,0 +1,91 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# Fix brain-damaged compilers that don't understand -o and -c together
+#
+CC=`echo $1 | sed -e "s|'||g" -e 's|"||g'`
+shift
+DASH_C=0
+DASH_O=0
+DUMMY="XxxXxxX"
+GET_OBJECT=0
+OBJ="${DUMMY}"
+OBJECT="${DUMMY}"
+
+for i in $*
+do
+	[ "${CHECK_O}" = yes ]  && {
+	case $i in
+		./*/*.o)	OBJECT="$i"
+			OPTS="${OPTS} -o"
+   			DASH_O=1
+			;;
+		./*.o)	OBJECT="`basename $i`"
+			i=""
+   			DASH_O=1
+			;;
+		*.o)	if [ $i = `basename $i` ]
+			then
+				OBJECT="$i"
+				i=""
+			else
+				OPTS="${OPTS} -o"
+			fi
+   			DASH_O=1
+			;;
+		*)	OPTS="${OPTS} -o $i"
+   			DASH_O=1
+			i=""
+			;;
+	esac
+	CHECK_O=no
+	}
+   case $i in
+   -c)     DASH_C=1
+	OPTS="${OPTS} -c"
+		;;
+   -o)     CHECK_O=yes
+		;;
+   *.c)    C_SRC=$i
+	OPTS="${OPTS} $i"
+# cc always creates the .o from the .c name
+	OBJ=`basename $C_SRC .c`.o
+		;;
+   *.s)    S_SRC=$i
+	OPTS="${OPTS} $i"
+# or the .o from the .s name
+	OBJ=`basename $S_SRC .s`.o
+		;;
+   *.o)    OBJECT=$i
+	OPTS="${OPTS} $i"
+		;;
+   *) 	OPTS="${OPTS} $i"
+		;;
+   esac
+done
+
+${CC} ${OPTS} || exit $?
+
+# if there was no -c and -o we're done
+[ $DASH_C = 1 -a $DASH_O = 1 ] || exit 0
+
+# if $OBJ and $OBJECT are the same we're done
+[ $OBJ = $OBJECT ] && exit 0
+
+[ -f $OBJ ] && mv -f $OBJ $OBJECT

mozilla/build/hcpp

@@ -0,0 +1,118 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# Wrapper for brain-damaged compilers that don't understand -o and -c together.
+#
+CXX=`echo $1 | sed -e "s|'||g" -e 's|"||g'`
+shift
+DUMMY="XxxXxxX"
+DASH_C=0
+DASH_O=0
+GET_OBJECT=0
+C_SRC="${DUMMY}"
+CC_SRC="${DUMMY}"
+CPP_SRC="${DUMMY}"
+S_SRC="${DUMMY}"
+OBJECT="${DUMMY}"
+
+for i in $*
+do
+	[ ${GET_OBJECT} -eq 1 ]  && {
+	case $i in
+		./*/*.o)	OBJECT="$i"
+			OPTS="${OPTS} -o"
+   			DASH_O=1
+			;;
+		./*.o)	OBJECT="`basename $i`"
+			i=""
+   			DASH_O=1
+			;;
+		*.o)	if [ $i = `basename $i` ]
+			then
+				i=""
+			else
+				OPTS="${OPTS} -o"
+   				DASH_O=1
+			fi
+			;;
+		*)	OPTS="${OPTS} -o $i"
+   			DASH_O=1
+			i=""
+			;;
+	esac
+	GET_OBJECT=0
+	}
+	case $i in
+		-c)
+			DASH_C=1
+			OPTS="${OPTS} -c"
+			;;
+		-o)
+			GET_OBJECT=1
+			;;
+		*.c)
+			C_SRC="$i"
+			OPTS="${OPTS} $i"
+# cc always creates the .o from the .c name
+			OBJ=`basename ${C_SRC} .c`.o
+			;;
+		+.*)
+			OPTS="${OPTS} $i"
+			;;
+		*.cpp)
+			CPP_SRC="$i"
+			OPTS="${OPTS} $i"
+# cc always creates the .o from the .cpp name
+			OBJ=`basename ${CPP_SRC} .cpp`.o
+			;;
+		*.cc)
+			CC_SRC="$i"
+			OPTS="${OPTS} $i"
+# cc always creates the .o from the .cc name
+			OBJ=`basename ${CC_SRC} .cc`.o
+			;;
+		*.s)
+			S_SRC="$i"
+			OPTS="${OPTS} $i"
+# cc always creates the .o from the .s name
+			OBJ=`basename ${S_SRC} .s`.o
+			;;
+   		*.o)    OBJECT=$i
+			OPTS="${OPTS} $i"
+			;;
+   		*) 	OPTS="${OPTS} $i"
+			;;
+	esac
+done
+
+${CXX} ${OPTS} || exit $?
+
+# LAME!!!
+if [ -f -O ]; then
+	mv -f -- -O ${OBJECT}
+fi
+
+# if there was no -c and -o we're done
+[ ${DASH_C} -eq 1 -a ${DASH_O} -eq 1 ] || exit 0
+
+# if $OBJ and $OBJECT are the same we're done
+[ $OBJ = $OBJECT ] && exit 0
+
+[ -f $OBJ ] && mv -f $OBJ $OBJECT
+

mozilla/build/mac/BuildList.pm

@@ -0,0 +1,357 @@
+#!perl
+
+package			BuildList;
+require			Exporter;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw(BuildMozilla DistMozilla);
+
+=head1 NAME
+
+BuildList - build the [ordered] set of projects needed to construct Mozilla
+
+=head1 SYNOPSIS
+
+...
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public License
+Version 1.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut
+
+		use Moz;
+		use File::Path;
+		
+sub BuildMozilla()
+	{
+		if ( $main::DEBUG )
+			{
+				$D = "Debug";
+				$dist_dir = ":mozilla:dist:client_debug:";
+			}
+		else
+			{
+				$D = "";
+				$dist_dir = ":mozilla:dist:client:";
+			}
+
+			#
+			# Build the appropriate target of each project
+			#
+
+		BuildProjectClean(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",							"Stubs");
+		BuildProjectClean(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",						"Stubs");
+		BuildProjectClean(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",			"Stubs");
+#		BuildProjectClean(":mozilla:cmd:macfe:projects:client:Client.mcp",					"Stubs");
+		
+		if ( $main::CARBON )
+		{
+			BuildProject(":mozilla:cmd:macfe:projects:interfaceLib:Interface.mcp",			"Carbon Interfaces");
+		}
+		else
+		{
+			BuildProject(":mozilla:cmd:macfe:projects:interfaceLib:Interface.mcp",			"MacOS Interfaces");
+		}
+		
+		BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",							"NSRuntime$D.shlb");
+		MakeAlias(":mozilla:lib:mac:NSRuntime:NSRuntime$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:cmd:macfe:restext:StringLib.mcp",							"Strings$D.shlb");
+		MakeAlias(":mozilla:cmd:macfe:restext:Strings$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.mcp",					"MoreFiles$D.shlb");
+		MakeAlias(":mozilla:lib:mac:MoreFiles:build:MoreFiles$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp",								"NSPR20$D.shlb");
+		MakeAlias(":mozilla:nsprpub:macbuild:NSPR20$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:dbm:macbuild:DBMPPC.mcp",									"DBM$D.shlb");
+		MakeAlias(":mozilla:dbm:macbuild:DBM$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",				"MemAllocator$D.shlb");
+		MakeAlias(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",								"NSStdLib$D.shlb");
+		MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:modules:libreg:macbuild:libreg.mcp",							"libreg$D.shlb");
+		MakeAlias(":mozilla:modules:libreg:macbuild:libreg$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp",								"xpcom$D.shlb");
+		MakeAlias(":mozilla:xpcom:macbuild:xpcom$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp",							"PowerPlant$D.shlb");		
+		MakeAlias(":mozilla:lib:mac:PowerPlant:PowerPlant$D.shlb", "$dist_dir");
+
+		BuildProject(":mozilla:modules:progress:macbuild:ProgressPPC.mcp",					"Progress$D.shlb");
+		MakeAlias(":mozilla:modules:progress:macbuild:Progress$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp",								"zlib$D.shlb");
+		MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp",										"JPEG$D.shlb");
+		MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:sun-java:stubs:macbuild:JavaStubs.mcp",						"JavaRuntime$D.shlb");
+		MakeAlias(":mozilla:sun-java:stubs:macbuild:JavaRuntime$D.shlb", "$dist_dir");	
+				
+		BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp",								"JavaScript$D.shlb");
+		MakeAlias(":mozilla:js:macbuild:JavaScript$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:js:macbuild:LiveConnect.mcp",								"LiveConnect$D.shlb");
+		MakeAlias(":mozilla:js:macbuild:LiveConnect$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:nav-java:stubs:macbuild:NavJavaStubs.mcp",					"NavJava$D.shlb");
+		MakeAlias(":mozilla:nav-java:stubs:macbuild:NavJava$D.shlb", "$dist_dir");
+
+		BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp", 								"RDF$D.shlb");
+		MakeAlias(":mozilla:modules:rdf:macbuild:RDF$D.shlb", "$dist_dir");
+	
+		BuildProject(":mozilla:modules:xml:macbuild:XML.mcp",								"XML$D.shlb");
+		MakeAlias(":mozilla:modules:xml:macbuild:XML$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:modules:schedulr:macbuild:Schedulr.mcp",						"Scheduler$D.shlb");
+		MakeAlias(":mozilla:modules:schedulr:macbuild:Scheduler$D.shlb", "$dist_dir");
+			
+		BuildProject(":mozilla:build:mac:CustomLib:CustomLib.mcp",							"CustomLib$D.shlb");
+		MakeAlias(":mozilla:build:mac:CustomLib:CustomLib$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp",			"Security.o");
+		BuildProject(":mozilla:modules:libfont:macbuild:FontBroker.mcp",					"FontBroker$D.o");
+		BuildProject(":mozilla:modules:oji:macbuild:oji.mcp",								"oji$D.o");
+		BuildProject(":mozilla:lib:libmocha:macbuild:LibMocha.mcp",							"LibMocha$D.o");	
+
+		if ( $main::MOZ_DARK == 1 )
+		{
+			BuildProject(":mozilla:network:macbuild:network.mcp",							"Network$D.o (mailnews)");
+		}
+		else
+		{
+			BuildProject(":mozilla:network:macbuild:network.mcp",							"Network$D.o");
+		}
+		BuildProject(":mozilla:caps:macbuild:Caps.mcp",										"Caps$D.o");
+
+		BuildProject(":mozilla:modules:libimg:macbuild:png.mcp",						"png$D.o");
+		BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp",					"libimg$D.o");
+
+		BuildProject(":mozilla:build:mac:CustomLib:CustomLib.mcp",							"CustomStaticLib$D.o");
+		
+		if ( $main::MOZ_LITE == 1 )
+		{
+			BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"MailNews$D.o");
+			BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"Composer$D.o");
+			BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 					"Nav_Resources");
+		}
+		else
+		{
+			if ( $main::MOZ_MEDIUM == 1 )
+			{
+				BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"MailNews$D.o");
+				BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp",					"Composer$D.o");
+				BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 					"Moz_Resources");
+			}
+			else
+			{
+				if ( $main::MOZ_DARK == 1 )
+				{
+					BuildProject(":ns:lib:libneo:mac:macbuild:NeoLib.mcp",							"NeoLib$D.o");
+					MakeAlias(   ":ns:lib:libneo:mac:macbuild:NeoLib$D.o", "$dist_dir");				
+					BuildProject(":mozilla:lib:libmsg:macbuild:MsgLib.mcp",							"MsgLib$D.o (secure)");
+					MakeAlias(   ":mozilla:lib:libmsg:macbuild:MsgLib$D.o", "$dist_dir");				
+					BuildProject(":mozilla:directory:c-sdk:ldap:libraries:macintosh:LDAPClient.mcp","LDAPClient$D.o");
+					MakeAlias(   ":mozilla:directory:c-sdk:ldap:libraries:macintosh:LDAPClient$D.o", "$dist_dir");				
+
+					BuildProject(":mozilla:cmd:macfe:MailNews:build:MailNews.mcp",					"MailNews$D.o");
+					BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp",					"Composer$D.o");
+					BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 					"MozDark_Resources");
+				}
+			}
+		}
+		
+#		BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 						"Client$D");
+	}
+
+
+sub DistMozilla()
+	{
+		mkpath([ ":mozilla:dist:", ":mozilla:dist:client:", ":mozilla:dist:client_debug:", ":mozilla:dist:client_stubs:" ]);
+
+		#CONFIG
+		InstallFromManifest(":mozilla:config:mac:MANIFEST",								":mozilla:dist:config:");
+		InstallFromManifest(":mozilla:config:mac:MANIFEST_config",						":mozilla:dist:config:");
+
+		#INCLUDE
+		InstallFromManifest(":mozilla:include:MANIFEST",								":mozilla:dist:include:");
+		InstallFromManifest(":mozilla:cmd:macfe:pch:MANIFEST",							":mozilla:dist:include:");
+
+		#MAC_COMMON
+		InstallFromManifest(":mozilla:build:mac:MANIFEST",								":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:NSStdLib:include:MANIFEST",				":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:MacMemoryAllocator:include:MANIFEST",		":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:Misc:MANIFEST",							":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:MoreFiles:MANIFEST",						":mozilla:dist:mac:common:morefiles:");
+		InstallFromManifest(":mozilla:cmd:macfe:MANIFEST",								":mozilla:dist:mac:macfe:");
+
+		#NSPR
+		InstallFromManifest(":mozilla:nsprpub:pr:include:MANIFEST",						":mozilla:dist:nspr:");
+		InstallFromManifest(":mozilla:nsprpub:pr:src:md:mac:MANIFEST",					":mozilla:dist:nspr:mac:");
+		InstallFromManifest(":mozilla:nsprpub:lib:ds:MANIFEST",							":mozilla:dist:nspr:");
+		InstallFromManifest(":mozilla:nsprpub:lib:libc:include:MANIFEST",				":mozilla:dist:nspr:");
+		InstallFromManifest(":mozilla:nsprpub:lib:msgc:include:MANIFEST",				":mozilla:dist:nspr:");
+		
+		#DBM
+		InstallFromManifest(":mozilla:dbm:include:MANIFEST",							":mozilla:dist:dbm:");
+		
+		#LIBIMAGE
+		InstallFromManifest(":mozilla:modules:libimg:png:MANIFEST",						":mozilla:dist:libimg:");
+		InstallFromManifest(":mozilla:modules:libimg:src:MANIFEST",						":mozilla:dist:libimg:");
+		InstallFromManifest(":mozilla:modules:libimg:public:MANIFEST",					":mozilla:dist:libimg:");
+		
+		#SECURITY_freenav
+		InstallFromManifest(":mozilla:modules:security:freenav:MANIFEST",				":mozilla:dist:security:");
+		
+		#XPCOM
+		InstallFromManifest(":mozilla:xpcom:public:MANIFEST",								":mozilla:dist:xpcom:");
+		
+		#ZLIB
+		InstallFromManifest(":mozilla:modules:zlib:src:MANIFEST",						":mozilla:dist:zlib:");
+				
+		#JPEG
+		InstallFromManifest(":mozilla:jpeg:MANIFEST",									":mozilla:dist:jpeg:");
+		
+		#JSJ
+		# beard: this conflicts with LiveConnect's jsjava.h.
+		#InstallFromManifest(":mozilla:js:jsj:MANIFEST",								":mozilla:dist:jsj:");
+		
+		#JSDEBUG
+		InstallFromManifest(":mozilla:js:jsd:MANIFEST",									":mozilla:dist:jsdebug:");
+		
+		#JS
+		InstallFromManifest(":mozilla:js:src:MANIFEST",									":mozilla:dist:js:");
+		
+		#LIVECONNECT
+		InstallFromManifest(":mozilla:js:src:liveconnect:MANIFEST",						":mozilla:dist:liveconnect:");
+		
+		#RDF
+		InstallFromManifest(":mozilla:modules:rdf:include:MANIFEST",					":mozilla:dist:rdf:");
+		
+		#XML
+		InstallFromManifest(":mozilla:modules:xml:glue:MANIFEST",						":mozilla:dist:xml:");
+		InstallFromManifest(":mozilla:modules:xml:expat:xmlparse:MANIFEST",				":mozilla:dist:xml:");
+		
+		#LIBFONT
+		InstallFromManifest(":mozilla:modules:libfont:MANIFEST",						":mozilla:dist:libfont:");
+		InstallFromManifest(":mozilla:modules:libfont:src:MANIFEST",					":mozilla:dist:libfont:");
+		
+		#LDAP
+		if ( $main::MOZ_LDAP ||  $main::MOZ_DARK )
+			{
+				InstallFromManifest(":mozilla:directory:c-sdk:ldap:include:MANIFEST",	":mozilla:dist:ldap:");
+			}
+
+		#PRIVACY
+		InstallFromManifest(":mozilla:privacy:public:MANIFEST", ":mozilla:dist:privacy:");
+			
+		#SCHEDULER
+		InstallFromManifest(":mozilla:modules:schedulr:public:MANIFEST",				":mozilla:dist:schedulr:");
+		
+		#NETWORK
+		InstallFromManifest(":mozilla:network:cache:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:client:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:cnvts:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:cstream:MANIFEST",						":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:main:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:mimetype:MANIFEST",						":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:util:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:about:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:certld:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:dataurl:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:file:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:ftp:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:gopher:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:http:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:imap4:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:js:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:ldap:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:mailbox:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:marimba:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:nntp:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:pop3:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:remote:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:smtp:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:sockstub:MANIFEST",				":mozilla:dist:network:");
+		
+		#HTML_DIALOGS
+		InstallFromManifest(":mozilla:lib:htmldlgs:MANIFEST",							":mozilla:dist:htmldlgs:");
+		
+		#LAYOUT
+		InstallFromManifest(":mozilla:lib:layout:MANIFEST",								":mozilla:dist:layout:");
+		
+		#LAYERS
+		InstallFromManifest(":mozilla:lib:liblayer:include:MANIFEST",					":mozilla:dist:layers:");
+		
+		#PARSE
+		InstallFromManifest(":mozilla:lib:libparse:MANIFEST",							":mozilla:dist:libparse:");
+		
+		#STYLE
+		InstallFromManifest(":mozilla:lib:libstyle:MANIFEST",							":mozilla:dist:libstyle:");
+		
+		#PLUGIN
+		InstallFromManifest(":mozilla:modules:plugin:public:MANIFEST",					":mozilla:dist:plugin:");
+		InstallFromManifest(":mozilla:modules:plugin:src:MANIFEST",						":mozilla:dist:plugin:");
+		
+		#LIBHOOK
+		InstallFromManifest(":mozilla:modules:libhook:public:MANIFEST",					":mozilla:dist:libhook:");
+		
+		#LIBPREF
+		InstallFromManifest(":mozilla:modules:libpref:public:MANIFEST",					":mozilla:dist:libpref:");
+		
+		#LIBREG
+		InstallFromManifest(":mozilla:modules:libreg:include:MANIFEST",					":mozilla:dist:libreg:");
+		
+		#LIBUTIL
+		InstallFromManifest(":mozilla:modules:libutil:public:MANIFEST",					":mozilla:dist:libutil:");
+		
+		#PROGRESS
+		InstallFromManifest(":mozilla:modules:progress:public:MANIFEST",				":mozilla:dist:progress:");
+		
+		#EDTPLUG
+		InstallFromManifest(":mozilla:modules:edtplug:include:MANIFEST", 				":mozilla:dist:edtplug:");
+
+		#NAV_JAVA
+		InstallFromManifest(":mozilla:nav-java:stubs:include:MANIFEST",					":mozilla:dist:nav-java:");
+		InstallFromManifest(":mozilla:nav-java:stubs:macjri:MANIFEST",					":mozilla:dist:nav-java:");
+		
+		#SUN_JAVA
+		InstallFromManifest(":mozilla:sun-java:stubs:include:MANIFEST",					":mozilla:dist:sun-java:");
+		InstallFromManifest(":mozilla:sun-java:stubs:macjri:MANIFEST",					":mozilla:dist:sun-java:");
+
+		#OJI
+		InstallFromManifest(":mozilla:modules:oji:public:MANIFEST",						":mozilla:dist:oji:");
+		InstallFromManifest(":mozilla:modules:oji:src:MANIFEST",						":mozilla:dist:oji:");
+
+		#CAPS
+		InstallFromManifest(":mozilla:caps:include:MANIFEST",							":mozilla:dist:caps:");
+		InstallFromManifest(":mozilla:caps:public:MANIFEST",							":mozilla:dist:caps:");
+
+		#BASE
+		InstallFromManifest(":mozilla:base:public:MANIFEST",							":mozilla:dist:base:");
+		InstallFromManifest(":mozilla:base:src:MANIFEST",								":mozilla:dist:base:");
+	}
+
+1;
+

mozilla/build/mac/BuildMozilla.pl

@@ -0,0 +1,40 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+	use Moz;
+	use BuildList;
+
+$DEBUG = 0;
+
+	# One of them should be 1. This will come from a config file at some stage.
+	# In the meanwhile, it should match mozilla/config/mac/MacConfig.h
+$MOZ_LITE   = 0;
+$MOZ_MEDIUM = 1;
+$MOZ_DARK   = 0;
+
+Moz::OpenErrorLog(":::Mozilla.BuildLog");
+Moz::StopForErrors();
+
+chdir("::::");
+
+# Make and popuplate the dist directory
+DistMozilla();
+
+# Now build the projects
+BuildMozilla();

mozilla/build/mac/BuildMozillaDebug.pl

@@ -0,0 +1,44 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+	use Moz;
+	use BuildList;
+
+$DEBUG = 1;
+
+	# One of them should be 1. This will come from a config file at some stage.
+	# In the meanwhile, it should match mozilla/config/mac/MacConfig.h
+$MOZ_LITE   = 0;
+$MOZ_MEDIUM = 1;
+$MOZ_DARK   = 0;
+
+Moz::OpenErrorLog(":::Mozilla.BuildLog");
+Moz::StopForErrors();
+
+chdir("::::");
+
+# Make and popuplate the dist directory
+DistMozilla();
+
+# Set the build number in about-all.html.  Commented out for now
+# until ckid/mcvs resource problem is resolved.
+# SetBuildNumber();
+
+# Now build the projects
+BuildMozilla();

mozilla/build/mac/BuildMozillaOfficialDebug.pl

@@ -0,0 +1,51 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+	use Moz;
+	use BuildList;
+
+$DEBUG = 1;
+
+	# One of them should be 1. This will come from a config file at some stage.
+	# In the meanwhile, it should match mozilla/config/mac/MacConfig.h
+$MOZ_LITE   = 0;
+$MOZ_MEDIUM = 1;
+$MOZ_DARK   = 0;
+
+Moz::OpenErrorLog(":::Mozilla.BuildLog");
+Moz::StopForErrors();
+
+chdir("::::");
+
+SetBuildNumber();
+
+SetTimeBomb(0, 30);
+
+# Make and popuplate the dist directory
+DistMozilla();
+
+Delay(10);
+
+# Set the build number in about-all.html.  Commented out for now
+# until ckid/mcvs resource problem is resolved.
+
+# SetAgentString();
+
+# Now build the projects
+BuildMozilla();

mozilla/build/mac/BuildNGLayout.pl

@@ -0,0 +1,95 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# nglayout build script (debug)
+#
+use Mac::Processes;
+use NGLayoutBuildList;
+use Cwd;
+use Moz;
+
+# configuration variables
+$DEBUG = 0;
+$ALIAS_SYM_FILES = $DEBUG;
+$CLOBBER_LIBS = 0;
+$MOZ_FULLCIRCLE = 0;
+
+$pull{all} = 0;
+$pull{lizard} = 0;
+$pull{xpcom} = 0;
+$pull{imglib} = 0;
+$pull{netlib} = 0;
+$pull{nglayout} = 0;
+$pull{mac} = 0;
+
+$build{all} = 1;				# turn off to do individual builds
+$build{dist} = 0;
+$build{stubs} = 0;
+$build{common} = 0;
+$build{nglayout} = 0;
+$build{resources} = 0;
+$build{editor} = 0;
+$build{viewer} = 0;
+$build{xpapp} = 0;
+
+if ($pull{all})
+{
+	foreach $k (keys(%pull))
+	{
+		$pull{$k} = 1;
+	}
+}
+if ($build{all})
+{
+	foreach $k (keys(%build))
+	{
+		$build{$k} = 1;
+	}
+}
+
+# do the work
+# you should not have to edit anything bellow
+
+chdir("::::");
+$MOZ_SRC = cwd();
+
+if ($MOZ_FULLCIRCLE)
+{
+	#// Get the Build Number for the Master.ini(Full Circle) n'stuff
+	$buildnum = Moz::SetBuildNumber();
+}
+
+OpenErrorLog("NGLayoutBuildLog");
+#OpenErrorLog("Mozilla.BuildLog");		# Tinderbox requires that name
+
+Moz::StopForErrors();
+#Moz::DontStopForErrors();
+
+if ($pull{all}) { 
+   Checkout();
+}
+
+chdir($MOZ_SRC);
+BuildDist();
+
+chdir($MOZ_SRC);
+BuildProjects();
+
+print "Build layout complete\n";

mozilla/build/mac/BuildNGLayoutDebug.pl

@@ -0,0 +1,96 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# nglayout build script (debug)
+#
+use Mac::Processes;
+use NGLayoutBuildList;
+use Cwd;
+use Moz;
+
+# configuration variables
+$DEBUG = 1;
+$ALIAS_SYM_FILES = $DEBUG;
+$CLOBBER_LIBS = 1;			# turn on to clobber existing libs and .xSYM files before
+							# building each project
+$MOZ_FULLCIRCLE = 0;
+
+$pull{all} = 0;
+$pull{lizard} = 0;
+$pull{xpcom} = 0;
+$pull{imglib} = 0;
+$pull{netlib} = 0;
+$pull{nglayout} = 0;
+$pull{mac} = 0;
+
+$build{all} = 1;			# turn off to do individual builds
+$build{dist} = 0;
+$build{stubs} = 0;
+$build{common} = 0;
+$build{nglayout} = 0;
+$build{resources} = 0;
+$build{editor} = 0;
+$build{viewer} = 0;
+$build{xpapp} = 0;
+
+if ($pull{all})
+{
+	foreach $k (keys(%pull))
+	{
+		$pull{$k} = 1;
+	}
+}
+if ($build{all})
+{
+	foreach $k (keys(%build))
+	{
+		$build{$k} = 1;
+	}
+}
+
+# do the work
+# you should not have to edit anything bellow
+
+chdir("::::");
+$MOZ_SRC = cwd();
+
+if ($MOZ_FULLCIRCLE)
+{
+	#// Get the Build Number for the Master.ini(Full Circle) n'stuff
+	$buildnum = Moz::SetBuildNumber();
+}
+
+OpenErrorLog("NGLayoutDebugBuildLog");
+#OpenErrorLog("Mozilla.BuildLog");		# Tinderbox requires that name
+
+Moz::StopForErrors();
+#Moz::DontStopForErrors();
+
+if ($pull{all}) { 
+   Checkout();
+}
+
+chdir($MOZ_SRC);
+BuildDist();
+
+chdir($MOZ_SRC);
+BuildProjects();
+
+print "Build layout complete\n";

mozilla/build/mac/CodeWarriorLib.pm

@@ -0,0 +1,385 @@
+#!perl
+package CodeWarriorLib;
+
+=pod
+
+=head1 NAME
+
+CodeWarriorLib - supply interface to CodeWarrior
+
+=head1 SYNOPSIS
+
+	#!perl
+	use CodeWarriorLib;
+	CodeWarriorLib::activate();
+	$had_errors = CodeWarriorLib::build_project(
+		$project_path, $target_name, $recent_errors_file, $clean_build
+	);
+
+=head1 DESCRIPTION
+
+Replaces the AppleScript library I<CodeWarriorLib>.
+
+=over 4
+
+=cut
+
+use strict;
+use Mac::AppleEvents::Simple;
+use Mac::AppleEvents;
+use Mac::Processes;
+use Mac::MoreFiles;
+use Mac::Types;
+use File::Basename;
+
+use vars qw($VERSION);
+$VERSION = '1.02';
+
+my($app)  = 'CWIE';
+
+# 0 == don't switch CWIE to front app in do_event(), 1 == do switch
+# note: activate() still switches when called
+$Mac::AppleEvents::Simple::SWITCH = 0;
+
+# supply your own path to the source here
+#_test('PowerPudgeIV:mozilla:mozilla:');
+
+
+=pod
+
+=item _get_project($full_path)
+
+A private routine returning a reference to the open project with the given name,
+or else the empty string (when that project is not open)
+
+full_path is a string identifying the project to be built and is of the form, 
+e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
+
+=cut
+
+sub _get_project ($) {
+	my(
+		$full_path, $candidate_projects
+	) = @_;
+	$candidate_projects = _doc_named(basename($full_path, '*'));
+	if ($candidate_projects) {
+		my($cps) = _get_dobj($candidate_projects);
+		my($num) = AECountItems($cps);
+		if ($num) {  # is a list
+			foreach (1 .. AECountItems($cps)) {
+				my($cp) = AEGetNthDesc($cps, $_);
+				if ($full_path eq _full_path($cp)) {
+					return($cp);
+				}
+			}
+		} else {     # is only one, not a list
+			if ($full_path eq _full_path($cps)) {
+				return($cps);
+			}
+		}
+	}
+	return;
+}
+
+=pod
+
+=item build_project
+
+Build a selected target of a project, saving any errors to a file, if supplied.
+	
+full_path is a string identifying the project to be built and is of the form, 
+e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
+
+If target_name is the empty string, the current target of the selected project 
+will be built, else, target_name should be a string matching a target name in 
+the selected project.
+	
+If error_path is the empty string, errors will not be saved to a file,
+else, error_path should be the full path of a file to save error messages into.
+
+=cut
+
+sub build_project ($;$$$) {
+	my(
+		$full_path, $target_name, $error_path,
+		$remove_object, $p, $project_was_closed, $had_errors
+	) = @_;
+	_close_errors_window();
+
+	while (1) {
+		$p = _get_project($full_path);
+		if (!$p) {
+			if ($project_was_closed) {
+				print "### Error - request for project document failed after opening\n";
+				die "### possibly CW Pro 4 bug: be sure to close your Find window\n";
+			}
+			$project_was_closed = 1;
+			_open_file($full_path);
+		} else {
+			last;
+		}
+	}
+
+	$had_errors = 0;
+	if ($target_name eq '') {
+		if ($remove_object) {_remove_object($p)}
+		_build($p);
+	} else {
+		if ($remove_object) {_remove_object($p, $target_name)}
+		_build($p, $target_name);
+	}
+
+	if ($error_path ne '') {
+		_save_errors_window($error_path);
+	}
+	$had_errors = _close_errors_window();
+
+	if ($project_was_closed) {
+		$p = _get_project($full_path);
+		_close($p);
+	}
+
+	return($had_errors);
+}
+
+=pod
+
+=item activate()
+
+Launches CodeWarrior and brings it to the front.
+
+Once found, path will be saved in ':idepath.txt' for future reference.
+Edit or delete this file to change the location of the IDE.  If app is
+moved, C<activate()> will prompt for a new location.
+
+First looks for an open CodeWarrior app.  Second, tries to open previously
+saved location in ':idepath.txt'.  Third, tries to find it and allow user
+to choose it with Navigation Services (if present).  Fourth, uses good old
+GUSI routines built-in to MacPerl for a Choose Directory dialog box.
+
+=cut
+
+sub activate () {
+	local(*F);
+	my($filepath, $appath, $psi) = (':idepath.txt');
+
+	foreach $psi (values(%Process)) {
+		if ($psi->processSignature() eq $app) {
+			$appath = $psi->processAppSpec(), "\n";
+                        _save_appath($filepath, $appath);
+                        last;
+		}
+	}
+
+	if ((!$appath || ! -x $appath) && open(F, $filepath)) {
+		$appath = <F>;
+		close(F);
+	}
+
+	if (!$appath || ! -x $appath) {
+		if (eval {require Mac::Navigation}) {
+			my($options, $nav);
+			Mac::Navigation->import();
+			$options = NavGetDefaultDialogOptions();
+			$options->message('Where is CodeWarrior IDE?');
+			$options->windowTitle('Find CodeWarrior IDE');
+			$nav = NavChooseObject($Application{$app}, $options);
+			die "CodeWarrior IDE not found.\n" if (!$nav || !$nav->file(1));
+			$appath = $nav->file(1);
+		} else {
+			local(*D);
+			my $cwd = `pwd`;
+			$appath = _get_folder(
+                               'Where is the CW IDE folder?',
+				dirname($Application{$app})
+			);
+			die "CodeWarrior IDE not found.\n" if !$appath;
+			opendir(D, $appath) or die $!;
+			chdir($appath);
+			foreach my $file (sort readdir (D)) {
+				my(@app) = MacPerl::GetFileInfo($file);
+				if ($app[0] && $app[1] &&
+					$app[1] eq 'APPL' && $app[0] eq $app
+				) {
+					$appath .= $file;
+					last;
+				}
+			}
+			chomp($cwd);
+			chdir($cwd);
+		}
+		_save_appath($filepath, $appath);
+	}
+
+	my($lp) = LaunchParam->new(
+		launchAppSpec => $appath,
+		launchControlFlags => launchContinue() + launchNoFileFlags()
+	);
+        unless (LaunchApplication($lp)) {
+                unlink($filepath);
+                die $^E;
+        }
+}
+
+sub _build ($;$) {
+	my($evt);
+	if ($_[1]) {
+		my($prm) =
+			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
+			AEPrint($_[0]) . '}';
+		$evt = do_event(qw/CWIE MAKE/, $app, $prm, $_[1]);
+	} else {
+		my($prm) = q"'----':" . AEPrint($_[0]);
+		$evt = do_event(qw/CWIE MAKE/, $app, $prm);
+	}
+}
+
+sub _remove_object ($;$) {
+	my($evt);
+	if ($_[1]) {
+		my($prm) =
+			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
+			AEPrint($_[0]) . '}';
+		$evt = do_event(qw/CWIE RMOB/, $app, $prm, $_[1]);
+	} else {
+		my($prm) = q"'----':" . AEPrint($_[0]);
+		$evt = do_event(qw/CWIE RMOB/, $app, $prm);
+	}
+}
+
+sub _open_file ($) {
+	my($prm) =
+		q"'----':obj {form:name, want:type(alis), " .
+		q"seld:TEXT(@), from:'null'()}";
+
+	do_event(qw/aevt odoc/, $app, $prm, $_[0]);
+}
+
+sub _doc_named ($) {
+	my($prm) =
+		q"'----':obj {form:test, want:type(docu), from:'null'(), " .
+		q"seld:cmpd{relo:'=   ', 'obj1':obj {form:prop, want:type" .
+		q"(prop), seld:type(pnam), from:'exmn'()}, 'obj2':TEXT(@)}}";
+
+	my($evt) = do_event(qw/core getd/, $app, $prm, $_[0]);
+	return($evt->{REPLY} eq 'aevt\ansr{}' ? undef : $evt);
+}
+
+sub _full_path ($) {
+	my($obj) = $_[0];
+	my($prm) =
+		q"'----':obj {form:prop, want:type(prop), seld:type(FILE), " .
+		q"from:" . AEPrint($_[0]) . q"}, rtyp:type(TEXT)";
+	my($evt) = do_event(qw/core getd/, $app, $prm);
+
+	return MacPerl::MakePath(
+		MacUnpack('fss ', (
+			AEGetParamDesc($evt->{REP}, keyDirectObject()))->data()->get()
+		)
+	);
+}
+
+sub _save_errors_window ($) {
+	my($prm) = 
+		q"'----':obj {form:name, want:type(alis), seld:TEXT(@), from:'null'()}";
+	do_event(qw/MMPR SvMs/, $app, $prm, $_[0]);
+}
+
+
+sub _close_errors_window () {
+	my($prm) =
+		q"'----':obj {form:name, want:type(cwin), " .
+		q"seld:TEXT(@), from:'null'()}";
+
+	my($evt) = do_event(qw/core clos/, $app, $prm, 'Errors & Warnings');
+	return($evt->{REPLY} eq 'aevt\ansr{}' ? 1 : 0);
+}
+
+sub _close () {
+	my($prm) = q"'----':" . AEPrint($_[0]);
+	do_event(qw/core clos/, $app, $prm);
+}
+
+sub _get_dobj ($) {
+	return(AEGetParamDesc($_[0]->{REP}, keyDirectObject()));
+}
+
+sub _get_folder ($$) {
+    require 'GUSI.ph';
+    my($prompt, $default) = @_;
+    MacPerl::Choose(
+        GUSI::AF_FILE(), 0, $prompt, '',
+        GUSI::CHOOSE_DIR() + ($default ? &GUSI::CHOOSE_DEFAULT : 0),
+        $default
+    );
+}
+
+sub _save_appath ($$) {
+	open(F, '>' . $_[0]) or die $!;
+	print F $_[1];
+	close(F);
+}
+
+sub _test ($) {
+	activate();
+	my($path) = $_[0];
+	build_project(
+	  "${path}modules:xml:macbuild:XML.mcp", '',
+	  "${path}build:mac:Mozilla.BuildLog.part"
+	);
+}
+
+1;
+
+=pod
+
+=back
+
+=head1 HISTORY
+
+=over 4
+
+=item v1.02, September 23, 1998
+
+Made fixes in finding and saving location of CodeWarrior IDE.
+
+=item v1.01, June 1, 1998
+
+Made fixes to C<chdir()> in C<activate()>, made C<activate()> more robust 
+in finding CodeWarrior IDE, added global variable to NOT switch to IDE
+for each sent event, a few other fixes.
+
+=item v1.00, May 30, 1998
+
+First shot
+
+=back
+
+
+=head1 AUTHORS
+
+Chris Nandor F<E<lt>pudge@pobox.comE<gt>>, and the author of the
+original I<CodeWarriorLib>, Scott Collins F<E<lt>scc@netscape.comE<gt>>.
+
+=head1 SEE ALSO
+
+BuildProject L<Moz>.
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public License
+Version 1.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut

mozilla/build/mac/CustomLib/CustomLib.c

@@ -0,0 +1,4 @@
+
+/* This library only exists to provide a dummy library for the final project */
+
+/* There is nothing to do here. */

mozilla/build/mac/GenToc.script

@@ -0,0 +1,260 @@
+(*
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *)
+
+(*
+	GenToc - Generates a .toc file from the current contents of a project.
+
+	by Patrick C. Beard <beard@netscape.com>
+ *)
+
+on swapDelimiters(newDelimiters)
+	set oldDelimiters to get AppleScript's text item delimiters
+	set AppleScript's text item delimiters to newDelimiters
+	return oldDelimiters
+end swapDelimiters
+
+on setDelimiters(newDelimiters)
+	set AppleScript's text item delimiters to newDelimiters
+end setDelimiters
+
+on setExtension(fileName, newExtension)
+	set oldDelimiters to swapDelimiters(".")
+	set newFileName to (text item 1 of fileName) & newExtension
+	setDelimiters(oldDelimiters)
+	return newFileName
+end setExtension
+
+on folderFromPath(filePath)
+	set folderPath to ((filePath's text items 1 thru ((count of filePath's text items) - 1)) as string) & ":"
+	return folderPath
+end folderFromPath
+
+on fileFromPath(filePath)
+	return last text item of filePath
+end fileFromPath
+
+on openProject(aProjectFile)
+	tell application "CodeWarrior IDE 3.3"
+		open aProjectFile
+	end tell
+end openProject
+
+on selectProject(aProjectFile)
+	set projectName to fileFromPath(aProjectFile as text)
+	tell application "CodeWarrior IDE 3.3"
+		if (name of window 1 is not projectName) then
+			select window projectName
+		end if
+	end tell
+end selectProject
+
+on getTargets()
+	set targetList to {}
+	set nameList to {}
+	tell application "CodeWarrior IDE 3.3"
+		set currentProject to project document 1
+		repeat with targetIndex from 1 to (count of targets of currentProject)
+			set currentTarget to (target targetIndex of currentProject)
+			set targetList to targetList & {currentTarget}
+			set nameList to nameList & {name of currentTarget}
+		end repeat
+		return {target:targetList, names:nameList}
+	end tell
+end getTargets
+
+(* uses "sort" scripting addition to sort a list of strings. *)
+on sortList(aList)
+	if (aList ­ {}) then
+		return sort aList
+	else
+		return {}
+	end if
+end sortList
+
+(* uses "info for" scripting addition, to return the file type of a path. *)
+on getFileType(aFilePath)
+	return file type of (info for alias aFilePath)
+end getFileType
+
+(* returns all "TEXT" files of the named target. *)
+on getTargetFiles(targetKey)
+	set targetFiles to {}
+	tell application "CodeWarrior IDE 3.3"
+		set currentProject to project document 1
+		set currentTarget to (target targetKey of currentProject)
+		try
+			-- workaround for CW IDE 3.X bug, loop until error encountered.
+			set fileIndex to 1
+			repeat until false
+				set targetFile to (target file fileIndex of currentTarget)
+				-- only consider text files, since other platforms won't be managing binaries.
+				-- also, only consider if target file is directly linked.
+				if (linked of targetFile) then
+					set targetFilePath to (Access Paths of targetFile)
+					tell me
+						if (getFileType(targetFilePath) = "TEXT") then
+							set targetFiles to targetFiles & {targetFilePath}
+						end if
+					end tell
+				end if
+				set fileIndex to (fileIndex + 1)
+			end repeat
+		on error msg
+			-- display dialog msg & " file count = " & fileIndex
+		end try
+	end tell
+	return sortList(targetFiles)
+end getTargetFiles
+
+on addTargetFile(targetFile, targetName)
+	tell application "CodeWarrior IDE 3.3"
+		add (project document 1) new target file with data {targetFile} to targets {targetName}
+	end tell
+end addTargetFile
+
+on setCurrentTarget(currentTargetName)
+	tell application "CodeWarrior IDE 3.3"
+		Set Current Target currentTargetName
+	end tell
+end setCurrentTarget
+
+on removeTargetFile(targetFile)
+	tell application "CodeWarrior IDE 3.3"
+		Remove Files {targetFile}
+	end tell
+end removeTargetFile
+
+on quote(aString)
+	return "'" & aString & "'"
+end quote
+
+on listContains(aList, anItem)
+	repeat with listItem in aList
+		if (listItem contains anItem) then
+			return true
+		end if
+	end repeat
+	return false
+end listContains
+
+on showList(listToShow)
+	choose from list listToShow with prompt "List:" with empty selection allowed
+end showList
+
+on replace(aString, oldChar, newChar)
+	set newString to ""
+	repeat with aChar in (every character of aString)
+		if (contents of aChar = oldChar) then
+			set newString to newString & newChar
+		else
+			set newString to newString & aChar
+		end if
+	end repeat
+	return newString
+end replace
+
+on substring(aString, anOffset)
+	set aSubString to ""
+	repeat with charIndex from anOffset to (count aString)
+		set aSubString to aSubString & (character charIndex of aString)
+	end repeat
+	return aSubString
+end substring
+
+on setFileInfo(aFile, aCreator, aType)
+	tell application "Finder"
+		set creator type of aFile to aCreator
+		set file type of aFile to aType
+	end tell
+end setFileInfo
+
+on closeFile(fileRef)
+	try
+		-- make sure it's not currently open.
+		close access fileRef
+	on error
+		-- ignore error closing.
+	end try
+end closeFile
+
+on mroFile(aFile)
+	try
+		-- make sure it's modifiable.
+		mro aFile
+	on error
+		-- ignore error MROing.
+	end try
+end mroFile
+
+on run
+	-- so we can easily strip off file names from paths.
+	set oldDelimiters to swapDelimiters(":")
+	
+	set theProjectFile to (choose file with prompt "Choose a CW Project file." of type {"MMPr"})
+	set theManifestFile to (new file with prompt "Create MANIFEST where?" default name setExtension(fileFromPath(theProjectFile as text), ".toc"))
+	
+	set manifestRef to false
+	
+	try
+		-- make sure the file is closed & is modifiable.
+		closeFile(theManifestFile)
+		mroFile(theManifestFile)
+		
+		-- open the new MANIFEST file.
+		set manifestRef to (open for access theManifestFile with write permission)
+		set eof manifestRef to 0
+		
+		-- give it CodeWarrior look and feel.
+		setFileInfo(theManifestFile, "CWIE", "TEXT")
+		
+		openProject(theProjectFile)
+		selectProject(theProjectFile)
+		
+		set targetsList to getTargets()
+		set targetNames to names of targetsList
+		set targetCount to count items of targetNames
+		
+		set mozillaTreePathOffset to (offset of "mozilla" in (theManifestFile as text))
+		
+		-- dump all targets into the new MANIFEST file.
+		repeat with targetName in targetNames
+			write ("# target: " & targetName & return) to manifestRef
+			setCurrentTarget(targetName)
+			set targetFiles to getTargetFiles(contents of targetName)
+			repeat with targetFile in targetFiles
+				-- only store the path name relative to the source tree itself.
+				set targetFilePath to substring(contents of targetFile, mozillaTreePathOffset)
+				write (replace(targetFilePath, ":", "/") & return) to manifestRef
+			end repeat
+		end repeat
+	on error msg
+		display dialog msg
+	end try
+	if (manifestRef is not false) then
+		closeFile(manifestRef)
+	end if
+	
+	-- shut the project down, and display the result.
+	tell application "CodeWarrior IDE 3.3"
+		activate
+		Close Project
+		open theManifestFile
+	end tell
+	
+	setDelimiters(oldDelimiters)
+end run

mozilla/build/mac/IDE_Options.h

@@ -0,0 +1,103 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*
+
+	This file overrides all option settings in the IDE.  It is an attempt to allow all builds
+	to have the same options.
+
+	Note: We can't use ConditionalMacros.h in this file because it will conflict with 
+	the PowerPlant precompiled headers.
+
+*/
+
+	/* warning pragmas */
+#pragma warn_hidevirtual 		on
+#pragma warn_emptydecl 			on
+#pragma warn_unusedvar 			on
+#pragma warn_extracomma 		on
+#pragma warn_illpragma 			on
+#pragma warn_possunwant 		on
+#pragma warn_unusedarg 			off		/* turned off to reduce warnings */
+
+#pragma check_header_flags 		on
+
+	/* Language features that must be the same across libraries... */
+#pragma enumsalwaysint			on
+#pragma unsigned_char			off
+#pragma exceptions				on
+#pragma bool 					on
+#pragma RTTI                on
+
+
+	/* Save as much space as possible with strings... */
+#pragma pool_strings				on
+#pragma dont_reuse_strings			off
+
+#pragma options align=native
+#pragma sym 						on				/* Takes no memory.  OK in non-debug. */
+
+
+
+#ifdef powerc /* ...generating PowerPC */
+	#pragma toc_data 				on
+	#pragma fp_contract 			on
+	#pragma readonly_strings 		on
+
+	#ifdef DEBUG
+		#pragma traceback 			on
+		#pragma global_optimizer 	off
+		#pragma scheduling 			off
+		#pragma peephole 			off
+		#pragma optimize_for_size 	off
+	#else
+		#pragma traceback 			on					/* leave on until the final release, so MacsBug logs are interpretable */
+		#pragma global_optimizer 	on
+		#pragma optimization_level 	4
+		#pragma scheduling 			603
+		#pragma peephole 			on
+		#pragma optimize_for_size	on
+
+    #pragma opt_strength_reduction on
+    #pragma opt_propagation on
+    #pragma opt_loop_invariants on
+    #pragma opt_lifetimes on
+    #pragma opt_dead_code on
+    #pragma opt_dead_assignments on
+    #pragma opt_common_subs on
+	#endif
+
+#else /* ...generating 68k */
+	#pragma code68020 			on
+	#pragma code68881 			off
+
+		/* Far everything... */
+	#pragma far_code
+	#pragma far_data 			on
+	#pragma far_strings 		on
+	#pragma far_vtables 		on
+
+	#pragma fourbyteints		on	/* 4-byte ints */
+	#pragma IEEEdoubles			on	/* 8-byte doubles (as required by Java and NSPR) */
+
+	#ifdef DEBUG
+		#pragma macsbug 		on
+		#pragma oldstyle_symbols off
+	#else
+		#pragma macsbug 		off
+	#endif
+#endif

mozilla/build/mac/MANIFEST

@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+IDE_Options.h

mozilla/build/mac/MANIFESTO.pm

@@ -0,0 +1,217 @@
+#!perl -w
+package	MANIFESTO;
+
+require 5.004;
+require	Exporter;
+
+#use strict;
+
+use vars qw($VERSION @ISA @EXPORT $MANIFESTOLib);
+use Mac::StandardFile;
+use Moz;
+use Cwd;
+use Exporter;
+use File::Basename;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw(ReconcileProject);
+$VERSION = "1.00";
+
+=head1 NAME
+
+MANIFESTO - drives the Mac Project Reconciliation tool.
+
+=head1 SYNOPSIS
+
+You want to use this script. It will make your life easier.
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public License
+Version 1.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut
+
+# 
+# globals
+# $MANIFESTOLib - location of MANIFESTO applescript library
+#
+
+#
+# utility routines
+#
+
+sub current_directory()
+{
+	my $current_directory = cwd();
+	chop($current_directory) if ( $current_directory =~ m/:$/ );
+	return $current_directory;
+}
+
+# Uses the "compile script" extension to compile a script.
+sub compile_script($;$) {
+	my($scriptPath, $outputPath) = @_;
+	
+	#// generate a script to compile a script file.
+	my $script = <<END_OF_APPLESCRIPT;
+	store script (compile script (alias "$scriptPath")) in (file "$outputPath") replacing yes
+END_OF_APPLESCRIPT
+
+	#// run the script.
+	MacPerl::DoAppleScript($script);
+}
+
+# _useMANIFESTOLib()
+# returns 1 on success
+# Search the include path for the file called MANIFESTOLib
+sub _useMANIFESTOLib() 
+{
+	unless ( defined($MANIFESTOLib) )
+	{
+		my($scriptName) = "MANIFESTOLib.script";
+		my($libName) = "MANIFESTOLib";
+		# try the directory we were run from
+		my($scriptPath) = dirname($0) . ":" . $scriptName;
+		my($libPath) = dirname($0) . ":" . $libName;
+		# make sure that the compiled script is up to date with the textual script.
+		unless (-e $libPath && getModificationDate($libPath) >= getModificationDate($scriptPath)) {
+			print "# Recompiling MANIFESTOLib.script.\n";
+			compile_script($scriptPath, $libPath);
+		}
+		if ( -e $libPath) {
+			$MANIFESTOLib = $libPath;
+		} else {
+			# now search the include directories
+			foreach (@INC)
+			{
+				unless ( m/^Dev:Pseudo/ )	# This is some bizarre MacPerl special-case directory
+				{
+					$libPath = $_ . $libName;
+					if (-e $libPath)
+					{
+						$MANIFESTOLib = $libPath;
+						last;
+					}
+				}
+			}
+		}
+		if (! (-e $MANIFESTOLib)) {
+			print STDERR "MANIFESTOLib lib could not be found! $MANIFESTOLib";
+			return 0;
+		}
+	}
+	return 1;
+}
+
+sub getModificationDate($) {
+	my($filePath)=@_;
+	my($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
+		$atime,$mtime,$ctime,$blksize,$blocks) = stat($filePath);
+	return $mtime;
+}
+
+sub setExtension($;$;$) {
+	my($filePath, $oldExtension, $newExtension)=@_;
+	my($name, $dir, $type) = fileparse($filePath, $oldExtension);
+	return "$dir$name$newExtension";
+}
+
+#
+# ReconcileProject(projectPath, manifestoPath)
+#
+# Uses MANIFESTOLib AppleScript to reconcile the contents (toc?) of a
+# CodeWarrior project with an external MANIFEST file.
+#
+
+sub ReconcileProject($;$) {
+	#// turn this feature on by removing the following line.
+	return 1;
+
+	my($projectPath, $manifestoPath) = @_;
+	my($sourceTree) = current_directory();
+	my($logPath) = setExtension($manifestoPath, ".toc", ".log");
+
+	print STDERR "# Reconciling Project: $projectPath with $manifestoPath\n";
+	
+	#// compare the modification dates of the .toc and .log files. If .log is newer, do nothing.
+	if (-e $logPath && getModificationDate($logPath) >= getModificationDate($manifestoPath)) {
+		print "# Project is up to date.\n";
+		return 1;
+	}
+
+	_useMANIFESTOLib() || die "Could not load MANIFESTOLib\n";
+	
+	my $script = <<END_OF_APPLESCRIPT;
+	tell (load script file "$MANIFESTOLib") to ReconcileProject("$sourceTree:", "$sourceTree$projectPath", "$sourceTree$manifestoPath")
+END_OF_APPLESCRIPT
+
+	#// run the script, and store the results in a file called "$manifestoPath.log"
+	my $asresult = substr(MacPerl::DoAppleScript($script), 1, -1);	#// chops off leading, trailing quotes.
+
+	#// print out to STDOUT to show progress.
+	print $asresult;
+
+	#// store the results in "$manifestoPath.log", which will act as a cache for later checks.
+	open(OUTPUT, ">$logPath") || die "can't open log file $logPath.";
+	print OUTPUT $asresult;
+	close(OUTPUT);
+
+	return 1;
+}
+
+1;
+=pod
+
+=head1 NAME
+
+MANIFESTO - Scripts to process source .toc files.
+
+=head1 SYNOPSIS
+
+	use MANIFESTO;
+	ReconcileProject(<path to Mac project file>, <path to table of contents file>) || die "cannot reconcile project";
+		
+=head1 DESCRIPTION
+
+This is a PERL interface for talking to MANIFESTOLib AppleScripts.
+
+=item ReconcileProject
+	ReconcileProject(<path to Mac project file>, <path to table of contents file>);
+	
+	Reconciles the contents of a project with an external .toc file.
+
+=cut
+
+=head1 SEE ALSO
+
+=over
+
+=item MacCVS Home Page
+
+http://www.maccvs.org/
+
+=back 
+
+=head1 AUTHORS
+
+Patrick Beard beard@netscape.com
+
+based on work by
+
+Aleks Totic atotic@netscape.com
+
+=cut
+
+__END__