fixing for linux...

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

mozilla/Makefile.in

@@ -31,12 +31,23 @@ include $(topsrcdir)/build/unix/modules.mk
 ifneq ($(BUILD_MODULES),all)
 
 DIRS		= $(BUILD_MODULE_DIRS)
-EXPORT_DIRS	= $(BUILD_MODULE_DEP_DIRS)
+
+ifdef USE_ELF_DYNSTR_GC
+DIRS		+= tools/elf-dynstr-gc
+endif
 
 else
 
 DIRS		= config build
 
+ifdef USE_ELF_DYNSTR_GC
+DIRS		+= tools/elf-dynstr-gc
+endif
+
+ifdef MOZ_L10N
+DIRS        += l10n
+endif
+
 ifdef MOZ_JAVA_SUPPLEMENT
 DIRS += 			\
   java/util			\
@@ -51,7 +62,7 @@ endif
 
 DIRS	+= $(NSPRPUB_DIR)
 
-DIRS		+= dbm modules/libreg js string xpcom js/src/xpconnect
+DIRS		+= dbm modules/libreg js xpcom js/src/xpconnect
 
 ifdef MOZ_OJI
 DIRS		+= js/src/liveconnect
@@ -65,10 +76,6 @@ ifndef MOZ_NATIVE_JPEG
 DIRS		+= jpeg
 endif
 
-ifdef MOZ_ENABLE_XLIB
-DIRS           += gfx/src/xlibrgb widget/src/xlibxtbin
-endif
-
 ifdef MOZ_ENABLE_GTK
 DIRS           += widget/src/gtksuperwin widget/src/gtkxtbin
 endif
@@ -83,7 +90,8 @@ DIRS		+= \
 		include \
 		modules/libutil \
 		netwerk \
-		modules/mpfilelocprovider \
+		modules/appfilelocprovider \
+		security \
 		uriloader \
 		intl \
 		modules/libpref \
@@ -91,24 +99,16 @@ DIRS		+= \
 		modules/oji \
 		modules/libjar \
 		caps \
-		rdf \
 		expat \
 		htmlparser \
 		gfx \
-		$(NULL)
-
-ifdef USE_IMG2
-DIRS		+= gfx2 modules/libpr0n
-endif
-
-DIRS		+= \
 		modules/plugin \
 		dom \
 		view \
 		widget \
-		content \
 		layout \
 		db \
+		rdf \
 		docshell \
 		webshell \
 		embedding \
@@ -116,7 +116,6 @@ DIRS		+= \
 		sun-java \
 		profile \
 		themes \
-		accessible \
 		$(NULL)
 
 # This must preceed xpfe
@@ -130,10 +129,6 @@ endif
 
 DIRS		+= xpinstall
 
-ifdef MOZ_PSM
-DIRS		+= security/nss security/manager
-endif
-
 ifdef MOZ_EXTENSIONS
 DIRS		+= extensions
 endif
@@ -156,32 +151,15 @@ endif
 
 DIRS	+= l10n
 
-ifdef MOZ_STATIC_COMPONENTS
-DIRS   += modules/staticmod
-endif
-
-DIRS	+= xpfe/bootstrap
-
 endif # BUILD_MODULES == all
 
-STATIC_MAKEFILES := $(NSPRPUB_DIR) directory/c-sdk/ldap
-
-ifdef MOZ_PSM
-STATIC_MAKEFILES += security/nss 
-endif
+STATIC_MAKEFILES := $(NSPRPUB_DIR)
 
 GARBAGE_DIRS += dist
 DIST_GARBAGE = config.cache config.log config.status config-defs.h \
    dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
-   unallmakefiles \
+   $(shell cat unallmakefiles) unallmakefiles \
    $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out 
 
 include $(topsrcdir)/config/rules.mk
 
-export::
-	+$(LOOP_OVER_EXPORT_DIRS)
-
-distclean::
-	cat unallmakefiles | $(XARGS) rm -f
-	rm -f unallmakefiles $(DIST_GARBAGE)
-

mozilla/README/IBMChangeLog

@@ -1,2 +0,0 @@
-Pursuant to section 3.3 of the MPL, this file will contain a list of the files
-that have been modified by IBM Corporation.

mozilla/README/mozilla/README.build

@@ -1,3 +1,4 @@
 For mozilla-the-client build instructions, please read:
-http://www.mozilla.org/build/
+http://www.mozilla.org/build
+
 

mozilla/accessible/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org code.
-#
-# 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): 
-#
-
-DEPTH		= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src build
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/accessible/build/Makefile.in

@@ -1,51 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org code.
-#
-# 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): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= accessibility
-LIBRARY_NAME	= accessibility
-EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= access
-IS_COMPONENT	= 1
-REQUIRES	= xpcom string dom
-
-CPPSRCS		= nsAccessibilityFactory.cpp
-
-LOCAL_INCLUDES	= -I$(srcdir)/../src
-
-SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libaccessibility_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libchrome_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		-lgkgfx \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/accessible/build/makefile.win

@@ -1,47 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org code.
-#
-# 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): 
-
-DEPTH=..\..
-MODULE=accessibility
-
-MAKE_OBJ_TYPE=DLL
-DLLNAME=accessibility
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
-
-CPP_OBJS=\
-        .\$(OBJDIR)\nsAccessibilityFactory.obj    \
-	$(NULL)
-
-LINCS = $(LINCS) -I..\src         # for implementation headers
-
-LLIBS=\
- $(DIST)\lib\xpcom.lib         \
- $(DIST)\lib\accessibility_s.lib      \
- $(DIST)\lib\timer_s.lib       \
- $(DIST)\lib\gkgfxwin.lib \
- $(LIBNSPR)  
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
-

mozilla/accessible/build/nsAccessibilityFactory.cpp

@@ -1,60 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#include "nsCOMPtr.h"
-#include "nsIModule.h"
-#include "nsIGenericFactory.h"
-
-#include "nsIServiceManager.h"
-#include "nsIComponentManager.h"
-#include "nsIAccessibilityService.h"
-#include "nscore.h"
-
-static NS_IMETHODIMP
-NS_ConstructAccessibilityService(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    nsresult rv;
-    NS_ASSERTION(aOuter == nsnull, "no aggregation");
-    nsIAccessibilityService* accessibility;
-    rv = NS_NewAccessibilityService(&accessibility);
-    if (NS_FAILED(rv)) {
-        NS_ERROR("Unable to construct chrome registry");
-        return rv;
-    }
-    rv = accessibility->QueryInterface(aIID, aResult);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "unable to find correct interface");
-    NS_RELEASE(accessibility);
-    return rv;
-}
-
-// The list of components we register
-static nsModuleComponentInfo components[] = 
-{
-    { "AccessibilityService", 
-      NS_ACCESSIBILITY_SERVICE_CID,
-      "@mozilla.org/accessibilityService;1", 
-      NS_ConstructAccessibilityService
-    },
-};
-
-NS_IMPL_NSGETMODULE(nsAccessibilityModule, components);
-

mozilla/accessible/makefile.win

@@ -1,26 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org code.
-#
-# 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): 
-
-DEPTH=..
-
-DIRS= public src build
-
-include <$(DEPTH)\config\rules.mak>

mozilla/accessible/public/MANIFEST

@@ -1,3 +0,0 @@
-nsIAccessibilityService.idl
-nsIAccessible.idl
-nsIMutableAccessible.idl

mozilla/accessible/public/Makefile.in

@@ -1,41 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org code.
-#
-# 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): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= accessibility
-XPIDL_MODULE= accessibility
-
-XPIDLSRCS	= \
-			nsIAccessibilityService.idl \
-			nsIAccessible.idl \
-			nsIMutableAccessible.idl \
-			nsIAccessibleEventReceiver.idl \
-			nsIAccessibleEventListener.idl \
-			$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/accessible/public/makefile.win

@@ -1,34 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org code.
-#
-# 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): 
-
-DEPTH=..\..
-MODULE=accessibility
-XPIDL_MODULE=accessibility
-
-XPIDLSRCS =               \
-  .\nsIAccessibilityService.idl \
-  .\nsIAccessible.idl \
-  .\nsIMutableAccessible.idl \
-  .\nsIAccessibleEventReceiver.idl \
-  .\nsIAccessibleEventListener.idl \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>

mozilla/accessible/public/nsIAccessibilityService.idl

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: Eric Vaughan (evaughan@netscape.com)
- * 
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "domstubs.idl"
-#include "nsIMutableAccessible.idl"
-#include "nsIAtom.idl"
-
-[scriptable, uuid(68D9720A-0984-42b6-A3F5-8237ED925727)]
-interface nsIAccessibilityService : nsISupports
-{
-  nsIAccessible createRootAccessible(in nsISupports aPresShell, in nsISupports aFrame);
-  nsIMutableAccessible createMutableAccessible(in nsISupports aNode);
-  nsIAccessible createHTMLBlockAccessible(in nsIAccessible aAccessible, in nsIDOMNode aNode, in nsISupports aPresShell);
-  nsIAccessible createHTMLSelectAccessible(in nsIAtom aAccessible, in nsIDOMNode aNode, in nsISupports aPresShell);
-  nsIAccessible createHTMLCheckboxAccessible(in nsISupports aFrame);
-  nsIAccessible createHTMLRadioButtonAccessible(in nsISupports aFrame);
-  nsIAccessible createHTMLButtonAccessible(in nsISupports aFrame);
-  nsIAccessible createHTMLTextAccessible(in nsISupports aFrame);
-};
-
-
-%{ C++
-
-// for component registration
-// {DE401C37-9A7F-4278-A6F8-3DE2833989EF}
-#define NS_ACCESSIBILITY_SERVICE_CID \
-{ 0xde401c37, 0x9a7f, 0x4278, { 0xa6, 0xf8, 0x3d, 0xe2, 0x83, 0x39, 0x89, 0xef } }
-
-extern nsresult
-NS_NewAccessibilityService(nsIAccessibilityService** aResult);
-%}

mozilla/accessible/public/nsIAccessible.idl

@@ -1,205 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: Eric D Vaughan (evaughan@netscape.com)
- * 
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(B26FBE47-9A5F-42a1-822B-082461AE4D6D)]
-interface nsIAccessible : nsISupports
-{
-  /* Can't use these javascript can't tell us if properties are undefined 
-     
-  readonly attribute nsIAccessible accParent;
-  readonly attribute nsIAccessible accNextSibling;
-  readonly attribute nsIAccessible accPreviousSibling;
-  readonly attribute nsIAccessible accFirstChild;
-  readonly attribute nsIAccessible accLastChild;
-  readonly attribute long accChildCount;
-
-  attribute wstring accName;
-  attribute wstring accValue;
-  readonly attribute wstring accDescription;
-  readonly attribute wstring accRole;
-  readonly attribute unsigned long accState;
-  readonly attribute wstring accHelp;
-  readonly attribute wstring accDefaultAction;
-  readonly attribute boolean accFocused;
-  */
-
-  nsIAccessible getAccParent();
-  nsIAccessible getAccNextSibling();
-  nsIAccessible getAccPreviousSibling();
-  nsIAccessible getAccFirstChild();
-  nsIAccessible getAccLastChild();
-
-  long getAccChildCount();
-  wstring getAccName();
-  wstring getAccValue();
-  void setAccName(in wstring name);
-  void setAccValue(in wstring value);
-
-  wstring getAccDescription();
-  wstring getAccRole();
-  unsigned long getAccState();
-  unsigned long getAccExtState();
-  wstring getAccDefaultAction();
-  wstring getAccHelp();
-  boolean getAccFocused();
-
-  nsIAccessible accGetAt(in long x, in long y);
-
-  nsIAccessible accNavigateRight();
-  nsIAccessible accNavigateLeft();
-  nsIAccessible accNavigateUp();
-  nsIAccessible accNavigateDown();
-
-  void accGetBounds(out long x, 
-                    out long y, 
-					out long width, 
-					out long height);
-
-  void accAddSelection();
-  void accRemoveSelection();
-  void accExtendSelection();
-  void accTakeSelection();
-  void accTakeFocus();
-  void accDoDefaultAction();
-
- // MSAA State flags - used for bitfield. More than 1 allowed.
-  const unsigned long  STATE_UNAVAILABLE        = 0x00000001;  // Disabled, maps to opposite of Java ENABLED, Gnome/ATK SENSITIVE?
-  const unsigned long  STATE_SELECTED           = 0x00000002;
-  const unsigned long  STATE_FOCUSED            = 0x00000004;
-  const unsigned long  STATE_PRESSED            = 0x00000008;
-  const unsigned long  STATE_CHECKED            = 0x00000010;
-  const unsigned long  STATE_MIXED              = 0x00000020; // 3-state checkbox or toolbar button
-  const unsigned long  STATE_READONLY           = 0x00000040; // Maps to opposite of Java/Gnome/ATK EDITABLE state
-  const unsigned long  STATE_HOTTRACKED         = 0x00000080;
-  const unsigned long  STATE_DEFAULT            = 0x00000100;
-  const unsigned long  STATE_EXPANDED           = 0x00000200;
-  const unsigned long  STATE_COLLAPSED          = 0x00000400;
-  const unsigned long  STATE_BUSY               = 0x00000800;
-  const unsigned long  STATE_FLOATING           = 0x00001000;  // Children "owned" not "contained" by parent
-  const unsigned long  STATE_MARQUEED           = 0x00002000;
-  const unsigned long  STATE_ANIMATED           = 0x00004000;
-  const unsigned long  STATE_INVISIBLE          = 0x00008000;
-  const unsigned long  STATE_OFFSCREEN          = 0x00010000;
-  const unsigned long  STATE_SIZEABLE           = 0x00020000;
-  const unsigned long  STATE_MOVEABLE           = 0x00040000;
-  const unsigned long  STATE_SELFVOICING        = 0x00080000;
-  const unsigned long  STATE_FOCUSABLE          = 0x00100000;
-  const unsigned long  STATE_SELECTABLE         = 0x00200000;
-  const unsigned long  STATE_LINKED             = 0x00400000;
-  const unsigned long  STATE_TRAVERSED          = 0x00800000;
-  const unsigned long  STATE_MULTISELECTABLE    = 0x01000000;  // Supports multiple selection
-  const unsigned long  STATE_EXTSELECTABLE      = 0x02000000;  // Supports extended selection
-  const unsigned long  STATE_ALERT_LOW          = 0x04000000;  // This information is of low priority
-  const unsigned long  STATE_ALERT_MEDIUM       = 0x08000000;  // This information is of medium priority
-  const unsigned long  STATE_ALERT_HIGH         = 0x10000000;  // This information is of high priority
-  const unsigned long  STATE_PROTECTED          = 0x20000000;  // Maps to Gnome's *Role* ATK_ROLE_PASSWD_TEXT, nothing for Java?
-  const unsigned long  STATE_HASPOPUP           = 0x40000000;  // New in MSAA 2.0
-
-// Extended state flags (for now non-MSAA, for Java and Gnome/ATK support)
-// This is only the states that there isn't already a mapping for in MSAA
-// See www.accessmozilla.org/article.php?sid=11 for information on the mappings between accessibility API states
-  const unsigned long  STATE_INVALID            = 0x00200000;  // No explanation given    
-  const unsigned long  STATE_ACTIVE             = 0x00400000;  // This window is currently the active window    
-  const unsigned long  STATE_EXPANDABLE         = 0x00800000;  // An item that can be expanded, such as a tree item with children    
-  const unsigned long  STATE_MODAL              = 0x01000000;  // Must do something with control before leaving it    
-  const unsigned long  STATE_MULTI_LINE         = 0x02000000;  // Edit control that can take multiple lines    
-  const unsigned long  STATE_SENSITIVE          = 0x04000000;  // No explanation given    
-  const unsigned long  STATE_RESIZABLE          = 0x08000000;  // Object can be resized    
-  const unsigned long  STATE_SHOWING            = 0x10000000;  // This object and all of it's ancestors are visible    
-  const unsigned long  STATE_SINGLE_LINE        = 0x20000000;  // This text object can only contain 1 line of text    
-  const unsigned long  STATE_TRANSIENT          = 0x40000000;  // Tells accessibility aid "Don't add event listener - this object doesn't generate any". For example, could be used with higher level containers.    
-  const unsigned long  STATE_VERTICAL           = 0x80000000;  // Especially used for sliders and scrollbars  
-
-
-/*
-// MSAA Roles - only one per nsIAccessible or IAccessible
-  const unsigned long  ROLE_TITLEBAR            = 0x00000001;
-  const unsigned long  ROLE_MENUBAR             = 0x00000002;
-  const unsigned long  ROLE_SCROLLBAR           = 0x00000003;
-  const unsigned long  ROLE_GRIP                = 0x00000004;
-  const unsigned long  ROLE_SOUND               = 0x00000005;
-  const unsigned long  ROLE_CURSOR              = 0x00000006;
-  const unsigned long  ROLE_CARET               = 0x00000007;
-  const unsigned long  ROLE_ALERT               = 0x00000008;
-  const unsigned long  ROLE_WINDOW              = 0x00000009;
-  const unsigned long  ROLE_CLIENT              = 0x0000000A;
-  const unsigned long  ROLE_MENUPOPUP           = 0x0000000B;
-  const unsigned long  ROLE_MENUITEM            = 0x0000000C;
-  const unsigned long  ROLE_TOOLTIP             = 0x0000000D;
-  const unsigned long  ROLE_APPLICATION         = 0x0000000E;
-  const unsigned long  ROLE_DOCUMENT            = 0x0000000F;
-  const unsigned long  ROLE_PANE                = 0x00000010;
-  const unsigned long  ROLE_CHART               = 0x00000011;
-  const unsigned long  ROLE_DIALOG              = 0x00000012;
-  const unsigned long  ROLE_BORDER              = 0x00000013;
-  const unsigned long  ROLE_GROUPING            = 0x00000014;
-  const unsigned long  ROLE_SEPARATOR           = 0x00000015;
-  const unsigned long  ROLE_TOOLBAR             = 0x00000016;
-  const unsigned long  ROLE_STATUSBAR           = 0x00000017;
-  const unsigned long  ROLE_TABLE               = 0x00000018;
-  const unsigned long  ROLE_COLUMNHEADER        = 0x00000019;
-  const unsigned long  ROLE_ROWHEADER           = 0x0000001A;
-  const unsigned long  ROLE_COLUMN              = 0x0000001B;
-  const unsigned long  ROLE_ROW                 = 0x0000001C;
-  const unsigned long  ROLE_CELL                = 0x0000001D;
-  const unsigned long  ROLE_LINK                = 0x0000001E;
-  const unsigned long  ROLE_HELPBALLOON         = 0x0000001F;
-  const unsigned long  ROLE_CHARACTER           = 0x00000020;
-  const unsigned long  ROLE_LIST                = 0x00000021;
-  const unsigned long  ROLE_LISTITEM            = 0x00000022;
-  const unsigned long  ROLE_OUTLINE             = 0x00000023;
-  const unsigned long  ROLE_OUTLINEITEM         = 0x00000024;
-  const unsigned long  ROLE_PAGETAB             = 0x00000025;
-  const unsigned long  ROLE_PROPERTYPAGE        = 0x00000026;
-  const unsigned long  ROLE_INDICATOR           = 0x00000027;
-  const unsigned long  ROLE_GRAPHIC             = 0x00000028;
-  const unsigned long  ROLE_STATICTEXT          = 0x00000029;
-  const unsigned long  ROLE_TEXT                = 0x0000002A;  // Editable, selectable, etc.
-  const unsigned long  ROLE_PUSHBUTTON          = 0x0000002B;
-  const unsigned long  ROLE_CHECKBUTTON         = 0x0000002C;
-  const unsigned long  ROLE_RADIOBUTTON         = 0x0000002D;
-  const unsigned long  ROLE_COMBOBOX            = 0x0000002E;
-  const unsigned long  ROLE_DROPLIST            = 0x0000002F;
-  const unsigned long  ROLE_PROGRESSBAR         = 0x00000030;
-  const unsigned long  ROLE_DIAL                = 0x00000031;
-  const unsigned long  ROLE_HOTKEYFIELD         = 0x00000032;
-  const unsigned long  ROLE_SLIDER              = 0x00000033;
-  const unsigned long  ROLE_SPINBUTTON          = 0x00000034;
-  const unsigned long  ROLE_DIAGRAM             = 0x00000035;
-  const unsigned long  ROLE_ANIMATION           = 0x00000036;
-  const unsigned long  ROLE_EQUATION            = 0x00000037;
-  const unsigned long  ROLE_BUTTONDROPDOWN      = 0x00000038;
-  const unsigned long  ROLE_BUTTONMENU          = 0x00000039;
-  const unsigned long  ROLE_BUTTONDROPDOWNGRID  = 0x0000003A;
-  const unsigned long  ROLE_WHITESPACE          = 0x0000003B;
-  const unsigned long  ROLE_PAGETABLIST         = 0x0000003C;
-  const unsigned long  ROLE_CLOCK               = 0x0000003D;
-  const unsigned long  ROLE_SPLITBUTTON         = 0x0000003E;   // New in MSAA 2.0 
-  const unsigned long  ROLE_IPADDRESS           = 0x0000003F;   // New in MSAA 2.0 
-
-  */
-
-};

mozilla/accessible/public/nsIAccessibleEventListener.idl

@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: Eric D Vaughan (evaughan@netscape.com)
- * 
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsIAccessible.idl"
-
-[scriptable, uuid(BEE49E7D-9D06-49bf-8984-1694C697D74F)]
-interface nsIAccessibleEventListener : nsISupports
-{
-  const unsigned long EVENT_FOCUS = 0x8005;
-
-  void handleEvent(in unsigned long aEvent, in nsIAccessible aTarget);
-};

mozilla/accessible/public/nsIAccessibleEventReceiver.idl

@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: Eric D Vaughan (evaughan@netscape.com)
- * 
- * Contributor(s): 
- */
-
-#include "nsIAccessibleEventListener.idl"
-
-[scriptable, uuid(AB331E47-4FAA-4a12-9480-9B480DD78B39)]
-interface nsIAccessibleEventReceiver : nsISupports
-{
-  void addAccessibleEventListener(in nsIAccessibleEventListener aListener);
-  void removeAccessibleEventListener(in nsIAccessibleEventListener aListener);
-};

mozilla/accessible/public/nsIMutableAccessible.idl

@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- * 
- * Contributor(s): pav
- */
-
-#include "nsIAccessible.idl"
-#include "nsIAtom.idl"
-
-[scriptable, uuid(AD3274E5-9DD1-4614-81C8-BFF992869CBE)]
-interface nsIMutableAccessible : nsIAccessible
-{
-  void SetNameAsNodeValue();
-  void SetName(in wstring aName);
-  void SetNameAsAttribute(in nsIAtom aAtom);
-  void SetRole(in wstring aRole);
-  void SetIsLeaf(in boolean aLeaf);
-};

mozilla/accessible/src/Makefile.in

@@ -1,49 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org code.
-#
-# 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): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= accessibility
-LIBRARY_NAME	= accessibility_s
-REQUIRES	= xpcom string layout widget dom view locale gfx2
-
-CPPSRCS		= \
-		nsAccessible.cpp \
-		nsAccessibilityService.cpp \
-		nsMutableAccessible.cpp \
-		nsRootAccessible.cpp \
-		nsHTMLFormControlAccessible.cpp \
-		nsHTMLTextAccessible.cpp \
-		nsSelectAccessible.cpp \
-		nsGenericAccessible.cpp \
-		$(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/accessible/src/base/nsAccessibilityService.cpp

@@ -1,252 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#include "nsIAccessibilityService.h"
-#include "nsAccessibilityService.h"
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsRootAccessible.h"
-#include "nsINameSpaceManager.h"
-#include "nsMutableAccessible.h"
-#include "nsHTMLFormControlAccessible.h"
-#include "nsLayoutAtoms.h"
-#include "nsSelectAccessible.h"
-#include "nsHTMLTextAccessible.h"
-
-//--------------------
-
-
-nsAccessibilityService::nsAccessibilityService()
-{
-	NS_INIT_REFCNT();
-}
-
-nsAccessibilityService::~nsAccessibilityService()
-{
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsAccessibilityService, nsIAccessibilityService);
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIAccessibilityService methods:
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateRootAccessible(nsISupports* aPresContext, nsISupports* aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* f = NS_STATIC_CAST(nsIFrame*, aFrame);
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s));
-
-  NS_ASSERTION(s,"Error not presshell!!");
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsRootAccessible(wr,f);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateMutableAccessible(nsISupports* aNode, nsIMutableAccessible **_retval)
-{
-  *_retval = new nsMutableAccessible(aNode);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateHTMLBlockAccessible(nsIAccessible* aAccessible, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
-{
-  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
-  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s));
-
-  NS_ASSERTION(s,"Error not presshell!!");
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsHTMLBlockAccessible(aAccessible, n,wr);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateHTMLSelectAccessible(nsIAtom* aPopupAtom, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
-{
-  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
-  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s)); 
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsSelectAccessible(aPopupAtom, nsnull, n, wr);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLCheckboxAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLCheckboxAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLRadioButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-
-  *_retval = new nsHTMLRadioButtonAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLButtonAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLTextAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLTextAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLTextAccessible(shell, node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP nsAccessibilityService::GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aNode)
-{
-  *aRealFrame = NS_STATIC_CAST(nsIFrame*, aFrame);
-  nsCOMPtr<nsIContent> content;
-  (*aRealFrame)->GetContent(getter_AddRefs(content));
-  nsCOMPtr<nsIDOMNode> node = do_QueryInterface(content);
-  *aNode = node;
-  NS_ADDREF(*aNode);
-
-  nsCOMPtr<nsIDocument> document;
-  content->GetDocument(*getter_AddRefs(document));
-
-#ifdef DEBUG
-  PRInt32 shells = document->GetNumberOfShells();
-  NS_ASSERTION(shells > 0,"Error no shells!");
-#endif
-
-  *aShell = document->GetShellAt(0);
-  NS_IF_ADDREF(*aShell);
-
-  return NS_OK;
-}
-
-
-//////////////////////////////////////////////////////////////////////
-
-nsresult
-NS_NewAccessibilityService(nsIAccessibilityService** aResult)
-{
-    NS_PRECONDITION(aResult != nsnull, "null ptr");
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    nsAccessibilityService* a = new nsAccessibilityService();
-    if (a == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(a);
-    *aResult = a;
-    return NS_OK;
-}
-

mozilla/accessible/src/base/nsAccessibilityService.h

@@ -1,53 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- * 
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#ifndef __nsAccessibilityService_h__
-#define __nsAccessibilityService_h__
-
-#include "nsIAccessibilityService.h"
-class nsIFrame;
-class nsIPresShell;
-class nsIDOMNode;
-
-class nsAccessibilityService : public nsIAccessibilityService
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  // nsIAccessibilityService methods:
-  NS_DECL_NSIACCESSIBILITYSERVICE
-
-  // nsAccessibilityService methods:
-  nsAccessibilityService();
-  virtual ~nsAccessibilityService();
-
-public:
-
-private:
-  NS_IMETHOD GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aContent);
-
-};
-
-#endif /* __nsIccessibilityService_h__ */

mozilla/accessible/src/base/nsAccessible.cpp

@@ -1,968 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsIScrollableView.h"
-#include "nsRootAccessible.h"
-
-//#define DEBUG_LEAKS
-
-#ifdef DEBUG_LEAKS
-static gnsAccessibles = 0;
-#endif
-
-
-class nsFrameTreeWalker {
-public:
-  nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner);
-  nsIFrame* GetNextSibling(nsIFrame* aFrame);
-  nsIFrame* GetPreviousSibling(nsIFrame* aFrame);
-  nsIFrame* GetParent(nsIFrame* aFrame);
-  nsIFrame* GetFirstChild(nsIFrame* aFrame);
-  nsIFrame* GetLastChild(nsIFrame* aFrame);
-  nsIFrame* GetChildBefore(nsIFrame* aParent, nsIFrame* aChild);
-  PRInt32 GetCount(nsIFrame* aFrame);
-
-  static PRBool IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2);
-  static void GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent);
-
-  nsCOMPtr<nsIPresContext> mPresContext;
-  nsCOMPtr<nsIAccessible> mAccessible;
-  nsCOMPtr<nsIContent> mContent;
-  nsAccessible* mOwner;
-};
-
-nsFrameTreeWalker::nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner)
-{
-  mPresContext = aPresContext;
-  mOwner = aOwner;
-}
-
-nsIFrame* nsFrameTreeWalker::GetParent(nsIFrame* aFrame)
-{
-  //printf("Get parent\n");
-
-  nsIFrame* parent = nsnull;
-  aFrame->GetParent(&parent);
-
-  // if no parent then we hit the root
-  // just return that top frame
-  if (!parent) {
-    mAccessible = nsnull;
-    mContent = nsnull;
-    return aFrame;
-  }
-
-  GetAccessible(parent, mAccessible, mContent);
-  if (mAccessible)
-    return parent;
-  
-  return GetParent(parent);
-}
-
-nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
-{
-  //printf("Get next\n");
-
-  // get next sibling
-  nsIFrame* next = nsnull;
-  aFrame->GetNextSibling(&next);
-
-  // skip any frames with the same content node
-  while(IsSameContent(aFrame,next)) 
-    next->GetNextSibling(&next);
-
-  // if failed
-  if (!next)
-  {
-    // if parent has content
-    nsIFrame* parent = nsnull;
-    aFrame->GetParent(&parent);
-    
-    // if no parent fail
-    if (!parent) {
-      mAccessible = nsnull;
-      mContent = nsnull;
-      return nsnull;
-    }
-
-    // fail if we reach a parent that is accessible
-    GetAccessible(parent, mAccessible, mContent);
-    if (mAccessible)
-    {
-      // fail
-      mAccessible = nsnull;
-      mContent = nsnull;
-      return nsnull;
-    } else {
-      // next on parent
-      return GetNextSibling(parent);
-    }
-  }
-
-  // if next has content
-  GetAccessible(next, mAccessible, mContent);
-  if (mAccessible)
-  {
-    // done
-    return next;
-  }
-
-  // if next doesn't have node
-
-  // call first on next
-  nsIFrame* first = GetFirstChild(next);
-
-  // if found
-  if (first)
-    return first;
-
-  // call next on next
-  return GetNextSibling(next);
-}
-
-nsIFrame* nsFrameTreeWalker::GetFirstChild(nsIFrame* aFrame)
-{
-
-  //printf("Get first\n");
-
-  // get first child
-  nsIFrame* child = nsnull;
-  nsIAtom* list = nsnull;
-  mOwner->GetListAtomForFrame(aFrame, list);
-  aFrame->FirstChild(mPresContext, list, &child);
-
-  while(child)
-  {
-    // if first has a content node
-    GetAccessible(child, mAccessible, mContent);
-    if (mAccessible)
-    {
-      // done
-      return child;
-    } else {
-      // call first on child
-      nsIFrame* first = GetFirstChild(child);
-
-      // if succeeded
-      if (first)
-      {
-        // return child
-        return first;
-      }
-    }
-
-    // get next sibling
-    nsIFrame* next;
-    child->GetNextSibling(&next);
-
-    // skip children with duplicate content nodes
-    while(IsSameContent(child,next)) 
-      next->GetNextSibling(&next);
-
-    child = next;
-  }
-
-  // fail
-  mAccessible = nsnull;
-  mContent = nsnull;
-  return nsnull;
-}
-
-nsIFrame* nsFrameTreeWalker::GetChildBefore(nsIFrame* aParent, nsIFrame* aChild)
-{
-  nsIFrame* child = GetFirstChild(aParent);
-
-  // if the child is not us
-  if (child == aChild) {
-    mAccessible = nsnull;
-    mContent = nsnull;
-    return nsnull;
-  }
-
-  nsIFrame* prev = child;
-  nsCOMPtr<nsIContent> prevContent = mContent;
-  nsCOMPtr<nsIAccessible> prevAccessible = mAccessible;
-
-  while(child) 
-  {
-    child = GetNextSibling(child);
-
-    if (child == aChild)
-      break;
-
-    prev = child;
-    prevContent = mContent;
-    prevAccessible = mAccessible;
-  }
-
-  mAccessible = prevAccessible;
-  mContent = prevContent;
-  return prev;
-}
-
-nsIFrame* nsFrameTreeWalker::GetPreviousSibling(nsIFrame* aFrame)
-{
-  //printf("Get previous\n");
-
-  nsIFrame* parent = GetParent(aFrame);
-  
-  return GetChildBefore(parent, aFrame);
-}
-
-nsIFrame* nsFrameTreeWalker::GetLastChild(nsIFrame* aFrame)
-{
-  //printf("Get last\n");
-
-  return GetChildBefore(aFrame, nsnull);
-}
-
-PRInt32 nsFrameTreeWalker::GetCount(nsIFrame* aFrame)
-{
-
-  //printf("Get count\n");
-  nsIFrame* child = GetFirstChild(aFrame);
-
-  PRInt32 count = 0;
-  while(child) 
-  {
-    count++;
-    child = GetNextSibling(child);
-  }
-
-  return count;
-}
-
-void nsFrameTreeWalker::GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent)
-{
-  aContent = nsnull;
-  aAccessible = nsnull;
-
-  aFrame->GetContent(getter_AddRefs(aContent));
-
-  if (!aContent)
-    return;
-
-  nsCOMPtr<nsIDocument> document;
-  aContent->GetDocument(*getter_AddRefs(document));
-  if (!document)
-    return;
-
-  PRInt32 shells = document->GetNumberOfShells();
-  NS_ASSERTION(shells > 0,"Error no shells!");
-  nsIPresShell* shell = document->GetShellAt(0);
-  nsIFrame* frame = nsnull;
-  shell->GetPrimaryFrameFor(aContent, &frame);
-
-  if (!frame)
-    return;
-
-  aAccessible = do_QueryInterface(aFrame);
-
-  if (!aAccessible)
-    aAccessible = do_QueryInterface(aContent);
-
-  if (aAccessible)
-    printf("Found accessible!\n");
-}
-
-PRBool nsFrameTreeWalker::IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2)
-{
-  if (!aFrame1 || !aFrame2)
-    return PR_FALSE;
-
-  nsCOMPtr<nsIContent> content1;
-  nsCOMPtr<nsIContent> content2;
-
-  aFrame1->GetContent(getter_AddRefs(content1));
-  aFrame2->GetContent(getter_AddRefs(content2));
-
-  if (content1 == content2 && content1 != nsnull)
-    return PR_TRUE;
-  
-  return PR_FALSE;
-}
-
-/*
- * Class nsAccessible
- */
-
-//-----------------------------------------------------
-// construction 
-//-----------------------------------------------------
-nsAccessible::nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-   NS_INIT_REFCNT();
-
-   // get frame and node
-   mContent = aContent;
-   mAccessible = aAccessible;
-   mPresShell = aShell;
-
-#ifdef DEBUG_LEAKS
-  printf("nsAccessibles=%d\n", ++gnsAccessibles);
-#endif
-
-}
-
-//-----------------------------------------------------
-// destruction
-//-----------------------------------------------------
-nsAccessible::~nsAccessible()
-{
-#ifdef DEBUG_LEAKS
-  printf("nsAccessibles=%d\n", --gnsAccessibles);
-#endif
-}
-
-//NS_IMPL_ISUPPORTS2(nsAccessible, nsIAccessible, nsIAccessibleWidgetAccess);
-NS_IMPL_ISUPPORTS1(nsAccessible, nsIAccessible);
-
-  /* readonly attribute nsIAccessible accParent; */
-NS_IMETHODIMP nsAccessible::GetAccParent(nsIAccessible * *aAccParent) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccParent(aAccParent);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-
-    // failed? Lets do some default behavior
-    walker.GetParent(GetFrame());
-
-    // if no content or accessible then we hit the root
-    if (!walker.mContent || !walker.mAccessible)
-    {
-      *aAccParent = new nsRootAccessible(mPresShell);
-      NS_ADDREF(*aAccParent);
-      return NS_OK;
-    }
-
-    *aAccParent = CreateNewParentAccessible(walker.mAccessible, walker.mContent, mPresShell);
-    NS_ADDREF(*aAccParent);
-    return NS_OK;
-  }
-
-  *aAccParent = nsnull;
-  return NS_OK;
-}
-  /* readonly attribute nsIAccessible accNextSibling; */
-NS_IMETHODIMP nsAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) 
-{ 
-  // delegate
- 
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccNextSibling(aAccNextSibling);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  // failed? Lets do some default behavior
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this);
-
-    nsIFrame* next = walker.GetNextSibling(GetFrame());
-  
-    if (next && walker.mAccessible && walker.mContent) 
-    {
-      *aAccNextSibling = CreateNewNextAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccNextSibling);
-      return NS_OK;
-    }
-  }
-
-  *aAccNextSibling = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accPreviousSibling; */
-NS_IMETHODIMP nsAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling) 
-{ 
-// delegate
- 
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccPreviousSibling(aAccPreviousSibling);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
- 
-  // failed? Lets do some default behavior
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* prev = walker.GetPreviousSibling(GetFrame());
-
-    if (prev && walker.mAccessible && walker.mContent) 
-    {
-      *aAccPreviousSibling = CreateNewPreviousAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccPreviousSibling);
-      return NS_OK;
-    }
-  }
-
-  *aAccPreviousSibling = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accFirstChild; */
-NS_IMETHODIMP nsAccessible::GetAccFirstChild(nsIAccessible * *aAccFirstChild) 
-{ 
-    
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccFirstChild(aAccFirstChild);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* child = walker.GetFirstChild(GetFrame());
-
-    if (child && walker.mAccessible && walker.mContent) 
-    {
-      *aAccFirstChild = CreateNewFirstAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccFirstChild);
-      return NS_OK;
-    }
-  }
-
-  *aAccFirstChild = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accFirstChild; */
-NS_IMETHODIMP nsAccessible::GetAccLastChild(nsIAccessible * *aAccLastChild)
-{  
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccLastChild(aAccLastChild);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* last = walker.GetLastChild(GetFrame());
-
-    if (last && walker.mAccessible && walker.mContent) 
-    {
-      *aAccLastChild = CreateNewLastAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccLastChild);
-      return NS_OK;
-    }
-  }
-
-  *aAccLastChild = nsnull;
-
-  return NS_OK;
-}
-
-/* readonly attribute long accChildCount; */
-NS_IMETHODIMP nsAccessible::GetAccChildCount(PRInt32 *aAccChildCount) 
-{
-  
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccChildCount(aAccChildCount);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-  
-
-  // failed? Lets do some default behavior
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    *aAccChildCount = walker.GetCount(GetFrame());
-  } else 
-    *aAccChildCount = 0;
-
-  return NS_OK;  
-}
-
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsAccessible::GetAccName(PRUnichar * *aAccName) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccName(aAccName);
-    if (NS_SUCCEEDED(rv) && *aAccName != nsnull)
-      return rv;
-  }
-
-  *aAccName = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsAccessible::GetAccDefaultAction(PRUnichar * *aDefaultAction) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccDefaultAction(aDefaultAction);
-    if (NS_SUCCEEDED(rv) && *aDefaultAction != nsnull)
-      return rv;
-  }
-
-  *aDefaultAction = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::SetAccName(const PRUnichar * aAccName) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->SetAccName(aAccName);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* attribute wstring accValue; */
-NS_IMETHODIMP nsAccessible::GetAccValue(PRUnichar * *aAccValue) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccValue(aAccValue);
-
-    if (NS_SUCCEEDED(rv) && *aAccValue != nsnull)
-      return rv;
-  }
-
-  *aAccValue = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::SetAccValue(const PRUnichar * aAccValue) { return NS_ERROR_NOT_IMPLEMENTED;  }
-
-  /* readonly attribute wstring accDescription; */
-NS_IMETHODIMP nsAccessible::GetAccDescription(PRUnichar * *aAccDescription) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccDescription(aAccDescription);
-    if (NS_SUCCEEDED(rv) && *aAccDescription != nsnull)
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accRole; */
-NS_IMETHODIMP nsAccessible::GetAccRole(PRUnichar * *aAccRole) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccRole(aAccRole);
-    if (NS_SUCCEEDED(rv) && *aAccRole != nsnull)
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accState; */
-NS_IMETHODIMP nsAccessible::GetAccState(PRUint32 *aAccState) 
-{ 
-  // delegate
-  if (mAccessible) 
-    return mAccessible->GetAccState(aAccState);
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::GetAccExtState(PRUint32 *aAccExtState) 
-{ 
-  // delegate
-  if (mAccessible) 
-    return mAccessible->GetAccExtState(aAccExtState);
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accHelp; */
-NS_IMETHODIMP nsAccessible::GetAccHelp(PRUnichar * *aAccHelp) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccHelp(aAccHelp);
-    if (NS_SUCCEEDED(rv) && *aAccHelp != nsnull)
-      return rv;
-  }
-
-  // failed? Lets do some default behavior
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute boolean accFocused; */
-NS_IMETHODIMP nsAccessible::GetAccFocused(PRBool *aAccFocused) { return NS_OK;  }
-
-  /* nsIAccessible accGetChildAt (in long x, in long y); */
-NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
-{
-  PRInt32 x,y,w,h;
-  AccGetBounds(&x,&y,&w,&h);
-  if (tx > x && tx < x + w && ty > y && ty < y + h)
-  {
-    nsCOMPtr<nsIAccessible> child;
-    nsCOMPtr<nsIAccessible> next;
-    GetAccFirstChild(getter_AddRefs(child));
-    PRInt32 cx,cy,cw,ch;
-
-    while(child) {
-      child->AccGetBounds(&cx,&cy,&cw,&ch);
-      
-      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
-      {
-        *_retval = child;
-        NS_ADDREF(*_retval);
-        return NS_OK;
-      }
-      child->GetAccNextSibling(getter_AddRefs(next));
-      child = next;
-    }
-
-
-    *_retval = this;
-    NS_ADDREF(this);
-    return NS_OK;
-  }
-
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-  /* void accNavigateRight (); */
-NS_IMETHODIMP nsAccessible::AccNavigateRight(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateLeft (); */
-NS_IMETHODIMP nsAccessible::AccNavigateLeft(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateUp (); */
-
-NS_IMETHODIMP nsAccessible::AccNavigateUp(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateDown (); */
-NS_IMETHODIMP nsAccessible::AccNavigateDown(nsIAccessible **_retval) { return NS_OK;  }
-
-
-  /* void addSelection (); */
-NS_IMETHODIMP nsAccessible::AccAddSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccAddSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void removeSelection (); */
-NS_IMETHODIMP nsAccessible::AccRemoveSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccRemoveSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void extendSelection (); */
-NS_IMETHODIMP nsAccessible::AccExtendSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccExtendSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void takeSelection (); */
-NS_IMETHODIMP nsAccessible::AccTakeSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccTakeSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void takeFocus (); */
-NS_IMETHODIMP nsAccessible::AccTakeFocus(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccTakeFocus();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void doDefaultAction (); */
-NS_IMETHODIMP nsAccessible::AccDoDefaultAction(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccDoDefaultAction();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  nsIFrame* frame = GetBoundsFrame();
-
-  if (!frame || !context)
-  {
-    *x = *y = *width = *height = 0;
-    return NS_OK;
-  }
-
-   // sum up all rects of frames with the same content node
-  nsRect r;
-  nsIFrame* start = frame;
-  nsIFrame* next = nsnull;
-  start->GetNextSibling(&next);
-
-  start->GetRect(r);
-  
-  while (nsFrameTreeWalker::IsSameContent(start, next))
-  {
-    nsRect r2;
-    next->GetRect(r2);
-    r.UnionRect(r,r2);
-    next->GetNextSibling(&next);
-  }
-
-  nsPoint offset(r.x,r.y);
-
-  frame->GetParent(&frame);
-
-  nsPoint pos(0,0);
-  while(frame) {
-    nsIScrollableView* scrollingView;
-    nsIView*           view;
-    // XXX hack
-    frame->GetView(context, &view);
-    if (view) {
-     nsresult result = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView);
-     if (NS_SUCCEEDED(result)) {
-         nscoord xoff = 0;
-         nscoord yoff = 0;
-         scrollingView->GetScrollPosition(xoff, yoff);
-         offset.x -= xoff;
-         offset.y -= yoff;
-     }
-    }
-
-    frame->GetOrigin(pos);
-    offset += pos;
-    frame->GetParent(&frame);
-  }
-
-  float t2p;
-  context->GetTwipsToPixels(&t2p);
-
-  *x = (PRInt32)(offset.x*t2p);
-  *y = (PRInt32)(offset.y*t2p);
-  *width = (PRInt32)(r.width*t2p);
-  *height = (PRInt32)(r.height*t2p);
-
-  return NS_OK;
-}
-
-// helpers
-
-nsIFrame* nsAccessible::GetBoundsFrame()
-{
-   return GetFrame();
-}
-
-nsIFrame* nsAccessible::GetFrame()
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mContent, &frame);
-   return frame;
-}
-
-void nsAccessible::GetPresContext(nsCOMPtr<nsIPresContext>& aContext)
-{
-  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-
-  if (shell) {
-    shell->GetPresContext(getter_AddRefs(aContext));
-  } else
-    aContext = nsnull;
-}
-
-nsIAccessible* nsAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsAccessible(aAccessible, aContent, aShell);
-}
-
-
-// ------- nsHTMLBlockAccessible ------
-
-nsHTMLBlockAccessible::nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):nsAccessible(aAccessible, aContent, aShell)
-{
-
-}
-
-nsIAccessible* nsHTMLBlockAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
-}
-
-/* nsIAccessible accGetAt (in long x, in long y); */
-NS_IMETHODIMP nsHTMLBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
-{
-  PRInt32 x,y,w,h;
-  AccGetBounds(&x,&y,&w,&h);
-  if (tx > x && tx < x + w && ty > y && ty < y + h)
-  {
-    nsCOMPtr<nsIAccessible> child;
-    nsCOMPtr<nsIAccessible> smallestChild;
-    PRInt32 smallestArea = -1;
-    nsCOMPtr<nsIAccessible> next;
-    GetAccFirstChild(getter_AddRefs(child));
-    PRInt32 cx,cy,cw,ch;
-
-    while(child) {
-      child->AccGetBounds(&cx,&cy,&cw,&ch);
-      
-      // ok if there are multiple frames the contain the point 
-      // and they overlap then pick the smallest. We need to do this
-      // for text frames.
-      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
-      {
-        if (smallestArea == -1 || cw*ch < smallestArea) {
-          smallestArea = cw*ch;
-          smallestChild = child;
-        }
-      }
-      child->GetAccNextSibling(getter_AddRefs(next));
-      child = next;
-    }
-
-    if (smallestChild != nsnull)
-    {
-      *_retval = smallestChild;
-      NS_ADDREF(*_retval);
-      return NS_OK;
-    }
-
-    *_retval = this;
-    NS_ADDREF(this);
-    return NS_OK;
-  }
-
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-
-
-
-

mozilla/accessible/src/base/nsAccessible.h

@@ -1,79 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#ifndef _nsAccessible_H_
-#define _nsAccessible_H_
-
-#include "nsISupports.h"
-#include "nsIAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsWeakReference.h"
-
-class nsIFrame;
-
-class nsAccessible : public nsIAccessible
-//                     public nsIAccessibleWidgetAccess
-{
-  NS_DECL_ISUPPORTS
-
-  // nsIAccessibilityService methods:
-  NS_DECL_NSIACCESSIBLE
-
-  //NS_IMETHOD AccGetWidget(nsIWidget**);
-
-	public:
-		nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-		virtual ~nsAccessible();
-
-    virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList) { aList = nsnull; }
-
-protected:
-  virtual nsIFrame* GetFrame();
-  virtual nsIFrame* GetBoundsFrame();
-  virtual void GetPresContext(nsCOMPtr<nsIPresContext>& aContext);
-  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIContent> mContent;
-  nsCOMPtr<nsIWeakReference> mPresShell;
-  nsCOMPtr<nsIAccessible> mAccessible;
-};
-
-/* Special Accessible that knows how to handle hit detection for flowing text */
-class nsHTMLBlockAccessible : public nsAccessible
-{
-public:
-   nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-   NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval);
-protected:
-   virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aFrame, nsIWeakReference* aShell);
-};
-
-#endif  

mozilla/accessible/src/base/nsGenericAccessible.cpp

@@ -1,335 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsGenericAccessible.h"
-#include "nsIEventStateManager.h"
-#include "nsIFrame.h"
-#include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsGenericAccessible, nsIAccessible)
-
-nsGenericAccessible::nsGenericAccessible()
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-nsGenericAccessible::~nsGenericAccessible()
-{
-  /* destructor code */
-}
-
-/* nsIAccessible getAccParent (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccParent(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccNextSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccPreviousSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccName(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccValue (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccValue(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setAccName (in wstring name); */
-NS_IMETHODIMP nsGenericAccessible::SetAccName(const PRUnichar *name)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setAccValue (in wstring value); */
-NS_IMETHODIMP nsGenericAccessible::SetAccValue(const PRUnichar *value)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccDescription (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccDescription(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccRole(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccHelp (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccHelp(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* boolean getAccFocused (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFocused(PRBool *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accGetAt (in long x, in long y); */
-NS_IMETHODIMP nsGenericAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateRight (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateRight(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateLeft (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateLeft(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateUp (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateUp(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateDown (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateDown(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsGenericAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accAddSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccAddSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accRemoveSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccRemoveSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accExtendSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccExtendSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeFocus (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeFocus()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accDoDefaultAction (); */
-NS_IMETHODIMP nsGenericAccessible::AccDoDefaultAction()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long getAccExtState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccExtState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//-------------
-// nsDOMAccessible
-//-------------
-
-nsDOMAccessible::nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode)
-{
-  mPresShell = do_GetWeakReference(aShell);
-  mNode = aNode;
-}
-
-
-/* void accRemoveSelection (); */
-NS_IMETHODIMP nsDOMAccessible::AccRemoveSelection()
-{
-    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
-    nsCOMPtr<nsISelection> selection;
-    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> parent;
-    rv = mNode->GetParentNode(getter_AddRefs(parent));
-    if (NS_FAILED(rv))
-      return rv;
-
-    rv = selection->Collapse(parent, 0);
-    if (NS_FAILED(rv))
-      return rv;
-
-    return NS_OK;
-}
-
-/* void accTakeSelection (); */
-NS_IMETHODIMP nsDOMAccessible::AccTakeSelection()
-{
-    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
-    nsCOMPtr<nsISelection> selection;
-    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> parent;
-    rv = mNode->GetParentNode(getter_AddRefs(parent));
-    if (NS_FAILED(rv))
-      return rv;
-
-    PRInt32 offsetInParent = 0;
-    nsCOMPtr<nsIDOMNode> child;
-    rv = parent->GetFirstChild(getter_AddRefs(child));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> next; 
-
-    while(child)
-    {
-      if (child == mNode) {
-        // Collapse selection to just before desired element,
-        rv = selection->Collapse(parent, offsetInParent);
-        if (NS_FAILED(rv))
-          return rv;
-
-        // then extend it to just after
-        rv = selection->Extend(parent, offsetInParent+1);
-        return rv;
-      }
-
-       child->GetNextSibling(getter_AddRefs(next));
-       child = next;
-       offsetInParent++;
-    }
-
-    // didn't find a child
-    return NS_ERROR_FAILURE;
-}
-
-/* void accTakeFocus (); */
-NS_IMETHODIMP nsDOMAccessible::AccTakeFocus()
-{ 
-  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-  nsCOMPtr<nsIPresContext> context;
-  shell->GetPresContext(getter_AddRefs(context));
-  nsCOMPtr<nsIContent> content = do_QueryInterface(mNode);
-  content->SetFocus(context);
-  
-  return NS_OK;
-}
-
-//-------------
-// nsLeafFrameAccessible
-//-------------
-
-nsLeafDOMAccessible::nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsDOMAccessible(aShell, aNode)
-{
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}
-

mozilla/accessible/src/base/nsGenericAccessible.h

@@ -1,83 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsGenericAccessible_H_
-#define _nsGenericAccessible_H_
-
-#include "nsISupports.h"
-#include "nsIAccessible.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
-
-/**
- * Basic implementation
- * supports nothing
- */
-class nsGenericAccessible : public nsIAccessible
-{
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIACCESSIBLE
-
-	public:
-    nsGenericAccessible();
-    virtual ~nsGenericAccessible();
-};
-
-/**
- * And accessible that observes a dom node
- * supports:
- * - selection
- * - focus
- */
-class nsDOMAccessible : public nsGenericAccessible
-{
-  public:
-    nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-
-    NS_IMETHOD AccTakeSelection(void); 
-    NS_IMETHOD AccTakeFocus(void); 
-    NS_IMETHOD AccRemoveSelection(void);
-
-  protected:
-    nsCOMPtr<nsIWeakReference> mPresShell;
-    nsCOMPtr<nsIDOMNode> mNode;
-};
-
-/* Leaf version of DOM Accessible
- * has no children
- */
-class nsLeafDOMAccessible : public nsDOMAccessible
-{
-  public:
-    nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-
-    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-};
-
-#endif  

mozilla/accessible/src/base/nsRootAccessible.cpp

@@ -1,199 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#include "nsRootAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsIDOMEventTarget.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsReadableUtils.h"
-
-NS_INTERFACE_MAP_BEGIN(nsRootAccessible)
-  NS_INTERFACE_MAP_ENTRY(nsIAccessibleEventReceiver)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAccessibleEventReceiver)
-NS_INTERFACE_MAP_END_INHERITING(nsAccessible)
-
-NS_IMPL_ADDREF_INHERITED(nsRootAccessible, nsAccessible);
-NS_IMPL_RELEASE_INHERITED(nsRootAccessible, nsAccessible);
-
-//-----------------------------------------------------
-// construction 
-//-----------------------------------------------------
-nsRootAccessible::nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame):nsAccessible(nsnull,nsnull,aShell)
-{
- // mFrame = aFrame;
- mListener = nsnull;
-}
-
-//-----------------------------------------------------
-// destruction
-//-----------------------------------------------------
-nsRootAccessible::~nsRootAccessible()
-{
-  RemoveAccessibleEventListener(mListener);
-}
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsRootAccessible::GetAccName(PRUnichar * *aAccName) 
-{ 
-  *aAccName = ToNewUnicode(NS_LITERAL_STRING("Mozilla Document"));
-  return NS_OK;  
-}
-
-// helpers
-nsIFrame* nsRootAccessible::GetFrame()
-{
-  //if (!mFrame) {
-    nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-    nsIFrame* root = nsnull;
-    if (shell) 
-      shell->GetRootFrame(&root);
-  
-    return root;
-  //}
- 
- // return mFrame;
-}
-
-nsIAccessible* nsRootAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
-}
-
-  /* readonly attribute nsIAccessible accParent; */
-NS_IMETHODIMP nsRootAccessible::GetAccParent(nsIAccessible * *aAccParent) 
-{ 
-  *aAccParent = nsnull;
-  return NS_OK;
-}
-
-  /* readonly attribute wstring accRole; */
-NS_IMETHODIMP nsRootAccessible::GetAccRole(PRUnichar * *aAccRole) 
-{ 
-  *aAccRole = ToNewUnicode(NS_LITERAL_STRING("client"));
-  return NS_OK;  
-}
-
-/* void addAccessibleEventListener (in nsIAccessibleEventListener aListener); */
-NS_IMETHODIMP nsRootAccessible::AddAccessibleEventListener(nsIAccessibleEventListener *aListener)
-{
-  if (!mListener)
-  {
-     // add an event listener to the document
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     nsCOMPtr<nsIDocument> document;
-     shell->GetDocument(getter_AddRefs(document));
-
-     nsCOMPtr<nsIDOMEventReceiver> receiver;
-     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(receiver))) && receiver)
-     {
-        nsresult rv = receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-     }
-  }
-
-  // create a weak reference to the listener
-  mListener =  aListener;
-
-  return NS_OK;
-}
-
-/* void removeAccessibleEventListener (in nsIAccessibleEventListener aListener); */
-NS_IMETHODIMP nsRootAccessible::RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener)
-{
-  if (mListener)
-  {
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     nsCOMPtr<nsIDocument> document;
-     if (!shell)
-       return NS_OK;
-
-     shell->GetDocument(getter_AddRefs(document));
-
-     nsCOMPtr<nsIDOMEventReceiver> erP;
-     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP))) && erP)
-     {
-        nsresult rv = erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-     }
-  }
-
-  mListener = nsnull;
-
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
-{
-  if (mListener) {
-     nsCOMPtr<nsIDOMEventTarget> t;
-     aEvent->GetOriginalTarget(getter_AddRefs(t));
-  
-     // create and accessible for the target
-     nsCOMPtr<nsIContent> content = do_QueryInterface(t); 
-
-     if (!content)
-       return NS_OK;
-
-     if (mCurrentFocus == content)
-       return NS_OK;
-
-     mCurrentFocus = content;
-
-     nsIFrame* frame = nsnull;
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     shell->GetPrimaryFrameFor(content, &frame);
-
-     if (!frame)
-       return NS_OK;
-
-     nsCOMPtr<nsIAccessible> a = do_QueryInterface(frame);
-
-     if (!a)
-       a = do_QueryInterface(content);
-
-     nsCOMPtr<nsIAccessible> na = CreateNewAccessible(a, content, mPresShell);
-
-     mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, na);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsRootAccessible::Focus(nsIDOMEvent* aEvent) 
-{ 
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsRootAccessible::Blur(nsIDOMEvent* aEvent) 
-{ 
-  return NS_OK;
-}
-
-
-

mozilla/accessible/src/base/nsRootAccessible.h

@@ -1,70 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#ifndef _nsRootAccessible_H_
-#define _nsRootAccessible_H_
-
-#include "nsAccessible.h"
-#include "nsIAccessibleEventReceiver.h"
-#include "nsIAccessibleEventListener.h"
-#include "nsIDOMFocusListener.h"
-
-class nsRootAccessible : public nsAccessible,
-                         public nsIAccessibleEventReceiver,
-                         public nsIDOMFocusListener
-
-{
-  
-  NS_DECL_ISUPPORTS_INHERITED
-
-  public:
-    nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame = nsnull);
-    virtual ~nsRootAccessible();
-
-    /* attribute wstring accName; */
-    NS_IMETHOD GetAccName(PRUnichar * *aAccName);
-    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
-    NS_IMETHOD GetAccRole(PRUnichar * *aAccRole);
-
-    // ----- nsIAccessibleEventReceiver ------
-
-    NS_IMETHOD AddAccessibleEventListener(nsIAccessibleEventListener *aListener);
-    NS_IMETHOD RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener);
-
-    // ----- nsIDOMEventListener --------
-    NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent);
-    NS_IMETHOD Focus(nsIDOMEvent* aEvent);
-    NS_IMETHOD Blur(nsIDOMEvent* aEvent);
-
-protected:
-  virtual nsIFrame* GetFrame();
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  // not a com pointer. We don't own the listener
-  // it is the callers responsibility to remove the listener
-  // otherwise we will get into circular referencing problems
-  nsIAccessibleEventListener* mListener;
-  nsCOMPtr<nsIContent> mCurrentFocus;
-};
-
-
-#endif  

mozilla/accessible/src/base/nsSelectAccessible.cpp

@@ -1,717 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#include "nsSelectAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsRootAccessible.h"
-#include "nsINameSpaceManager.h"
-#include "nsMutableAccessible.h"
-#include "nsLayoutAtoms.h"
-#include "nsIDOMMenuListener.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsReadableUtils.h"
-
-class nsSelectChildAccessible : public nsAccessible,
-                                public nsIDOMMenuListener
-{
-public:
-  
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectChildAccessible();
-
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccValue(PRUnichar **_retval);
-
-  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  // popup listener
-  NS_IMETHOD Create(nsIDOMEvent* aEvent);
-  NS_IMETHOD Close(nsIDOMEvent* aEvent);
-  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
-  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIContent> mSelectContent;
-  PRBool mRegistered;
-  PRBool mOpen;
-};
-
-NS_IMPL_ISUPPORTS_INHERITED(nsSelectChildAccessible, nsAccessible, nsIDOMMenuListener)
-
-class nsSelectWindowAccessible : public nsAccessible,
-                                 public nsIDOMMenuListener
-{
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectWindowAccessible();
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccExtState(PRUint32 *_retval);
-
-  // popup listener
-  NS_IMETHOD Create(nsIDOMEvent* aEvent);
-  NS_IMETHOD Close(nsIDOMEvent* aEvent);
-  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
-  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
-
-  // helpers
-  virtual nsIFrame* GetBoundsFrame();
-
-  nsCOMPtr<nsIAccessible> mParent;
-  nsCOMPtr<nsIAccessible> mPrev;
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  PRBool mRegistered;
-  PRBool mOpen;
-};
-
-NS_IMPL_ISUPPORTS_INHERITED(nsSelectWindowAccessible, nsAccessible, nsIDOMMenuListener)
-
-class nsSelectListAccessible : public nsAccessible
-{
-public:
-  
-  nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectListAccessible() {}
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
-
-  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-class nsListChildAccessible : public nsAccessible
-{
-public:
-  
-  nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsListChildAccessible() {}
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-
-  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAccessible> mParent;
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIContent> mSelectContent;
-};
-
-//---------
- 
-nsSelectAccessible::nsSelectAccessible(nsIAtom* aPopupAtom, 
-                                       nsIAccessible* aAccessible, 
-                                       nsIContent* aContent, 
-                                       nsIWeakReference* aShell)
-                                               :nsAccessible(aAccessible, aContent, aShell)
-{
-  mPopupAtom = aPopupAtom;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccValue(PRUnichar **_retval)
-{
-  // our value is our first child's value. Which is the combo boxes text.
-  nsCOMPtr<nsIAccessible> text;
-  nsresult rv = GetAccFirstChild(getter_AddRefs(text));
-
-  if (NS_FAILED(rv)) {
-     *_retval = nsnull;
-     return rv;
-  }
-
-  if (!text) {
-     *_retval = nsnull;
-     return NS_ERROR_FAILURE;
-  }
-
-  // look at our role
-  return text->GetAccValue(_retval);
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccName(PRUnichar **_retval)
-{
-   *_retval = nsnull;
-   return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("combo box"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  // get the last child. Wrap it with a connector that connects it to the window accessible
-  nsCOMPtr<nsIAccessible> last;
-  nsresult rv = nsAccessible::GetAccLastChild(getter_AddRefs(last));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!last) {
-    // we have a parent but not previous
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
-  } else {
-    *_retval = last;
-  }
-
-  NS_ADDREF(*_retval);
-
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  // get the last child. Wrap it with a connector that connects it to the window accessible
-  nsCOMPtr<nsIAccessible> first;
-  nsresult rv = nsAccessible::GetAccFirstChild(getter_AddRefs(first));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!first) {
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
-  } else {
-    *_retval = first;
-  }
-
-  NS_ADDREF(*_retval);
-
-  return NS_OK;
-}
-
-nsIAccessible* nsSelectAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewLastAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsSelectChildAccessible(mPopupAtom, mContent, aAccessible, aContent, aShell);
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  nsresult rv = nsAccessible::GetAccChildCount(_retval);
-  if (NS_FAILED(rv))
-    return rv;
-
-  // always have one more that is our window child
-  (*_retval)++;
-  return NS_OK;
-}
-
-//--------------------
-
-nsSelectChildAccessible::nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
-nsAccessible(aAccessible, aContent, aShell)
-{
-  mPopupAtom = aPopupAtom;
-  mSelectContent = aSelectContent;
-  mRegistered = PR_FALSE;
-  mOpen = PR_FALSE;
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccValue(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  rv = nsAccessible::GetAccRole(&string);
-  if (NS_FAILED(rv)) {
-   *_retval = nsnull;
-   return rv;
-  }
-
-  nsAutoString role(string);
-
-  // if its the text in the combo box then
-  // its value should be its name.
-  if (role.EqualsIgnoreCase("text")) {
-    rv = nsAccessible::GetAccName(_retval);
-  } else {
-    rv = nsAccessible::GetAccValue(_retval);
-  }
-
-  delete string;
-  return rv;
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccRole(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  rv = nsAccessible::GetAccRole(&string);
-  if (NS_FAILED(rv)) {
-   *_retval = nsnull;
-   return rv;
-  }
-
-  nsAutoString role(string);
-
-  // any text in the combo box is static
-  if (role.EqualsIgnoreCase("text")) {
-    // if it the comboboxes text. Make it static
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("static text"));
-  } else {
-    rv = nsAccessible::GetAccRole(_retval);
-  }
-
-  delete string;
-  return rv;
-}
-
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccName(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  nsAccessible::GetAccRole(&string);
-  nsAutoString role(string);
-
-  // if button then we need to make the name be open or close
-  if (role.EqualsIgnoreCase("push button"))
-  {
-     // if its a button and not already registered, 
-     // register ourselves as a popup listener   
-     if (!mRegistered) {
-       nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
-       if (!eventReceiver) {
-         *_retval = nsnull;
-         return NS_ERROR_NOT_IMPLEMENTED;
-       }
-
-       eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-
-       mRegistered = PR_TRUE;
-     }
-
-     // get the current state open or closed
-     // set _retval to it.
-     // notice its supposed to be reversed. Close if opened
-     // and Open if closed.
-
-     if (mOpen)
-         *_retval = ToNewUnicode(NS_LITERAL_STRING("Close"));
-     else
-         *_retval = ToNewUnicode(NS_LITERAL_STRING("Open"));
-
-  } else {
-    /*rv = nsAccessible::GetAccName(_retval);*/
-    rv = NS_ERROR_NOT_IMPLEMENTED;
-    *_retval = nsnull;
-  }
-
-  delete string;
-
-  return rv;
-}
-
-
-nsSelectChildAccessible::~nsSelectChildAccessible()
-{
-  if (mRegistered) {
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
-     if (eventReceiver) 
-       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-  }
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Create(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_TRUE;
-  printf("Open\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Destroy(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Close(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-nsIAccessible* nsSelectChildAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewPreviousAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectChildAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsSelectChildAccessible(mPopupAtom, mSelectContent, aAccessible, aContent, aShell);
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{ 
-  nsCOMPtr<nsIAccessible> next;
-  nsresult rv = nsAccessible::GetAccNextSibling(getter_AddRefs(next));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!next) {
-    // ok no more siblings. Lets create our window
-    nsCOMPtr<nsIAccessible> parent;
-    GetAccParent(getter_AddRefs(parent));
-
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, parent, nsnull, nsnull, mSelectContent, mPresShell);
-  } else {
-    *_retval = next;
-  }
-
-  NS_ADDREF(*_retval);
-
-  return NS_OK;
-} 
-
-
-//---------------------
-
-
-nsSelectWindowAccessible::nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-:nsAccessible(aAccessible, aContent, aShell)
-{
-  mParent = aParent;
-  mPrev = aPrev;
-  mPopupAtom = aPopupAtom;
-  mRegistered = PR_FALSE;
-  mOpen = PR_FALSE;
-}
-
-nsSelectWindowAccessible::~nsSelectWindowAccessible()
-{
-  if (mRegistered) {
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
-     if (eventReceiver) 
-       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-  }
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Create(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_TRUE;
-  printf("Open\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Destroy(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Close(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccState(PRUint32 *_retval)
-{
-  // not not already one register ourselves as a popup listener
-   
-  if (!mRegistered) {
-
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
-     if (!eventReceiver) {
-       *_retval = 0;
-       return NS_ERROR_NOT_IMPLEMENTED;
-     }
-
-     nsresult rv = eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-
-     if (NS_FAILED(rv)) {
-       *_retval = 0;
-       return rv;
-     }
-
-     mRegistered = PR_TRUE;
-  }
-
-  // if open we are visible if closed we are invisible
-   // set _retval to it.
-   if (mOpen)
-     *_retval |= STATE_DEFAULT;
-   else
-     *_retval |= STATE_INVISIBLE;
-
-   return NS_OK;
-}
-
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccExtState(PRUint32 *_retval)
-{
-	*_retval=0;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccName(PRUnichar **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
- 
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("window"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_IF_ADDREF(*_retval);
-    return NS_OK;
-}
- 
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{ 
-  *_retval = mPrev;
-  NS_IF_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 1;
-  return NS_OK;
-}
-
-/*
-NS_IMETHODIMP nsSelectWindowAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  *x = *y = *width = *height = 0;
-  return NS_OK;
-}
-*/
-
-nsIFrame* nsSelectWindowAccessible::GetBoundsFrame()
-{
-  // get our frame
-  nsIFrame* frame = GetFrame();
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  // get its first popup child that should be the window
-  frame->FirstChild(context, mPopupAtom, &frame);
-
-  return frame;
-}
-
-//----------
-
-
-nsSelectListAccessible::nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-:nsAccessible(aAccessible, aContent, aShell)
-{
-    mPopupAtom = aPopupAtom;
-    mParent = aParent;
-}
-
-void nsSelectListAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mContent, &frame);
-   if (aFrame == frame)
-     aList = mPopupAtom;
-   else
-     aList = nsnull;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  return mParent->AccGetBounds(x,y,width,height);
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_ADDREF(*_retval);
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccName(PRUnichar **_retval)
-{
-  *_retval = nsnull;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("list"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{ 
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-nsIAccessible* nsSelectListAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectListAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
-}
- 
-//--------
-
-nsListChildAccessible::nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
-nsAccessible(aAccessible, aContent, aShell)
-{
-  mParent = aParent;
-  mPopupAtom = aPopupAtom;
-  mSelectContent = aSelectContent;
-}
-
-nsIAccessible* nsListChildAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mSelectContent, mParent, aAccessible, aContent, aShell);
-}
-
-void nsListChildAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mSelectContent, &frame);
-   if (aFrame == frame)
-     aList = mPopupAtom;
-   else
-     aList = nsnull;
-}
-
-NS_IMETHODIMP nsListChildAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("list item"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsListChildAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_IF_ADDREF(*_retval);
-    return NS_OK;
-}
-

mozilla/accessible/src/base/nsSelectAccessible.h

@@ -1,51 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-#ifndef __nsSelectAccessible_h__
-#define __nsSelectAccessible_h__
-
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIAtom.h"
-
-class nsSelectAccessible : public nsAccessible
-{
-public:
-  
-  nsSelectAccessible(nsIAtom* aPopupAtom, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccValue(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-
-  virtual ~nsSelectAccessible() {}
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-};
-
-
-#endif

mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp

@@ -1,175 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLFormControlAccessible.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-#include "nsIDOMHTMLInputElement.h"
-#include "nsINameSpaceManager.h"
-#include "nsHTMLAtoms.h"
-#include "nsIDOMHTMLButtonElement.h"
-#include "nsReadableUtils.h"
-
-nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsLeafDOMAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccName(PRUnichar **_retval)
-{
-  // go up tree get name of label if there is one.
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccState (); */
-NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccState(PRUint32 *_retval)
-{
-    // can be
-    // focusable, focused, checked
-    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-
-    PRBool checked = PR_FALSE;
-    element->GetChecked(&checked);
-    *_retval = (checked ? STATE_CHECKED : 0);
-    return NS_OK;
-}
-
-// --- checkbox -----
-
-nsHTMLCheckboxAccessible::nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("check box"));
-    return NS_OK;
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    // check or uncheck
-    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-
-    PRBool checked = PR_FALSE;
-    element->GetChecked(&checked);
-    if (checked)
-        *_retval = ToNewUnicode(NS_LITERAL_STRING("Check"));
-    else
-        *_retval = ToNewUnicode(NS_LITERAL_STRING("UnCheck"));
-
-    return NS_OK;
-}
-
-/* void accDoDefaultAction (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  PRBool checked = PR_FALSE;
-  element->GetChecked(&checked);
-  element->SetChecked(checked ? PR_FALSE : PR_TRUE);
-
-  return NS_OK;
-}
-
-
-//------ Radio button -------
-
-nsHTMLRadioButtonAccessible::nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("Select"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("radio button"));
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  element->Click();
-
-  return NS_OK;
-}
-
-// ----- Button -----
-
-nsHTMLButtonAccessible::nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("Press"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("push button"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(PRUnichar **_retval)
-{
-    *_retval = nsnull;
-    nsCOMPtr<nsIDOMHTMLInputElement> button = do_QueryInterface(mNode);
-
-    if (!button)
-      return NS_ERROR_FAILURE;
-
-    nsAutoString name;
-    button->GetValue(name);
-    name.CompressWhitespace();
-
-    *_retval = name.ToNewUnicode();
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLButtonAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  element->Click();
-
-  return NS_OK;
-}

mozilla/accessible/src/html/nsHTMLFormControlAccessible.h

@@ -1,77 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLFormControlAccessible_H_
-#define _nsHTMLFormControlAccessible_H_
-
-#include "nsGenericAccessible.h"
-
-class nsICheckboxControlFrame;
-
-/* Accessible for supporting for controls
- * supports:
- * - walking up to get name from label
- * - support basic state
- */
-class nsHTMLFormControlAccessible : public nsLeafDOMAccessible
-{
-
-public:
-  nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-};
-
-class nsHTMLCheckboxAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-};
-
-class nsHTMLRadioButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-};
-
-class nsHTMLButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-
-};
-
-#endif  

mozilla/accessible/src/html/nsHTMLTextAccessible.cpp

@@ -1,51 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLTextAccessible.h"
-#include "nsICheckboxControlFrame.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-
-nsHTMLTextAccessible::nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode):
-nsLeafDOMAccessible(aShell, aDomNode)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(PRUnichar **_retval)
-{
-  nsAutoString value;
-  mNode->GetNodeValue(value);
-  value.CompressWhitespace();
-  *_retval = value.ToNewUnicode();
-  return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccRole(PRUnichar **_retval)
-{
-    nsAutoString role(NS_LITERAL_STRING("text"));
-    *_retval = role.ToNewUnicode();
-
-    return NS_OK;
-}

mozilla/accessible/src/html/nsHTMLTextAccessible.h

@@ -1,43 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#ifndef _nsHTMLTextAccessible_H_
-#define _nsHTMLTextAccessible_H_
-
-#include "nsGenericAccessible.h"
-
-class nsIWeakReference;
-class nsITextControlFrame;
-
-class nsHTMLTextAccessible : public nsLeafDOMAccessible
-{
-
-public:
-  nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode);
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-
-private:
-  nsCOMPtr<nsIDOMNode> mDomNode;
-};
-
-#endif  

mozilla/accessible/src/makefile.win

@@ -1,53 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org code.
-#
-# 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): 
-
-DEPTH=..\..
-MODULE=accessibility
-LIBRARY_NAME=accessibility_s
-
-CPP_OBJS=\
-        .\$(OBJDIR)\nsAccessible.obj    \
-        .\$(OBJDIR)\nsRootAccessible.obj    \
-        .\$(OBJDIR)\nsMutableAccessible.obj    \
-        .\$(OBJDIR)\nsAccessibilityService.obj    \
-        .\$(OBJDIR)\nsSelectAccessible.obj    \
-        .\$(OBJDIR)\nsGenericAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLFormControlAccessible.obj    \
-        .\$(OBJDIR)\nsHTMLTextAccessible.obj    \
-	$(NULL)
-
-LINCS=                                  \
-	-I..\..\layout\html\forms\public \
-	-I..\..\layout\html\forms\src \
-	-I..\..\layout\html\base\src \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(LIBRARY)
-        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-
-
-
-

mozilla/accessible/src/nsAccessibilityService.cpp

@@ -1,252 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#include "nsIAccessibilityService.h"
-#include "nsAccessibilityService.h"
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsRootAccessible.h"
-#include "nsINameSpaceManager.h"
-#include "nsMutableAccessible.h"
-#include "nsHTMLFormControlAccessible.h"
-#include "nsLayoutAtoms.h"
-#include "nsSelectAccessible.h"
-#include "nsHTMLTextAccessible.h"
-
-//--------------------
-
-
-nsAccessibilityService::nsAccessibilityService()
-{
-	NS_INIT_REFCNT();
-}
-
-nsAccessibilityService::~nsAccessibilityService()
-{
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsAccessibilityService, nsIAccessibilityService);
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIAccessibilityService methods:
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateRootAccessible(nsISupports* aPresContext, nsISupports* aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* f = NS_STATIC_CAST(nsIFrame*, aFrame);
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s));
-
-  NS_ASSERTION(s,"Error not presshell!!");
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsRootAccessible(wr,f);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateMutableAccessible(nsISupports* aNode, nsIMutableAccessible **_retval)
-{
-  *_retval = new nsMutableAccessible(aNode);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateHTMLBlockAccessible(nsIAccessible* aAccessible, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
-{
-  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
-  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s));
-
-  NS_ASSERTION(s,"Error not presshell!!");
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsHTMLBlockAccessible(aAccessible, n,wr);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP 
-nsAccessibilityService::CreateHTMLSelectAccessible(nsIAtom* aPopupAtom, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
-{
-  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
-  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
-  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
-
-  nsCOMPtr<nsIPresShell> s;
-  c->GetShell(getter_AddRefs(s)); 
-
-  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
-
-  *_retval = new nsSelectAccessible(aPopupAtom, nsnull, n, wr);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLCheckboxAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLCheckboxAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLRadioButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-
-  *_retval = new nsHTMLRadioButtonAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLButtonAccessible(shell,node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-/* nsIAccessible createHTMLTextAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
-NS_IMETHODIMP nsAccessibilityService::CreateHTMLTextAccessible(nsISupports *aFrame, nsIAccessible **_retval)
-{
-  nsIFrame* frame;
-  nsCOMPtr<nsIDOMNode> node;
-  nsCOMPtr<nsIPresShell> shell;
-  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = new nsHTMLTextAccessible(shell, node);
-  if (*_retval) {
-    NS_ADDREF(*_retval);
-    return NS_OK;
-  } else 
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP nsAccessibilityService::GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aNode)
-{
-  *aRealFrame = NS_STATIC_CAST(nsIFrame*, aFrame);
-  nsCOMPtr<nsIContent> content;
-  (*aRealFrame)->GetContent(getter_AddRefs(content));
-  nsCOMPtr<nsIDOMNode> node = do_QueryInterface(content);
-  *aNode = node;
-  NS_ADDREF(*aNode);
-
-  nsCOMPtr<nsIDocument> document;
-  content->GetDocument(*getter_AddRefs(document));
-
-#ifdef DEBUG
-  PRInt32 shells = document->GetNumberOfShells();
-  NS_ASSERTION(shells > 0,"Error no shells!");
-#endif
-
-  *aShell = document->GetShellAt(0);
-  NS_IF_ADDREF(*aShell);
-
-  return NS_OK;
-}
-
-
-//////////////////////////////////////////////////////////////////////
-
-nsresult
-NS_NewAccessibilityService(nsIAccessibilityService** aResult)
-{
-    NS_PRECONDITION(aResult != nsnull, "null ptr");
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-
-    nsAccessibilityService* a = new nsAccessibilityService();
-    if (a == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(a);
-    *aResult = a;
-    return NS_OK;
-}
-

mozilla/accessible/src/nsAccessibilityService.h

@@ -1,53 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- * 
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#ifndef __nsAccessibilityService_h__
-#define __nsAccessibilityService_h__
-
-#include "nsIAccessibilityService.h"
-class nsIFrame;
-class nsIPresShell;
-class nsIDOMNode;
-
-class nsAccessibilityService : public nsIAccessibilityService
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  // nsIAccessibilityService methods:
-  NS_DECL_NSIACCESSIBILITYSERVICE
-
-  // nsAccessibilityService methods:
-  nsAccessibilityService();
-  virtual ~nsAccessibilityService();
-
-public:
-
-private:
-  NS_IMETHOD GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aContent);
-
-};
-
-#endif /* __nsIccessibilityService_h__ */

mozilla/accessible/src/nsAccessible.cpp

@@ -1,968 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsIScrollableView.h"
-#include "nsRootAccessible.h"
-
-//#define DEBUG_LEAKS
-
-#ifdef DEBUG_LEAKS
-static gnsAccessibles = 0;
-#endif
-
-
-class nsFrameTreeWalker {
-public:
-  nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner);
-  nsIFrame* GetNextSibling(nsIFrame* aFrame);
-  nsIFrame* GetPreviousSibling(nsIFrame* aFrame);
-  nsIFrame* GetParent(nsIFrame* aFrame);
-  nsIFrame* GetFirstChild(nsIFrame* aFrame);
-  nsIFrame* GetLastChild(nsIFrame* aFrame);
-  nsIFrame* GetChildBefore(nsIFrame* aParent, nsIFrame* aChild);
-  PRInt32 GetCount(nsIFrame* aFrame);
-
-  static PRBool IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2);
-  static void GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent);
-
-  nsCOMPtr<nsIPresContext> mPresContext;
-  nsCOMPtr<nsIAccessible> mAccessible;
-  nsCOMPtr<nsIContent> mContent;
-  nsAccessible* mOwner;
-};
-
-nsFrameTreeWalker::nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner)
-{
-  mPresContext = aPresContext;
-  mOwner = aOwner;
-}
-
-nsIFrame* nsFrameTreeWalker::GetParent(nsIFrame* aFrame)
-{
-  //printf("Get parent\n");
-
-  nsIFrame* parent = nsnull;
-  aFrame->GetParent(&parent);
-
-  // if no parent then we hit the root
-  // just return that top frame
-  if (!parent) {
-    mAccessible = nsnull;
-    mContent = nsnull;
-    return aFrame;
-  }
-
-  GetAccessible(parent, mAccessible, mContent);
-  if (mAccessible)
-    return parent;
-  
-  return GetParent(parent);
-}
-
-nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
-{
-  //printf("Get next\n");
-
-  // get next sibling
-  nsIFrame* next = nsnull;
-  aFrame->GetNextSibling(&next);
-
-  // skip any frames with the same content node
-  while(IsSameContent(aFrame,next)) 
-    next->GetNextSibling(&next);
-
-  // if failed
-  if (!next)
-  {
-    // if parent has content
-    nsIFrame* parent = nsnull;
-    aFrame->GetParent(&parent);
-    
-    // if no parent fail
-    if (!parent) {
-      mAccessible = nsnull;
-      mContent = nsnull;
-      return nsnull;
-    }
-
-    // fail if we reach a parent that is accessible
-    GetAccessible(parent, mAccessible, mContent);
-    if (mAccessible)
-    {
-      // fail
-      mAccessible = nsnull;
-      mContent = nsnull;
-      return nsnull;
-    } else {
-      // next on parent
-      return GetNextSibling(parent);
-    }
-  }
-
-  // if next has content
-  GetAccessible(next, mAccessible, mContent);
-  if (mAccessible)
-  {
-    // done
-    return next;
-  }
-
-  // if next doesn't have node
-
-  // call first on next
-  nsIFrame* first = GetFirstChild(next);
-
-  // if found
-  if (first)
-    return first;
-
-  // call next on next
-  return GetNextSibling(next);
-}
-
-nsIFrame* nsFrameTreeWalker::GetFirstChild(nsIFrame* aFrame)
-{
-
-  //printf("Get first\n");
-
-  // get first child
-  nsIFrame* child = nsnull;
-  nsIAtom* list = nsnull;
-  mOwner->GetListAtomForFrame(aFrame, list);
-  aFrame->FirstChild(mPresContext, list, &child);
-
-  while(child)
-  {
-    // if first has a content node
-    GetAccessible(child, mAccessible, mContent);
-    if (mAccessible)
-    {
-      // done
-      return child;
-    } else {
-      // call first on child
-      nsIFrame* first = GetFirstChild(child);
-
-      // if succeeded
-      if (first)
-      {
-        // return child
-        return first;
-      }
-    }
-
-    // get next sibling
-    nsIFrame* next;
-    child->GetNextSibling(&next);
-
-    // skip children with duplicate content nodes
-    while(IsSameContent(child,next)) 
-      next->GetNextSibling(&next);
-
-    child = next;
-  }
-
-  // fail
-  mAccessible = nsnull;
-  mContent = nsnull;
-  return nsnull;
-}
-
-nsIFrame* nsFrameTreeWalker::GetChildBefore(nsIFrame* aParent, nsIFrame* aChild)
-{
-  nsIFrame* child = GetFirstChild(aParent);
-
-  // if the child is not us
-  if (child == aChild) {
-    mAccessible = nsnull;
-    mContent = nsnull;
-    return nsnull;
-  }
-
-  nsIFrame* prev = child;
-  nsCOMPtr<nsIContent> prevContent = mContent;
-  nsCOMPtr<nsIAccessible> prevAccessible = mAccessible;
-
-  while(child) 
-  {
-    child = GetNextSibling(child);
-
-    if (child == aChild)
-      break;
-
-    prev = child;
-    prevContent = mContent;
-    prevAccessible = mAccessible;
-  }
-
-  mAccessible = prevAccessible;
-  mContent = prevContent;
-  return prev;
-}
-
-nsIFrame* nsFrameTreeWalker::GetPreviousSibling(nsIFrame* aFrame)
-{
-  //printf("Get previous\n");
-
-  nsIFrame* parent = GetParent(aFrame);
-  
-  return GetChildBefore(parent, aFrame);
-}
-
-nsIFrame* nsFrameTreeWalker::GetLastChild(nsIFrame* aFrame)
-{
-  //printf("Get last\n");
-
-  return GetChildBefore(aFrame, nsnull);
-}
-
-PRInt32 nsFrameTreeWalker::GetCount(nsIFrame* aFrame)
-{
-
-  //printf("Get count\n");
-  nsIFrame* child = GetFirstChild(aFrame);
-
-  PRInt32 count = 0;
-  while(child) 
-  {
-    count++;
-    child = GetNextSibling(child);
-  }
-
-  return count;
-}
-
-void nsFrameTreeWalker::GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent)
-{
-  aContent = nsnull;
-  aAccessible = nsnull;
-
-  aFrame->GetContent(getter_AddRefs(aContent));
-
-  if (!aContent)
-    return;
-
-  nsCOMPtr<nsIDocument> document;
-  aContent->GetDocument(*getter_AddRefs(document));
-  if (!document)
-    return;
-
-  PRInt32 shells = document->GetNumberOfShells();
-  NS_ASSERTION(shells > 0,"Error no shells!");
-  nsIPresShell* shell = document->GetShellAt(0);
-  nsIFrame* frame = nsnull;
-  shell->GetPrimaryFrameFor(aContent, &frame);
-
-  if (!frame)
-    return;
-
-  aAccessible = do_QueryInterface(aFrame);
-
-  if (!aAccessible)
-    aAccessible = do_QueryInterface(aContent);
-
-  if (aAccessible)
-    printf("Found accessible!\n");
-}
-
-PRBool nsFrameTreeWalker::IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2)
-{
-  if (!aFrame1 || !aFrame2)
-    return PR_FALSE;
-
-  nsCOMPtr<nsIContent> content1;
-  nsCOMPtr<nsIContent> content2;
-
-  aFrame1->GetContent(getter_AddRefs(content1));
-  aFrame2->GetContent(getter_AddRefs(content2));
-
-  if (content1 == content2 && content1 != nsnull)
-    return PR_TRUE;
-  
-  return PR_FALSE;
-}
-
-/*
- * Class nsAccessible
- */
-
-//-----------------------------------------------------
-// construction 
-//-----------------------------------------------------
-nsAccessible::nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-   NS_INIT_REFCNT();
-
-   // get frame and node
-   mContent = aContent;
-   mAccessible = aAccessible;
-   mPresShell = aShell;
-
-#ifdef DEBUG_LEAKS
-  printf("nsAccessibles=%d\n", ++gnsAccessibles);
-#endif
-
-}
-
-//-----------------------------------------------------
-// destruction
-//-----------------------------------------------------
-nsAccessible::~nsAccessible()
-{
-#ifdef DEBUG_LEAKS
-  printf("nsAccessibles=%d\n", --gnsAccessibles);
-#endif
-}
-
-//NS_IMPL_ISUPPORTS2(nsAccessible, nsIAccessible, nsIAccessibleWidgetAccess);
-NS_IMPL_ISUPPORTS1(nsAccessible, nsIAccessible);
-
-  /* readonly attribute nsIAccessible accParent; */
-NS_IMETHODIMP nsAccessible::GetAccParent(nsIAccessible * *aAccParent) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccParent(aAccParent);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-
-    // failed? Lets do some default behavior
-    walker.GetParent(GetFrame());
-
-    // if no content or accessible then we hit the root
-    if (!walker.mContent || !walker.mAccessible)
-    {
-      *aAccParent = new nsRootAccessible(mPresShell);
-      NS_ADDREF(*aAccParent);
-      return NS_OK;
-    }
-
-    *aAccParent = CreateNewParentAccessible(walker.mAccessible, walker.mContent, mPresShell);
-    NS_ADDREF(*aAccParent);
-    return NS_OK;
-  }
-
-  *aAccParent = nsnull;
-  return NS_OK;
-}
-  /* readonly attribute nsIAccessible accNextSibling; */
-NS_IMETHODIMP nsAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) 
-{ 
-  // delegate
- 
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccNextSibling(aAccNextSibling);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  // failed? Lets do some default behavior
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this);
-
-    nsIFrame* next = walker.GetNextSibling(GetFrame());
-  
-    if (next && walker.mAccessible && walker.mContent) 
-    {
-      *aAccNextSibling = CreateNewNextAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccNextSibling);
-      return NS_OK;
-    }
-  }
-
-  *aAccNextSibling = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accPreviousSibling; */
-NS_IMETHODIMP nsAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling) 
-{ 
-// delegate
- 
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccPreviousSibling(aAccPreviousSibling);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
- 
-  // failed? Lets do some default behavior
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* prev = walker.GetPreviousSibling(GetFrame());
-
-    if (prev && walker.mAccessible && walker.mContent) 
-    {
-      *aAccPreviousSibling = CreateNewPreviousAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccPreviousSibling);
-      return NS_OK;
-    }
-  }
-
-  *aAccPreviousSibling = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accFirstChild; */
-NS_IMETHODIMP nsAccessible::GetAccFirstChild(nsIAccessible * *aAccFirstChild) 
-{ 
-    
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccFirstChild(aAccFirstChild);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* child = walker.GetFirstChild(GetFrame());
-
-    if (child && walker.mAccessible && walker.mContent) 
-    {
-      *aAccFirstChild = CreateNewFirstAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccFirstChild);
-      return NS_OK;
-    }
-  }
-
-  *aAccFirstChild = nsnull;
-
-  return NS_OK;  
-}
-
-  /* readonly attribute nsIAccessible accFirstChild; */
-NS_IMETHODIMP nsAccessible::GetAccLastChild(nsIAccessible * *aAccLastChild)
-{  
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccLastChild(aAccLastChild);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    nsIFrame* last = walker.GetLastChild(GetFrame());
-
-    if (last && walker.mAccessible && walker.mContent) 
-    {
-      *aAccLastChild = CreateNewLastAccessible(walker.mAccessible, walker.mContent, mPresShell);
-      NS_ADDREF(*aAccLastChild);
-      return NS_OK;
-    }
-  }
-
-  *aAccLastChild = nsnull;
-
-  return NS_OK;
-}
-
-/* readonly attribute long accChildCount; */
-NS_IMETHODIMP nsAccessible::GetAccChildCount(PRInt32 *aAccChildCount) 
-{
-  
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccChildCount(aAccChildCount);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-  
-
-  // failed? Lets do some default behavior
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  if (context) {
-    nsFrameTreeWalker walker(context, this); 
-    *aAccChildCount = walker.GetCount(GetFrame());
-  } else 
-    *aAccChildCount = 0;
-
-  return NS_OK;  
-}
-
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsAccessible::GetAccName(PRUnichar * *aAccName) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccName(aAccName);
-    if (NS_SUCCEEDED(rv) && *aAccName != nsnull)
-      return rv;
-  }
-
-  *aAccName = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsAccessible::GetAccDefaultAction(PRUnichar * *aDefaultAction) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccDefaultAction(aDefaultAction);
-    if (NS_SUCCEEDED(rv) && *aDefaultAction != nsnull)
-      return rv;
-  }
-
-  *aDefaultAction = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::SetAccName(const PRUnichar * aAccName) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->SetAccName(aAccName);
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* attribute wstring accValue; */
-NS_IMETHODIMP nsAccessible::GetAccValue(PRUnichar * *aAccValue) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccValue(aAccValue);
-
-    if (NS_SUCCEEDED(rv) && *aAccValue != nsnull)
-      return rv;
-  }
-
-  *aAccValue = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::SetAccValue(const PRUnichar * aAccValue) { return NS_ERROR_NOT_IMPLEMENTED;  }
-
-  /* readonly attribute wstring accDescription; */
-NS_IMETHODIMP nsAccessible::GetAccDescription(PRUnichar * *aAccDescription) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccDescription(aAccDescription);
-    if (NS_SUCCEEDED(rv) && *aAccDescription != nsnull)
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accRole; */
-NS_IMETHODIMP nsAccessible::GetAccRole(PRUnichar * *aAccRole) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccRole(aAccRole);
-    if (NS_SUCCEEDED(rv) && *aAccRole != nsnull)
-      return rv;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accState; */
-NS_IMETHODIMP nsAccessible::GetAccState(PRUint32 *aAccState) 
-{ 
-  // delegate
-  if (mAccessible) 
-    return mAccessible->GetAccState(aAccState);
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-NS_IMETHODIMP nsAccessible::GetAccExtState(PRUint32 *aAccExtState) 
-{ 
-  // delegate
-  if (mAccessible) 
-    return mAccessible->GetAccExtState(aAccExtState);
-
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute wstring accHelp; */
-NS_IMETHODIMP nsAccessible::GetAccHelp(PRUnichar * *aAccHelp) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->GetAccHelp(aAccHelp);
-    if (NS_SUCCEEDED(rv) && *aAccHelp != nsnull)
-      return rv;
-  }
-
-  // failed? Lets do some default behavior
-  return NS_ERROR_NOT_IMPLEMENTED;  
-}
-
-  /* readonly attribute boolean accFocused; */
-NS_IMETHODIMP nsAccessible::GetAccFocused(PRBool *aAccFocused) { return NS_OK;  }
-
-  /* nsIAccessible accGetChildAt (in long x, in long y); */
-NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
-{
-  PRInt32 x,y,w,h;
-  AccGetBounds(&x,&y,&w,&h);
-  if (tx > x && tx < x + w && ty > y && ty < y + h)
-  {
-    nsCOMPtr<nsIAccessible> child;
-    nsCOMPtr<nsIAccessible> next;
-    GetAccFirstChild(getter_AddRefs(child));
-    PRInt32 cx,cy,cw,ch;
-
-    while(child) {
-      child->AccGetBounds(&cx,&cy,&cw,&ch);
-      
-      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
-      {
-        *_retval = child;
-        NS_ADDREF(*_retval);
-        return NS_OK;
-      }
-      child->GetAccNextSibling(getter_AddRefs(next));
-      child = next;
-    }
-
-
-    *_retval = this;
-    NS_ADDREF(this);
-    return NS_OK;
-  }
-
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-  /* void accNavigateRight (); */
-NS_IMETHODIMP nsAccessible::AccNavigateRight(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateLeft (); */
-NS_IMETHODIMP nsAccessible::AccNavigateLeft(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateUp (); */
-
-NS_IMETHODIMP nsAccessible::AccNavigateUp(nsIAccessible **_retval) { return NS_OK;  }
-
-  /* void navigateDown (); */
-NS_IMETHODIMP nsAccessible::AccNavigateDown(nsIAccessible **_retval) { return NS_OK;  }
-
-
-  /* void addSelection (); */
-NS_IMETHODIMP nsAccessible::AccAddSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccAddSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void removeSelection (); */
-NS_IMETHODIMP nsAccessible::AccRemoveSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccRemoveSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void extendSelection (); */
-NS_IMETHODIMP nsAccessible::AccExtendSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccExtendSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void takeSelection (); */
-NS_IMETHODIMP nsAccessible::AccTakeSelection(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccTakeSelection();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void takeFocus (); */
-NS_IMETHODIMP nsAccessible::AccTakeFocus(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccTakeFocus();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void doDefaultAction (); */
-NS_IMETHODIMP nsAccessible::AccDoDefaultAction(void) 
-{ 
-  // delegate
-  if (mAccessible) {
-    nsresult rv = mAccessible->AccDoDefaultAction();
-    if (NS_SUCCEEDED(rv))
-      return rv;
-  }
-
-  return NS_ERROR_FAILURE;  
-}
-
-  /* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  nsIFrame* frame = GetBoundsFrame();
-
-  if (!frame || !context)
-  {
-    *x = *y = *width = *height = 0;
-    return NS_OK;
-  }
-
-   // sum up all rects of frames with the same content node
-  nsRect r;
-  nsIFrame* start = frame;
-  nsIFrame* next = nsnull;
-  start->GetNextSibling(&next);
-
-  start->GetRect(r);
-  
-  while (nsFrameTreeWalker::IsSameContent(start, next))
-  {
-    nsRect r2;
-    next->GetRect(r2);
-    r.UnionRect(r,r2);
-    next->GetNextSibling(&next);
-  }
-
-  nsPoint offset(r.x,r.y);
-
-  frame->GetParent(&frame);
-
-  nsPoint pos(0,0);
-  while(frame) {
-    nsIScrollableView* scrollingView;
-    nsIView*           view;
-    // XXX hack
-    frame->GetView(context, &view);
-    if (view) {
-     nsresult result = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView);
-     if (NS_SUCCEEDED(result)) {
-         nscoord xoff = 0;
-         nscoord yoff = 0;
-         scrollingView->GetScrollPosition(xoff, yoff);
-         offset.x -= xoff;
-         offset.y -= yoff;
-     }
-    }
-
-    frame->GetOrigin(pos);
-    offset += pos;
-    frame->GetParent(&frame);
-  }
-
-  float t2p;
-  context->GetTwipsToPixels(&t2p);
-
-  *x = (PRInt32)(offset.x*t2p);
-  *y = (PRInt32)(offset.y*t2p);
-  *width = (PRInt32)(r.width*t2p);
-  *height = (PRInt32)(r.height*t2p);
-
-  return NS_OK;
-}
-
-// helpers
-
-nsIFrame* nsAccessible::GetBoundsFrame()
-{
-   return GetFrame();
-}
-
-nsIFrame* nsAccessible::GetFrame()
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mContent, &frame);
-   return frame;
-}
-
-void nsAccessible::GetPresContext(nsCOMPtr<nsIPresContext>& aContext)
-{
-  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-
-  if (shell) {
-    shell->GetPresContext(getter_AddRefs(aContext));
-  } else
-    aContext = nsnull;
-}
-
-nsIAccessible* nsAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsAccessible(aAccessible, aContent, aShell);
-}
-
-
-// ------- nsHTMLBlockAccessible ------
-
-nsHTMLBlockAccessible::nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):nsAccessible(aAccessible, aContent, aShell)
-{
-
-}
-
-nsIAccessible* nsHTMLBlockAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
-}
-
-/* nsIAccessible accGetAt (in long x, in long y); */
-NS_IMETHODIMP nsHTMLBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
-{
-  PRInt32 x,y,w,h;
-  AccGetBounds(&x,&y,&w,&h);
-  if (tx > x && tx < x + w && ty > y && ty < y + h)
-  {
-    nsCOMPtr<nsIAccessible> child;
-    nsCOMPtr<nsIAccessible> smallestChild;
-    PRInt32 smallestArea = -1;
-    nsCOMPtr<nsIAccessible> next;
-    GetAccFirstChild(getter_AddRefs(child));
-    PRInt32 cx,cy,cw,ch;
-
-    while(child) {
-      child->AccGetBounds(&cx,&cy,&cw,&ch);
-      
-      // ok if there are multiple frames the contain the point 
-      // and they overlap then pick the smallest. We need to do this
-      // for text frames.
-      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
-      {
-        if (smallestArea == -1 || cw*ch < smallestArea) {
-          smallestArea = cw*ch;
-          smallestChild = child;
-        }
-      }
-      child->GetAccNextSibling(getter_AddRefs(next));
-      child = next;
-    }
-
-    if (smallestChild != nsnull)
-    {
-      *_retval = smallestChild;
-      NS_ADDREF(*_retval);
-      return NS_OK;
-    }
-
-    *_retval = this;
-    NS_ADDREF(this);
-    return NS_OK;
-  }
-
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-
-
-
-

mozilla/accessible/src/nsAccessible.h

@@ -1,79 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#ifndef _nsAccessible_H_
-#define _nsAccessible_H_
-
-#include "nsISupports.h"
-#include "nsIAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsWeakReference.h"
-
-class nsIFrame;
-
-class nsAccessible : public nsIAccessible
-//                     public nsIAccessibleWidgetAccess
-{
-  NS_DECL_ISUPPORTS
-
-  // nsIAccessibilityService methods:
-  NS_DECL_NSIACCESSIBLE
-
-  //NS_IMETHOD AccGetWidget(nsIWidget**);
-
-	public:
-		nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-		virtual ~nsAccessible();
-
-    virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList) { aList = nsnull; }
-
-protected:
-  virtual nsIFrame* GetFrame();
-  virtual nsIFrame* GetBoundsFrame();
-  virtual void GetPresContext(nsCOMPtr<nsIPresContext>& aContext);
-  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIContent> mContent;
-  nsCOMPtr<nsIWeakReference> mPresShell;
-  nsCOMPtr<nsIAccessible> mAccessible;
-};
-
-/* Special Accessible that knows how to handle hit detection for flowing text */
-class nsHTMLBlockAccessible : public nsAccessible
-{
-public:
-   nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-   NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval);
-protected:
-   virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aFrame, nsIWeakReference* aShell);
-};
-
-#endif  

mozilla/accessible/src/nsGenericAccessible.cpp

@@ -1,335 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsGenericAccessible.h"
-#include "nsIEventStateManager.h"
-#include "nsIFrame.h"
-#include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsGenericAccessible, nsIAccessible)
-
-nsGenericAccessible::nsGenericAccessible()
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-nsGenericAccessible::~nsGenericAccessible()
-{
-  /* destructor code */
-}
-
-/* nsIAccessible getAccParent (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccParent(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccNextSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccPreviousSibling (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccName(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccValue (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccValue(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setAccName (in wstring name); */
-NS_IMETHODIMP nsGenericAccessible::SetAccName(const PRUnichar *name)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setAccValue (in wstring value); */
-NS_IMETHODIMP nsGenericAccessible::SetAccValue(const PRUnichar *value)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccDescription (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccDescription(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccRole(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccHelp (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccHelp(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* boolean getAccFocused (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccFocused(PRBool *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accGetAt (in long x, in long y); */
-NS_IMETHODIMP nsGenericAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateRight (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateRight(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateLeft (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateLeft(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateUp (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateUp(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIAccessible accNavigateDown (); */
-NS_IMETHODIMP nsGenericAccessible::AccNavigateDown(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accGetBounds (out long x, out long y, out long width, out long height); */
-NS_IMETHODIMP nsGenericAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accAddSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccAddSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accRemoveSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccRemoveSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accExtendSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccExtendSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeSelection (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accTakeFocus (); */
-NS_IMETHODIMP nsGenericAccessible::AccTakeFocus()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void accDoDefaultAction (); */
-NS_IMETHODIMP nsGenericAccessible::AccDoDefaultAction()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long getAccExtState (); */
-NS_IMETHODIMP nsGenericAccessible::GetAccExtState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//-------------
-// nsDOMAccessible
-//-------------
-
-nsDOMAccessible::nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode)
-{
-  mPresShell = do_GetWeakReference(aShell);
-  mNode = aNode;
-}
-
-
-/* void accRemoveSelection (); */
-NS_IMETHODIMP nsDOMAccessible::AccRemoveSelection()
-{
-    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
-    nsCOMPtr<nsISelection> selection;
-    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> parent;
-    rv = mNode->GetParentNode(getter_AddRefs(parent));
-    if (NS_FAILED(rv))
-      return rv;
-
-    rv = selection->Collapse(parent, 0);
-    if (NS_FAILED(rv))
-      return rv;
-
-    return NS_OK;
-}
-
-/* void accTakeSelection (); */
-NS_IMETHODIMP nsDOMAccessible::AccTakeSelection()
-{
-    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
-    nsCOMPtr<nsISelection> selection;
-    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> parent;
-    rv = mNode->GetParentNode(getter_AddRefs(parent));
-    if (NS_FAILED(rv))
-      return rv;
-
-    PRInt32 offsetInParent = 0;
-    nsCOMPtr<nsIDOMNode> child;
-    rv = parent->GetFirstChild(getter_AddRefs(child));
-    if (NS_FAILED(rv))
-      return rv;
-
-    nsCOMPtr<nsIDOMNode> next; 
-
-    while(child)
-    {
-      if (child == mNode) {
-        // Collapse selection to just before desired element,
-        rv = selection->Collapse(parent, offsetInParent);
-        if (NS_FAILED(rv))
-          return rv;
-
-        // then extend it to just after
-        rv = selection->Extend(parent, offsetInParent+1);
-        return rv;
-      }
-
-       child->GetNextSibling(getter_AddRefs(next));
-       child = next;
-       offsetInParent++;
-    }
-
-    // didn't find a child
-    return NS_ERROR_FAILURE;
-}
-
-/* void accTakeFocus (); */
-NS_IMETHODIMP nsDOMAccessible::AccTakeFocus()
-{ 
-  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-  nsCOMPtr<nsIPresContext> context;
-  shell->GetPresContext(getter_AddRefs(context));
-  nsCOMPtr<nsIContent> content = do_QueryInterface(mNode);
-  content->SetFocus(context);
-  
-  return NS_OK;
-}
-
-//-------------
-// nsLeafFrameAccessible
-//-------------
-
-nsLeafDOMAccessible::nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsDOMAccessible(aShell, aNode)
-{
-}
-
-/* nsIAccessible getAccFirstChild (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* nsIAccessible getAccLastChild (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-/* long getAccChildCount (); */
-NS_IMETHODIMP nsLeafDOMAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 0;
-  return NS_OK;
-}
-

mozilla/accessible/src/nsGenericAccessible.h

@@ -1,83 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsGenericAccessible_H_
-#define _nsGenericAccessible_H_
-
-#include "nsISupports.h"
-#include "nsIAccessible.h"
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
-
-/**
- * Basic implementation
- * supports nothing
- */
-class nsGenericAccessible : public nsIAccessible
-{
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIACCESSIBLE
-
-	public:
-    nsGenericAccessible();
-    virtual ~nsGenericAccessible();
-};
-
-/**
- * And accessible that observes a dom node
- * supports:
- * - selection
- * - focus
- */
-class nsDOMAccessible : public nsGenericAccessible
-{
-  public:
-    nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-
-    NS_IMETHOD AccTakeSelection(void); 
-    NS_IMETHOD AccTakeFocus(void); 
-    NS_IMETHOD AccRemoveSelection(void);
-
-  protected:
-    nsCOMPtr<nsIWeakReference> mPresShell;
-    nsCOMPtr<nsIDOMNode> mNode;
-};
-
-/* Leaf version of DOM Accessible
- * has no children
- */
-class nsLeafDOMAccessible : public nsDOMAccessible
-{
-  public:
-    nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-
-    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-};
-
-#endif  

mozilla/accessible/src/nsHTMLFormControlAccessible.cpp

@@ -1,175 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLFormControlAccessible.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-#include "nsIDOMHTMLInputElement.h"
-#include "nsINameSpaceManager.h"
-#include "nsHTMLAtoms.h"
-#include "nsIDOMHTMLButtonElement.h"
-#include "nsReadableUtils.h"
-
-nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsLeafDOMAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccName(PRUnichar **_retval)
-{
-  // go up tree get name of label if there is one.
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* wstring getAccState (); */
-NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccState(PRUint32 *_retval)
-{
-    // can be
-    // focusable, focused, checked
-    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-
-    PRBool checked = PR_FALSE;
-    element->GetChecked(&checked);
-    *_retval = (checked ? STATE_CHECKED : 0);
-    return NS_OK;
-}
-
-// --- checkbox -----
-
-nsHTMLCheckboxAccessible::nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("check box"));
-    return NS_OK;
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    // check or uncheck
-    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-
-    PRBool checked = PR_FALSE;
-    element->GetChecked(&checked);
-    if (checked)
-        *_retval = ToNewUnicode(NS_LITERAL_STRING("Check"));
-    else
-        *_retval = ToNewUnicode(NS_LITERAL_STRING("UnCheck"));
-
-    return NS_OK;
-}
-
-/* void accDoDefaultAction (); */
-NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  PRBool checked = PR_FALSE;
-  element->GetChecked(&checked);
-  element->SetChecked(checked ? PR_FALSE : PR_TRUE);
-
-  return NS_OK;
-}
-
-
-//------ Radio button -------
-
-nsHTMLRadioButtonAccessible::nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("Select"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("radio button"));
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  element->Click();
-
-  return NS_OK;
-}
-
-// ----- Button -----
-
-nsHTMLButtonAccessible::nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
-nsHTMLFormControlAccessible(aShell, aNode)
-{ 
-}
-
-/* wstring getAccDefaultAction (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("Press"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUnichar **_retval)
-{
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("push button"));
-    return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(PRUnichar **_retval)
-{
-    *_retval = nsnull;
-    nsCOMPtr<nsIDOMHTMLInputElement> button = do_QueryInterface(mNode);
-
-    if (!button)
-      return NS_ERROR_FAILURE;
-
-    nsAutoString name;
-    button->GetValue(name);
-    name.CompressWhitespace();
-
-    *_retval = name.ToNewUnicode();
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsHTMLButtonAccessible::AccDoDefaultAction()
-{
-  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
-  element->Click();
-
-  return NS_OK;
-}

mozilla/accessible/src/nsHTMLFormControlAccessible.h

@@ -1,77 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Author: Eric D Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#ifndef _nsHTMLFormControlAccessible_H_
-#define _nsHTMLFormControlAccessible_H_
-
-#include "nsGenericAccessible.h"
-
-class nsICheckboxControlFrame;
-
-/* Accessible for supporting for controls
- * supports:
- * - walking up to get name from label
- * - support basic state
- */
-class nsHTMLFormControlAccessible : public nsLeafDOMAccessible
-{
-
-public:
-  nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccState(PRUint32 *_retval); 
-};
-
-class nsHTMLCheckboxAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-};
-
-class nsHTMLRadioButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-};
-
-class nsHTMLButtonAccessible : public nsHTMLFormControlAccessible
-{
-
-public:
-  nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
-  NS_IMETHOD AccDoDefaultAction(void); 
-
-};
-
-#endif  

mozilla/accessible/src/nsHTMLTextAccessible.cpp

@@ -1,51 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Author: Eric Vaughan (evaughan@netscape.com)
- * Contributor(s): 
- */
-
-#include "nsHTMLTextAccessible.h"
-#include "nsICheckboxControlFrame.h"
-#include "nsWeakReference.h"
-#include "nsIFrame.h"
-
-nsHTMLTextAccessible::nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode):
-nsLeafDOMAccessible(aShell, aDomNode)
-{ 
-}
-
-/* wstring getAccName (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(PRUnichar **_retval)
-{
-  nsAutoString value;
-  mNode->GetNodeValue(value);
-  value.CompressWhitespace();
-  *_retval = value.ToNewUnicode();
-  return NS_OK;
-}
-
-/* wstring getAccRole (); */
-NS_IMETHODIMP nsHTMLTextAccessible::GetAccRole(PRUnichar **_retval)
-{
-    nsAutoString role(NS_LITERAL_STRING("text"));
-    *_retval = role.ToNewUnicode();
-
-    return NS_OK;
-}

mozilla/accessible/src/nsHTMLTextAccessible.h

@@ -1,43 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#ifndef _nsHTMLTextAccessible_H_
-#define _nsHTMLTextAccessible_H_
-
-#include "nsGenericAccessible.h"
-
-class nsIWeakReference;
-class nsITextControlFrame;
-
-class nsHTMLTextAccessible : public nsLeafDOMAccessible
-{
-
-public:
-  nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode);
-  NS_IMETHOD GetAccName(PRUnichar **_retval); 
-  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
-
-private:
-  nsCOMPtr<nsIDOMNode> mDomNode;
-};
-
-#endif  

mozilla/accessible/src/nsMutableAccessible.cpp

@@ -1,263 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#include "nsMutableAccessible.h"
-#include "nsINameSpaceManager.h"
-
-NS_IMPL_ISUPPORTS1(nsMutableAccessible, nsIAccessible)
-
-nsMutableAccessible::nsMutableAccessible(nsISupports* aNode)
-{
-  NS_INIT_ISUPPORTS();
-  NS_ASSERTION(aNode,"We must have a valid node!!");
-  mNode = aNode;
-  mNameNodeValue = PR_FALSE;
-  mNameStringSet = PR_FALSE;
-  mRole = NS_LITERAL_STRING("unknown");
-  mIsLeaf = PR_FALSE;
-}
-
-nsMutableAccessible::~nsMutableAccessible()
-{
-}
-
-NS_IMETHODIMP nsMutableAccessible::SetIsLeaf(PRBool aLeaf)
-{
-    mIsLeaf = aLeaf;
-    return NS_OK;
-}
-
-/* void SetNodeAsNodeValue (); */
-NS_IMETHODIMP nsMutableAccessible::SetNameAsNodeValue()
-{
-    mNameNodeValue = PR_TRUE;
-    return NS_OK;
-}
-
-/* void SetName (in wstring name); */
-NS_IMETHODIMP nsMutableAccessible::SetName(const PRUnichar *aName)
-{
-    mName = aName; 
-    mNameStringSet = PR_TRUE;
-    return NS_OK;
-}
-
-/* void SetNameAsAttribute (in nsIAtom atom); */
-NS_IMETHODIMP nsMutableAccessible::SetNameAsAttribute(nsIAtom *aAttribute)
-{
-   mNameAttribute = aAttribute;
-   return NS_OK;
-}
-
-/* void SetNameAsAttribute (in nsIAtom atom); */
-NS_IMETHODIMP nsMutableAccessible::SetRole(const PRUnichar *aRole)
-{
-   mRole = aRole;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccParent(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{ 
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  if (mIsLeaf) {
-    *_retval = nsnull;
-    return NS_OK;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  if (mIsLeaf) {
-    *_retval = nsnull;
-    return NS_OK;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  if (mIsLeaf) {
-    *_retval = 0;
-    return NS_OK;
-  }
-
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccName(PRUnichar **_retval)
-{
-  nsAutoString value;
-
-  if (mNameNodeValue) {
-    // see if we can get nodevalue
-    nsCOMPtr<nsIDOMNode> node = do_QueryInterface(mNode);
-    if (node) {
-      node->GetNodeValue(value);
-      value.CompressWhitespace();
-    } else {
-      *_retval = nsnull;
-      return NS_ERROR_NOT_IMPLEMENTED;
-    }
-  } else if (mNameStringSet) {
-    value = mName;
-  } else if (mNameAttribute) {
-    nsCOMPtr<nsIContent> content = do_QueryInterface(mNode);
-    content->GetAttribute(kNameSpaceID_None, mNameAttribute, value);
-    value.CompressWhitespace();
-  } else {
-     *_retval = nsnull;
-     return NS_ERROR_NOT_IMPLEMENTED;
-  }
-    
-  *_retval = value.ToNewUnicode();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccValue(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::SetAccName(const PRUnichar *name)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::SetAccValue(const PRUnichar *value)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccDescription(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = mRole.ToNewUnicode();
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccExtState(PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccDefaultAction(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccHelp(PRUnichar **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::GetAccFocused(PRBool *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccNavigateRight(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccNavigateLeft(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccNavigateUp(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccNavigateDown(nsIAccessible **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccAddSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccRemoveSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccExtendSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccTakeSelection()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccTakeFocus()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMutableAccessible::AccDoDefaultAction()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-

mozilla/accessible/src/nsMutableAccessible.h

@@ -1,51 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#ifndef _nsMutableAccessible_H_
-#define _nsMutableAccessible_H_
-
-#include "nsIMutableAccessible.h"
-#include "nsAccessible.h"
-#include "nsString.h"
-
-class nsMutableAccessible : public nsIMutableAccessible
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIACCESSIBLE
-  NS_DECL_NSIMUTABLEACCESSIBLE
-
-  nsMutableAccessible(nsISupports* aNode);
-  virtual ~nsMutableAccessible();
-
-private:
-  nsCOMPtr<nsISupports> mNode;
-  nsString mName;
-  nsString mRole;
-  nsCOMPtr<nsIAtom> mNameAttribute;
-  PRPackedBool mNameNodeValue;
-  PRPackedBool mNameStringSet;
-  PRPackedBool mIsLeaf;
-};
-
-#endif
-

mozilla/accessible/src/nsRootAccessible.cpp

@@ -1,199 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#include "nsRootAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsIDOMEventTarget.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsReadableUtils.h"
-
-NS_INTERFACE_MAP_BEGIN(nsRootAccessible)
-  NS_INTERFACE_MAP_ENTRY(nsIAccessibleEventReceiver)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAccessibleEventReceiver)
-NS_INTERFACE_MAP_END_INHERITING(nsAccessible)
-
-NS_IMPL_ADDREF_INHERITED(nsRootAccessible, nsAccessible);
-NS_IMPL_RELEASE_INHERITED(nsRootAccessible, nsAccessible);
-
-//-----------------------------------------------------
-// construction 
-//-----------------------------------------------------
-nsRootAccessible::nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame):nsAccessible(nsnull,nsnull,aShell)
-{
- // mFrame = aFrame;
- mListener = nsnull;
-}
-
-//-----------------------------------------------------
-// destruction
-//-----------------------------------------------------
-nsRootAccessible::~nsRootAccessible()
-{
-  RemoveAccessibleEventListener(mListener);
-}
-
-  /* attribute wstring accName; */
-NS_IMETHODIMP nsRootAccessible::GetAccName(PRUnichar * *aAccName) 
-{ 
-  *aAccName = ToNewUnicode(NS_LITERAL_STRING("Mozilla Document"));
-  return NS_OK;  
-}
-
-// helpers
-nsIFrame* nsRootAccessible::GetFrame()
-{
-  //if (!mFrame) {
-    nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-    nsIFrame* root = nsnull;
-    if (shell) 
-      shell->GetRootFrame(&root);
-  
-    return root;
-  //}
- 
- // return mFrame;
-}
-
-nsIAccessible* nsRootAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
-}
-
-  /* readonly attribute nsIAccessible accParent; */
-NS_IMETHODIMP nsRootAccessible::GetAccParent(nsIAccessible * *aAccParent) 
-{ 
-  *aAccParent = nsnull;
-  return NS_OK;
-}
-
-  /* readonly attribute wstring accRole; */
-NS_IMETHODIMP nsRootAccessible::GetAccRole(PRUnichar * *aAccRole) 
-{ 
-  *aAccRole = ToNewUnicode(NS_LITERAL_STRING("client"));
-  return NS_OK;  
-}
-
-/* void addAccessibleEventListener (in nsIAccessibleEventListener aListener); */
-NS_IMETHODIMP nsRootAccessible::AddAccessibleEventListener(nsIAccessibleEventListener *aListener)
-{
-  if (!mListener)
-  {
-     // add an event listener to the document
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     nsCOMPtr<nsIDocument> document;
-     shell->GetDocument(getter_AddRefs(document));
-
-     nsCOMPtr<nsIDOMEventReceiver> receiver;
-     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(receiver))) && receiver)
-     {
-        nsresult rv = receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-     }
-  }
-
-  // create a weak reference to the listener
-  mListener =  aListener;
-
-  return NS_OK;
-}
-
-/* void removeAccessibleEventListener (in nsIAccessibleEventListener aListener); */
-NS_IMETHODIMP nsRootAccessible::RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener)
-{
-  if (mListener)
-  {
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     nsCOMPtr<nsIDocument> document;
-     if (!shell)
-       return NS_OK;
-
-     shell->GetDocument(getter_AddRefs(document));
-
-     nsCOMPtr<nsIDOMEventReceiver> erP;
-     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP))) && erP)
-     {
-        nsresult rv = erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
-     }
-  }
-
-  mListener = nsnull;
-
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
-{
-  if (mListener) {
-     nsCOMPtr<nsIDOMEventTarget> t;
-     aEvent->GetOriginalTarget(getter_AddRefs(t));
-  
-     // create and accessible for the target
-     nsCOMPtr<nsIContent> content = do_QueryInterface(t); 
-
-     if (!content)
-       return NS_OK;
-
-     if (mCurrentFocus == content)
-       return NS_OK;
-
-     mCurrentFocus = content;
-
-     nsIFrame* frame = nsnull;
-     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-     shell->GetPrimaryFrameFor(content, &frame);
-
-     if (!frame)
-       return NS_OK;
-
-     nsCOMPtr<nsIAccessible> a = do_QueryInterface(frame);
-
-     if (!a)
-       a = do_QueryInterface(content);
-
-     nsCOMPtr<nsIAccessible> na = CreateNewAccessible(a, content, mPresShell);
-
-     mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, na);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsRootAccessible::Focus(nsIDOMEvent* aEvent) 
-{ 
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsRootAccessible::Blur(nsIDOMEvent* aEvent) 
-{ 
-  return NS_OK;
-}
-
-
-

mozilla/accessible/src/nsRootAccessible.h

@@ -1,70 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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): 
- */
-
-#ifndef _nsRootAccessible_H_
-#define _nsRootAccessible_H_
-
-#include "nsAccessible.h"
-#include "nsIAccessibleEventReceiver.h"
-#include "nsIAccessibleEventListener.h"
-#include "nsIDOMFocusListener.h"
-
-class nsRootAccessible : public nsAccessible,
-                         public nsIAccessibleEventReceiver,
-                         public nsIDOMFocusListener
-
-{
-  
-  NS_DECL_ISUPPORTS_INHERITED
-
-  public:
-    nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame = nsnull);
-    virtual ~nsRootAccessible();
-
-    /* attribute wstring accName; */
-    NS_IMETHOD GetAccName(PRUnichar * *aAccName);
-    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
-    NS_IMETHOD GetAccRole(PRUnichar * *aAccRole);
-
-    // ----- nsIAccessibleEventReceiver ------
-
-    NS_IMETHOD AddAccessibleEventListener(nsIAccessibleEventListener *aListener);
-    NS_IMETHOD RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener);
-
-    // ----- nsIDOMEventListener --------
-    NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent);
-    NS_IMETHOD Focus(nsIDOMEvent* aEvent);
-    NS_IMETHOD Blur(nsIDOMEvent* aEvent);
-
-protected:
-  virtual nsIFrame* GetFrame();
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  // not a com pointer. We don't own the listener
-  // it is the callers responsibility to remove the listener
-  // otherwise we will get into circular referencing problems
-  nsIAccessibleEventListener* mListener;
-  nsCOMPtr<nsIContent> mCurrentFocus;
-};
-
-
-#endif  

mozilla/accessible/src/nsSelectAccessible.cpp

@@ -1,717 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-
-#include "nsSelectAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "nsIPresShell.h"
-#include "nsIPresContext.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsRootAccessible.h"
-#include "nsINameSpaceManager.h"
-#include "nsMutableAccessible.h"
-#include "nsLayoutAtoms.h"
-#include "nsIDOMMenuListener.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsReadableUtils.h"
-
-class nsSelectChildAccessible : public nsAccessible,
-                                public nsIDOMMenuListener
-{
-public:
-  
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectChildAccessible();
-
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccValue(PRUnichar **_retval);
-
-  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  // popup listener
-  NS_IMETHOD Create(nsIDOMEvent* aEvent);
-  NS_IMETHOD Close(nsIDOMEvent* aEvent);
-  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
-  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIContent> mSelectContent;
-  PRBool mRegistered;
-  PRBool mOpen;
-};
-
-NS_IMPL_ISUPPORTS_INHERITED(nsSelectChildAccessible, nsAccessible, nsIDOMMenuListener)
-
-class nsSelectWindowAccessible : public nsAccessible,
-                                 public nsIDOMMenuListener
-{
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectWindowAccessible();
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccState(PRUint32 *_retval);
-  NS_IMETHOD GetAccExtState(PRUint32 *_retval);
-
-  // popup listener
-  NS_IMETHOD Create(nsIDOMEvent* aEvent);
-  NS_IMETHOD Close(nsIDOMEvent* aEvent);
-  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
-  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
-
-  // helpers
-  virtual nsIFrame* GetBoundsFrame();
-
-  nsCOMPtr<nsIAccessible> mParent;
-  nsCOMPtr<nsIAccessible> mPrev;
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  PRBool mRegistered;
-  PRBool mOpen;
-};
-
-NS_IMPL_ISUPPORTS_INHERITED(nsSelectWindowAccessible, nsAccessible, nsIDOMMenuListener)
-
-class nsSelectListAccessible : public nsAccessible
-{
-public:
-  
-  nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsSelectListAccessible() {}
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
-  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
-  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
-
-  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIAccessible> mParent;
-};
-
-class nsListChildAccessible : public nsAccessible
-{
-public:
-  
-  nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual ~nsListChildAccessible() {}
-
-  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-
-  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
-  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAccessible> mParent;
-  nsCOMPtr<nsIAtom> mPopupAtom;
-  nsCOMPtr<nsIContent> mSelectContent;
-};
-
-//---------
- 
-nsSelectAccessible::nsSelectAccessible(nsIAtom* aPopupAtom, 
-                                       nsIAccessible* aAccessible, 
-                                       nsIContent* aContent, 
-                                       nsIWeakReference* aShell)
-                                               :nsAccessible(aAccessible, aContent, aShell)
-{
-  mPopupAtom = aPopupAtom;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccValue(PRUnichar **_retval)
-{
-  // our value is our first child's value. Which is the combo boxes text.
-  nsCOMPtr<nsIAccessible> text;
-  nsresult rv = GetAccFirstChild(getter_AddRefs(text));
-
-  if (NS_FAILED(rv)) {
-     *_retval = nsnull;
-     return rv;
-  }
-
-  if (!text) {
-     *_retval = nsnull;
-     return NS_ERROR_FAILURE;
-  }
-
-  // look at our role
-  return text->GetAccValue(_retval);
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccName(PRUnichar **_retval)
-{
-   *_retval = nsnull;
-   return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("combo box"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  // get the last child. Wrap it with a connector that connects it to the window accessible
-  nsCOMPtr<nsIAccessible> last;
-  nsresult rv = nsAccessible::GetAccLastChild(getter_AddRefs(last));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!last) {
-    // we have a parent but not previous
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
-  } else {
-    *_retval = last;
-  }
-
-  NS_ADDREF(*_retval);
-
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  // get the last child. Wrap it with a connector that connects it to the window accessible
-  nsCOMPtr<nsIAccessible> first;
-  nsresult rv = nsAccessible::GetAccFirstChild(getter_AddRefs(first));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!first) {
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
-  } else {
-    *_retval = first;
-  }
-
-  NS_ADDREF(*_retval);
-
-  return NS_OK;
-}
-
-nsIAccessible* nsSelectAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewLastAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsSelectChildAccessible(mPopupAtom, mContent, aAccessible, aContent, aShell);
-}
-
-NS_IMETHODIMP nsSelectAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  nsresult rv = nsAccessible::GetAccChildCount(_retval);
-  if (NS_FAILED(rv))
-    return rv;
-
-  // always have one more that is our window child
-  (*_retval)++;
-  return NS_OK;
-}
-
-//--------------------
-
-nsSelectChildAccessible::nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
-nsAccessible(aAccessible, aContent, aShell)
-{
-  mPopupAtom = aPopupAtom;
-  mSelectContent = aSelectContent;
-  mRegistered = PR_FALSE;
-  mOpen = PR_FALSE;
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccValue(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  rv = nsAccessible::GetAccRole(&string);
-  if (NS_FAILED(rv)) {
-   *_retval = nsnull;
-   return rv;
-  }
-
-  nsAutoString role(string);
-
-  // if its the text in the combo box then
-  // its value should be its name.
-  if (role.EqualsIgnoreCase("text")) {
-    rv = nsAccessible::GetAccName(_retval);
-  } else {
-    rv = nsAccessible::GetAccValue(_retval);
-  }
-
-  delete string;
-  return rv;
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccRole(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  rv = nsAccessible::GetAccRole(&string);
-  if (NS_FAILED(rv)) {
-   *_retval = nsnull;
-   return rv;
-  }
-
-  nsAutoString role(string);
-
-  // any text in the combo box is static
-  if (role.EqualsIgnoreCase("text")) {
-    // if it the comboboxes text. Make it static
-    *_retval = ToNewUnicode(NS_LITERAL_STRING("static text"));
-  } else {
-    rv = nsAccessible::GetAccRole(_retval);
-  }
-
-  delete string;
-  return rv;
-}
-
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccName(PRUnichar **_retval)
-{
-  nsresult rv = NS_OK;
-  PRUnichar* string = nsnull;
-
-  // look at our role
-  nsAccessible::GetAccRole(&string);
-  nsAutoString role(string);
-
-  // if button then we need to make the name be open or close
-  if (role.EqualsIgnoreCase("push button"))
-  {
-     // if its a button and not already registered, 
-     // register ourselves as a popup listener   
-     if (!mRegistered) {
-       nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
-       if (!eventReceiver) {
-         *_retval = nsnull;
-         return NS_ERROR_NOT_IMPLEMENTED;
-       }
-
-       eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-
-       mRegistered = PR_TRUE;
-     }
-
-     // get the current state open or closed
-     // set _retval to it.
-     // notice its supposed to be reversed. Close if opened
-     // and Open if closed.
-
-     if (mOpen)
-         *_retval = ToNewUnicode(NS_LITERAL_STRING("Close"));
-     else
-         *_retval = ToNewUnicode(NS_LITERAL_STRING("Open"));
-
-  } else {
-    /*rv = nsAccessible::GetAccName(_retval);*/
-    rv = NS_ERROR_NOT_IMPLEMENTED;
-    *_retval = nsnull;
-  }
-
-  delete string;
-
-  return rv;
-}
-
-
-nsSelectChildAccessible::~nsSelectChildAccessible()
-{
-  if (mRegistered) {
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
-     if (eventReceiver) 
-       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-  }
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Create(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_TRUE;
-  printf("Open\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Destroy(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::Close(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-nsIAccessible* nsSelectChildAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  return CreateNewPreviousAccessible(aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectChildAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsSelectChildAccessible(mPopupAtom, mSelectContent, aAccessible, aContent, aShell);
-}
-
-NS_IMETHODIMP nsSelectChildAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{ 
-  nsCOMPtr<nsIAccessible> next;
-  nsresult rv = nsAccessible::GetAccNextSibling(getter_AddRefs(next));
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!next) {
-    // ok no more siblings. Lets create our window
-    nsCOMPtr<nsIAccessible> parent;
-    GetAccParent(getter_AddRefs(parent));
-
-    *_retval = new nsSelectWindowAccessible(mPopupAtom, parent, nsnull, nsnull, mSelectContent, mPresShell);
-  } else {
-    *_retval = next;
-  }
-
-  NS_ADDREF(*_retval);
-
-  return NS_OK;
-} 
-
-
-//---------------------
-
-
-nsSelectWindowAccessible::nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-:nsAccessible(aAccessible, aContent, aShell)
-{
-  mParent = aParent;
-  mPrev = aPrev;
-  mPopupAtom = aPopupAtom;
-  mRegistered = PR_FALSE;
-  mOpen = PR_FALSE;
-}
-
-nsSelectWindowAccessible::~nsSelectWindowAccessible()
-{
-  if (mRegistered) {
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
-     if (eventReceiver) 
-       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-  }
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Create(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_TRUE;
-  printf("Open\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Destroy(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::Close(nsIDOMEvent* aEvent)
-{ 
-  mOpen = PR_FALSE;
-  printf("Close\n");
-
-  /* TBD send state change event */ 
-
-  return NS_OK; 
-}
-
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccState(PRUint32 *_retval)
-{
-  // not not already one register ourselves as a popup listener
-   
-  if (!mRegistered) {
-
-     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
-     if (!eventReceiver) {
-       *_retval = 0;
-       return NS_ERROR_NOT_IMPLEMENTED;
-     }
-
-     nsresult rv = eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
-
-     if (NS_FAILED(rv)) {
-       *_retval = 0;
-       return rv;
-     }
-
-     mRegistered = PR_TRUE;
-  }
-
-  // if open we are visible if closed we are invisible
-   // set _retval to it.
-   if (mOpen)
-     *_retval |= STATE_DEFAULT;
-   else
-     *_retval |= STATE_INVISIBLE;
-
-   return NS_OK;
-}
-
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccExtState(PRUint32 *_retval)
-{
-	*_retval=0;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccName(PRUnichar **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
- 
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("window"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_IF_ADDREF(*_retval);
-    return NS_OK;
-}
- 
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{ 
-  *_retval = mPrev;
-  NS_IF_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccLastChild(nsIAccessible **_retval)
-{
-  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccFirstChild(nsIAccessible **_retval)
-{
-  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectWindowAccessible::GetAccChildCount(PRInt32 *_retval)
-{
-  *_retval = 1;
-  return NS_OK;
-}
-
-/*
-NS_IMETHODIMP nsSelectWindowAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  *x = *y = *width = *height = 0;
-  return NS_OK;
-}
-*/
-
-nsIFrame* nsSelectWindowAccessible::GetBoundsFrame()
-{
-  // get our frame
-  nsIFrame* frame = GetFrame();
-
-  nsCOMPtr<nsIPresContext> context;
-  GetPresContext(context);
-
-  // get its first popup child that should be the window
-  frame->FirstChild(context, mPopupAtom, &frame);
-
-  return frame;
-}
-
-//----------
-
-
-nsSelectListAccessible::nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-:nsAccessible(aAccessible, aContent, aShell)
-{
-    mPopupAtom = aPopupAtom;
-    mParent = aParent;
-}
-
-void nsSelectListAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mContent, &frame);
-   if (aFrame == frame)
-     aList = mPopupAtom;
-   else
-     aList = nsnull;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
-{
-  return mParent->AccGetBounds(x,y,width,height);
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_ADDREF(*_retval);
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccName(PRUnichar **_retval)
-{
-  *_retval = nsnull;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("list"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
-{ 
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsSelectListAccessible::GetAccNextSibling(nsIAccessible **_retval)
-{
-  *_retval = nsnull;
-  return NS_OK;
-}
-
-nsIAccessible* nsSelectListAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
-}
-
-nsIAccessible* nsSelectListAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
-}
- 
-//--------
-
-nsListChildAccessible::nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
-nsAccessible(aAccessible, aContent, aShell)
-{
-  mParent = aParent;
-  mPopupAtom = aPopupAtom;
-  mSelectContent = aSelectContent;
-}
-
-nsIAccessible* nsListChildAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
-{
-  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
-  return new nsListChildAccessible(mPopupAtom, mSelectContent, mParent, aAccessible, aContent, aShell);
-}
-
-void nsListChildAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
-{
-   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
-   nsIFrame* frame = nsnull;
-   shell->GetPrimaryFrameFor(mSelectContent, &frame);
-   if (aFrame == frame)
-     aList = mPopupAtom;
-   else
-     aList = nsnull;
-}
-
-NS_IMETHODIMP nsListChildAccessible::GetAccRole(PRUnichar **_retval)
-{
-  *_retval = ToNewUnicode(NS_LITERAL_STRING("list item"));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsListChildAccessible::GetAccParent(nsIAccessible **_retval)
-{   
-    *_retval = mParent;
-    NS_IF_ADDREF(*_retval);
-    return NS_OK;
-}
-

mozilla/accessible/src/nsSelectAccessible.h

@@ -1,51 +0,0 @@
-/* -*- 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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/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.org code.
- *
- * 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.
- *
- * Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Contributor(s): 
- */
-#ifndef __nsSelectAccessible_h__
-#define __nsSelectAccessible_h__
-
-#include "nsAccessible.h"
-#include "nsCOMPtr.h"
-#include "nsIAtom.h"
-
-class nsSelectAccessible : public nsAccessible
-{
-public:
-  
-  nsSelectAccessible(nsIAtom* aPopupAtom, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
-  NS_IMETHOD GetAccName(PRUnichar **_retval);
-  NS_IMETHOD GetAccValue(PRUnichar **_retval);
-  NS_IMETHOD GetAccRole(PRUnichar **_retval);
-  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
-
-  virtual ~nsSelectAccessible() {}
-  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
-
-  nsCOMPtr<nsIAtom> mPopupAtom;
-};
-
-
-#endif

mozilla/aclocal.m4

@@ -5,9 +5,7 @@ dnl
 
 builtin(include, build/autoconf/glib.m4)dnl
 builtin(include, build/autoconf/gtk.m4)dnl
-builtin(include, build/autoconf/gdk-pixbuf.m4)dnl
 builtin(include, build/autoconf/libIDL.m4)dnl
-builtin(include, build/autoconf/nspr.m4)dnl
 dnl
 define(MOZ_TOPSRCDIR,.)dnl MOZ_TOPSRCDIR is used in altoptions.m4
 builtin(include, build/autoconf/altoptions.m4)dnl

mozilla/allmakefiles.sh

@@ -48,11 +48,14 @@ Makefile
 build/Makefile
 build/unix/Makefile
 build/unix/mozilla-config
+build/unix/nspr_my_config.mk
+build/unix/nspr_my_overrides.mk
 config/Makefile
 config/autoconf.mk
 config/mkdepend/Makefile
 config/mkdetect/Makefile
 include/Makefile
+tools/elf-dynstr-gc/Makefile
 "
 
 MAKEFILES_db="
@@ -75,23 +78,29 @@ MAKEFILES_dom="
 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/range/Makefile
+dom/public/html/Makefile
 dom/public/idl/Makefile
 dom/public/idl/base/Makefile
-dom/public/idl/core/Makefile
+dom/public/idl/coreDom/Makefile
 dom/public/idl/css/Makefile
 dom/public/idl/events/Makefile
 dom/public/idl/html/Makefile
 dom/public/idl/range/Makefile
-dom/public/idl/stylesheets/Makefile
-dom/public/idl/views/Makefile
-dom/public/idl/xbl/Makefile
-dom/public/idl/xul/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/range/Makefile
+dom/src/html/Makefile
 dom/src/jsurl/Makefile
+dom/tools/Makefile
 "
 
 MAKEFILES_editor="
@@ -107,6 +116,16 @@ editor/txmgr/tests/Makefile
 editor/txtsvc/Makefile
 editor/txtsvc/public/Makefile
 editor/txtsvc/src/Makefile
+editor/ui/Makefile
+editor/ui/composer/Makefile
+editor/ui/composer/content/Makefile
+editor/ui/composer/content/images/Makefile
+editor/ui/composer/locale/Makefile
+editor/ui/composer/locale/en-US/Makefile
+editor/ui/dialogs/Makefile
+editor/ui/dialogs/content/Makefile
+editor/ui/dialogs/locale/Makefile
+editor/ui/dialogs/locale/en-US/Makefile
 "
 
 MAKEFILES_expat="
@@ -119,11 +138,6 @@ MAKEFILES_extensions="
 extensions/Makefile
 "
 
-MAKEFILES_gc="
-gc/boehm/Makefile
-gc/boehm/leaksoup/Makefile
-"
-
 MAKEFILES_gfx="
 gfx/Makefile
 gfx/idl/Makefile
@@ -222,54 +236,6 @@ js/src/xpconnect/tools/idl/Makefile
 js/src/xpconnect/tools/idl/Makefile
 "
 
-MAKEFILES_content="
-content/Makefile
-content/base/Makefile
-content/base/public/Makefile
-content/base/src/Makefile
-content/build/Makefile
-content/events/Makefile
-content/events/public/Makefile
-content/events/src/Makefile
-content/html/Makefile
-content/html/content/Makefile
-content/html/content/public/Makefile
-content/html/content/src/Makefile
-content/html/document/Makefile
-content/html/document/public/Makefile
-content/html/document/src/Makefile
-content/html/style/Makefile
-content/html/style/public/Makefile
-content/html/style/src/Makefile
-content/xml/Makefile
-content/xml/content/Makefile
-content/xml/content/public/Makefile
-content/xml/content/src/Makefile
-content/xml/document/Makefile
-content/xml/document/public/Makefile
-content/xml/document/src/Makefile
-content/xul/Makefile
-content/xul/content/Makefile
-content/xul/content/public/Makefile
-content/xul/content/src/Makefile
-content/xul/document/Makefile
-content/xul/document/public/Makefile
-content/xul/document/src/Makefile
-content/xul/templates/public/Makefile
-content/xul/templates/src/Makefile
-content/xbl/Makefile
-content/xbl/public/Makefile
-content/xbl/src/Makefile
-content/xbl/builtin/Makefile
-content/xbl/builtin/os2/Makefile
-content/xsl/Makefile
-content/xsl/document/Makefile
-content/xsl/document/src/Makefile
-content/shared/Makefile
-content/shared/public/Makefile
-content/shared/src/Makefile
-"
-
 MAKEFILES_layout="
 layout/Makefile
 layout/base/Makefile
@@ -277,34 +243,45 @@ 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/public/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/public/Makefile
 layout/xul/base/src/Makefile
-layout/xul/base/src/outliner/Makefile
-layout/xul/base/src/outliner/src/Makefile
-layout/xul/base/src/outliner/public/Makefile
-"
-
-MAKEFILES_mpfilelocprovider="
-modules/mpfilelocprovider/Makefile
-modules/mpfilelocprovider/public/Makefile
-modules/mpfilelocprovider/src/Makefile
+layout/xul/content/Makefile
+layout/xul/content/src/Makefile
+layout/xbl/Makefile
+layout/xbl/public/Makefile
+layout/xbl/src/Makefile
 "
 
 MAKEFILES_libimg="
@@ -314,13 +291,11 @@ modules/libimg/public_com/Makefile
 modules/libimg/src/Makefile
 modules/libimg/gifcom/Makefile
 modules/libimg/jpgcom/Makefile
-modules/libimg/pngcom/Makefile
-modules/libimg/mngcom/Makefile
+modules/libimg/pngcom/Makefile  
 "
 
 MAKEFILES_libjar="
 modules/libjar/Makefile
-modules/libjar/standalone/Makefile
 "
 
 MAKEFILES_libreg="
@@ -351,14 +326,9 @@ MAKEFILES_plugin="
 modules/plugin/Makefile
 modules/plugin/nglsrc/Makefile
 modules/plugin/public/Makefile
+modules/plugin/src/Makefile
 modules/plugin/test/Makefile
 modules/plugin/SanePlugin/Makefile
-modules/plugin/default/unix/Makefile
-"
-
-MAKEFILES_access_builtin="
-extensions/access-builtin/Makefile
-extensions/access-builtin/accessproxy/Makefile
 "
 
 MAKEFILES_netwerk="
@@ -367,7 +337,6 @@ netwerk/base/Makefile
 netwerk/base/public/Makefile
 netwerk/base/src/Makefile
 netwerk/build/Makefile
-netwerk/build2/Makefile
 netwerk/cache/build/Makefile
 netwerk/cache/filecache/Makefile
 netwerk/cache/Makefile
@@ -394,8 +363,6 @@ netwerk/protocol/finger/src/Makefile
 netwerk/protocol/ftp/Makefile
 netwerk/protocol/ftp/public/Makefile
 netwerk/protocol/ftp/src/Makefile
-netwerk/protocol/gopher/Makefile
-netwerk/protocol/gopher/src/Makefile
 netwerk/protocol/http/Makefile
 netwerk/protocol/http/public/Makefile
 netwerk/protocol/http/src/Makefile
@@ -419,19 +386,15 @@ netwerk/streamconv/src/Makefile
 netwerk/streamconv/test/Makefile
 netwerk/test/Makefile
 netwerk/testserver/Makefile
-netwerk/resources/Makefile
-
-uriloader/exthandler/Makefile
-intl/strres/public/Makefile
-intl/locale/idl/Makefile
-$MAKEFILES_js
-modules/libpref/public/Makefile
 "
 
 MAKEFILES_uriloader="
 uriloader/Makefile
 uriloader/base/Makefile
 uriloader/build/Makefile
+uriloader/extprotocol/Makefile
+uriloader/extprotocol/base/Makefile
+uriloader/extprotocol/unix/Makefile
 uriloader/exthandler/Makefile
 "
 
@@ -440,10 +403,16 @@ profile/Makefile
 profile/src/Makefile
 profile/public/Makefile
 profile/resources/Makefile
+profile/resources/content/Makefile
+profile/resources/locale/Makefile
+profile/resources/locale/en-US/Makefile
 profile/pref-migrator/Makefile
 profile/pref-migrator/public/Makefile
 profile/pref-migrator/src/Makefile
 profile/pref-migrator/resources/Makefile
+profile/pref-migrator/resources/content/Makefile
+profile/pref-migrator/resources/locale/Makefile
+profile/pref-migrator/resources/locale/en-US/Makefile
 profile/defaults/Makefile
 "
 
@@ -457,13 +426,15 @@ rdf/chrome/Makefile
 rdf/chrome/build/Makefile
 rdf/chrome/public/Makefile
 rdf/chrome/src/Makefile
-rdf/chrome/tools/Makefile
-rdf/chrome/tools/chromereg/Makefile
 rdf/util/Makefile
 rdf/util/public/Makefile
 rdf/util/src/Makefile
 rdf/resources/Makefile
 rdf/build/Makefile
+rdf/content/Makefile
+rdf/content/public/Makefile
+rdf/content/public/idl/Makefile
+rdf/content/src/Makefile
 rdf/datasource/Makefile
 rdf/datasource/public/Makefile
 rdf/datasource/src/Makefile
@@ -481,6 +452,7 @@ sun-java/Makefile
 sun-java/stubs/Makefile
 sun-java/stubs/include/Makefile
 sun-java/stubs/jri/Makefile
+sun-java/stubs/src/Makefile
 "
 
 MAKEFILES_caps="
@@ -553,14 +525,9 @@ widget/timer/src/unix/motif/Makefile
 widget/timer/src/unix/photon/Makefile
 widget/timer/src/unix/xlib/Makefile
 widget/timer/src/unix/qt/Makefile
-widget/timer/src/os2/Makefile
 "
 
 MAKEFILES_xpcom="
-string/Makefile
-string/obsolete/Makefile
-string/public/Makefile
-string/src/Makefile
 xpcom/Makefile
 xpcom/base/Makefile
 xpcom/build/Makefile
@@ -592,34 +559,24 @@ xpcom/proxy/public/Makefile
 xpcom/proxy/src/Makefile
 xpcom/proxy/tests/Makefile
 xpcom/sample/Makefile
-xpcom/threads/Makefile
-xpcom/tools/Makefile
-xpcom/tools/registry/Makefile
-
-$MAKEFILES_libreg
-$MAKEFILES_libjar
-intl/unicharutil/public/Makefile
-intl/uconv/public/Makefile
-"
-
-MAKEFILES_xpcom_tests="
 xpcom/tests/Makefile
 xpcom/tests/dynamic/Makefile
 xpcom/tests/services/Makefile
+xpcom/threads/Makefile
+xpcom/tools/Makefile
+xpcom/tools/registry/Makefile
 "
 
-MAKEFILES_string="$MAKEFILES_xpcom"
-
 MAKEFILES_xpinstall="
 xpinstall/Makefile
 xpinstall/packager/Makefile
 xpinstall/public/Makefile
 xpinstall/res/Makefile
+xpinstall/res/content/Makefile
+xpinstall/res/locale/Makefile
+xpinstall/res/locale/en-US/Makefile
 xpinstall/src/Makefile
 xpinstall/stub/Makefile
-xpinstall/wizard/libxpnet/Makefile
-xpinstall/wizard/libxpnet/src/Makefile
-xpinstall/wizard/libxpnet/test/Makefile
 xpinstall/wizard/unix/src2/Makefile
 "
 
@@ -632,24 +589,39 @@ xpfe/browser/samples/Makefile
 xpfe/browser/samples/sampleimages/Makefile
 xpfe/components/Makefile
 xpfe/components/public/Makefile
+xpfe/components/sample/Makefile
+xpfe/components/sample/public/Makefile
+xpfe/components/sample/src/Makefile
+xpfe/components/sample/resources/Makefile
 xpfe/components/shistory/Makefile
 xpfe/components/shistory/public/Makefile
 xpfe/components/shistory/src/Makefile
 xpfe/components/bookmarks/Makefile
 xpfe/components/bookmarks/public/Makefile
 xpfe/components/bookmarks/src/Makefile
+xpfe/components/bookmarks/resources/Makefile
 xpfe/components/directory/Makefile
 xpfe/components/timebomb/Makefile
 xpfe/components/timebomb/tools/Makefile
+xpfe/components/timebomb/resources/Makefile
+xpfe/components/timebomb/resources/content/Makefile
+xpfe/components/timebomb/resources/locale/Makefile
+xpfe/components/timebomb/resources/locale/en-US/Makefile
 xpfe/components/regviewer/Makefile
 xpfe/components/find/Makefile
 xpfe/components/find/public/Makefile
 xpfe/components/find/src/Makefile
+xpfe/components/find/resources/Makefile
 xpfe/components/filepicker/src/Makefile
+xpfe/components/filepicker/res/content/Makefile
+xpfe/components/filepicker/res/locale/Makefile
+xpfe/components/filepicker/res/locale/en-US/Makefile
+xpfe/components/filepicker/res/Makefile
 xpfe/components/filepicker/Makefile
 xpfe/components/history/Makefile
 xpfe/components/history/src/Makefile
 xpfe/components/history/public/Makefile
+xpfe/components/history/resources/Makefile
 xpfe/components/prefwindow/Makefile
 xpfe/components/prefwindow/resources/Makefile
 xpfe/components/prefwindow/resources/content/Makefile
@@ -657,34 +629,40 @@ xpfe/components/prefwindow/resources/content/unix/Makefile
 xpfe/components/prefwindow/resources/locale/Makefile
 xpfe/components/prefwindow/resources/locale/en-US/Makefile
 xpfe/components/prefwindow/resources/locale/en-US/unix/Makefile
-xpfe/components/prefwindow/resources/locale/en-US/win/Makefile
 xpfe/components/related/Makefile
 xpfe/components/related/src/Makefile
 xpfe/components/related/public/Makefile
+xpfe/components/related/resources/Makefile
 xpfe/components/search/Makefile
 xpfe/components/search/datasets/Makefile
+xpfe/components/search/resources/Makefile
 xpfe/components/search/public/Makefile
 xpfe/components/search/src/Makefile
 xpfe/components/sidebar/Makefile
 xpfe/components/sidebar/public/Makefile
+xpfe/components/sidebar/resources/Makefile
 xpfe/components/sidebar/src/Makefile
 xpfe/components/xfer/Makefile
 xpfe/components/xfer/public/Makefile
 xpfe/components/xfer/src/Makefile
+xpfe/components/xfer/resources/Makefile
 xpfe/components/ucth/Makefile
 xpfe/components/ucth/public/Makefile
 xpfe/components/ucth/src/Makefile
+xpfe/components/ucth/resources/Makefile
 xpfe/components/remote/Makefile
 xpfe/components/remote/public/Makefile
 xpfe/components/remote/src/Makefile
 xpfe/components/autocomplete/Makefile
 xpfe/components/autocomplete/public/Makefile
+xpfe/components/autocomplete/resources/Makefile
+xpfe/components/autocomplete/resources/content/Makefile
 xpfe/components/autocomplete/src/Makefile
-xpfe/components/urlbarhistory/Makefile
-xpfe/components/urlbarhistory/public/Makefile
-xpfe/components/urlbarhistory/src/Makefile
 xpfe/components/console/Makefile
-xpfe/components/build/Makefile
+xpfe/components/console/resources/Makefile
+xpfe/components/console/resources/content/Makefile
+xpfe/components/console/resources/locale/Makefile
+xpfe/components/console/resources/locale/en-US/Makefile
 xpfe/appshell/Makefile
 xpfe/appshell/src/Makefile
 xpfe/appshell/public/Makefile
@@ -694,10 +672,12 @@ xpfe/browser/src/Makefile
 xpfe/browser/resources/Makefile
 xpfe/browser/resources/content/Makefile
 xpfe/browser/resources/content/unix/Makefile
-xpfe/browser/resources/content/os2/Makefile
 xpfe/browser/resources/locale/Makefile
 xpfe/browser/resources/locale/en-US/Makefile
 xpfe/browser/resources/locale/en-US/unix/Makefile
+xpfe/appfilelocprovider/Makefile
+xpfe/appfilelocprovider/public/Makefile
+xpfe/appfilelocprovider/src/Makefile
 xpfe/global/Makefile
 xpfe/global/resources/Makefile
 xpfe/global/resources/content/Makefile
@@ -705,24 +685,19 @@ xpfe/global/resources/content/os2/Makefile
 xpfe/global/resources/content/unix/Makefile
 xpfe/global/resources/locale/Makefile
 xpfe/global/resources/locale/en-US/Makefile
-xpfe/global/resources/locale/en-US/mac/Makefile
 xpfe/global/resources/locale/en-US/os2/Makefile
 xpfe/global/resources/locale/en-US/unix/Makefile
-xpfe/global/resources/locale/en-US/win/Makefile
 xpfe/communicator/Makefile
 xpfe/communicator/resources/Makefile
 xpfe/communicator/resources/locale/Makefile
 xpfe/communicator/resources/locale/en-US/Makefile
 xpfe/communicator/resources/content/Makefile
-xpfe/communicator/resources/content/os2/Makefile
 "
 
 MAKEFILES_embedding="
 embedding/Makefile
-embedding/base/Makefile
 embedding/browser/Makefile
 embedding/browser/build/Makefile
-embedding/browser/chrome/Makefile
 embedding/browser/webBrowser/Makefile
 embedding/browser/gtk/Makefile
 embedding/browser/gtk/src/Makefile
@@ -730,105 +705,22 @@ embedding/browser/gtk/tests/Makefile
 embedding/browser/photon/Makefile
 embedding/browser/photon/src/Makefile
 embedding/browser/photon/tests/Makefile
-embedding/components/Makefile
-embedding/components/build/Makefile
-embedding/components/windowwatcher/Makefile
-embedding/components/windowwatcher/public/Makefile
-embedding/components/windowwatcher/src/Makefile
-embedding/components/ui/Makefile
-embedding/components/ui/helperAppDlg/Makefile
 embedding/config/Makefile
 embedding/tests/gtkEmbed/Makefile
 "
 
-MAKEFILES_psm2="
-security/manager/Makefile
-security/manager/ssl/Makefile
-security/manager/ssl/src/Makefile
-security/manager/ssl/resources/Makefile
-security/manager/ssl/public/Makefile
-security/manager/pki/Makefile
-security/manager/pki/resources/Makefile
-security/manager/pki/src/Makefile
-security/manager/pki/public/Makefile
-netwerk/protocol/http/public/Makefile
-netwerk/build/Makefile
-netwerk/base/public/Makefile
-netwerk/socket/base/Makefile
-uriloader/base/Makefile
-intl/locale/idl/Makefile
-intl/strres/public/Makefile
-dom/public/Makefile
-dom/public/base/Makefile
-rdf/base/idl/Makefile
-xpfe/appshell/public/Makefile
-caps/idl/Makefile
-layout/html/forms/public/Makefile
-gfx/public/Makefile
-gfx/idl/Makefile
-widget/public/Makefile
-layout/base/public/Makefile
-docshell/base/Makefile
-modules/libpref/public/Makefile
-content/base/public/Makefile
-intl/locale/public/Makefile
-"
-
 MAKEFILES_security="
 security/Makefile
+security/base/Makefile
+security/base/public/Makefile
+security/base/res/Makefile
+security/base/res/content/Makefile
+security/base/res/locale/Makefile
+security/base/res/locale/en-US/Makefile
 security/psm/Makefile
 security/psm/lib/Makefile
 security/psm/lib/client/Makefile
 security/psm/lib/protocol/Makefile
-
-intl/strres/public/Makefile
-intl/locale/idl/Makefile
-intl/locale/public/Makefile
-"
-
-MAKEFILES_psm_glue="
-extensions/psm-glue/public/Makefile
-extensions/psm-glue/Makefile
-extensions/psm-glue/src/Makefile
-netwerk/base/public/Makefile
-netwerk/build/Makefile
-netwerk/socket/base/Makefile
-dom/public/Makefile
-uriloader/base/Makefile
-modules/libpref/public/Makefile
-profile/public/Makefile
-caps/idl/Makefile
-caps/include/Makefile
-netwerk/protocol/http/public/Makefile
-widget/public/Makefile
-rdf/base/idl/Makefile
-xpfe/appshell/public/Makefile
-gfx/idl/Makefile
-gfx/public/Makefile
-docshell/base/Makefile
-layout/html/forms/public/Makefile
-layout/base/public/Makefile
-content/base/public/Makefile
-dom/src/base/Makefile
-modules/oji/public/Makefile
-gfx2/public/Makefile
-embedding/components/windowwatcher/public/Makefile
-"
-
-MAKEFILES_inspector="
-extensions/inspector/base/public/Makefile
-extensions/inspector/base/Makefile
-extensions/inspector/base/src/Makefile
-extensions/inspector/Makefile
-extensions/inspector/build/src/Makefile
-extensions/inspector/build/Makefile
-extensions/inspector/resources/content/Makefile
-extensions/inspector/resources/Makefile
-extensions/inspector/resources/locale/en-US/Makefile
-extensions/inspector/resources/locale/Makefile
-extensions/inspector/resources/skin/classic/Makefile
-extensions/inspector/resources/skin/Makefile
-extensions/inspector/resources/skin/modern/Makefile
 "
 
 MAKEFILES_transformiix="
@@ -851,36 +743,7 @@ extensions/transformiix/Makefile
 "
 
 if [ "$MOZ_MAIL_NEWS" ]; then
-    if [ -f ${srcdir}/mailnews/makefiles ]; then
-        MAKEFILES_mailnews=`cat ${srcdir}/mailnews/makefiles`
-    fi
-fi
-
-
-if [ "$USE_IMG2" ]; then
-    MAKEFILES_libpr0n="
-        modules/libpr0n/Makefile
-        modules/libpr0n/public/Makefile
-        modules/libpr0n/src/Makefile
-        modules/libpr0n/decoders/Makefile
-        modules/libpr0n/decoders/gif/Makefile
-        modules/libpr0n/decoders/png/Makefile
-        modules/libpr0n/decoders/ppm/Makefile
-        modules/libpr0n/decoders/jpeg/Makefile
-"
-
-    MAKEFILES_gfx2="
-        gfx2/Makefile
-        gfx2/public/Makefile
-        gfx2/src/Makefile
-"
- 
-    MAKEFILES_accessible="
-       accessible/Makefile
-       accessible/public/Makefile
-       accessible/src/Makefile
-       accessible/build/Makefile
-"
+    MAKEFILES_mailnews=`cat ${srcdir}/mailnews/makefiles`
 fi
 
 if [ ! "$SYSTEM_JPEG" ]; then
@@ -894,19 +757,10 @@ if [ ! "$SYSTEM_ZLIB" ]; then
 "
 fi
 
-MAKEFILES_zlib="
-    $MAKEFILES_zlib
-    modules/zlib/standalone/Makefile
-"
-
-
 if [ ! "$SYSTEM_PNG" ]; then
     MAKEFILES_libimg="$MAKEFILES_libimg modules/libimg/png/Makefile"
 fi
 
-if [ ! "$SYSTEM_MNG" ]; then
-    MAKEFILES_libimg="$MAKEFILES_libimg modules/libimg/mng/Makefile"
-fi
 
 #
 #  java/
@@ -918,9 +772,7 @@ fi
 #
 # l10n/
 #
-if [ -f ${srcdir}/l10n/makefiles.all ]; then
-    MAKEFILES_langpacks=`cat ${srcdir}/l10n/makefiles.all`
-fi
+MAKEFILES_langpacks=`cat ${srcdir}/l10n/makefiles.all`
 
 if [ "$MOZ_L10N" ]; then
     MAKEFILES_l10n="l10n/Makefile"
@@ -999,11 +851,11 @@ if [ "$MOZ_LDAP_XPCOM" ]; then
 "
 fi
 
-# modules/staticmod
-
-if [ "$MOZ_STATIC_COMPONENTS" ]; then
-    MAKEFILES_static_components="$MAKEFILES_static_components
-	modules/staticmod/Makefile
+# libimg/mng
+if [ "$MOZ_MNG" ]; then
+    MAKEFILES_libimg="$MAKEFILES_libimg
+	modules/libimg/mng/Makefile
+	modules/libimg/mngcom/Makefile
 "
 fi
 
@@ -1013,8 +865,17 @@ for extension in $MOZ_EXTENSIONS; do
 	    extensions/cookie/Makefile
 	    extensions/cookie/tests/Makefile
             " ;;
+        psm-glue ) MAKEFILES_extensions="$MAKEFILES_extensions
+	    extensions/psm-glue/public/Makefile
+	    extensions/psm-glue/Makefile
+	    extensions/psm-glue/src/Makefile
+            " ;;
         irc ) MAKEFILES_extensions="$MAKEFILES_extensions
 	    extensions/irc/Makefile
+	    extensions/irc/xul/Makefile
+	    extensions/irc/xul/content/Makefile
+	    extensions/irc/xul/locale/Makefile
+	    extensions/irc/xul/locale/en-US/Makefile
             " ;;
 	transformiix ) MAKEFILES_extensions="$MAKEFILES_extensions
 	    $MAKEFILES_transformiix"
@@ -1029,10 +890,6 @@ for extension in $MOZ_EXTENSIONS; do
 	    extensions/wallet/walletpreview/Makefile
 	    extensions/wallet/build/Makefile
             " ;;
-        access-builtin ) MAKEFILES_access_builtin="$MAKEFILES_extensions
-	    extensions/access-builtin/Makefile
-	    extensions/access-builtin/accessproxy/Makefile
-            " ;;
         xmlextras ) MAKEFILES_extensions="$MAKEFILES_extensions
 	    extensions/xmlextras/Makefile
 	    extensions/xmlextras/base/Makefile
@@ -1040,10 +897,7 @@ for extension in $MOZ_EXTENSIONS; do
 	    extensions/xmlextras/base/public/Makefile
 	    extensions/xmlextras/build/Makefile
 	    extensions/xmlextras/build/src/Makefile
-	    extensions/xmlextras/soap/Makefile
 	    extensions/xmlextras/soap/public/Makefile
-	    extensions/xmlextras/soap/src/Makefile
-	    extensions/xmlextras/tests/Makefile
             " ;;
         xmlterm ) MAKEFILES_extensions="$MAKEFILES_extensions
 	    extensions/xmlterm/Makefile
@@ -1059,14 +913,6 @@ for extension in $MOZ_EXTENSIONS; do
 	    extensions/xml-rpc/idl/Makefile
 	    extensions/xml-rpc/src/Makefile
             " ;;
-	inspector ) MAKEFILES_extensions="$MAKEFILES_extensions
-	    $MAKEFILES_inspector"
-	    ;;
- 	help ) MAKEFILES_extensions="$MAKEFILES_extensions
- 	    extensions/help/resources/Makefile
-	    extensions/help/Makefile
-            " ;;
- 
     esac
 done
 
@@ -1088,10 +934,7 @@ $MAKEFILES_editor
 $MAKEFILES_embedding
 $MAKEFILES_expat
 $MAKEFILES_extensions
-$MAKEFILES_gc
 $MAKEFILES_gfx
-$MAKEFILES_gfx2
-$MAKEFILES_accessible
 $MAKEFILES_htmlparser
 $MAKEFILES_intl
 $MAKEFILES_java_supplement
@@ -1103,15 +946,12 @@ $MAKEFILES_js
 $MAKEFILES_l10n
 $MAKEFILES_l10n_lang
 $MAKEFILES_langpacks
-$MAKEFILES_content
 $MAKEFILES_layout
 $MAKEFILES_libreg
 $MAKEFILES_libimg
-$MAKEFILES_libpr0n
 $MAKEFILES_libjar
 $MAKEFILES_libpref
 $MAKEFILES_libutil
-$MAKEFILES_mpfilelocprovider
 $MAKEFILES_liveconnect
 $MAKEFILES_mailnews
 $MAKEFILES_oji
@@ -1119,7 +959,7 @@ $MAKEFILES_plugin
 $MAKEFILES_netwerk
 $MAKEFILES_profile
 $MAKEFILES_rdf
-$MAKEFILES_static_components
+$MAKEFILES_security
 $MAKEFILES_sun_java
 $MAKEFILES_themes
 $MAKEFILES_uriloader
@@ -1127,7 +967,6 @@ $MAKEFILES_view
 $MAKEFILES_webshell
 $MAKEFILES_widget
 $MAKEFILES_xpcom
-$MAKEFILES_xpcom_tests
 $MAKEFILES_xpconnect
 $MAKEFILES_xpinstall
 $MAKEFILES_xpfe
@@ -1144,23 +983,15 @@ else
 	    js) add_makefiles "$MAKEFILES_js"
 		;;
 	    necko) add_makefiles "
-                 $MAKEFILES_netwerk $MAKEFILES_dbm $MAKEFILES_xpcom"
+                 $MAKEFILES_netwerk $MAKEFILES_xpcom $MAKEFILES_libreg"
 		;;
-	    psm) add_makefiles "$MAKEFILES_dbm $MAKEFILES_xpcom $MAKEFILES_security $MAKEFILES_js $MAKEFILES_psm_glue"
-		;;
-	    psm2) add_makefiles "$MAKEFILES_dbm $MAKEFILES_js $MAKEFILES_xpcom $MAKEFILES_psm2"
-		;;
-            string) add_makefiles "$MAKEFILES_string"
-                ;;
 	    transformiix) add_makefiles "$MAKEFILES_transformiix"
 		;;
-	    access-builtin) add_makefiles "$MAKEFILES_access_builtin"
-		;;
-	    xpcom) add_makefiles "$MAKEFILES_xpcom"
-
+	    xpcom) add_makefiles "$MAKEFILES_xpcom $MAKEFILES_libreg"
 		;;
 	    xpconnect) add_makefiles "
-		$MAKEFILES_xpconnect $MAKEFILES_js $MAKEFILES_xpcom"
+		$MAKEFILES_xpconnect $MAKEFILES_js $MAKEFILES_xpcom
+		$MAKEFILES_libreg"
 		;;
         esac
     done

mozilla/build/Makefile.in

@@ -27,16 +27,10 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
 DIRS		= unix
-endif
 
 include $(topsrcdir)/config/rules.mk
 
 # Install bloaturls.txt file for tinderbox Bloaty test.
 install:: $(srcdir)/bloaturls.txt
 	$(INSTALL) $< $(DIST)/bin
-
-# Install startup.html, startup test page.
-install:: $(srcdir)/startup-test.html
-	$(INSTALL) $< $(DIST)/bin

mozilla/build/autoconf/acoutput-fast.pl

@@ -132,7 +132,7 @@ foreach $ac_file (@makefiles) {
       $top_srcdir = $ac_dots;
       $top_srcdir =~ s%/$%%;
     }
-  } elsif ($ac_given_srcdir =~ m%^/% or $ac_given_srcdir =~ m%^.:/%) {
+  } elsif ($ac_given_srcdir =~ m%^/%) {
     $srcdir     = "$ac_given_srcdir$ac_dir_suffix";
     $top_srcdir = "$ac_given_srcdir";
   } else {

mozilla/build/autoconf/altoptions.m4

@@ -34,7 +34,6 @@ 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_CHECK_PTHREADS(            NAME, IF-YES [, ELSE ])
 dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
 
 
@@ -96,38 +95,6 @@ dnl MOZ_ARG_HEADER(Comment)
 dnl This is used by webconfig to group options
 define(MOZ_ARG_HEADER, [# $1])
 
-dnl
-dnl Apparently, some systems cannot properly check for the pthread
-dnl library unless <pthread.h> is included so we need to test
-dnl using it
-dnl
-dnl MOZ_CHECK_PTHREADS(lib, success, failure)
-AC_DEFUN(MOZ_CHECK_PTHREADS,
-[
-AC_MSG_CHECKING([for pthread_create in -l$1])
-echo "
-    #include <pthread.h> 
-    void *foo(void *v) { int a = 1;  } 
-    int main() { 
-        pthread_t t;
-        if (!pthread_create(&t, 0, &foo, 0)) {
-            pthread_join(t, 0);
-        }
-        exit(0);
-    }" > dummy.c ;
-    echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -l[$1] $LDFLAGS $LIBS" 1>&5;
-    ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -l[$1] $LDFLAGS $LIBS 2>&5;
-    _res=$? ;
-    rm -f dummy.c dummy${ac_exeext} ;
-    if test "$_res" = "0"; then
-        AC_MSG_RESULT([yes])
-        [$2]
-    else
-        AC_MSG_RESULT([no])
-        [$3]
-    fi
-])
-
 dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
 AC_DEFUN(MOZ_READ_MOZCONFIG,
 [AC_REQUIRE([AC_INIT_BINSH])dnl

mozilla/build/autoconf/config.guess

@@ -1,10 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
-
-timestamp='2001-03-30'
-
+#
 # 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
@@ -32,86 +30,26 @@ timestamp='2001-03-30'
 # 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 build system type.
+# 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).
+#
 
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
+# Use $HOST_CC if defined. $CC may point to a cross-compiler
+if test x"$CC_FOR_BUILD" = x; then
+  if test x"$HOST_CC" != x; then
+    CC_FOR_BUILD="$HOST_CC"
+  else
+    if test x"$CC" != x; then
+      CC_FOR_BUILD="$CC"
+    else
+      CC_FOR_BUILD=cc
+    fi
+  fi
 fi
 
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break
-	  fi
-	done
-	rm -f $dummy.c $dummy.o $dummy.rel
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac
-
 # 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
@@ -120,9 +58,12 @@ 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_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+dummy=dummy-$$
+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
@@ -136,7 +77,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# object file format.
 	# Determine the machine/vendor (is the vendor relevant).
 	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
+	    amiga) machine=m68k-cbm ;;
 	    arm32) machine=arm-unknown ;;
 	    atari*) machine=m68k-atari ;;
 	    sun3*) machine=m68k-sun ;;
@@ -146,24 +87,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    ibmrt|romp-ibm) machine=romp-ibm ;;
 	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
+	# The Operating System including object format.
+	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep __ELF__ >/dev/null
+	then
+	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+	    # Return netbsd for either.  FIX?
+	    os=netbsd
+	else
+	    os=netbsdelf
+	fi
 	# The OS release
 	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ -240,7 +173,7 @@ EOF
 	echo alpha-dec-winnt3.5
 	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
+	echo m68k-cbm-sysv4
 	exit 0;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
@@ -272,7 +205,7 @@ EOF
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+    SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@ -408,7 +341,7 @@ EOF
 EOF
 	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
+	  && rm $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
@@ -427,7 +360,7 @@ EOF
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
@@ -462,14 +395,6 @@ EOF
     i?86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		sed 's/^		//' << EOF >$dummy.c
@@ -483,7 +408,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+		$CC_FOR_BUILD $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
@@ -492,9 +417,9 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit 0 ;;
-    *:AIX:*:[45])
+    *:AIX:*:4)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -502,7 +427,7 @@ EOF
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV=4.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 	exit 0 ;;
@@ -528,31 +453,11 @@ EOF
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                        esac ;;
-                    esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
               sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
               #include <stdlib.h>
               #include <unistd.h>
 
@@ -584,15 +489,10 @@ EOF
               }
 EOF
 	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
 	rm -f $dummy.c $dummy
-	fi ;;
 	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
 	sed 's/^	//' << EOF >$dummy.c
@@ -620,7 +520,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
@@ -684,11 +584,8 @@ EOF
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
     CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
@@ -696,12 +593,14 @@ EOF
     CRAY-2:*:*:*)
 	echo cray2-cray-unicos
         exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+    F300:UNIX_System_V:*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -715,6 +614,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
+	if test -x /usr/bin/objformat; then
+	    if test "elf" = "`/usr/bin/objformat`"; then
+		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+		exit 0
+	    fi
+	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
     *:OpenBSD:*:*)
@@ -726,15 +631,6 @@ EOF
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
-#### MozillaHack 
-# Netscape's hacked uname
-    xx:WINNT:* | xx:WIN95:*)
-	echo i586-pc-msvc
-	exit 0 ;;
-###  End MozillaHack
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -753,41 +649,54 @@ EOF
     *:GNU:*:*)
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-int main (int argc, char *argv[]) {
-#else
-int main (argc, argv) int argc; char *argv[]; {
-#endif
-#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_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	;;
-    ppc:Linux:*:*)
-	# Determine Lib Version
-	cat >$dummy.c <<EOF
+    *:Linux:*:*)
+
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	ld_help_string=`cd /; 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
+	  *ia64)
+		echo "${UNAME_MACHINE}-unknown-linux"
+		exit 0
+		;;
+	  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
+		;;
+	  elf32arm*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
+		exit 0
+		;;
+	  armelf_linux*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
+	  m68klinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32ppc | elf32ppclinux)
+		# Determine Lib Version
+		cat >$dummy.c <<EOF
 #include <features.h>
 #if defined(__GLIBC__)
 extern char __libc_version[];
@@ -800,127 +709,123 @@ main(argc, argv)
 #if defined(__GLIBC__)
   printf("%s %s\n", __libc_version, __libc_release);
 #else
-  printf("unknown\n");
+  printf("unkown\n");
 #endif
   return 0;
 }
 EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		./$dummy | grep 1\.99 > /dev/null
-		if test "$?" = 0 ; then LIBC="libc1" ; fi
-	fi
-	rm -f $dummy.c $dummy
-	echo powerpc-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    alpha:Linux:*:*)
-	cat <<EOF >$dummy.s
-	  .data
-	  \$Lformat:
-		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-	   .text
-		.globl main
-		.align 4
-		.ent main
-	    main:
-		.frame \$30,16,\$26,0
-		ldgp \$29,0(\$27)
-		.prologue 1
-		.long 0x47e03d80 # implver \$0
-		lda \$2,-1
-		.long 0x47e20c21 # amask \$2,\$1
-		lda \$16,\$Lformat
-		mov \$0,\$17
-		not \$1,\$18
-		jsr \$26,printf
-		ldgp \$29,0(\$26)
-		mov 0,\$16
-		jsr \$26,exit
-		.end main
-EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-		0-0)	UNAME_MACHINE="alpha" ;;
-		1-0)	UNAME_MACHINE="alphaev5" ;;
-		1-1)    UNAME_MACHINE="alphaev56" ;;
-		1-101)	UNAME_MACHINE="alphapca56" ;;
-		2-303)	UNAME_MACHINE="alphaev6" ;;
-		2-307)	UNAME_MACHINE="alphaev67" ;;
-		esac
-		objdump --private-headers $dummy | \
-		  grep ld.so.1 > /dev/null
+		LIBC=""
+		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
-			LIBC="libc1"
+			./$dummy | grep 1\.99 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
 		fi
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i?86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	ld_supported_emulations=`cd /; ld --help 2>&1 \
-			 | 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
-		;;
-	  elf_i?86)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  i?86coff)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		rm -f $dummy.c $dummy
+		echo powerpc-unknown-linux-gnu${LIBC}
 		exit 0
 		;;
 	esac
-	# 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.
-	test -z "$ld_supported_emulations" && 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
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		cat <<EOF >$dummy.s
+			.data
+		\$Lformat:
+			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+			.text
+			.globl main
+			.align 4
+			.ent main
+		main:
+			.frame \$30,16,\$26,0
+			ldgp \$29,0(\$27)
+			.prologue 1
+			.long 0x47e03d80 # implver \$0
+			lda \$2,-1
+			.long 0x47e20c21 # amask \$2,\$1
+			lda \$16,\$Lformat
+			mov \$0,\$17
+			not \$1,\$18
+			jsr \$26,printf
+			ldgp \$29,0(\$26)
+			mov 0,\$16
+			jsr \$26,exit
+			.end main
+EOF
+		LIBC=""
+		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			case `./$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+			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
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+#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_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
+	elif test "${UNAME_MACHINE}" = "s390"; then
+	  echo s390-ibm-linux && exit 0
+	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>
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -944,10 +849,9 @@ EOF
   return 0;
 }
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
+	  $CC_FOR_BUILD $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*:*)
@@ -1024,7 +928,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.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`
@@ -1035,24 +939,21 @@ EOF
     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.*:* | m68*:LynxOS:3.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.*:* | i?86:LynxOS:3.[01]*:* | i?86:LynxOS:4.0*:*)
+    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
 	exit 0 ;;
@@ -1074,16 +975,14 @@ EOF
                            # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
         exit 0 ;;
-#### MozillaHack 
     *:*OpenVMS*:*:*)
-        case "${UNAME_SYSTEM}" in
-            POSIX_for_OpenVMS_AXP) echo alpha-dec-openvmsposix ;;
-            POSIX_for_OpenVMS_VAX) echo vax-dec-openvmsposix ;;
-            OpenVMS) echo alpha-dec-openvms ;;
-            *) echo unknown-dec-openvms ;;
-        esac
-        exit 0 ;;
-#### End MozillaHack 
+	case "${UNAME_SYSTEM}" in
+	    POSIX_for_OpenVMS_AXP) echo alpha-dec-openvmsposix ;;
+	    POSIX_for_OpenVMS_VAX) echo vax-dec-openvmsposix ;;
+	    OpenVMS) echo alpha-dec-openvms ;;
+	    *) echo unknown-dec-openvms ;;
+	esac
+	exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1096,7 +995,7 @@ EOF
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
-    news*:NEWS-OS:6*:*)
+    news*:NEWS-OS:*:6*)
 	echo mips-sony-newsos6
 	exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
@@ -1127,71 +1026,31 @@ EOF
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
-    *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+    Power*:Mac*OS:*:*)
+	echo powerpc-apple-macos${UNAME_RELEASE}
+	exit 0 ;;
+    *:Mac*OS:*:*)
+	echo ${UNAME_MACHINE}-apple-macos${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	if test "${UNAME_MACHINE}" = "x86pc"; then
 		UNAME_MACHINE=pc
 	fi
 	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	exit 0 ;;
+	exit 0;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
+    NSR-W:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i?86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	# echo ${UNAME_MACHINE}-pc-os2-emx
-#### MozillaHack 
- 	if test "$VACPP" = "yes"; then
+    *:OS/2:*:*)
+	if test "$VACPP" = "yes"; then
 		echo "i386-pc-os2_vacpp"
 	else
 		echo "i386-pc-os2_emx"
 	fi
-#### End MozillaHack 
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
+    exit 0;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1283,24 +1142,11 @@ main ()
 #endif
 
 #if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
+#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)
@@ -1311,7 +1157,7 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+$CC_FOR_BUILD $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.
@@ -1344,48 +1190,6 @@ then
     esac
 fi
 
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
+#echo '(Unable to guess system type)' 1>&2
 
 exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

mozilla/build/autoconf/config.sub

@@ -1,10 +1,8 @@
 #! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
-
-timestamp='2001-03-30'
-
+#
 # 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.
@@ -29,6 +27,7 @@ timestamp='2001-03-30'
 # 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>.
 # Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
@@ -51,73 +50,30 @@ timestamp='2001-03-30'
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
-me=`echo "$0" | sed -e 's,.*/,,'`
+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
 
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
+# 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
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+  nto-qnx* | linux-gnu*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -143,7 +99,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple)
 		os=
 		basic_machine=$1
 		;;
@@ -215,39 +171,29 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
-	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
-		| pyramid | mn10200 | mn10300 | tron | a29k \
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
 		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
+		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| hppa64 \
 		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
 		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | sh[34] \
-		| powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp10 | pdp11 \
-		| mips16 | mips64 | mipsel | mips64el \
+		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
+		| mips64vr5000 | miprs64vr5000el | mcore \
 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
-		| pj | pjl | h8500)
+		| thumb | d10v | fr30 | avr)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
 		;;
 
 	# 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[234567]86 | x86_64)
+	i[34567]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -257,29 +203,25 @@ case $basic_machine in
 		;;
 	# Recognize the basic CPU types with company name.
 	# FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
-	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
+	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
 	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-	      | hppa2.0n-* | hppa64-* \
+	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
 	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
 	      | alphaev6[78]-* \
 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
 	      | clipper-* | orion-* \
-	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
 	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
 	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
-	      | [cjt]90-* \
+	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
-	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -316,14 +258,14 @@ case $basic_machine in
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		os=-sysv4
 		;;
 	apollo68)
@@ -370,16 +312,13 @@ case $basic_machine in
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
+	[ctj]90-cray)
+		basic_machine=c90-cray
 		os=-unicos
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -427,10 +366,6 @@ case $basic_machine in
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -530,6 +465,14 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
+	i386-go32 | go32)
+		basic_machine=i386-unknown
+		os=-go32
+		;;
+	i386-mingw32 | mingw32)
+		basic_machine=i386-unknown
+		os=-mingw32
+		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -555,16 +498,6 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-#### MozillaHack 
-	i386-msvc | msvc)
-		basic_machine=i386-pc
-		os=-msvc
-		;;
-#### End MozillaHack 
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -595,7 +528,7 @@ case $basic_machine in
 		os=-coff
 		;;
 	msdos)
-		basic_machine=i386-pc
+		basic_machine=i386-unknown
 		os=-msdos
 		;;
 	mvs)
@@ -659,10 +592,6 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-mon960
 		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
 	np1)
 		basic_machine=np1-gould
 		;;
@@ -698,28 +627,28 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i686-pc
+		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+	pentiumpro-* | p6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=power-ibm
+	power)	basic_machine=rs6000-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
 	        ;;
@@ -734,10 +663,6 @@ case $basic_machine in
 	ps2)
 		basic_machine=i386-ibm
 		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -829,10 +754,6 @@ case $basic_machine in
 		basic_machine=t3e-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -928,19 +849,12 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4)
-		basic_machine=sh-unknown
-		;;
 	sparc | sparcv9)
 		basic_machine=sparc-sun
 		;;
@@ -963,9 +877,6 @@ case $basic_machine in
 		basic_machine=c4x-none
 		os=-coff
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -1007,12 +918,10 @@ case $os in
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
-#### MozillaHack 
 	-os2_emx)
 		;;
 	-os2_vacpp)
 		;;
-#### End MozillaHack 
 	# First accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST END IN A *, to match a version number.
@@ -1030,10 +939,7 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -msvc* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1094,7 +1000,7 @@ case $os in
 	-ns2 )
 	        os=-nextstep2
 		;;
-	-nsk*)
+	-nsk)
 		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
@@ -1131,7 +1037,7 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+        -*mint | -*MiNT)
 	        os=-mint
 		;;
 	-none)
@@ -1165,9 +1071,6 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	pdp10-*)
-		os=-tops20
-		;;
         pdp11-*)
 		os=-none
 		;;
@@ -1276,7 +1179,7 @@ case $basic_machine in
 	*-masscomp)
 		os=-rtu
 		;;
-	f30[01]-fujitsu | f700-fujitsu)
+	f301-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@@ -1354,7 +1257,7 @@ case $basic_machine in
 			-mpw* | -macos*)
 				vendor=apple
 				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+			-*mint | -*MiNT)
 				vendor=atari
 				;;
 		esac
@@ -1363,11 +1266,3 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

mozilla/build/autoconf/gdk-pixbuf.m4

@@ -1,166 +0,0 @@
-# Configure paths for gdk-pixbuf
-# Elliot Lee 2000-01-10
-# stolen from Raph Levien 98-11-18
-# stolen from Manish Singh    98-9-30
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS
-dnl
-AC_DEFUN(AM_PATH_GDK_PIXBUF,
-[dnl 
-dnl Get the cflags and libraries from the gdk-pixbuf-config script
-dnl
-AC_ARG_WITH(gdk-pixbuf-prefix,[  --with-gdk-pixbuf-prefix=PFX   Prefix where GDK_PIXBUF is installed (optional)],
-            gdk_pixbuf_prefix="$withval", gdk_pixbuf_prefix="")
-AC_ARG_WITH(gdk-pixbuf-exec-prefix,[  --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional)],
-            gdk_pixbuf_exec_prefix="$withval", gdk_pixbuf_exec_prefix="")
-AC_ARG_ENABLE(gdk_pixbuftest, [  --disable-gdk_pixbuftest       Do not try to compile and run a test GDK_PIXBUF program],
-		    , enable_gdk_pixbuftest=yes)
-
-  if test x$gdk_pixbuf_exec_prefix != x ; then
-     gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix"
-     if test x${GDK_PIXBUF_CONFIG+set} = xset ; then
-        GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config
-     fi
-  fi
-  if test x$gdk_pixbuf_prefix != x ; then
-     gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix"
-     if test x${GDK_PIXBUF_CONFIG+set} = xset ; then
-        GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config
-     fi
-  fi
-
-  AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no)
-  min_gdk_pixbuf_version=ifelse([$1], ,0.2.5,$1)
-  AC_MSG_CHECKING(for GDK_PIXBUF - version >= $min_gdk_pixbuf_version)
-  no_gdk_pixbuf=""
-  if test "$GDK_PIXBUF_CONFIG" = "no" ; then
-    no_gdk_pixbuf=yes
-  else
-    GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags`
-    GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs`
-
-    gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gdk_pixbuftest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
-      LIBS="$LIBS $GDK_PIXBUF_LIBS"
-dnl
-dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity
-dnl checks the results of gdk-pixbuf-config to some extent
-dnl
-      rm -f conf.gdk_pixbuftest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gdk_pixbuftest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_gdk_pixbuf_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gdk_pixbuf_version");
-     exit(1);
-   }
-
-   if (($gdk_pixbuf_major_version > major) ||
-      (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) ||
-      (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version);
-      printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n");
-      printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gdk_pixbuf" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GDK_PIXBUF_CONFIG" = "no" ; then
-       echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found"
-       echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the"
-       echo "*** full path to gdk-pixbuf-config."
-     else
-       if test -f conf.gdk_pixbuftest ; then
-        :
-       else
-          echo "*** Could not run GDK_PIXBUF test program, checking why..."
-          CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
-          LIBS="$LIBS $GDK_PIXBUF_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong"
-          echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, 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 "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed"
-          echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you"
-          echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GDK_PIXBUF_CFLAGS=""
-     GDK_PIXBUF_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GDK_PIXBUF_CFLAGS)
-  AC_SUBST(GDK_PIXBUF_LIBS)
-  rm -f conf.gdk_pixbuftest
-])

mozilla/build/autoconf/make-makefile

@@ -43,8 +43,7 @@ chomp $object_root;
 #    called from "mozilla/gfx/src", then $source_subdir would be
 #    "gfx/src/".
 $source_subdir = "$object_fullpath/";
-my $quoted_object_root = quotemeta($object_root);
-$source_subdir =~ s|^$quoted_object_root/||;
+$source_subdir =~ s|^$object_root/||;
 
 # Prefix makefiles with $source_subdir so that paths
 # will be relative to the top of the object tree.
@@ -208,7 +207,7 @@ sub update_makefiles {
         $top_srcdir = $ac_dots;
         $top_srcdir =~ s%/$%%;
       }
-    } elsif ($ac_given_srcdir =~ m%^/% or $ac_given_srcdir =~ m%^.:/%) {
+    } elsif ($ac_given_srcdir =~ m%^/%) {
       $srcdir     = "$ac_given_srcdir$ac_dir_suffix";
       $top_srcdir = "$ac_given_srcdir";
     } else {
@@ -246,14 +245,14 @@ sub update_makefiles {
     };
 
     while (<INFILE>) {
-      #if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
-      #  #warn "Two defines on a line:$ac_file:$.:$_";
-      #  push @unhandled, $ac_file;
-      #  last;
-      #}
+      if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
+        #warn "Two defines on a line:$ac_file:$.:$_";
+        push @unhandled, $ac_file;
+        last;
+      }
 
-      s/\@srcdir\@/$srcdir/g;
-      s/\@top_srcdir\@/$top_srcdir/g;
+      s/\@srcdir\@/$srcdir/;
+      s/\@top_srcdir\@/$top_srcdir/;
 
       if (/\@[_a-zA-Z]*\@/) {
         #warn "Unknown variable:$ac_file:$.:$_";

mozilla/build/autoconf/nspr.m4

@@ -1,67 +0,0 @@
-# -*- tab-width: 4; -*-
-# Configure paths for NSPR
-# Public domain - Chris Seawood <cls@seawood.org> 2001-04-05
-# Based upon gtk.m4 (also PD) by Owen Taylor
-
-dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
-AC_DEFUN(AM_PATH_NSPR,
-[dnl
-
-AC_ARG_WITH(nspr-prefix,
-	[  --with-nspr-prefix=PFX  Prefix where NSPR is installed],
-	nspr_config_prefix="$withval",
-	nspr_config_prefix="")
-
-AC_ARG_WITH(nspr-exec-prefix,
-	[  --with-nspr-exec-prefix=PFX
-                          Exec prefix where NSPR is installed],
-	nspr_config_exec_prefix="$withval",
-	nspr_config_exec_prefix="")
-
-	if test -n "$nspr_config_exec_prefix"; then
-		nspr_config_args="$nspr_config_args --exec-prefix=$nspr_config_exec_prefix"
-		if test -z "$NSPR_CONFIG"; then
-			NSPR_CONFIG=$nspr_config_exec_prefix/bin/nspr-config
-		fi
-	fi
-	if test -n "$nspr_config_prefix"; then
-		nspr_config_args="$nspr_config_args --prefix=$nspr_config_prefix"
-		if test -z "$NSPR_CONFIG"; then
-			NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config
-		fi
-	fi
-
-	unset ac_cv_path_NSPR_CONFIG
-	AC_PATH_PROG(NSPR_CONFIG, nspr-config, no)
-	min_nspr_version=ifelse([$1], ,4.0.0,$1)
-	AC_MSG_CHECKING(for NSPR - version >= $min_nspr_version (skipping))
-
-	no_nspr=""
-	if test "$NSPR_CONFIG" = "no"; then
-		no_nspr="yes"
-	else
-		NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
-		NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
-
-		dnl Skip version check for now
-		nspr_config_major_version=`$NSPR_CONFIG $nspr_config_args --version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-		nspr_config_minor_version=`$NSPR_CONFIG $nspr_config_args --version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-		nspr_config_micro_version=`$NSPR_CONFIG $nspr_config_args --version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-	fi
-
-	if test -z "$no_nspr"; then
-		AC_MSG_RESULT(yes)
-		ifelse([$2], , :, [$2])     
-	else
-		AC_MSG_RESULT(no)
-	fi
-
-
-	AC_SUBST(NSPR_CFLAGS)
-	AC_SUBST(NSPR_LIBS)
-
-])

mozilla/build/bloaturls.txt

@@ -1,6 +1,5 @@
 http://www.mozilla.org
-ftp://ftp.netscape.com/Welcome
-http://www.mozilla.org
+ftp://ftp.mozilla.org
 resource:///res/samples/test2.html
 resource:///res/samples/test8.html
 resource:///res/samples/test6.html

mozilla/build/build_number

@@ -0,0 +1 @@
+0000000000

mozilla/build/mac/BuildNGLayout.pl

@@ -0,0 +1,197 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/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.org code.
+#
+# 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): 
+#
+
+#
+# build script (optimized)
+#
+use Mac::Processes;
+use NGLayoutBuildList;
+use Cwd;
+use Moz;
+
+#-----------------------------------------------
+# configuration variables that globally affect what is built
+#-----------------------------------------------
+$DEBUG					= 0;
+$CARBON					= 0;	# turn on to build with TARGET_CARBON
+$PROFILE				= 0;
+$GC_LEAK_DETECTOR		= 0;	# turn on to use GC leak detection
+$INCLUDE_CLASSIC_SKIN 	= 1; 
+
+$pull{all} 				= 0;
+$pull{moz}				= 0;
+$pull{runtime} 			= 0;
+
+$build{all}             = 1;	# turn off to do individual builds, or to do "most"
+$build{most}            = 0;	# turn off to do individual builds
+$build{dist}            = 0;
+$build{dist_runtime}    = 0;	# implied by $build{dist}
+$build{xpidl}           = 0;
+$build{idl}             = 0;
+$build{stubs}           = 0;
+$build{runtime}         = 0;
+$build{common}          = 0;
+$build{imglib}          = 0;
+$build{necko}           = 0;
+$build{security}        = 0;
+$build{browserutils}    = 0;
+$build{intl}            = 0;
+$build{nglayout}        = 0;
+$build{editor}          = 0;
+$build{viewer}          = 0;
+$build{xpapp}           = 0;
+$build{extensions}      = 1;
+$build{plugins}         = 0;
+$build{mailnews}        = 0;
+$build{apprunner}       = 0;
+$build{resources}       = 1;
+
+$build{xptlink}		    = 0;
+
+$options{transformiix}	= 0;
+$options{mathml}		= 0;
+$options{svg}			= 0;
+$options{mng}			= 1;
+$options{ldap}			= 0;
+$options{xmlextras}		= 0;
+
+$options{jar_manifests} = 1;        # use jar.mn files for resources, not MANIFESTs
+$options{jars}    		= 1;        # build jar files
+$options{chrome_files}  = 0;        # install files in chrome as well as making jar files.
+
+# Don't change these (where should they go?)
+$optiondefines{mathml}{MOZ_MATHML}		= 1;
+$optiondefines{svg}{MOZ_SVG}			= 1;
+
+#-----------------------------------------------
+# configuration variables that affect the manner
+# of building, but possibly affecting
+# the outcome.
+#-----------------------------------------------
+$ALIAS_SYM_FILES		= $DEBUG;
+$CLOBBER_LIBS			= 1;	# turn on to clobber existing libs and .xSYM files before
+								# building each project							
+# The following two options will delete all dist files (if you have $build{dist} turned on),
+# but leave the directory structure intact.
+$CLOBBER_DIST_ALL 		= 1;	# turn on to clobber all aliases/files inside dist (headers/xsym/libs)
+$CLOBBER_DIST_LIBS 		= 0;	# turn on to clobber only aliases/files for libraries/sym files in dist
+$CLOBBER_IDL_PROJECTS	= 0;	# turn on to clobber all IDL projects.
+
+#-----------------------------------------------
+# configuration variables that are preferences for the build style,
+# and do not affect what is built.
+#-----------------------------------------------
+$CodeWarriorLib::CLOSE_PROJECTS_FIRST
+						= 0;
+								# 1 = close then make (for development),
+								# 0 = make then close (for tinderbox).
+$USE_TIMESTAMPED_LOGS 	= 0;
+#-----------------------------------------------
+# END OF CONFIG SWITCHES
+#-----------------------------------------------
+
+if ($pull{all})
+{
+	foreach $k (keys(%pull))
+	{
+		$pull{$k} = 1;
+	}
+}
+if ($build{all})
+{
+	foreach $k (keys(%build))
+	{
+		$build{$k} = 1;
+	}
+}
+if ($build{most})
+{
+### Just uncomment/comment to get the ones you want (if "most" is selected).
+#   $build{dist}            = 0;
+#   $build{dist_runtime}    = 0;	# Implied by $build{dist}
+#   $build{xpidl}           = 0;
+#   $build{idl}             = 0;
+#   $build{stubs}           = 0;
+#   $build{runtime}         = 1;
+#   $build{common}          = 1;
+#   $build{imglib}          = 1;
+#   $build{necko}           = 1;
+#   $build{security}        = 1;
+#   $build{browserutils}    = 1;
+#   $build{intl}            = 1;
+#   $build{nglayout}        = 1;
+#   $build{editor}          = 1;
+#   $build{viewer}          = 1;
+#   $build{xpapp}           = 1;
+#   $build{extensions}      = 1;
+#   $build{plugins}         = 1;
+#   $build{mailnews}        = 1;
+#   $build{apprunner}       = 1;
+#   $build{resources}       = 0;
+}
+
+# do the work
+# you should not have to edit anything below
+
+chdir("::::");
+$MOZ_SRC = cwd();
+
+if ($USE_TIMESTAMPED_LOGS)
+{
+	#Use time-stamped names so that you don't clobber your previous log file!
+	my $now = localtime();
+	while ($now =~ s@:@.@) {} # replace all colons by periods
+	my $logdir = ":Build Logs:";
+	if (!stat($logdir))
+	{
+	        print "Creating directory $logdir\n";
+	        mkdir $logdir, 0777 || die "Couldn't create directory $logdir";
+	}
+	OpenErrorLog("$logdir$now");
+}
+else
+{
+	OpenErrorLog("NGLayoutBuildLog");		# Release build requires that name
+	#OpenErrorLog("Mozilla.BuildLog");		# Tinderbox requires that name
+}
+
+Moz::StopForErrors();
+#Moz::DontStopForErrors();
+
+ConfigureBuildSystem();
+
+Checkout();
+
+my(@gen_files) = (
+    ":mozilla:xpfe:appshell:public:nsBuildID.h",
+    ":mozilla:xpfe:browser:resources:locale:en-US:navigator.dtd"
+);
+SetBuildNumber(":mozilla:config:build_number", ":mozilla:config:aboutime.pl", \@gen_files);
+
+chdir($MOZ_SRC);
+BuildDist();
+
+chdir($MOZ_SRC);
+BuildProjects();
+
+print "Build complete\n";

mozilla/build/mac/BuildNGLayoutDebug.pl

@@ -0,0 +1,189 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/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.org code.
+#
+# 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): 
+#
+
+#
+# build script (debug)
+#
+use Mac::Processes;
+use NGLayoutBuildList;
+use Cwd;
+use Moz;
+
+$DEBUG					= 1;
+$CARBON					= 0;	# Turn on to build with TARGET_CARBON
+$PROFILE				= 0;
+$GC_LEAK_DETECTOR		= 0;	# turn on to use GC leak detection
+$INCLUDE_CLASSIC_SKIN = 1;
+
+$pull{all} 				= 0;
+$pull{moz}				= 0;
+$pull{runtime} 			= 0;
+
+$build{all} 			= 1;	# Turn off to do individual builds, or to do "most"
+$build{most} 			= 0;	# Turn off to do individual builds
+$build{dist} 			= 0;
+$build{dist_runtime}	= 0;	# Implied by $build{dist}
+$build{xpidl}			= 0;
+$build{idl}             = 0;
+$build{stubs} 			= 0;
+$build{runtime}			= 0;
+$build{common} 			= 0;
+$build{imglib} 			= 0;
+$build{necko} 			= 0;
+$build{security}        = 0;
+$build{browserutils} 	= 0;
+$build{intl} 			= 0;
+$build{nglayout} 		= 0;
+$build{editor} 			= 0;
+$build{viewer} 			= 0;
+$build{xpapp} 			= 0;
+$build{extensions} 		= 1;
+$build{plugins}			= 0;
+$build{mailnews} 		= 0;
+$build{apprunner}		= 0;
+$build{resources} 		= 1;
+
+$build{xptlink}		    = 0;
+
+$options{transformiix}	= 0;
+$options{mathml}		= 0;
+$options{svg}			= 0;
+$options{mng}			= 1;
+$options{ldap}			= 0;
+$options{xmlextras}		= 0;
+
+$options{jar_manifests} = 1;        # use jar.mn files for resources, not MANIFESTs
+$options{jars}    		= 1;        # build jar files
+$options{chrome_files}  = 0;        # install files in chrome as well as making jar files.
+
+
+# Don't change these (where should they go?)
+$optiondefines{mathml}{MOZ_MATHML}		= 1;
+$optiondefines{svg}{MOZ_SVG}			= 1;
+
+#-----------------------------------------------
+# configuration variables that affect the manner
+# of building, but possibly affecting
+# the outcome.
+#-----------------------------------------------
+$ALIAS_SYM_FILES		= $DEBUG;
+$CLOBBER_LIBS			= 1;	# turn on to clobber existing libs and .xSYM files before
+								# building each project							
+# The following two options will delete all dist files (if you have $build{dist} turned on),
+# but leave the directory structure intact.
+$CLOBBER_DIST_ALL 		= 1;	# turn on to clobber all aliases/files inside dist (headers/xsym/libs)
+$CLOBBER_DIST_LIBS 		= 0;	# turn on to clobber only aliases/files for libraries/sym files in dist
+$CLOBBER_IDL_PROJECTS	= 0;	# turn on to clobber all IDL projects.
+
+#-----------------------------------------------
+# configuration variables that are preferences for the build style,
+# and do not affect what is built.
+#-----------------------------------------------
+$CodeWarriorLib::CLOSE_PROJECTS_FIRST
+						= 1;
+								# 1 = close then make (for development),
+								# 0 = make then close (for tinderbox).
+$USE_TIMESTAMPED_LOGS 	= 1;
+#-----------------------------------------------
+# END OF CONFIG SWITCHES
+#-----------------------------------------------
+
+if ($pull{all})
+{
+	foreach $k (keys(%pull))
+	{
+		$pull{$k} = 1;
+	}
+}
+if ($build{all})
+{
+	foreach $k (keys(%build))
+	{
+		$build{$k} = 1;
+	}
+}
+if ($build{most})
+{
+### Just uncomment/comment to get the ones you want (if "most" is selected).
+#	$build{dist}		= 1;
+#	$build{dist_runtime}= 1;
+    $build{xpidl}		= 1; # build idl compiler
+	$build{idl}         = 1;
+	$build{stubs}		= 1;
+	$build{runtime}		= 1;
+	$build{common}		= 1;
+	$build{imglib} 		= 1;
+	$build{necko} 		= 1;
+    $build{security}    = 1;
+	$build{browserutils} = 1;
+	$build{intl}		= 1; 
+	$build{nglayout}	= 1;
+	$build{editor}		= 1;
+	$build{viewer}		= 1;
+	$build{xpapp}		= 1;
+	$build{extensions} 	= 1;
+	$build{plugins}		= 1;
+	$build{mailnews}	= 1;
+	$build{apprunner} 	= 1;
+	$build{resources}	= 1;
+}
+
+# do the work
+# you should not have to edit anything below
+
+chdir("::::");
+$MOZ_SRC = cwd();
+
+if ($USE_TIMESTAMPED_LOGS)
+{
+	#Use time-stamped names so that you don't clobber your previous log file!
+	my $now = localtime();
+	while ($now =~ s@:@.@) {} # replace all colons by periods
+	my $logdir = ":Build Logs:";
+	if (!stat($logdir))
+	{
+	        print "Creating directory $logdir\n";
+	        mkdir $logdir, 0777 || die "Couldn't create directory $logdir";
+	}
+	OpenErrorLog("$logdir$now");
+}
+else
+{
+	OpenErrorLog("NGLayoutBuildLog");		# Release build
+	#OpenErrorLog("Mozilla.BuildLog");		# Tinderbox requires that name
+}
+
+Moz::StopForErrors();
+#Moz::DontStopForErrors();
+
+ConfigureBuildSystem();
+
+Checkout();
+
+chdir($MOZ_SRC);
+BuildDist();
+
+chdir($MOZ_SRC);
+BuildProjects();
+
+print "Build complete\n";

mozilla/build/mac/CodeWarriorLib.pm

@@ -1,5 +1,5 @@
 #!perl
-package Moz::CodeWarriorLib;
+package CodeWarriorLib;
 
 =pod
 
@@ -27,7 +27,6 @@ Replaces the AppleScript library I<CodeWarriorLib>.
 use strict;
 use Cwd;
 use Mac::Types;
-use Mac::Events;
 use Mac::AppleEvents;
 use Mac::AppleEvents::Simple;
 use Mac::Processes;
@@ -39,19 +38,15 @@ use vars qw($VERSION);
 $VERSION = '1.02';
 
 my($app)  = 'CWIE';
-my($scriptDir) = cwd();         # could use $0 for this
-my($ide_loc_file) = "";
+my($scriptDir) = cwd();
 
 # 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;
-# $Mac::AppleEvents::Simple::WARN = 1;
 
 # supply your own path to the source here
 #_test('PowerPudgeIV:mozilla:mozilla:');
 
-# If you want to understand the gobbldeygook that's used to build Apple Events,
-# you should start by reading the AEGizmos documentation.
 
 =pod
 
@@ -170,64 +165,13 @@ sub build_project ($;$$$) {
 	return($had_errors);
 }
 
-=pod
-
-=item appIsRunning()
-
-=cut
-sub _appIsRunning($)
-{
-	my ($appSignature) = @_;
-	my ($psi);
-	my ($found) = 0;
-	my ($appPSN);
-
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-	
-	return $found;
-}
-
-=pod
-
-=item appIsFrontmost()
-
-=cut
-sub _appIsFrontmost($)
-{
-	my ($appSignature) = @_;
-	my ($psi);
-	my ($found) = 0;
-	my ($appPSN);
-
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-	
-	return (GetFrontProcess() == $appPSN);
-}
-
-
 =pod
 
 =item activate()
 
 Launches CodeWarrior and brings it to the front.
 
-Once found, path will be saved in $idepath_file for future reference.
+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.
 
@@ -238,11 +182,9 @@ GUSI routines built-in to MacPerl for a Choose Directory dialog box.
 
 =cut
 
-sub activate ($) {
-
-    $ide_loc_file = $_[0];     # save in global
-        
-	my($filepath, $appath, $psi) = ($ide_loc_file);
+sub activate () {
+	local(*F);
+	my($filepath, $appath, $psi) = (':idepath.txt');
 
 	foreach $psi (values(%Process)) {
 		if ($psi->processSignature() eq $app) {
@@ -311,66 +253,12 @@ sub activate ($) {
 		launchAppSpec => $appath,
 		launchControlFlags => launchContinue() + launchNoFileFlags()
 	);
-	
-	unless (LaunchApplication($lp)) {
-		unlink($filepath);
-		die $^E;
-	}
-	
-	# wait for CodeWarrior to show up in the list of processes
-	while (!_appIsRunning('CWIE'))
-	{
-		WaitNextEvent();
-	}
-
-	# wait for CodeWarrior to come to the front
-	while (!_appIsFrontmost('CWIE'))
-	{
-		WaitNextEvent();
-	}
+        unless (LaunchApplication($lp)) {
+                unlink($filepath);
+                die $^E;
+        }
 }
 
-=pod
-
-=item getCodeWarriorPath()
-
-Returns a file path relative to the CodeWarrior folder
-
-=cut
-
-sub getCodeWarriorPath($)
-{
-    my($subfolder)=@_;
-    
-    my($app_path) = _read_appath($ide_loc_file);
-    if ($app_path eq "") { die "Error: Failed to get CodeWarrior IDE path\n"; }
-    
-    my($codewarrior_root) = $app_path;
-    $codewarrior_root =~ s/[^:]*$//;
-    return ($codewarrior_root . $subfolder);
-}
-
-
-=pod
-
-=item getCodeWarriorIDEName()
-
-Returns the name of the CodeWarrior application
-
-=cut
-
-sub getCodeWarriorIDEName()
-{
-    my($subfolder)=@_;
-
-    my($app_path) = _read_appath($ide_loc_file);
-    if ($app_path eq "") { die "Error: Failed to get CodeWarrior IDE path\n"; }
-
-    my(@codewarrior_path) = split(/:/, $app_path);
-    return pop(@codewarrior_path);
-}
-
-
 =pod
 
 =item quit()
@@ -422,15 +310,6 @@ sub _open_file ($) {
 	do_event(qw/aevt odoc/, $app, $prm, $_[0]);
 }
 
-sub import_project ($$) {
-	my($xml_file, $project_path) = @_;
-	
-	my($prm) = "kocl:type(PRJD), rtyp:TEXT(@), data:TEXT(@), &subj:'null'()";
-	
-	my($evt) = do_event(qw/core crel/, $app, $prm, $project_path, $xml_file);    
-	return $evt->{ERROR};
-}
-
 sub _doc_named ($) {
 	my($prm) =
 		q"'----':obj {form:test, want:type(docu), from:'null'(), " .
@@ -495,7 +374,6 @@ sub _save_appath ($$) {
 	my($cwd) = cwd();	# remember the current working dir
 	chdir($scriptDir);	# change dir to the script dir
 
-	local(*F);
 	open(F, '>' . $_[0]) or die $!;
 	print F $_[1];
 	close(F);
@@ -513,8 +391,6 @@ sub _read_appath ($) {
 	if (! -e $filepath) {
 		return "";
 	}
-
-	local(*F);
 	open(F, $filepath);
 	my($appath) = <F>;
 	close(F);
@@ -525,7 +401,7 @@ sub _read_appath ($) {
 
 
 sub _test ($) {
-	activate($ide_loc_file);
+	activate();
 	my($path) = $_[0];
 	build_project(
 	  "${path}modules:xml:macbuild:XML.mcp", '',

mozilla/build/mac/GenToc.script

@@ -0,0 +1,264 @@
+(*
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.org code.
+ *
+ * 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): 
+ *)
+
+(*
+	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/MANIFESTO.pm

@@ -0,0 +1,222 @@
+#!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.1 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of
+the License at http://www.mozilla.org/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-1999 Netscape Communications Corporation. All
+Rights Reserved.
+
+Contributor(s): 
+
+=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__

mozilla/build/mac/MANIFESTOLib.script

@@ -0,0 +1,376 @@
+(*
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/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.org code.
+ *
+ * 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): 
+ *)
+
+(*
+	MANIFESTOLib - Reconciles a CW Project file with an external table of contents file.
+
+	Uses merge sort, one pass per target.
+	
+	by Patrick C. Beard <beard@netscape.com>
+ *)
+
+(* Global Configuration Properties *)
+
+property pShowReport : true
+-- property pSourceTree : "Homeward:Work:Raptor:src:"
+property pSourceTree : "Morbeus:Projects:Raptor:src:"
+
+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
+
+-- replaces oldChar with newChar in a string.
+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
+
+(* 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
+
+-- reads .toc file into a list.
+on readManifestFile(sourceTree, manifestFile)
+	set oldDelimiters to swapDelimiters(return)
+	set fileRef to false
+	set fileLines to {}
+	try
+		set fileRef to (open for access manifestFile without write permission)
+		-- read entire file into memory, use text items to delimit lines.
+		set fileContents to (read fileRef)
+		repeat with lineRef in (every text item of fileContents)
+			-- ignore lines that start with "#" or are empty.
+			set fileLine to (contents of lineRef)
+			if (fileLine ­ "") and not (fileLine starts with "#") then
+				set fileLines to fileLines & (sourceTree & replace(fileLine, "/", ":"))
+			end if
+		end repeat
+	on error
+		-- ignore errors.
+	end try
+	if (fileRef is not false) then close access fileRef
+	setDelimiters(oldDelimiters)
+	return sortList(fileLines)
+end readManifestFile
+
+(* both of the following depend on ":" as the delimiter character. *)
+
+on folderFromPath(filePath)
+	return ((filePath's text items 1 thru ((count of filePath's text items) - 1)) as string) & ":"
+end folderFromPath
+
+on fileFromPath(filePath)
+	return last text item of filePath
+end fileFromPath
+
+(* CW Pro IDE Interface Handlers. *)
+
+on openProject(aProjectFile)
+	tell application "CodeWarrior IDE 3.3"
+		-- activate
+		open aProjectFile
+	end tell
+end openProject
+
+(* forces the named project file to be the front window. *)
+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 closeProject(aProjectFile)
+	tell application "CodeWarrior IDE 3.3"
+		Close Project
+	end tell
+end closeProject
+
+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 "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, targetList)
+	tell application "CodeWarrior IDE 3.3"
+		add (project document 1) new target file with data {targetFile} to targets targetList
+	end tell
+end addTargetFile
+
+global gCurrentTarget
+
+on setCurrentTarget(currentTargetName)
+	if (gCurrentTarget ­ currentTargetName) then
+		set gCurrentTarget to currentTargetName
+		tell application "CodeWarrior IDE 3.3"
+			Set Current Target currentTargetName
+		end tell
+	end if
+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 (contents of listItem = anItem) then
+			return true
+		end if
+	end repeat
+	return false
+end listContains
+
+on showList(aList)
+	choose from list aList with prompt "List:" with empty selection allowed
+end showList
+
+global gProjectModified
+
+on ModifyReadOnly(aProjectFile)
+	if (not gProjectModified) then
+		set gProjectModified to true
+		-- so CodeWarrior will notice, must close the file before MROing it.
+		closeProject(aProjectFile)
+		mro aProjectFile
+		openProject(aProjectFile)
+		selectProject(aProjectFile)
+	end if
+end ModifyReadOnly
+
+on makeStream(itemList)
+	return {streamList:itemList, streamCount:count itemList, streamIndex:0}
+end makeStream
+
+(* true is used as the end of stream value. *)
+property pEOS : true
+
+on advanceStream(stream)
+	set itemCount to (streamCount of stream)
+	set itemIndex to (streamIndex of stream)
+	if (itemIndex < itemCount) then
+		set itemIndex to (itemIndex + 1)
+		set (streamIndex of stream) to itemIndex
+		return (item itemIndex of streamList of stream)
+	else
+		return pEOS
+	end if
+end advanceStream
+
+-- returns true if str2 is INFINITELY great, or str1 is less than str2.
+on precedes(str1, str2)
+	return (str2 = pEOS) or ((str1 ­ pEOS) and (str1 < str2))
+end precedes
+
+on get_current_application()
+	return last text item of ((path to current application) as text)
+end get_current_application
+
+on get_frontmost_application()
+	return last text item of ((path to frontmost application) as text)
+end get_frontmost_application
+
+on activate_application(applicationName)
+	tell application "Finder"
+		set applicationProcess to (application process applicationName)
+		set frontmost of applicationProcess to true
+	end tell
+end activate_application
+
+on ReconcileProject(sourceTree, projectPath, manifestoPath)
+	-- so we can easily strip off file names from paths.
+	set oldDelimiters to swapDelimiters(":")
+	
+	-- initialize globals.
+	set gCurrentTarget to ""
+	set gProjectModified to false
+	
+	-- convert paths to aliases.
+	set projectFile to alias projectPath
+	set manifestFile to alias manifestoPath
+	
+	-- read the MANIFESTO file into a list of paths.
+	set manifestContents to readManifestFile(sourceTree, manifestFile)
+	-- return manifestContents
+	
+	-- now, start processing the file items, ensuring that the project contains all items.
+	openProject(projectFile)
+	selectProject(projectFile)
+	set targetsList to getTargets()
+	set targetNames to names of targetsList
+	
+	if (pShowReport) then
+		set theReport to ""
+		set addedFiles to ""
+		set removedFiles to ""
+	end if
+	
+	-- push current application to front for speed.
+	-- set frontmostApplication to get_frontmost_application()
+	-- set currentApplication to get_current_application()
+	-- activate_application(currentApplication)
+	
+	-- reconcile all targets with the MANIFEST file.
+	-- this loop should be recoded in PERL for speed.
+	-- IDEA: with sorted lists, can scan both lists, like a merge sort, and make one pass per target.
+	repeat with targetNameRef in targetNames
+		-- switch targets because getTargetFiles now checks to see if file is linked in current target.
+		set targetName to (contents of targetNameRef)
+		set targetFiles to getTargetFiles(targetName)
+		-- hopefully, this list test is fast.
+		if (targetFiles ­ manifestContents) then
+			-- return {count targetFiles, count manifestContents, targetFiles, manifestContents}
+			-- make sure the project file is modifiable.
+			ModifyReadOnly(projectFile)
+			setCurrentTarget(targetName)
+			set targetStream to makeStream(targetFiles)
+			set targetItem to advanceStream(targetStream)
+			set manifestStream to makeStream(manifestContents)
+			set manifestItem to advanceStream(manifestStream)
+			repeat until (manifestItem is pEOS) and (targetItem is pEOS)
+				-- display dialog "m: " & manifestItem & ", t: " & targetFileItem
+				if (manifestItem = targetItem) then
+					-- items match, advance both.
+					set manifestItem to advanceStream(manifestStream)
+					set targetItem to advanceStream(targetStream)
+				else
+					-- return {manifestItem, targetItem}
+					if (precedes(manifestItem, targetItem)) then
+						-- we have an item in manifest, not in project, so we have to add it to the targets.
+						-- display dialog "adding " & manifestItem
+						addTargetFile(manifestItem, targetNames)
+						if pShowReport then
+							set addedFiles to addedFiles & ("# " & (last text item of manifestItem) & return)
+						end if
+						set manifestItem to advanceStream(manifestStream)
+					else
+						-- we have an item not in manifest, but in project, so it must be removed from this target.
+						-- display dialog "removing " & targetItem
+						removeTargetFile(targetItem)
+						if pShowReport then
+							set removedFiles to removedFiles & ("# " & targetName & " - " & (last text item of targetItem) & return)
+						end if
+						set targetItem to advanceStream(targetStream)
+					end if
+				end if
+			end repeat
+		end if
+	end repeat
+	
+	-- activate_application(frontmostApplication)
+	
+	-- commit the project changes, and  optionally display a report.
+	tell application "CodeWarrior IDE 3.3"
+		-- leave project open for compilation phase?
+		Close Project
+		if pShowReport then
+			if addedFiles is not "" then set theReport to ("# Added files: " & return & addedFiles)
+			if removedFiles is not "" then set theReport to theReport & ("# Removed files: " & return & removedFiles)
+			if (theReport is "") then set theReport to (" # Project is up to date." & return)
+			-- display dialog theReport buttons {"OK"} default button "OK"
+		end if
+	end tell
+	
+	-- restore AppleScript's delimiters.
+	setDelimiters(oldDelimiters)
+	
+	-- return 0 to indicate no error.
+	return theReport
+end ReconcileProject
+
+on run
+	-- when run interactively,
+	-- ask user which project/MANIFEST files to use.
+	set projectPath to (choose file with prompt "Choose a CW Project file." of type {"MMPr"}) as text
+	set manifestPath to (choose file with prompt "Choose a TOC file to process." of type {"TEXT"}) as text
+	ReconcileProject(pSourceTree, projectPath, manifestPath)
+end run

mozilla/build/mac/MacCVS.pm

@@ -0,0 +1,204 @@
+#!perl -w
+package	MacCVS;
+
+# package	Mac::Apps::MacCVS; this should really be the name of the package
+# but due to our directory hierarchy in mozilla, I am not doing it
+
+require 5.004;
+require	Exporter;
+
+use strict;
+
+use vars qw($VERSION @ISA @EXPORT $MacCVSLib);
+use Mac::StandardFile;
+use Moz;
+use Cwd;
+use Exporter;
+use File::Basename;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw( new print checkout);
+$VERSION = "1.00";
+
+# Architecture:
+# cvs session object:
+# name - session name
+# session_file - session file
+# 
+# globals
+# $MacCVSLib - location of MacCVS applescript library
+#
+# 
+
+#
+# utility routines
+#
+
+# just like Mac::DoAppleScript, 1 is success, 0 is failure
+sub _myDoAppleScript($)	
+{
+	my($script) = @_;
+	my $asresult = MacPerl::DoAppleScript($script);
+	if ($asresult eq "0")
+	{
+		return 1;
+	}
+	else
+	{
+		print STDERR "AppleScript error: $asresult\n";
+		print STDERR "AppleScript was: \n $script \n";
+		return 0;
+	}
+}
+
+# _useMacCVSLib
+# returns 1 on success
+# Search the include path for the file called MacCVSLib
+sub _useMacCVSLib() 
+{
+	unless ( defined($MacCVSLib) )
+	{
+		my($libname) = "MacCVSLib";
+# try the directory we were run from
+		my($c) = dirname($0) . ":" . $libname;
+		if ( -e $c)
+		{
+			$MacCVSLib = $c;
+		}
+		else
+		{
+	# now search the include directories
+			foreach (@INC)
+			{
+				unless ( m/^Dev:Pseudo/ )	# This is some bizarre MacPerl special-case directory
+				{
+					$c = $_ . $libname;
+					if (-e $c)
+					{
+						$MacCVSLib = $c;
+						last;
+					}
+				}
+			}
+		}
+		if (! (-e $MacCVSLib))
+		{
+			print STDERR "MacCVS lib could not be found! $MacCVSLib";
+			return 0;
+		}
+	}
+	return 1;
+}
+
+
+#
+# Session object methods
+#
+
+sub new		{
+	my ( $proto, $session_file) = @_;
+	my $class = ref($proto) || $proto;
+	my $self = {};
+
+	if ( defined($session_file) && ( -e $session_file) )
+	{
+		$self->{"name"} = basename( $session_file );
+		$self->{"session_file"} = $session_file;
+		bless $self, $class;
+		return $self;
+	}
+	else
+	{
+		print STDERR "MacCVS->new cvs file < $session_file > does not exist\n";
+		return;
+	}
+}
+
+# makes sure that the session is open
+# assertSessionOpen()
+# returns 1 on failure
+sub assertSessionOpen()	{
+	my ($self) = shift;
+	_useMacCVSLib() || die "Could not load MacCVSLib\n";
+	my $script = <<END_OF_APPLESCRIPT;
+	tell (load script file "$MacCVSLib") to OpenSession("$self->{session_file}")
+END_OF_APPLESCRIPT
+	return _myDoAppleScript($script);
+}
+
+# prints the cvs object, used mostly for debugging
+sub print {
+	my($self) = shift;
+	print "MacCVS:: name: ", $self->{name}, " session file: ", $self->{session_file}, "\n";
+}
+
+# checkout( self, module, revision, date)
+# MacCVS checkout command
+# returns 1 on failure
+sub checkout
+{
+	my($self, $module, $revision, $date ) = @_;
+	unless( defined ($module) ) { $module = ""; }	# get rid of the pesky undefined warnings
+	unless( defined ($revision) ) { $revision = ""; }
+	unless( defined ($date) ) { $date = ""; }
+
+	$self->assertSessionOpen() || return 1;
+	
+	my($revstring) = ($revision ne "") ? $revision : "(none)";
+	my($datestring) = ($date ne "") ? $date : "(none)";
+	
+	print "Checking out $module with revision $revstring, date $datestring\n";
+	
+	my $script = <<END_OF_APPLESCRIPT;
+	tell (load script file "$MacCVSLib") to Checkout given sessionName:"$self->{name}", module:"$module", revision:"$revision", date:"$date"
+END_OF_APPLESCRIPT
+	return _myDoAppleScript($script);
+}
+
+1;
+=pod
+
+=head1 NAME
+
+MacCVS - Interface to MacCVS
+
+=head1 SYNOPSIS
+
+	use MacCVS;
+	$session = MacCVS->new( <session_file_path>) || die "cannot create session";
+	$session->checkout([module] [revision] [date]) || die "Could not check out";
+		
+=head1 DESCRIPTION
+
+This is a MacCVS interface for talking to MacCVS Pro client.
+MacCVSSession is the class used to manipulate the session
+
+=item new
+	MacCVS->new( <cvs session file path>);
+	
+	Creates a new session. Returns undef on failure.
+
+=item checkout( <module> [revision] [date] )
+
+	cvs checkout command. Revision and date are optional
+	returns 0 on failure
+	
+=cut
+
+=head1 SEE ALSO
+
+=over
+
+=item MacCVS Home Page
+
+http://www.maccvs.org/
+
+=back 
+
+=head1 AUTHORS
+
+Aleks Totic atotic@netscape.com
+
+=cut
+
+__END__

mozilla/build/mac/MakeJarsMac.pm

@@ -0,0 +1,146 @@
+#!perl -w
+# make-jars [-d <destPath>] < <manifest.jr>
+
+package	MozJar;
+
+require 5.004;
+
+use strict;
+use Cwd;
+use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
+use Moz;
+
+use vars qw( @ISA @EXPORT );
+
+@ISA		= qw(Exporter);
+@EXPORT     = qw(ProcessJarManifest);
+
+sub _addToJar($$$$$)
+{
+      my($thing, $srcPath, $jarManDir, $zip, $compress) = @_;
+      #print "_addToJar($thing, $srcPath, $jarManDir, $zip, $compress)\n";
+      
+      my $existingMember = $zip->memberNamed($thing);
+      if ($existingMember) {
+          my $modtime = $existingMember->lastModTime();
+          print "already have $thing at $modtime\n";  # XXX need to check mod time here!
+          return 0;
+      }
+      
+      my $filepath = "$jarManDir:$srcPath";
+      $filepath =~ s|/|:|g;
+      
+      if (!-e $filepath) {
+          $srcPath =~ /([\w\d.:\-\\\/]+)[:\\\/]([\w\d.\-]+)/;
+          $filepath = "$jarManDir:$2";
+          if (!-e $filepath) {
+              die "$filepath does not exist\n";
+          }
+      }
+      
+      my $member = Archive::Zip::Member->newFromFile($filepath);
+      die "Failed to create zip file member $filepath\n" unless $member;
+
+      $member->fileName($thing);
+
+      print "Adding $filepath as $thing\n";
+
+      if ($compress) {
+          $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
+      } else {
+          $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
+      }
+
+      $zip->addMember($member);
+}
+
+sub JarIt($$)
+{
+    my ($jarfile, $zip) = @_;
+    #print "+++ jarring $jarfile\n";
+    #flush();
+    #system "zip -u $jarfile $args\n";
+    my $jarTempFile = $jarfile . ".temp";
+    $zip->writeToFileNamed($jarTempFile) == AZ_OK
+      || die "zip writeToFileNamed $jarTempFile failed";
+
+    # set the file type/creator to something reasonable
+    MacPerl::SetFileInfo("ZIP ", "ZIP ", $jarTempFile);
+    rename($jarTempFile, $jarfile);
+    print "+++ finished jarring $jarfile\n";
+}
+
+sub ProcessJarManifest($$)
+{
+    my ($jarManPath, $destPath) = @_;
+    
+    $jarManPath = Moz::full_path_to($jarManPath);
+    $destPath = Moz::full_path_to($destPath);
+    #print "ProcessJarManifest($jarManPath, $destPath)\n";
+
+    print "+++ jarring $jarManPath\n";
+    
+	my $jarManDir = "";
+	my $jarManFile = "";
+	if ($jarManPath =~ /([\w\d.:\-\\\/]+)[:\\\/]([\w\d.\-]+)/) {
+        $jarManDir = $1;
+        $jarManFile = $2;
+    }
+    else {
+    	die "bad jar.mn specification";
+    }
+
+    open(FILE, "<$jarManPath") || die "could not open $jarManPath: $!";
+	while (<FILE>) {
+	    chomp;
+	  start: 
+	    if (/^([\w\d.\-\\\/]+)\:\s*$/) {
+	        my $jarfile = "$destPath/$1";
+	        $jarfile =~ s|/|:|g;
+	        #my $args = "";
+
+            my $zip = Archive::Zip->new();
+            #print "new jar $jarfile\n";
+	        if (-e $jarfile) {
+	        	#print "=====> $jarfile exists\n";
+	        	my $ok = $zip->read($jarfile);
+	        	if ($ok != AZ_OK) {
+	        	    die "zip read $jarfile failed: $ok";
+	        	}
+	        }
+
+	        while (<FILE>) {
+	            if (/^\s+([\w\d.\-\\\/]+)\s*(\([\w\d.\-\\\/]+\))?$\s*/) {
+					my $dest = $1;
+					my $srcPath = $2;
+                	if ( $srcPath ) {  
+                	    $srcPath = substr($srcPath,1,-1);
+                	}
+                	else {
+                		$srcPath = ":" . $dest;
+                	}
+                	$srcPath =~ s|/|:|g;
+
+	                _addToJar($dest, $srcPath, $jarManDir, $zip, 1);
+	            } elsif (/^\s*$/) {
+	                # end with blank line
+	                last;
+	            } else {
+	                JarIt($jarfile, $zip);
+	                goto start;
+	            }
+	        }
+	        JarIt($jarfile, $zip);
+
+	    } elsif (/^\s*\#.*$/) {
+	        # skip comments
+	    } elsif (/^\s*$/) {
+	        # skip blank lines
+	    } else {
+	        close;
+	        die "bad jar rule head at: $_";
+	    }
+	}
+    close(FILE);
+}
+

mozilla/build/mac/Moz.pm

@@ -0,0 +1,572 @@
+=head1 NAME
+
+B<Moz> - routines for automating CodeWarrior builds, and some extra-curricular activities related to building Mozilla
+
+=head1 SYNOPSIS
+
+    use Moz;
+
+    OpenErrorLog(":::BuildLog");
+    StopForErrors();
+
+		$Moz::QUIET = 1;
+		InstallFromManifest(":projects:MANIFEST", $dist_dir);
+
+    BuildProjectClean(":projects:SomeProject.mcp", "SomeTarget");
+    MakeAlias(":projects:SomeProject.shlb", $dist_dir);
+
+    DontStopForErrors();
+
+    BuildProject(":projects:SomeOtherProject.mcp", "SomeTarget");
+
+=head1 DESCRIPTION
+
+B<Moz> comprises the routines needed to slap CodeWarrior around, force it to build a sequence of projects, report the results, and a few other things.
+
+=cut
+
+
+
+
+package			Moz;
+require			Exporter;
+
+use Mac::Types;
+use Mac::Events;
+use Mac::Processes;
+use File::Copy;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw(BuildProject LaunchCodeWarrior BuildProjectClean GetFileModDate OpenErrorLog MakeAlias StopForErrors DontStopForErrors InstallFromManifest InstallResources SetBuildNumber SetAgentString SetTimeBomb Delay ActivateApplication);
+@EXPORT_OK	= qw(CloseErrorLog UseCodeWarriorLib QUIET);
+
+	use Cwd;
+	use File::Path;
+	use ExtUtils::Manifest 'maniread';
+
+	use CodeWarriorLib;
+
+sub current_directory()
+	{
+		my $current_directory = cwd();
+		chop($current_directory) if ( $current_directory =~ m/:$/ );
+		return $current_directory;
+	}
+
+sub full_path_to($)
+	{
+		my ($path) = @_;
+		if ( $path =~ m/^[^:]+$/ )
+			{
+				$path = ":" . $path;
+			}
+
+		if ( $path =~ m/^:/ )
+			{
+				$path = current_directory() . $path;
+			}
+
+		return $path;
+	}
+
+=head2 Setup
+
+Pretty much, everything is taken care of for you.
+  However, B<Moz> does use a little compiled AppleScript library (the file CodeWarriorLib) for some of its communcication with CodeWarrior.
+  If this library isn't in the same directory as "Moz.pm", then you need to tell B<Moz> where to find it.
+  Call C<UseCodeWarriorLib($path_to_CodeWarriorLib)>.
+  This routine is not exported by default, nor are you likely to need it.
+
+=cut
+
+sub UseCodeWarriorLib($)
+	{
+#		($CodeWarriorLib) = @_;
+#		$CodeWarriorLib = full_path_to($CodeWarriorLib);
+	}
+
+sub LaunchCodeWarrior()
+{
+  CodeWarriorLib::activate();
+}
+
+
+sub activate_CodeWarrior()
+	{
+#MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
+#	tell (load script file "$CodeWarriorLib") to ActivateCodeWarrior()
+#END_OF_APPLESCRIPT
+	}
+
+
+$logging								= 0;
+$recent_errors_file			= "";
+$stop_on_1st_error			= 1;
+$QUIET									= 0;
+
+
+
+=head2 Logging all the errors and warnings - C<OpenErrorLog($log_file)>, C<CloseErrorLog()>
+
+The warnings and errors generated in the course of building projects can be logged to a file.
+Tinderbox uses this facility to show why a remote build failed.
+
+Logging is off by default.
+  Start logging at any point in your build process with C<OpenErrorLog($log_file)>.
+  Stop with C<CloseErrorLog()>.
+  You never need to close the log explicitly, unless you want to just log a couple of projects in the middle of a big list.
+  C<CloseErrorLog()> is not exported by default. 
+
+=cut
+
+sub CloseErrorLog()
+	{
+		if ( $logging )
+			{
+				close(ERROR_LOG);
+				$logging = 0;
+				StopForErrors() if $stop_on_1st_error;
+			}
+	}
+
+
+
+sub OpenErrorLog($)
+	{
+		my ($log_file) = @_;
+
+		CloseErrorLog();
+		if ( $log_file )
+			{
+				$log_file = full_path_to($log_file);
+ 
+				open(ERROR_LOG, ">$log_file") || die "Can't open logfile, check the file path.\n";
+				MacPerl::SetFileInfo("CWIE", "TEXT", $log_file);
+
+				$log_file =~ m/.+:(.+)/;
+				$recent_errors_file = full_path_to("$1.part");
+				$logging = 1;
+			}
+	}
+
+
+=head2 Stopping before it's too late - C<StopForErrors()>, C<DontStopForErrors()>
+
+When building a long list of projects, you decide whether to continue building subsequent projects when one fails.
+  By default, your build script will C<die> after the first project that generates an error while building.
+  Change this behavior with C<DontStopForErrors()>.
+  Re-enable it with C<StopForErrors()>.
+
+=cut
+
+sub StopForErrors()
+	{
+		$stop_on_1st_error = 1;
+		
+			# Can't stop for errors unless we notice them.
+			# Can't notice them unless we are logging.
+			# If the user didn't explicitly request logging, log to a temporary file.
+
+		if ( ! $recent_errors_file )
+			{
+				OpenErrorLog("${TMPDIR}BuildResults");
+			}
+	}
+
+sub DontStopForErrors()
+	{
+		$stop_on_1st_error = 0;		
+	}
+
+sub log_message($)
+	{
+		if ( $logging )
+			{
+				my ($message) = @_;
+				print ERROR_LOG $message;
+			}
+	}
+
+sub log_message_with_time($)
+	{
+		if ( $logging )
+			{
+				my ($message) = @_;
+				my $time_stamp = localtime();
+				log_message("$message ($time_stamp)\n");
+			}
+	}
+
+sub log_recent_errors($)
+	{
+		my ($project_name) = @_;
+		my $found_errors = 0;
+	
+		if ( $logging )
+			{
+				open(RECENT_ERRORS, "<$recent_errors_file");
+
+				while( <RECENT_ERRORS> )
+					{
+						if ( /^Error/ || /^CouldnÕt find project file/ || /^Link Error/ )
+							{
+#								if (!$found_errors)
+#									print $_;
+								$found_errors = 1;
+							}
+						print ERROR_LOG $_;
+					}
+
+				close(RECENT_ERRORS);
+				unlink("$recent_errors_file");
+			}
+		
+		if ( $stop_on_1st_error && $found_errors )
+			{
+				print ERROR_LOG "### Build failed.\n";
+				die "### Errors encountered building \"$project_name\".\n";
+			}
+	}
+
+sub build_project($$$)
+	{
+		my ($project_path, $target_name, $clean_build) = @_;
+		$project_path = full_path_to($project_path);
+
+#		$project_path =~ m/.+:(.+)/;
+#		my $project_name = $1;
+
+		log_message_with_time("### Building \"$project_path\"");
+
+			# Check that the given project exists
+		if (! -e $project_path)
+			{
+				print ERROR_LOG "### Build failed.\n";
+				die "### Can't find project file \"$project_path\".\n";
+			}
+		
+		print "Building \"$project_path\[$target_name\]\"\n";
+		
+		$had_errors = CodeWarriorLib::build_project(
+			$project_path, $target_name, $recent_errors_file, $clean_build
+		);
+		WaitNextEvent();
+
+#		$had_errors =
+#MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
+#	tell (load script file "$CodeWarriorLib") to BuildProject("$project_path", "$project_name", "$target_name", "$recent_errors_file", $clean_build)
+#END_OF_APPLESCRIPT
+
+			# Append any errors to the globally accumulated log file
+#		if ( $had_errors ) # Removed this test, because we want warnings, too.  -- jrm
+			{
+				log_recent_errors($project_path);
+			}
+	}
+
+=head2 Getting CodeWarrior to build projects - C<BuildProject($project, $opt_target)>, C<BuildProjectClean($project, $opt_target)>
+
+C<BuildProject()> and C<BuildProjectClean()> are identical, except that the latter first removes object code.
+  In both, CodeWarrior opens the project if it wasn't already open; builds the given (or else current) target; and finally closes
+ the project, if it wasn't already open.
+
+=cut
+
+sub BuildProject($;$)
+	{
+		my ($project_path, $target_name) = @_;
+		build_project($project_path, $target_name, 0);
+	}
+
+sub BuildProjectClean($;$)
+	{
+		my ($project_path, $target_name) = @_;
+		build_project($project_path, $target_name, 1);
+	}
+
+
+=head2 Miscellaneous
+
+C<MakeAlias($old_file, $new_file)> functions like C<symlink()>, except with better argument defaulting and more explicit error messages.
+
+=cut
+
+sub MakeAlias($$)
+	{
+		my ($old_file, $new_file) = @_;
+
+			# if the directory to hold $new_file doesn't exist, create it
+		if ( ($new_file =~ m/(.+:)/) && !-d $1 )
+			{
+				mkpath($1);
+			}
+
+			# if a leaf name wasn't specified for $new_file, use the leaf from $old_file
+		if ( ($new_file =~ m/:$/) && ($old_file =~ m/.+:(.+)/) )
+			{
+				$new_file .= $1;
+			}
+
+		my $message = "Can't create a Finder alias (at \"$new_file\")\n for \"$old_file\"; because ";
+
+		die "$message \"$old_file\" doesn't exist.\n" unless -e $old_file;
+		die "$message I won't replace an existing (non-alias) file with an alias.\n" if ( -e $new_file && ! -l $new_file );
+
+			# now: $old_file exists; $new_file doesn't (or else, is an alias already)
+
+		if ( -l $new_file )
+			{
+					# ...then see if it already points to $old_file
+				my $current_target	= full_path_to(readlink($new_file));
+				my $new_target			= full_path_to($old_file);
+
+				return if ( $current_target eq $new_target );
+					# if the desired alias already exists and points to the right thing, then we're done
+				
+				unlink $new_file;
+			}
+		
+		symlink($old_file, $new_file) || die "$message symlink returned an unexpected error.\n";
+	}
+	
+	
+=pod
+
+C<InstallFromManifest()>
+
+=cut
+
+sub InstallFromManifest($;$$)
+	{
+		my ($manifest_file, $dest_dir, $flat) = @_;
+		
+		$flat = 0 unless defined($flat); # if $flat, all rel. paths in MANIFEST get aliased to the root of $dest_dir
+
+		$dest_dir ||= ":";
+
+		$manifest_file =~ m/(.+):/;
+		my $source_dir =  $1;
+
+		chop($dest_dir) if $dest_dir =~ m/:$/;
+
+		#Mac::Events->import();
+		WaitNextEvent();
+		if ($flat)
+		{
+			print "Doing manifest on \"$manifest_file\" FLAT\n" unless $QUIET;
+		}
+		else
+		{
+			print "Doing manifest on \"$manifest_file\"\n" unless $QUIET;
+		}
+		
+		my $read = maniread(full_path_to($manifest_file));
+		foreach $file (keys %$read)
+			{
+				next unless $file;
+
+				$subdir = ":";
+				if (!$flat && ($file =~ /:.+:/ ))
+					{
+						$subdir = $&;
+					}
+
+				$file = ":$file" unless $file =~ m/^:/;
+				MakeAlias("$source_dir$file", "$dest_dir$subdir");
+			}
+	}
+
+
+=pod
+
+C<InstallResources()>
+
+=cut
+
+# parameters are path to MANIFEST file, destination dir, true (to make copies) or false (to make aliases)
+sub InstallResources($;$;$)
+	{
+		my ($manifest_file, $dest_dir, $copy_files) = @_;
+
+		$dest_dir ||= ":";
+		mkpath($dest_dir) if !-d $dest_dir;
+
+		$manifest_file =~ m/(.+):/;
+		my $source_dir =  $1;
+
+		chop($dest_dir) if $dest_dir =~ m/:$/;
+
+		WaitNextEvent();
+		print "Installing resources from \"$manifest_file\"\n" unless $QUIET;
+		
+		my $read = maniread(full_path_to($manifest_file));
+		foreach $file (keys %$read)
+			{
+				next unless $file;
+				
+				if ($copy_files)
+					{
+						copy("$source_dir:$file", "$dest_dir:$file");
+					}
+				else
+					{
+						MakeAlias("$source_dir:$file", "$dest_dir:$file");
+					}
+			}
+	}
+
+ 
+sub SetBuildNumber($$$)
+{
+    my($build_num_file, $build_gen_script, $files_to_touch) = @_;
+    
+    open (OUTPUT, ">$build_num_file") || die "could not open buildnumber";
+
+    open (BDATE, "perl :mozilla:config:bdate.pl|");
+   
+    while (<BDATE>) {
+      print OUTPUT $_;
+    }
+
+    close (BDATE);
+    close (OUTPUT);
+
+    my($file);
+    foreach $file (@$files_to_touch)
+    {
+        print "Writing build number to $file\n";
+        system ("perl $build_gen_script $file $build_num_file");    
+    }
+}
+
+sub SetAgentString
+{
+	
+	open (BDATE, ":mozilla:config:build_number") || die "could not open buildnumber";
+	   
+	while (<BDATE>) {
+		$build_number = $_;
+	}
+	
+	close (BDATE);
+	
+	open (ORIGFILE, ":mozilla:cmd:macfe:restext:custom.r") || die "no original file";
+	open (OUTPUT, ">:mozilla:cmd:macfe:restext:agent.r") || die "no output file";
+	
+	chop($build_number);
+	
+	while (<ORIGFILE>) {
+	
+		$tempstring = $_;
+		if ($tempstring =~	"\#define		VERSION_MAJOR_STR") {
+			$tempstring = "\#define		VERSION_MAJOR_STR	\"5.0a1-" . $build_number . " Development\"\n";
+		}
+		print OUTPUT $tempstring;
+	}
+	
+	close (ORIGFILE);
+	close (OUTPUT);
+	
+	unlink (":mozilla:cmd:macfe:restext:custom.r");
+	rename (":mozilla:cmd:macfe:restext:agent.r", ":mozilla:cmd:macfe:restext:custom.r");
+}
+
+sub SetTimeBomb($$)
+		
+{
+  my ($warn_days, $bomb_days) = @_;
+  
+  system("perl :mozilla:config:mac-set-timebomb.pl $warn_days $bomb_days");
+	
+}
+
+sub Delay($)
+		
+{
+  my ($delay_seconds) = @_;
+
+  $now = time;
+  
+  $exit_time = $now + $delay_seconds;
+
+  while ($exit_time > $now) {
+     $now = time;
+  }
+	
+}
+
+
+sub GetFileModDate($)
+{
+    my($filePath)=@_;
+    my($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
+        $atime,$mtime,$ctime,$blksize,$blocks) = stat($filePath);
+    return $mtime;
+}
+
+
+sub ActivateApplication($)
+{
+	my ($appSignature) = @_;
+	my ($psi, $found);
+	my ($appPSN);
+	
+	$found = 0;
+	
+	foreach $psi (values(%Process))
+	{
+		if ($psi->processSignature() eq $appSignature)
+		{
+			$appPSN = $psi->processNumber();
+			$found = 1;
+      last;
+		}
+	}
+
+	if ($found == 0)
+	{
+		return;
+	}
+		
+	SetFrontProcess($appPSN);
+
+	while (GetFrontProcess() != $appPSN)
+	{
+		WaitNextEvent();
+	}
+
+}
+
+1;
+
+=head1 AUTHORS
+
+Scott Collins <scc@netscape.com>, Simon Fraser <sfraser@netscape.com>, Chris Yeh <cyeh@netscape.com>
+
+=head1 SEE ALSO
+
+BuildMozillaDebug.pl (et al), BuildList.pm, CodeWarriorLib (an AppleScript library)
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public
+License Version 1.1 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of
+the License at http://www.mozilla.org/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-1999 Netscape Communications Corporation. All
+Rights Reserved.
+
+Contributor(s): 
+
+=cut

mozilla/build/mac/MozBuildFlags.pm

@@ -0,0 +1,172 @@
+
+package MozBuildFlags;
+
+require 5.004;
+require Exporter;
+
+# Package that attempts to read a file from the Preferences folder,
+# and get build settings out of it
+
+use strict;
+use Exporter;
+
+use MozPrefs;
+
+use vars qw(@ISA @EXPORT);
+
+@ISA      = qw(Exporter);
+@EXPORT   = qw(SetupBuildParams);
+
+
+#-------------------------------------------------------------------------------
+# These 3 arrays are the 'master lists' to control what gets built.
+# We use arrays here, instead of just intializing the hashes directly,
+# so that we can start the build at a given stage using a stored key.
+# 
+# Ordering in these arrays is important; it has to reflect the order in
+# which the build occurs.
+#-------------------------------------------------------------------------------
+
+my(@pull_flags) =
+(
+  ["moz",          1],    # pull everything needed for mozilla
+  ["runtime",      0]     # used to just build runtime libs, up to NSPR
+);
+
+my(@build_flags) =
+(
+  ["all",           1],
+  ["dist",          0],
+  ["dist_runtime",  0],
+  ["xpidl",         0],
+  ["idl",           0],
+  ["stubs",         0],
+  ["runtime",       0],
+  ["common",        0],
+  ["imglib",        0],
+  ["necko",         0],
+  ["security",      0],
+  ["browserutils",  0],
+  ["intl",          0],
+  ["nglayout",      0],
+  ["editor",        0],
+  ["viewer",        0],
+  ["xpapp",         0],
+  ["extensions",    0],
+  ["plugins",       0],
+  ["mailnews",      0],
+  ["apprunner",     0],
+  ["resources",     0],
+  ["jars",          0]
+);
+
+my(@options_flags) = 
+(
+  ["transformiix",  0],
+  ["mathml",        0],
+  ["svg",           0],
+  ["mng",           1],
+  ["ldap",          0],
+  ["xmlextras",     0],
+  ["mailextras",    1],     # mail importers
+  ["xptlink",       0]      # xpt linker codewarrior plugin
+);
+
+
+#-------------------------------------------------------------------------------
+# End of build flags
+#-------------------------------------------------------------------------------
+
+
+
+
+
+#-------------------------------------------------------------------------------
+# flagsArrayToHash
+# 
+# Utility routine to migrate flag from a 2D array to a hash, where
+# item[n][0] is the hash entry name, and item[n][1] is the hash entry value.
+#-------------------------------------------------------------------------------
+
+sub flagsArrayToHash($$)
+{
+  my($src_array, $dest_hash) = @_;
+  
+  my($item);
+  foreach $item (@$src_array)
+  {
+    $dest_hash->{$item->[0]} = $item->[1];
+  }
+}
+
+#-----------------------------------------------
+# printHash
+#
+# Utility routine to print a hash
+#-----------------------------------------------
+sub printHash($)
+{
+	my($hash_ref) = @_;
+ 
+  my($key, $value);
+  
+  while (($key, $value) = each %$hash_ref)
+  {
+    print "$key $value\n";
+  }
+}
+
+
+#-------------------------------------------------------------------------------
+# SetPullFlags
+#-------------------------------------------------------------------------------
+sub SetPullFlags($)
+{
+  my($pull) = @_;
+  
+  flagsArrayToHash(\@pull_flags, $pull);
+}
+
+#-------------------------------------------------------------------------------
+# SetBuildFlags
+#-------------------------------------------------------------------------------
+sub SetBuildFlags($)
+{
+  my($build) = @_;
+
+  flagsArrayToHash(\@build_flags, $build);
+}
+
+#-------------------------------------------------------------------------------
+# SetBuildOptions
+#-------------------------------------------------------------------------------
+sub SetBuildOptions($)
+{
+  my($options) = @_;
+
+  flagsArrayToHash(\@options_flags, $options);
+}
+
+#-------------------------------------------------------------------------------
+# SetupBuildParams
+#-------------------------------------------------------------------------------
+sub SetupBuildParams($$$)
+{
+  my($pull, $build, $options) = @_;
+    
+	SetPullFlags($pull);
+	SetBuildFlags($build);
+	SetBuildOptions($options);
+
+  print "Build before:\n";
+  printHash($build);
+
+  # read the user pref file, that can change values in the array
+  ReadMozUserPrefs("Mozilla build prefs", $pull, $build, $options);
+	
+  print "Build after:\n";
+  printHash($build);
+}
+
+
+1;

mozilla/build/mac/MozJar.pm

@@ -0,0 +1,536 @@
+#!perl -w
+package MozJar;
+
+#
+# Module for creating jar files, either using a jar manifest, or
+# simply jarring up folders on disk.
+#
+
+require 5.004;
+require Exporter;
+
+use strict;
+use Archive::Zip;
+use File::Path;
+
+use Mac::Files;
+
+use Moz;
+
+use vars qw( @ISA @EXPORT );
+
+@ISA        = qw(Exporter);
+@EXPORT     = qw(CreateJarFileFromDirectory WriteOutJarFiles);
+
+
+#-------------------------------------------------------------------------------
+# Add the contents of a directory to the zip file
+#
+#-------------------------------------------------------------------------------
+sub _addDirToJar($$$$)
+{
+    my($dir, $jar_root, $zip, $compress) = @_;
+
+    opendir(DIR, $dir) or die "Cannot open dir $dir\n";
+    my @files = readdir(DIR);
+    closedir DIR;
+    
+    my $unix_jar_root = $jar_root;
+    $unix_jar_root =~ s|:|/|g;       # colon to slash conversion
+    
+    my $file;
+    
+    foreach $file (@files)
+    {        
+        my $filepath = $dir.":".$file;
+        
+        if (-d $filepath)
+        {
+            print "Adding files to jar from $filepath\n";            
+            _addDirToJar($filepath, $jar_root, $zip, $compress);
+        }
+        else
+        {
+            my $member = Archive::Zip::Member->newFromFile($filepath);
+            die "Failed to create zip file member $filepath\n" unless $member;
+            
+            my $unixName = $filepath;
+            $unixName =~ s|:|/|g;               # colon to slash conversion
+            $unixName =~ s|^$unix_jar_root||;   # relativise
+            
+            $member->fileName($unixName);
+            
+            # print "Adding $file as $unixName\n";
+            
+            if ($compress) {
+                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
+            } else {
+                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
+            }
+            
+            $zip->addMember($member);
+        }
+    }
+}
+
+#-------------------------------------------------------------------------------
+# Add the contents of a directory to the zip file
+#
+#-------------------------------------------------------------------------------
+
+sub CreateJarFileFromDirectory($$$)
+{
+    my($srcdir, $jarpath, $compress) = @_;
+
+    my $zip = Archive::Zip->new();
+
+    _addDirToJar($srcdir, $srcdir, $zip, $compress);
+
+    print "Saving zip file...\n";
+    my $status = $zip->writeToFileNamed($jarpath);
+    if ($status == 0) {
+        print "Zipping completed successfully\n";
+    } else {
+        print "Error saving zip file\n";
+    }
+    
+    # set the file type/creator to something reasonable
+    MacPerl::SetFileInfo("ZIP ", "ZIP ", $jarpath);
+}
+
+#-------------------------------------------------------------------------------
+# printZipContents
+# 
+#-------------------------------------------------------------------------------
+sub printZipContents($)
+{
+    my($zip) = @_;
+
+    my(@members) = $zip->memberNames();
+    
+    print "Zip contains:\n";
+    
+    my($member);
+    foreach $member (@members)
+    {
+        print "  $member\n";
+    }
+}
+
+
+#-------------------------------------------------------------------------------
+# safeSaveJarFile
+# 
+# Archive::Zip has a problem where you cannot save a zip file on top of
+# an existing zip file that it has open, because it holds references
+# into that zip. So we have to save to a temp file, then do a swap.
+# 
+# Note that the zip will become invalid after this operation.
+# If you want to do further operations on it, you'll have to reread it.
+#-------------------------------------------------------------------------------
+sub safeSaveJarFile($$)
+{
+    my($zip, $full_dest_path) = @_;
+    
+    my($temp_file_name) = $full_dest_path."_temp";
+
+    ($zip->writeToFileNamed($temp_file_name) == Archive::Zip::AZ_OK) || die "Error writing jar to temp file $temp_file_name\n";
+    
+    unlink $full_dest_path;
+    
+    (rename $temp_file_name, $full_dest_path) || die "Failed to rename $temp_file_name\n";
+    
+    MacPerl::SetFileInfo("ZIP ", "ZIP ", $full_dest_path);
+}
+
+
+#-------------------------------------------------------------------------------
+# addToJarFile
+# 
+# Add a file to a jar file
+#
+# Parameters:
+#   1. Jar ID. Unix path of jar file inside chrome.
+#   2. Abs path to jar.mn file (i.e. source)    (mac breaks)
+#   3. File source, relative to jar.mn path     (mac breaks)
+#   4. Abs path to the resulting .jar file      (mac breaks)
+#   5. Relative file path within the jar        (unix breaks)
+#   6. Reference to hash of jar files
+#
+#-------------------------------------------------------------------------------
+
+sub addToJarFile($$$$$$$)
+{
+    my($jar_id, $jar_man_dir, $file_src, $jar_path, $file_jar_path, $override, $jars) = @_;
+
+    # print "addToJarFile with:\n  $jar_man_dir\n  $file_src\n  $jar_path\n  $file_jar_path\n";
+
+    unless ($jar_path =~ m/(.+:)([^:]+)$/) { die "Bad jar path $jar_path\n"; }
+    
+    my($target_dir) = $1;
+    my($jar_name) = $2;
+
+    $target_dir =~ s/[^:]+$//;
+    
+    # print "¥ $target_dir $jar_name\n";
+
+    # find the source file
+    my($src) = $jar_man_dir.":".$file_src;
+    if ((!-e $src) && ($file_src =~ m/.+:([^:]+)$/))    # src does not exist. Fall back to looking for src in jar.mn dir
+    {
+        $file_src = $1;
+        $src = $jar_man_dir.":".$file_src;
+        
+        if (!-e $src) {
+            die "Can't find chrome file $src\n";
+        }
+    }
+    
+    if ($main::options{jars})
+    {
+        my($zip) = $jars->{$jar_id};
+        unless ($zip) { die "Can't find Zip entry for $jar_id\n"; }
+        
+        # print "Adding $file_src to jar file $jar_path at $file_jar_path\n";
+        my($member) = Archive::Zip::Member->newFromFile($src);
+        unless ($member) { die "Failed to create zip file member $src\n"; }
+
+        $member->fileName($file_jar_path);    
+    
+        my($compress) = 1;
+        if ($compress) {
+            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);
+            $member->desiredCompressionLevel(Archive::Zip::COMPRESSION_LEVEL_DEFAULT);   # defaults to 6
+        } else {
+            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
+        }
+
+        my($old_member) = $zip->memberNamed($file_jar_path);
+        
+        if ($override)
+        {
+            if ($old_member)
+            {
+                # print "Overriding $file_jar_path in jar file $jar_id\n";
+                # need to compare mod dates or use the + here
+                $zip->removeMember($old_member);
+            }
+        
+            $zip->addMember($member);
+        }
+        else
+        {
+            if ($old_member)
+            {
+                #compare dates here
+                my($member_moddate) = $old_member->lastModTime();
+                my($file_moddate) = GetFileModDate($src);
+            
+                if ($file_moddate > $member_moddate)
+                {
+                    print "Updating older file $file_jar_path in $jar_id\n";
+                    $zip->removeMember($old_member);
+                    $zip->addMember($member);
+                }
+                else
+                {
+                    print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
+                }
+            }
+            else
+            {
+                $zip->addMember($member);
+            }
+        }
+    }
+    
+    if ($main::options{chrome_files})  # we install raw files too
+    {
+        my($rel_path) = $file_jar_path;
+        $rel_path =~ s|/|:|g;       # slash to colons
+        
+        my($dir_name) = $jar_name;
+        $dir_name =~ s/\.jar$//;
+        
+        my($dst) = $target_dir.$dir_name.":".$rel_path;
+                
+        # print "Aliassing $src\n to\n$dst\n";        
+        MakeAlias($src, $dst);      # don't check errors, otherwise we fail on replacement
+    }
+}
+
+
+#-------------------------------------------------------------------------------
+# setupJarFile
+# 
+# setup a zip for writing
+#-------------------------------------------------------------------------------
+
+sub setupJarFile($$$)
+{
+    my($jar_id, $dest_path, $jar_hash) = @_;
+
+    # print "Creating jar file $jar_id at $jar_path\n";
+    
+    my($jar_file) = $jar_id;
+    $jar_file =~ s|/|:|g;           # slash to colons
+    my($full_jar_path) = Moz::full_path_to($dest_path.":".$jar_file);
+
+    if ($main::options{jars})
+    {
+        my($zip) = $jar_hash->{$jar_id};
+        if (!$zip)      # if we haven't made it already, do so
+        {
+            my($zip) = Archive::Zip->new();
+            $jar_hash->{$jar_id} = $zip;
+
+            # does the jar file exist already? If so, read it in
+            if (-e $full_jar_path)
+            {
+                print "Reading in jar file $jar_id\n";
+                if ($zip->read($full_jar_path) != Archive::Zip::AZ_OK) { die "Failed to re-read $full_jar_path\n"; }
+                
+                # printZipContents($zip);
+            }
+
+        }
+    }
+    else
+    {
+        # installing files.
+        # nothing to do. MakeAlias creates dirs as needed.
+
+        # add this jar to the list
+        $jar_hash->{$jar_id} = 1;
+    }
+}
+
+
+#-------------------------------------------------------------------------------
+# closeJarFile
+# 
+# We're done with this jar file _for this jar.mn_. We may add more entries
+# to it later, so keep it open in the hash.
+#-------------------------------------------------------------------------------
+sub closeJarFile($$)
+{
+    my($jar_path, $jar_hash) = @_;
+
+    # print "Closing jar file $jar_path\n";
+
+    if ($main::options{jars})
+    {
+    
+    }
+    else
+    {
+        # installing files.
+        # nothing to do
+    }
+}
+
+
+#-------------------------------------------------------------------------------
+# WriteOutJarFiles
+# 
+# Now we dump out the jars
+#-------------------------------------------------------------------------------
+sub WriteOutJarFiles($$)
+{
+    my($chrome_dir, $jars) = @_;
+
+    unless ($main::options{jars}) { return; }
+    
+    my($full_chrome_path) = Moz::full_path_to($chrome_dir);
+
+    my($key);
+    foreach $key (keys %$jars)
+    {
+        my($zip) = $jars->{$key};
+        
+        my($rel_path) = $key;
+        $rel_path =~ s/\//:/g;
+        
+        my($output_path) = $full_chrome_path.":".$rel_path;
+        
+        print "Writing zip file $key to $output_path\n";
+
+        # ensure the target dirs exist
+        my($path) = $output_path;
+        $path =~ s/[^:]+$//;
+        mkpath($path);
+        
+        # unlink $output_path;        # remove any existing jar
+        safeSaveJarFile($zip, $output_path);
+        # $zip is invalid after this operation, so nuke it here
+        $jars->{$key} = 0;
+    }
+}
+
+
+#-------------------------------------------------------------------------------
+# registerChromePackage
+# 
+# Enter a chrome package into the installed-chrome.txt file
+#-------------------------------------------------------------------------------
+sub registerChromePackage($$$$$$)
+{
+    my($jar_file, $file_path, $chrome_dir, $jar_hash, $chrome_type, $pkg_name) = @_;
+
+    my($manifest_subdir) = $jar_file;
+    $manifest_subdir =~ s/:/\//g;
+    
+    my($chrome_entry);
+    
+    if ($main::options{jars}) {
+        $chrome_entry = "$chrome_type,install,url,jar:resource:/chrome/$manifest_subdir!/$chrome_type/$pkg_name";
+    } else {
+        $manifest_subdir =~ s/\.jar$/\//;
+        $chrome_entry = "$chrome_type,install,url,resource:/chrome/$manifest_subdir/$chrome_type/$pkg_name";
+    }
+
+    # print "Entering $chrome_entry in installed-chrome.txt\n";
+
+    # ensure chrome_dir exists
+    mkpath($chrome_dir);
+    
+    my($inst_chrome) = ${chrome_dir}.":installed-chrome.txt";
+    
+    if (open(CHROMEFILE, "<$inst_chrome")) {
+        while (<CHROMEFILE>) {
+            chomp;
+            if ($_ eq $chrome_entry) {
+                # $chrome_entry already appears in installed-chrome.txt file
+                # just update the mod date
+                my $now = time;
+                utime($now, $now, $inst_chrome) || die "couldn't touch $inst_chrome";
+                print "+++ updating chrome $inst_chrome\n+++\t\t$chrome_entry\n";
+                close(CHROMEFILE) || die "error: can't close $inst_chrome: $!";
+                return 0;
+            }
+        }
+        close(CHROMEFILE) || die "error: can't close $inst_chrome: $!";
+    }
+    open(CHROMEFILE, ">>${inst_chrome}") || die "Failed to open $inst_chrome\n";
+    print(CHROMEFILE "${chrome_entry}\n");
+    close(CHROMEFILE) || die "Failed to close $inst_chrome\n";
+    print "+++ adding chrome $inst_chrome\n+++\t\t$chrome_entry\n";
+}
+
+#-------------------------------------------------------------------------------
+# Create or add to a jar file from a jar.mn file.
+# Both arguments are relative to the mozilla root dir.
+#
+#
+#-------------------------------------------------------------------------------
+sub CreateJarFromManifest($$$)
+{
+    my($jar_man_path, $dest_path, $jars) = @_;
+    
+    if ($main::options{jars}) {
+        print "Jarring from $jar_man_path\n";
+    } else {
+        print "Installing files from $jar_man_path\n";
+    }
+
+    $jar_man_path = Moz::full_path_to($jar_man_path);
+    $dest_path = Moz::full_path_to($dest_path);
+
+    # if the jars hash is empty, nuke installed-chrome.txt
+    if (! scalar(%$jars))
+    {
+        print "Nuking installed-chrome.txt\n";
+        my($installed_chrome) = $dest_path.":installed-chrome.txt";
+        # unlink $installed_chrome;
+    }
+    
+    my $jar_man_dir = "";
+    my $jar_man_file = "";
+    
+    if ($jar_man_path =~ /(.+):([^:]+)$/)
+    {
+        $jar_man_dir = $1;      # no trailing :
+        $jar_man_file = $2;
+    }
+
+    # Keep a hash of jar files, keyed on relative jar path (e.g. "packages/core.jar")
+    # Entries are open Archive::Zips (if zipping), and installed-chrome entries.
+    
+    my($jar_id) = "";       # Current foo/bar.jar from jar.mn file
+    my($jar_file) = "";     # relative path to jar file (from $dest_path), with mac separators
+    my($full_jar_path);
+    
+    open(FILE, "<$jar_man_path") || die "could not open \"$jar_man_path\": $!";
+    while (<FILE>)
+    {
+        my($line) = $_;
+        chomp($line);
+        
+        # print "$line\n";
+        
+        if ($line =~ /^\s*\#.*$/) {     # skip comments
+            next;
+        }
+        
+        if ($line =~/^([\w\d.\-\_\\\/]+)\:\s*$/)                                  # line start jar file entries
+        {
+            $jar_id = $1;
+            $jar_file = $jar_id;
+            $jar_file =~ s|/|:|g;           # slash to colons
+            $full_jar_path = $dest_path.":".$jar_file;
+                        
+            setupJarFile($jar_id, $dest_path, $jars);
+
+        }
+        elsif ($line =~ /^(\+?)\s+([\w\d.\-\_\\\/]+)\s*(\([\w\d.\-\_\\\/]+\))?$\s*/)     # jar file entry
+        {
+            my($override) = ($1 eq "+");
+            my($file_dest) = $2;
+            my($file_src) = $3;
+             
+            if ($file_src) {  
+                $file_src = substr($file_src, 1, -1);      #strip the ()
+            } else {
+                $file_src = $file_dest;
+            }
+            
+            $file_src =~ s|/|:|g;
+            
+            if ($jar_file ne "")    # if jar is open, add to jar
+            {
+                if ($file_dest =~ /([\w\d.\-\_]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
+                {
+                    my $chrome_type = $1;
+                    my $pkg_name = $2;
+                    registerChromePackage($jar_file, $file_dest, $dest_path, $jars, $chrome_type, $pkg_name);
+                }
+                
+                addToJarFile($jar_id, $jar_man_dir, $file_src, $full_jar_path, $file_dest, $override, $jars);
+            }
+            else
+            {
+                die "bad jar.mn format at $line\n";
+            }
+        }
+        elsif ($line =~ /^\s*$/ )                                               # blank line
+        {
+           if ($jar_file ne "")    #if a jar file is open, close it
+            {
+                closeJarFile($full_jar_path, $jars);
+                
+                $jar_file = "";
+                $full_jar_path = "";
+            }
+        }
+    }
+
+    close(FILE);
+
+    if ($jar_file ne "")    #if a jar file is open, close it
+    {
+        closeJarFile($full_jar_path, $jars);
+    }
+
+}
+
+1;

mozilla/build/mac/MozPrefs.pm

@@ -0,0 +1,146 @@
+
+package MozPrefs;
+
+require 5.004;
+require Exporter;
+
+# Package that attempts to read a file from the Preferences folder,
+# and get build settings out of it
+
+use strict;
+
+use Exporter;
+use Mac::Files;
+
+use vars qw(@ISA @EXPORT);
+
+@ISA		  = qw(Exporter);
+@EXPORT 	= qw(ReadMozUserPrefs);
+
+
+
+#-------------------------------------------------------------------------------
+#
+# GetPrefsFolder
+#
+#-------------------------------------------------------------------------------
+
+sub GetPrefsFolder()
+{
+  my($prefs_folder) = FindFolder(kOnSystemDisk, kPreferencesFolderType, 1);
+  return $prefs_folder;
+}
+
+
+#-------------------------------------------------------------------------------
+#
+# WriteDefaultPrefsFile
+#
+#-------------------------------------------------------------------------------
+
+sub WriteDefaultPrefsFile($)
+{
+  my($file_path) = @_;
+
+  my($file_contents);
+  $file_contents = <<'EOS';
+% You can use this file to customize the Mozilla build system.
+% The following kinds of lines are allowable:
+%   Comment lines, which start with a '%' in the first column
+%   Lines with modify the default build settings. Examples are:
+%
+%    pull        runtime         1       % just pull runtime
+%    options     mng             1       % turn mng on
+%    build       jars            0       % don't build jar files
+%
+% Note that by default, the scripts have $build{"all"} and $pull{"all"}
+% turned on, which overrides other settings. To do partial builds, turn
+% these off thus:
+%    build       all             0
+%
+EOS
+
+  $file_contents =~ s/%/#/g;
+   
+  open(PREFS_FILE, "> $file_path") || die "Could not write default prefs file\n";
+  print PREFS_FILE ($file_contents);
+  close(PREFS_FILE);
+
+  MacPerl::SetFileInfo("McPL", "TEXT", $file_path);
+}
+
+
+#-------------------------------------------------------------------------------
+#
+# ReadPrefsFile
+#
+#-------------------------------------------------------------------------------
+
+sub ReadPrefsFile($$$$)
+{
+  my($file_path, $pull_hash, $build_hash, $options_hash) = @_;
+  
+  if (open(PREFS_FILE, "< $file_path"))
+  {
+    print "Reading build prefs from $file_path\n";
+  
+    while (<PREFS_FILE>)
+    {
+      my($line) = $_;
+            
+      if ($line =~ /$\#/) {    # ignore comments
+        next;
+      }
+      
+      if ($line =~ /$\s*(\w+)\s+(\w+)\s+(\w+)\s*/)
+      {
+        my($array_name) = $1;      
+        my($option_name) = $2;
+        my($option_value) = $3;      
+      
+        if ($array_name eq "pull")
+        {
+          $pull_hash->{$option_name} = $option_value;
+        }
+        elsif ($array_name eq "build")
+        {
+          $build_hash->{$option_name} = $option_value;
+        }
+        elsif ($array_name eq "options")
+        {
+          $options_hash->{$option_name} = $option_value;
+        }
+        else
+        {
+          print "Unknown pref option at $line\n";
+        }
+      }    
+    }
+    
+    close(PREFS_FILE);  
+  }
+  else
+  {
+    print "No prefs file found at $file_path; using defaults\n";
+    WriteDefaultPrefsFile($file_path);
+  }
+}
+
+
+#-------------------------------------------------------------------------------
+#
+# ReadMozUserPrefs
+#
+#-------------------------------------------------------------------------------
+
+sub ReadMozUserPrefs($$$$)
+{
+  my($prefs_file_name, $pull_hash, $build_hash, $options_hash) = @_;
+  
+  my($prefs_path) = GetPrefsFolder();
+  $prefs_path .= ":$prefs_file_name";
+
+  ReadPrefsFile($prefs_path, $pull_hash, $build_hash, $options_hash);
+}
+
+1;

mozilla/build/mac/PullNGlayout.pl

@@ -0,0 +1,54 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/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.org code.
+#
+# 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): 
+#
+
+#
+# nglayout pull script 
+#
+use Mac::Processes;
+use NGLayoutBuildList;
+use Cwd;
+use Moz;
+
+# configuration variables
+$pull{all} = 1;
+$pull{moz} = 0;
+$pull{runtime} = 0;
+
+if ($pull{all})
+{
+	foreach $k (keys(%pull))
+	{
+		$pull{$k} = 1;
+	}
+}
+
+# you should not have to edit anything bellow
+
+chdir("::::");
+
+Moz::StopForErrors();
+#Moz::DontStopForErrors();
+
+OpenErrorLog("NGLayoutPullLog");
+
+Checkout();

mozilla/build/mac/build_scripts/BuildMozilla.pl

@@ -1,78 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org code.
-#
-# 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): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla opt build prefs";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "¥ Mozilla opt progress",
-  "buildmodule",    "MozillaBuildList.pm"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:");
-
-my($do_checkout)    = 0;
-my($do_build)       = 1;
-
-RunBuild($do_checkout, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/build_scripts/BuildMozillaDebug.pl

@@ -1,78 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org code.
-#
-# 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): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla debug build prefs";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "¥ Mozilla debug progress",
-  "buildmodule",    "MozillaBuildList.pm"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(1, ":mozilla:dist:viewer_debug:");
-
-my($do_pull)        = 0;    # overridden by flags and prefs
-my($do_build)       = 1;
-
-RunBuild($do_pull, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/build_scripts/Moz/BuildCore.pm

@@ -1,485 +0,0 @@
-#!perl -w
-package Moz::BuildCore;
-
-require 5.004;
-require Exporter;
-
-use strict;
-use vars qw( @ISA @EXPORT );
-
-# perl includes
-use Cwd;
-use File::Basename;
-use LWP::Simple;
-
-# homegrown
-use Moz::Moz;
-use Moz::Jar;
-use Moz::BuildFlags;
-use Moz::BuildUtils;
-use Moz::CodeWarriorLib;
-
-# use MozillaBuildList;   # eventually, this should go away, and be replaced by data input
-
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(
-                    RunBuild
-                );
-
-
-#//--------------------------------------------------------------------------------------------------
-#// DoPrebuildCheck
-#//
-#// Check the build tools etc before running the build.
-#//--------------------------------------------------------------------------------------------------
-sub DoPrebuildCheck()
-{
-    SanityCheckJarOptions();
-
-    # launch codewarrior and persist its location. Have to call this before first
-    # call to getCodeWarriorPath().
-    my($ide_path_file) = $main::filepaths{"idepath"};
-    $ide_path_file = full_path_to($ide_path_file);
-    LaunchCodeWarrior($ide_path_file);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Configure Build System
-#//--------------------------------------------------------------------------------------------------
-
-sub GenBuildSystemInfo()
-{
-    # always rebuild the configuration program.
-    BuildProjectClean(":mozilla:build:mac:tools:BuildSystemInfo:BuildSystemInfo.mcp", "BuildSystemInfo");
-
-    # delete the configuration file.
-    unlink(":mozilla:build:mac:BuildSystemInfo.pm");
-    
-    # run the program.
-    system(":mozilla:build:mac:BuildSystemInfo");
-
-    # wait for the file to be created.
-    while (!(-e ":mozilla:build:mac:BuildSystemInfo.pm")) { WaitNextEvent(); }
-    
-    # wait for BuildSystemInfo to finish, so that we see correct results.
-    while (IsProcessRunning("BuildSystemInfo")) { WaitNextEvent(); }
-
-    # now, evaluate the contents of the file.
-    open(F, ":mozilla:build:mac:BuildSystemInfo.pm");
-    while (<F>) { eval; }
-    close(F);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Make library aliases
-#//--------------------------------------------------------------------------------------------------
-
-sub MakeLibAliases()
-{
-    my($dist_dir) = GetBinDirectory();
-
-    #// ProfilerLib
-    if ($main::PROFILE)
-    {
-        my($profilerlibpath) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:Profiler:Profiler Common:ProfilerLib");
-        MakeAlias("$profilerlibpath", "$dist_dir"."Essential Files:");
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Regenerate DefinesOptions.h if necessary
-#//
-#//--------------------------------------------------------------------------------------------------
-
-sub UpdateConfigHeader($)
-{
-    my($config_path) = @_;
-    
-    my($config, $oldconfig) = ("", "");
-    my($define, $definevalue, $defines);
-    my($k, $l,);
-
-    foreach $k (keys(%main::options))
-    {
-        if ($main::options{$k})
-        {
-            foreach $l (keys(%{$main::optiondefines{$k}}))
-            {
-                $my::defines{$l} = $main::optiondefines{$k}{$l};
-                print "Setting up my::defines{$l}\n";
-            }
-        }
-    }
-
-    my $config_headerfile = current_directory().$config_path;
-    if (-e $config_headerfile)
-    {
-        open(CONFIG_HEADER, "< $config_headerfile") || die "$config_headerfile: $!\n";
-        my($line);
-        while ($line = <CONFIG_HEADER>)
-        {
-            $oldconfig .= $line;
-            if ($line =~ m/#define (.*) (.*)\n/)
-            {
-                $define = $1;
-                $definevalue = $2;
-                if (exists ($my::defines{$define}) and ($my::defines{$define} == $definevalue))
-                {
-                    delete $my::defines{$define};
-                    $config .= $line;
-                }
-            }
-        }
-        close(CONFIG_HEADER);
-    }
-
-    if (%my::defines)
-    {
-        foreach $k (keys(%my::defines))
-        {
-            $config .= "#define " . $k . " " . $my::defines{$k} . "\n";
-        }
-    }
-
-    if (($config ne $oldconfig) || (!-e $config_headerfile))
-    {
-        printf("Writing new DefinesOptions.h\n");
-        open(CONFIG_HEADER, "> $config_headerfile") || die "$config_headerfile: $!\n";
-        MacPerl::SetFileInfo("CWIE", "TEXT", $config_headerfile);
-        print CONFIG_HEADER ($config);
-        close(CONFIG_HEADER);
-    }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// ConfigureBuildSystem
-#//
-#// defines some build-system configuration variables.
-#//--------------------------------------------------------------------------------------------------
-sub ConfigureBuildSystem()
-{
-    #// In the future, we may want to do configurations based on the actual build system itself.
-    #// GenBuildSystemInfo();
-        
-    #// For now, if we discover a newer header file than existed in Universal Interfaces 3.2,
-    #// we'll assume that 3.3 or later is in use.
-    my($universal_interfaces) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:Universal:Interfaces:CIncludes:");
-    if (-e ($universal_interfaces . "ControlDefinitions.h")) {
-        $main::UNIVERSAL_INTERFACES_VERSION = 0x0330;
-    }
-
-    #// Rename IC SDK folder in the Mac OS Support folder
-    my($ic_sdk_folder) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:ICProgKit2.0.2");
-    if( -e $ic_sdk_folder)
-    {
-        my($new_ic_folder_name) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:(ICProgKit2.0.2)");
-        rename ($ic_sdk_folder, $new_ic_folder_name);
-        # note that CodeWarrior doesn't descnet into folders with () the name
-        print "Mozilla no longer needs the Internet Config SDK to build:\n  Renaming the 'ICProgKit2.0.2' folder to '(ICProgKit2.0.2)'\n";
-    }
-
-    printf("UNIVERSAL_INTERFACES_VERSION = 0x%04X\n", $main::UNIVERSAL_INTERFACES_VERSION);
-
-    UpdateConfigHeader(":mozilla:config:mac:DefinesOptions.h");
-
-    # alias required CodeWarrior libs into the Essential Files folder (only the Profiler lib now)
-    MakeLibAliases();
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// CheckOutModule. Takes variable number of args; first two are required
-#//--------------------------------------------------------------------------------------------------
-sub CheckOutModule($$$$)
-{
-    my($session, $module, $revision, $date) = @_;
-
-    my($result) = $session->checkout($module, $revision, $date);
-    
-    # result of 1 is success
-    if ($result) { return; }
-    
-    my($checkout_err) = $session->getLastError();
-    if ($checkout_err == 708) {
-        die "Error: Checkout was cancelled.\n";
-    } elsif ($checkout_err == 911) {
-        die "Error: CVS session settings are incorrect. Check your password, and the CVS root settings.\n";
-    } elsif ($checkout_err == 703) {
-        die "Error: CVS checkout failed. Unknown module, unknown tag, bad username, or other CVS error.\n";
-    } elsif ($checkout_err == 711) {
-        print "Checkout of '$module' failed.\n";
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getScriptFolder
-#//--------------------------------------------------------------------------------------------------
-sub getScriptFolder()
-{
-    return dirname($0);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getScriptFolder
-#//--------------------------------------------------------------------------------------------------
-sub get_url_contents($)
-{
-    my($url) = @_;
-
-    my($url_contents) = LWP::Simple::get($url);
-    $url_contents =~ s/\r\n/\n/g;     # normalize linebreaks
-    $url_contents =~ s/\r/\n/g;       # normalize linebreaks
-    return $url_contents;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// get_files_from_content
-#//--------------------------------------------------------------------------------------------------
-sub uniq
-{
-  my $lastval;
-  grep(($_ ne $lastval, $lastval = $_)[$[], @_);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// get_files_from_content
-#//--------------------------------------------------------------------------------------------------
-sub get_files_from_content($)
-{
-  my($content) = @_;
-
-  my(@jscalls) = grep (/return js_file_menu[^{]*/, split(/\n/, $content));
-  my $i;
-
-  for ($i = 0; $i < @jscalls ; $i++)
-  {
-    $jscalls[$i] =~ s/.*\(|\).*//g;
-    my(@callparams) = split(/,/, $jscalls[$i]);
-    my ($repos, $dir, $file, $rev) = grep(s/['\s]//g, @callparams);
-    $jscalls[$i] = "$dir/$file";
-  }
-
-  &uniq(sort(@jscalls));
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// FastUpdate
-#// 
-#// Use Bonsai url data to update only those dirs which have new files
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub FastUpdate($)
-{
-    my($num_hours) = @_;
-
-    my($the_module) = "SeaMonkeyAll";
-    my($the_branch) = "HEAD";
-    my($search_type) = "hours";
-    my($min_date) = "";
-    my($max_date) = "";
-    my($url) = "http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=${the_module}&branch=${the_branch}&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=${num_hours}&date=${search_type}&mindate=${min_date}&maxdate=${max_date}&cvsroot=%2Fcvsroot";
-
-    my(@files) = &get_files_from_content(&get_url_contents($url));
-
-	my(@cvs_co_list);
-
-	my($co_file);
-	foreach $co_file (@files)
-	{
-	  my(@cvs_co) = ["", "", ""];
-	  @cvs_co[0] = $co_file;
-	  push(@cvs_co_list, \@cvs_co);
-	}
-
-	CheckoutModules(\@cvs_co_list);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Checkout
-#//--------------------------------------------------------------------------------------------------
-sub CheckoutModules($)
-{
-    my($modules) = @_;          # list of modules to check out
-
-    my($start_time) = TimeStart();
-
-#    assertRightDirectory();
-    my($cvsfile) = AskAndPersistFile($main::filepaths{"sessionpath"});
-    my($session) = Moz::MacCVS->new( $cvsfile );
-    unless (defined($session)) { die "Error: Checkout aborted. Cannot create session file: $session" }
-
-    # activate MacCVS
-    ActivateApplication('Mcvs');
-
-    my($this_co);
-    foreach $this_co (@$modules)
-    {
-        my($module, $revision, $date) = ($this_co->[0], $this_co->[1], $this_co->[2]);        
-        CheckOutModule($session, $module, $revision, $date);
-        # print "Checking out $module with ref $revision, date $date\n";
-    }
-
-    TimeEnd($start_time, "Checkout");
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Checkout
-#//--------------------------------------------------------------------------------------------------
-sub Checkout($)
-{
-    my($checkout_list) = @_;
-    
-    unless ( $main::build{pull} ) { return; }
-
-    StartBuildModule("pull");
-
-    my(@cvs_co_list);
-    
-    my($checkout_file) = getScriptFolder().":".$checkout_list;
-    local(*CHECKOUT_FILE);  
-    open(CHECKOUT_FILE, "< $checkout_file") || die "Error: failed to open checkout list $checkout_file\n";
-    while (<CHECKOUT_FILE>)
-    {
-        my($line) = $_;
-        chomp($line);
-    
-        # ignore comments and empty lines
-        if ($line =~ /^\#/ || $line =~ /^\s*$/) {
-            next;
-        }
-    
-        my(@cvs_co) = ["", "", ""];
-        
-        my($module, $revision, $date) = (0, 1, 2);
-        
-        if ($line =~ /\s*([^#,\s]+)\s*\,\s*([^#,\s]+)\s*\,\s*([^#]+)/)
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$revision] = $2;
-            @cvs_co[$date] = $3;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)\s*\,\s*([^#,\s]+)\s*(#.+)?/)
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$revision] = $2;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)\s*\,\s*,\s*([^#,]+)/)       
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$date] = $2;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)/)
-        {
-            @cvs_co[$module] = $1;
-        }
-        else
-        {
-            die "Error: unrecognized line '$line' in $checkout_list\n";
-        }
-        
-        # strip surrounding space from date
-        @cvs_co[$date] =~ s/^\s*|\s*$//g;
-        
-        # print "Going to check out '@cvs_co[$module]', '@cvs_co[$revision]', '@cvs_co[$date]'\n";
-        push(@cvs_co_list, \@cvs_co);
-    }
-
-    close(CHECKOUT_FILE);
-
-    CheckoutModules(\@cvs_co_list);
-
-    EndBuildModule("pull");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// RunBuild
-#//--------------------------------------------------------------------------------------------------
-sub RunBuild($$$$)
-{
-    my($do_pull, $do_build, $input_files, $build_prefs) = @_;
-
-    InitBuildProgress($input_files->{"buildprogress"});
-    
-    # if we are pulling, we probably want to do a full build, so clear the build progress
-    if ($do_pull) {
-        ClearBuildProgress();    
-    }
-    
-    # read local prefs, and the build progress file, and set flags to say what to build
-    SetupBuildParams(\%main::build,
-                     \%main::options,
-                     \%main::optiondefines,
-                     \%main::filepaths,
-                     $input_files->{"buildflags"},
-                     $build_prefs);
-    
-    # If we were told to pull, make sure we do, overriding prefs etc.
-    if ($do_pull)
-    {
-        $main::build{"pull"} = 1;
-    }
-    
-    # transfer this flag
-    $CodeWarriorLib::CLOSE_PROJECTS_FIRST = $main::CLOSE_PROJECTS_FIRST;
-    
-    # setup the build log
-    SetupBuildLog($main::filepaths{"buildlogfilepath"}, $main::USE_TIMESTAMPED_LOGS);
-    StopForErrors();
-    
-    if ($main::LOG_TO_FILE) {
-        RedirectOutputToFile($main::filepaths{"scriptlogfilepath"});
-    }
-        
-    # run a pre-build check to see that the tools etc are in order
-    DoPrebuildCheck();
-    
-    if ($main::FAST_UPDATE)
-    {
-        my($hours) = 8;     # update files checked in during last 8 hours
-        FastUpdate($hours);
-    } else {
-        Checkout($input_files->{"checkoutdata"});
-    }
-    
-    unless ($do_build) { return; }
-
-    my($build_start) = TimeStart();
-
-    # create generated headers
-    ConfigureBuildSystem();
-
-    # here we load and call methods in the build module indirectly.
-    # we have to use indirection because the build module can be named
-    # differently for different builds.
-    chdir(dirname($0));     # change to the script dir
-    my($build_module) = $input_files->{"buildmodule"};
-    # load the build module
-    require $build_module;
-    {   # scope for no strict 'refs'
-        no strict 'refs';
-        
-        my($package_name) = $build_module;
-        $package_name =~ s/\.pm$//;
-        
-        chdir($main::MOZ_SRC);
-        &{$package_name."::BuildDist"}();
-        
-        chdir($main::MOZ_SRC);
-        &{$package_name."::BuildProjects"}();
-    }
-    
-    # the build finished, so clear the build progress state
-    ClearBuildProgress();
-    
-    TimeEnd($build_start, "Build");
-    print "Build complete\n";
-}
-
-1;

mozilla/build/mac/build_scripts/Moz/BuildFlags.pm

@@ -1,424 +0,0 @@
-
-package Moz::BuildFlags;
-
-require 5.004;
-require Exporter;
-
-# Package that attempts to read a file from the Preferences folder,
-# and get build settings out of it
-
-use strict;
-use Exporter;
-
-use Cwd;
-use File::Basename;
-
-use Moz::Moz;
-use Moz::Prefs;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA      = qw(Exporter);
-@EXPORT   = qw(
-                SetupBuildParams
-                InitBuildProgress
-                WriteBuildProgress
-                ClearBuildProgress
-                ReadBuildProgress
-              );
-
-
-my(@build_flags);
-my(@options_flags);
-my(@filepath_flags);
-
-my(%arrays_list) = (
-  "build_flags",    \@build_flags,
-  "options_flags",  \@options_flags,
-  "filepath_flags", \@filepath_flags
-);
-
-my($progress_file) = "¥ÊBuild progress";
-
-#-------------------------------------------------------------------------------
-# appendArrayFlag
-# 
-# Set a flag in the array
-#-------------------------------------------------------------------------------
-sub appendArrayFlag($$$)
-{
-  my($array_name, $setting, $value) = @_;
-  
-  my(@this_flag) = [$setting, $value];
-  my($flags_array) = $arrays_list{$array_name};
-  if ($flags_array)
-  {
-    push(@{$flags_array}, @this_flag) || die "Failed to append\n";
-  }
-  else
-  {
-    die "Error: unknown build flags array $array_name\n";
-  }
-}
-
-#-------------------------------------------------------------------------------
-# readFlagsFile
-# 
-# Read the file of build flags from disk. File path is relative to the
-# script directory.
-#-------------------------------------------------------------------------------
-sub readFlagsFile($)
-{
-  my($flags_file) = @_;
-
-  my($file_path) = $0;
-  $file_path =~ s/[^:]+$/$flags_file/;
-  
-  print "Reading build flags from '$file_path'\n";
-
-  local(*FLAGS_FILE);
-  open(FLAGS_FILE, "< $file_path") || die "Error: failed to open flags file $file_path\n";
-
-  my($cur_array) = "";
-  
-  while(<FLAGS_FILE>)
-  {
-      my($line) = $_;
-      chomp($line);
-      
-      # ignore comments and empty lines  
-      if ($line =~ /^\#/ || $line =~ /^\s*$/) {
-        next;
-      }
-
-      # 1-word line, probably array name
-      if ($line =~ /^([^#\s]+)\s*$/)
-      {
-        $cur_array = $1;
-        next;  
-      }
-      elsif ($line =~ /^([^#\s]+)\s+\"(.+)\"(\s+#.+)?$/)    # quoted option, possible comment
-      {
-        my($flag) = $1;
-        my($setting) = $2;
-        
-        appendArrayFlag($cur_array, $flag, $setting);
-      }
-      elsif ($line =~ /^([^#\s]+)\s+([^#\s]+)(\s+#.+)?$/)   # two-word line, possible comment
-      {
-        my($flag) = $1;
-        my($setting) = $2;
-        
-        appendArrayFlag($cur_array, $flag, $setting);
-      }
-      else
-      {
-        die "Error: unknown build flag at '$line'\n";
-      }
-  
-  }
-  
-  close(FLAGS_FILE);
-}
-
-
-
-#-------------------------------------------------------------------------------
-# flagsArrayToHash
-# 
-# Utility routine to migrate flag from a 2D array to a hash, where
-# item[n][0] is the hash entry name, and item[n][1] is the hash entry value.
-#-------------------------------------------------------------------------------
-
-sub flagsArrayToHash($$)
-{
-  my($src_array, $dest_hash) = @_;
-  
-  my($item);
-  foreach $item (@$src_array)
-  {
-    $dest_hash->{$item->[0]} = $item->[1];
-  }
-}
-
-#-----------------------------------------------
-# printHash
-#
-# Utility routine to print a hash
-#-----------------------------------------------
-sub printHash($)
-{
-  my($hash_ref) = @_;
- 
-  print "Printing hash:\n";
-  
-  my($key, $value);
-  
-  while (($key, $value) = each (%$hash_ref))
-  {
-    print "  $key $value\n";
-  }
-}
-
-
-#-----------------------------------------------
-# printBuildArray
-#
-# Utility routine to print a 2D array
-#-----------------------------------------------
-sub printBuildArray($)
-{
-  my($build_array) = @_;
-  
-  my($entry);
-  foreach $entry (@$build_array)
-  {  
-    print "$entry->[0] = $entry->[1]\n";
-  }
-
-}
-
-#-------------------------------------------------------------------------------
-# SetBuildFlags
-#-------------------------------------------------------------------------------
-sub SetBuildFlags($)
-{
-  my($build) = @_;
-
-  flagsArrayToHash(\@build_flags, $build);
-}
-
-#-------------------------------------------------------------------------------
-# SetBuildOptions
-#-------------------------------------------------------------------------------
-sub SetBuildOptions($)
-{
-  my($options) = @_;
-
-  flagsArrayToHash(\@options_flags, $options);
-}
-
-#-------------------------------------------------------------------------------
-# SetFilepathFlags
-#-------------------------------------------------------------------------------
-sub SetFilepathFlags($)
-{
-  my($filepath) = @_;
-
-  flagsArrayToHash(\@filepath_flags, $filepath);
-}
-
-#-------------------------------------------------------------------------------
-# SetOptionDefines
-#-------------------------------------------------------------------------------
-sub SetOptionDefines($)
-{
-  my($optiondefines) = @_;
-
-  # These should remain unchanged
-  $optiondefines->{"mathml"}{"MOZ_MATHML"}    = 1;
-  $optiondefines->{"svg"}{"MOZ_SVG"}          = 1;
-  $optiondefines->{"carbon"}{"TARGET_CARBON"} = 1;
-  $optiondefines->{"cache"}{"MOZ_NEW_CACHE"}  = 1;
-  $optiondefines->{"soap"}{"MOZ_SOAP"}        = 1;
-  $optiondefines->{"lowmem"}{"MOZ_MAC_LOWMEM"} = 1;
-  $optiondefines->{"ldap_experimental"}{"MOZ_LDAP_XPCOM_EXPERIMENTAL"} = 1;
-  $optiondefines->{"useimg2"}{"USE_IMG2"}     = 1;
-  $optiondefines->{"bidi"}{"IBMBIDI"}         = 1;
-  $optiondefines->{"ldap"}{"MOZ_LDAP_XPCOM"}  = 1;
-}
-
-
-#-------------------------------------------------------------------------------
-# PropagateAllFlags
-#-------------------------------------------------------------------------------
-sub PropagateAllFlags($)
-{
-  my($build_array) = @_;
-  
-  # if "all" is set, set all the flags to 1
-  unless ($build_array->[0][0] eq "all") { die "Error: 'all' must come first in the flags array\n"; }
-  
-  if ($build_array->[0][1] == 1)
-  {
-    my($index);
-    foreach $index (@$build_array)
-    {
-      $index->[1] = 1;
-    }
-  }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// _getBuildProgressFile
-#//--------------------------------------------------------------------------------------------------
-sub _getBuildProgressFile()
-{
-  return $progress_file;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// setBuildProgressStart
-#// 
-#// This automagically sets $build{"all"} to 0
-#//--------------------------------------------------------------------------------------------------
-sub setBuildProgressStart($$)
-{
-  my($build_array, $name) = @_;
-
-  my($index);
-  foreach $index (@$build_array)
-  {
-    $index->[1] = 0;
-    if ($index->[0] eq $name) {
-      last;
-    }    
-  }
-
-  print "Building from module after $name, as specified by build progress\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// InitBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub InitBuildProgress($)
-{
-  my($prog_file) = @_;
-  if ($prog_file ne "") {
-    $progress_file = full_path_to($prog_file);
-    print "Writing build progress to $progress_file\n";
-  }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// WriteBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub WriteBuildProgress($)
-{
-  my($module_built) = @_;
-
-  my($progress_file) = _getBuildProgressFile();
-  
-  if ($progress_file ne "")
-  {
-    open(PROGRESS_FILE, ">>$progress_file") || die "Failed to open $progress_file\n";
-    print(PROGRESS_FILE "$module_built\n");
-    close(PROGRESS_FILE);
-  }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// ClearBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub ClearBuildProgress()
-{
-  my($progress_file) = _getBuildProgressFile();
-  if ($progress_file ne "") {
-    unlink $progress_file;
-  }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// WipeBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub WipeBuildProgress()
-{
-  print "Ignoring build progress\n";
-  ClearBuildProgress();
-  $progress_file = "";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ReadBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub ReadBuildProgress($)
-{
-  my($build_array) = @_;
-  my($progress_file) = _getBuildProgressFile();
-
-  my($last_module);
-  
-  if (open(PROGRESS_FILE, "< $progress_file"))
-  {
-    print "Getting build progress from $progress_file\n";
-    
-    while (<PROGRESS_FILE>)
-    {
-      my($line) = $_;
-      chomp($line);
-      $last_module = $line;
-    }
-    
-    close(PROGRESS_FILE);
-  }
-  
-  if ($last_module)
-  {
-    setBuildProgressStart($build_array, $last_module);
-  }
-}
-
-#-------------------------------------------------------------------------------
-# clearOldBuildSettings
-#-------------------------------------------------------------------------------
-sub clearOldBuildSettings($$$$)
-{
-  my($build, $options, $optiondefines, $filepaths) = @_;
-
-  # empty the arrays in case we're being called twice
-  @build_flags = ();
-  @options_flags = ();
-  @filepath_flags = ();
-  
-  # and empty the hashes
-  %$build = ();
-  %$options = ();
-  %$optiondefines = ();
-  %$filepaths = ();
-}
-
-#-------------------------------------------------------------------------------
-# SetupBuildParams
-#-------------------------------------------------------------------------------
-sub SetupBuildParams($$$$$$)
-{
-  my($build, $options, $optiondefines, $filepaths, $flags_file, $prefs_file) = @_;
-  
-  # Empty the hashes and arrays, to wipe out any stale data.
-  # Needed because these structures persist across two build scripts
-  # called using 'do' from a parent script.
-  clearOldBuildSettings($build, $options, $optiondefines, $filepaths);
-  
-  # Read from the flags file, which sets up the various arrays
-  readFlagsFile($flags_file);
-  
-  # If 'all' is set in the build array, propagate that to all entries
-  PropagateAllFlags(\@build_flags);
-  
-  # read the user pref file, that can change values in the array
-  ReadMozUserPrefs($prefs_file, \@build_flags, \@options_flags, \@filepath_flags);
-
-  # If build progress exists, this clears flags in the array up to a certain point
-  if ($main::USE_BUILD_PROGRESS) {
-    ReadBuildProgress(\@build_flags);
-  } else {
-    WipeBuildProgress();
-  }
-  
-#  printBuildArray(\@build_flags);
-#  printBuildArray(\@options_flags);
-  
-  SetBuildFlags($build);
-  SetBuildOptions($options);
-  SetOptionDefines($optiondefines);
-  SetFilepathFlags($filepaths);
-  
-#  printHash($build);
-#  printHash($options);
-}
-
-
-1;

mozilla/build/mac/build_scripts/Moz/BuildUtils.pm

@@ -1,518 +0,0 @@
-
-package Moz::BuildUtils;
-
-require 5.004;
-require Exporter;
-
-# Package that contains build util functions specific to the Mozilla build
-# process.
-
-use strict;
-use Exporter;
-
-use Cwd;
-use File::Path;
-use File::Basename;
-
-use Mac::Events;
-use Mac::StandardFile;
-
-use Moz::Moz;
-use Moz::BuildFlags;
-use Moz::MacCVS;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA      = qw(Exporter);
-@EXPORT   = qw(
-                SetupDefaultBuildOptions
-                SetupBuildRootDir
-                StartBuildModule
-                EndBuildModule
-                GetBinDirectory
-                BuildOneProjectWithOutput
-                BuildOneProject
-                BuildIDLProject
-                BuildFolderResourceAliases
-                AskAndPersistFile
-                DelayFor
-                TimeStart
-                TimeEnd
-                EmptyTree
-                SetupBuildLog
-                SetBuildNumber
-                SetTimeBomb
-              );
-
-#//--------------------------------------------------------------------------------------------------
-#// SetupDefaultBuildOptions
-#//--------------------------------------------------------------------------------------------------
-sub SetupDefaultBuildOptions($$)
-{
-    my($debug, $bin_dir) = @_;
-
-    # Here we set up defaults for the various build flags.
-    # If you want to override any of these, it's best to do
-    # so via the relevant preferences file, which lives in
-    # System Folder:Preferences:Mozilla build prefs:{build prefs file}.
-    # For the name of the prefs file, see the .pl script that you
-    # run to start this build. The prefs files are created when
-    # you run the build, and contain some documentation.
-    
-    #-------------------------------------------------------------
-    # configuration variables that globally affect what is built
-    #-------------------------------------------------------------
-    $main::DEBUG                  = $debug;
-    $main::PROFILE                = 0;
-    $main::RUNTIME                = 0;    # turn on to just build runtime support and NSPR projects
-    $main::GC_LEAK_DETECTOR       = 0;    # turn on to use GC leak detection
-    $main::MOZILLA_OFFICIAL       = 0;    # generate build number
-    $main::LOG_TO_FILE            = 0;    # write perl output to a file
-    
-    #-------------------------------------------------------------
-    # configuration variables that affect the manner of building, 
-    # but possibly affecting the outcome.
-    #-------------------------------------------------------------    
-    $main::ALIAS_SYM_FILES        = $main::DEBUG;
-    $main::CLOBBER_LIBS           = 1;      # turn on to clobber existing libs and .xSYM files before
-                                            # building each project                         
-    # The following two options will delete all dist files (if you have $main::build{dist} turned on),
-    # but leave the directory structure intact.
-    $main::CLOBBER_DIST_ALL       = 1;    # turn on to clobber all aliases/files inside dist (headers/xsym/libs)
-    $main::CLOBBER_DIST_LIBS      = 0;    # turn on to clobber only aliases/files for libraries/sym files in dist
-    $main::CLOBBER_IDL_PROJECTS   = 0;    # turn on to clobber all IDL projects.
-    
-    $main::UNIVERSAL_INTERFACES_VERSION = 0x0320;
-    
-    #-------------------------------------------------------------
-    # configuration variables that are preferences for the build,
-    # style and do not affect what is built.
-    #-------------------------------------------------------------
-    $main::CLOSE_PROJECTS_FIRST   = 0;
-                                    # 1 = close then make (for development),
-                                    # 0 = make then close (for tinderbox).
-    $main::USE_TIMESTAMPED_LOGS   = 0;
-    $main::USE_BUILD_PROGRESS     = 1;    # track build progress for restartable builds
-    #-------------------------------------------------------------
-    # END OF CONFIG SWITCHES
-    #-------------------------------------------------------------
-    
-    $main::BIN_DIRECTORY = $bin_dir;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// SetupBuildRootDir
-#//--------------------------------------------------------------------------------------------------
-sub SetupBuildRootDir($)
-{
-    my($rel_path_to_script) = @_;
-
-    my($cur_dir) = cwd();
-    $cur_dir =~ s/$rel_path_to_script$//;
-    chdir($cur_dir) || die "Error: failed to set build root directory to '$cur_dir'.\nYou probably need to put 'mozilla' one level down (in a folder).\n";
-    $main::MOZ_SRC = cwd();
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// StartBuildModule
-#//--------------------------------------------------------------------------------------------------
-sub StartBuildModule($)
-{
-    my($module) = @_;
-
-    print("---- Start of $module ----\n");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// EndBuildModule
-#//--------------------------------------------------------------------------------------------------
-sub EndBuildModule($)
-{
-    my($module) = @_;
-    WriteBuildProgress($module);
-    print("---- End of $module ----\n");
-}
-
-#--------------------------------------------------------------------------------------------------
-# GetBinDirectory
-#--------------------------------------------------------------------------------------------------
-sub GetBinDirectory()
-{
-    if ($main::BIN_DIRECTORY eq "") { die "Dist directory not set\n"; }
-    return $main::BIN_DIRECTORY;
-}
-
-#--------------------------------------------------------------------------------------------------
-# AskAndPersistFile stores the information about the user pick inside
-# the file $session_storage
-#--------------------------------------------------------------------------------------------------
-sub AskAndPersistFile($)
-{
-    my ($sessionStorage) = @_;
-    my $cvsfile;
-
-    if (( -e $sessionStorage) &&
-        open( SESSIONFILE, $sessionStorage ))
-    {
-    # Read in the path if available
-        $cvsfile = <SESSIONFILE>;
-        chomp $cvsfile;
-        close SESSIONFILE;
-        if ( ! -e $cvsfile )
-        {
-            print STDERR "$cvsfile has disappeared\n";
-            undef $cvsfile;
-        }
-    }
-    unless (defined ($cvsfile))
-    {
-        # make sure that MacPerl is a front process
-        ActivateApplication('McPL');
-        MacPerl::Answer("Could not find your MacCVS session file. Please choose one", "OK");
-        
-        # prompt user for the file name, and store it
-        my $macFile = StandardGetFile( 0, "McvD");  
-        if ( $macFile->sfGood() )
-        {
-            $cvsfile = $macFile->sfFile();
-            # save the choice if we can
-            if ( open (SESSIONFILE, ">" . $sessionStorage))
-            {
-                printf SESSIONFILE $cvsfile, "\n";
-                close SESSIONFILE;
-            }
-            else
-            {
-                print STDERR "Could not open storage file $sessionStorage for saving $cvsfile\n";
-            }
-        }
-    }
-    return $cvsfile;
-}
-
-
-#--------------------------------------------------------------------------------------------------
-# BuildIDLProject
-#
-#--------------------------------------------------------------------------------------------------
-
-sub BuildIDLProject($$)
-{
-    my ($project_path, $module_name) = @_;
-
-    if ($main::CLOBBER_IDL_PROJECTS)
-    {
-        my($datafolder_path) = $project_path;
-        $datafolder_path =~ s/\.mcp$/ Data:/;       # generate name of the project's data folder.
-        print STDERR "Deleting IDL data folder: $datafolder_path\n";
-        EmptyTree($datafolder_path);
-    }
-
-    BuildOneProject($project_path,  "headers", 0, 0, 0);
-    BuildOneProject($project_path,  $module_name.".xpt", 1, 0, 1);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Build one project, and make the alias. Parameters are project path, target name, shared  library
-#// name, make shlb alias (boolean), make xSYM alias (boolean), and is component (boolean).
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildOneProjectWithOutput($$$$$$)
-{
-    my ($project_path, $target_name, $output_name, $alias_shlb, $alias_xSYM, $component) = @_;
-
-    unless ($project_path =~ m/^$main::BUILD_ROOT.+/) { return; }
-    
-    # $D becomes a suffix to target names for selecting either the debug or non-debug target of a project
-    my($D) = $main::DEBUG ? "Debug" : "";
-    my($dist_dir) = GetBinDirectory();
-    
-    # Put libraries in "Essential Files" folder, Components in "Components" folder
-    my($component_dir) = $component ? "Components:" : "Essential Files:";
-
-    my($project_dir) = $project_path;
-    $project_dir =~ s/:[^:]+$/:/;           # chop off leaf name
-
-    if ($main::CLOBBER_LIBS)
-    {
-        unlink "$project_dir$output_name";              # it's OK if these fail
-        unlink "$project_dir$output_name.xSYM";
-    }
-    
-    BuildProject($project_path, $target_name);
-    
-    $alias_shlb ? MakeAlias("$project_dir$output_name", "$dist_dir$component_dir") : 0;
-    $alias_xSYM ? MakeAlias("$project_dir$output_name.xSYM", "$dist_dir$component_dir") : 0;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// For compatiblity with existing scripts, BuildOneProject now just calls
-#// BuildOneProjectWithOutput, with the output name and target name identical.
-#// Note that this routine assumes that the target name and the shared libary name
-#// are the same.
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildOneProject($$$$$)
-{
-    my ($project_path, $target_name, $alias_shlb, $alias_xSYM, $component) = @_;
-	BuildOneProjectWithOutput($project_path, $target_name, $target_name,
-							  $alias_shlb, $alias_xSYM, $component);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Make resource aliases for one directory
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildFolderResourceAliases($$)
-{
-    my($src_dir, $dest_dir) = @_;
-        
-    # get a list of all the resource files
-    opendir(SRCDIR, $src_dir) || die("can't open $src_dir");
-    my(@resource_files) = readdir(SRCDIR);
-    closedir(SRCDIR);
-    
-    # make aliases for each one into the dest directory
-    print("Placing aliases to all files from $src_dir in $dest_dir\n");
-    for ( @resource_files )
-    {
-        next if $_ eq "CVS";
-        #print("    Doing $_\n");
-        if (-l $src_dir.$_)
-        {
-            print("     $_ is an alias\n");
-            next;
-        }
-        my($file_name) = $src_dir . $_; 
-        MakeAlias($file_name, $dest_dir);
-    }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// DelayFor
-#//
-#// Delay for the given number of seconds, allowing the script to be cancelled
-#//--------------------------------------------------------------------------------------------------
-
-sub DelayFor($)
-{
-  my($delay_secs) = @_;
-  
-  STDOUT->autoflush(1);
-  
-  my($end_time) = time() + $delay_secs;
-    
-  my($last_time) = 0;
-  my($cur_time) = time();
-  
-  while ($cur_time < $end_time)
-  {
-    $cur_time = time();
-    if ($cur_time > $last_time)
-    {
-      print ".";
-      $last_time = $cur_time;
-    }
-    
-    WaitNextEvent();
-  }
-
-  print "\n";
-  STDOUT->autoflush(0);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// TimeStart
-#//--------------------------------------------------------------------------------------------------
-sub TimeStart()
-{
-    return time();
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// TimeEnd
-#//--------------------------------------------------------------------------------------------------
-sub TimeEnd($$)
-{
-    use integer;
-    
-    my($start_time, $operation_name) = @_;
-    my($end_time) = time();
-    
-    my($tot_sec) = $end_time - $start_time;
-    
-    my($seconds) = $tot_sec;
-    
-    my($hours) = $seconds / (60 * 60);
-    $seconds -= $hours * (60 * 60);
-    
-    my($minutes) = $seconds / 60;
-    $seconds -= $minutes * 60;
-        
-    print "$operation_name took $hours hours $minutes minutes and $seconds seconds\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Remove all files from a tree, leaving directories intact (except "CVS").
-#//--------------------------------------------------------------------------------------------------
-
-sub EmptyTree($)
-{
-    my ($root) = @_; 
-    #print "EmptyTree($root)\n";
-    opendir(DIR, $root);
-    my $sub;
-    foreach $sub (readdir(DIR))
-    {
-        my $fullpathname = $root.$sub; # -f, -d only work on full paths
-
-        # Don't call empty tree for the alias of a directory.
-        # -d returns true for the alias of a directory, false for a broken alias)
-
-        if (-d $fullpathname)
-        {
-            if (-l $fullpathname)   # delete aliases
-            {
-                unlink $fullpathname;
-                next;
-            }
-            EmptyTree($fullpathname.":");
-            if ($sub eq "CVS")
-            {
-                #print "rmdir $fullpathname\n";
-                rmdir $fullpathname;
-            }
-        }
-        else
-        {
-            unless (unlink $fullpathname) { die "Failed to delete $fullpathname\n"; }
-        }
-    }
-    closedir(DIR);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Recurse through a directory hierarchy, looking for MANIFEST files.
-#// Currently unused.
-#//--------------------------------------------------------------------------------------------------
-
-sub ScanForManifestFiles($$$$)
-{
-    my($dir, $theme_root, $theme_name, $dist_dir) = @_;
-
-    opendir(DIR, $dir) or die "Cannot open dir $dir\n";
-    my @files = readdir(DIR);
-    closedir DIR;
-
-    my $file;
-
-    foreach $file (@files)
-    {    
-        my $filepath = $dir.":".$file;
-
-        if (-d $filepath)
-        {
-            # print "Looking for MANIFEST files in $filepath\n";        
-            ScanForManifestFiles($filepath, $theme_root, $theme_name, $dist_dir);
-        }
-        elsif ($file eq "MANIFEST")
-        {
-            # print "Doing manifest file $filepath\n";
-
-            # Get the dest path from the first line of the file
-
-            open(MANIFEST, $filepath) || die "Could not open file $file";
-            # Read in the path if available
-            my($dest_line) = <MANIFEST>;
-            chomp $dest_line;
-            close MANIFEST;
-
-            $dest_line =~ s|^#!dest[\t ]+|| || die "No destination line found in $filepath\n";
-
-            my($dest_path) = $dist_dir."chrome:skins:$theme_name:$dest_line";
-            # print " Destination is $dest_path\n";
-
-            InstallResources($filepath, "$dest_path", 0);
-        }
-    }
-}
-
-
-#-----------------------------------------------
-# SetupBuildLog
-#-----------------------------------------------
-sub SetupBuildLog($$)
-{
-    my($logfile_path, $timestamped_log) = @_;
-    
-    my($logdir) = "";
-    my($logfile) = $logfile_path;
-    
-    if ($logfile_path =~ /(.+?:)([^:]+)$/)       # ? for non-greedy match
-    {
-        $logdir = $1;
-        $logfile = $2;
-        
-        mkpath($logdir);
-    }
-    
-    if ($timestamped_log)
-    {
-        #Use time-stamped names so that you don't clobber your previous log file!
-        my $now = localtime();
-        while ($now =~ s@:@.@) {} # replace all colons by periods
-        OpenErrorLog("${logdir}${now}");
-    }
-    else
-    {
-        OpenErrorLog("${logdir}${logfile}");
-    }
-}
-
-#-----------------------------------------------
-# SetBuildNumber
-#-----------------------------------------------
-sub SetBuildNumber($$)
-{
-    my($build_num_file, $files_to_touch) = @_;
-
-    # Make sure we add the config dir to search, to pick up mozBDate.pm
-    # Need to do this dynamically, because this module can be used before
-    # mozilla/config has been checked out.
-    
-    my ($inc_path) = $0;        # $0 is the path to the parent script
-    $inc_path =~ s/:build:mac:build_scripts:.+$/:config/;
-    push(@INC, $inc_path);
-
-    require mozBDate;
-    
-    mozBDate::UpdateBuildNumber($build_num_file, $main::MOZILLA_OFFICIAL);
-   
-    my($file);
-    foreach $file (@$files_to_touch)
-    {
-        print "Writing build number to $file from ${file}.in\n";
-        mozBDate::SubstituteBuildNumber($file, $build_num_file, "${file}.in");
-    }
-}
-
-#-----------------------------------------------
-# SetBuildNumber
-#-----------------------------------------------
-sub SetTimeBomb($$)		
-{
-  my ($warn_days, $bomb_days) = @_;
-  
-  system("perl :mozilla:config:mac-set-timebomb.pl $warn_days $bomb_days");
-}
-
-
-1;
-

mozilla/build/mac/build_scripts/Moz/Jar.pm

@@ -1,599 +0,0 @@
-#!perl -w
-package Moz::Jar;
-
-#
-# Module for creating jar files, either using a jar manifest, or
-# simply jarring up folders on disk.
-#
-
-require 5.004;
-require Exporter;
-
-use strict;
-use Archive::Zip;
-use File::Path;
-
-use Mac::Files;
-
-use Moz::Moz;
-
-use vars qw( @ISA @EXPORT );
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(
-                    CreateJarFileFromDirectory
-                    CreateJarFromManifest
-                    WriteOutJarFiles
-                    SanityCheckJarOptions
-                );
-
-
-#-------------------------------------------------------------------------------
-# Add the contents of a directory to the zip file
-#
-#-------------------------------------------------------------------------------
-sub _addDirToJar($$$$)
-{
-    my($dir, $jar_root, $zip, $compress) = @_;
-
-    opendir(DIR, $dir) or die "Error: Cannot open dir $dir\n";
-    my @files = readdir(DIR);
-    closedir DIR;
-    
-    my $unix_jar_root = $jar_root;
-    $unix_jar_root =~ s|:|/|g;       # colon to slash conversion
-    
-    my $file;
-    
-    foreach $file (@files)
-    {        
-        my $filepath = $dir.":".$file;
-        
-        if (-d $filepath)
-        {
-            print "Adding files to jar from $filepath\n";            
-            _addDirToJar($filepath, $jar_root, $zip, $compress);
-        }
-        else
-        {
-            my $member = Archive::Zip::Member->newFromFile($filepath);
-            die "Error: Failed to create zip file member $filepath\n" unless $member;
-            
-            my $unixName = $filepath;
-            $unixName =~ s|:|/|g;               # colon to slash conversion
-            $unixName =~ s|^$unix_jar_root||;   # relativise
-            
-            $member->fileName($unixName);
-            
-            # print "Adding $file as $unixName\n";
-            
-            if ($compress) {
-                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
-            } else {
-                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
-            }
-            
-            $zip->addMember($member);
-        }
-    }
-}
-
-#-------------------------------------------------------------------------------
-# Add the contents of a directory to the zip file
-#
-#-------------------------------------------------------------------------------
-
-sub CreateJarFileFromDirectory($$$)
-{
-    my($srcdir, $jarpath, $compress) = @_;
-
-    my $zip = Archive::Zip->new();
-
-    _addDirToJar($srcdir, $srcdir, $zip, $compress);
-
-    print "Saving zip file...\n";
-    my $status = $zip->writeToFileNamed($jarpath);
-    if ($status == 0) {
-        print "Zipping completed successfully\n";
-    } else {
-        print "Error saving zip file\n";
-    }
-    
-    # set the file type/creator to something reasonable
-    MacPerl::SetFileInfo("ZIP ", "ZIP ", $jarpath);
-}
-
-
-#-------------------------------------------------------------------------------
-# SanityCheckJarOptions
-# 
-#-------------------------------------------------------------------------------
-sub SanityCheckJarOptions()
-{
-    if (!$main::options{chrome_jars} && !$main::options{chrome_files})
-    {
-        print "Both \$options{chrome_jars} and \$options{chrome_files} are off. You won't get any chrome.\n";
-        return;
-    }
-
-    if (!$main::options{chrome_jars} && $main::options{use_jars})
-    {
-        print "\$options{chrome_jars} is off but \$options{use_jars} is on. Your build won't run (expects jars, got files).\n";
-        return;
-    }
-
-    if (!$main::options{chrome_files} && !$main::options{use_jars})
-    {
-        print "\$options{chrome_jars} is off but \$options{chrome_files} is on. Your build won't run (expects files, got jars).\n";
-        return;
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# printZipContents
-# 
-#-------------------------------------------------------------------------------
-sub printZipContents($)
-{
-    my($zip) = @_;
-
-    my(@members) = $zip->memberNames();
-    
-    print "Zip contains:\n";
-    
-    my($member);
-    foreach $member (@members)
-    {
-        print "  $member\n";
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# safeSaveJarFile
-# 
-# Archive::Zip has a problem where you cannot save a zip file on top of
-# an existing zip file that it has open, because it holds references
-# into that zip. So we have to save to a temp file, then do a swap.
-# 
-# Note that the zip will become invalid after this operation.
-# If you want to do further operations on it, you'll have to reread it.
-#-------------------------------------------------------------------------------
-sub safeSaveJarFile($$)
-{
-    my($zip, $full_dest_path) = @_;
-    
-    my($temp_file_name) = $full_dest_path."_temp";
-
-    ($zip->writeToFileNamed($temp_file_name) == Archive::Zip::AZ_OK) || die "Error: died writing jar to temp file $temp_file_name\n";
-    
-    unlink $full_dest_path;
-    
-    (rename $temp_file_name, $full_dest_path) || die "Error: Failed to rename $temp_file_name\n";
-    
-    MacPerl::SetFileInfo("ZIP ", "ZIP ", $full_dest_path);
-}
-
-
-#-------------------------------------------------------------------------------
-# addToJarFile
-# 
-# Add a file to a jar file
-#
-# Parameters:
-#   1. Jar ID. Unix path of jar file inside chrome.
-#   2. Abs path to jar.mn file (i.e. source)    (mac breaks)
-#   3. File source, relative to jar.mn path     (mac breaks)
-#   4. Abs path to the resulting .jar file      (mac breaks)
-#   5. Relative file path within the jar        (unix breaks)
-#   6. Reference to hash of jar files
-#
-#-------------------------------------------------------------------------------
-
-sub addToJarFile($$$$$$$)
-{
-    my($jar_id, $jar_man_dir, $file_src, $jar_path, $file_jar_path, $override, $jars) = @_;
-
-    # print "addToJarFile with:\n  $jar_man_dir\n  $file_src\n  $jar_path\n  $file_jar_path\n";
-
-    unless ($jar_path =~ m/(.+:)([^:]+)$/) { die "Error: Bad jar path $jar_path\n"; }
-    
-    my($target_dir) = $1;
-    my($jar_name) = $2;
-
-    $target_dir =~ s/[^:]+$//;
-    
-    # print "¥ $target_dir $jar_name\n";
-
-    # find the source file
-    my($src) = $jar_man_dir.":".$file_src;
-    if ((!-e $src) && ($file_src =~ m/.+:([^:]+)$/))    # src does not exist. Fall back to looking for src in jar.mn dir
-    {
-        $file_src = $1;
-        $src = $jar_man_dir.":".$file_src;
-        
-        if (!-e $src) {
-            die "Error: Can't find chrome file $src\n";
-        }
-    }
-    
-    if ($main::options{chrome_jars})
-    {
-        my($zip) = $jars->{$jar_id};
-        unless ($zip) { die "Error: Can't find Zip entry for $jar_id\n"; }
-        
-        # print "Adding $file_src to jar file $jar_path at $file_jar_path\n";
-        my($member) = Archive::Zip::Member->newFromFile($src);
-        unless ($member) { die "Error: Failed to create zip file member $src\n"; }
-
-        $member->fileName($file_jar_path);    
-    
-        my($compress) = 1;
-        if ($compress) {
-            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
-            $member->desiredCompressionLevel(Archive::Zip::COMPRESSION_LEVEL_DEFAULT);   # defaults to 6
-        } else {
-            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
-        }
-
-        my($old_member) = $zip->memberNamed($file_jar_path);
-        
-        if ($override)
-        {
-            if ($old_member)
-            {
-                # print "Overriding $file_jar_path in jar file $jar_id\n";
-                # need to compare mod dates or use the + here
-                $zip->removeMember($old_member);
-            }
-        
-            $zip->addMember($member);
-        }
-        else
-        {
-            if ($old_member)
-            {
-                #compare dates here
-                my($member_moddate) = $old_member->lastModTime();
-                my($file_moddate) = GetFileModDate($src);
-            
-                if ($file_moddate > $member_moddate)
-                {
-                    print "Updating older file $file_jar_path in $jar_id\n";
-                    $zip->removeMember($old_member);
-                    $zip->addMember($member);
-                }
-                else
-                {
-                    print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
-                }
-            }
-            else
-            {
-                $zip->addMember($member);
-            }
-        }
-    }
-    
-    if ($main::options{chrome_files})  # we install raw files too
-    {
-        my($rel_path) = $file_jar_path;
-        $rel_path =~ s|/|:|g;       # slash to colons
-        
-        my($dir_name) = $jar_name;
-        $dir_name =~ s/\.jar$//;
-        
-        my($dst) = $target_dir.$dir_name.":".$rel_path;
-                
-        # print "Aliassing $src\n to\n$dst\n";        
-        if ($override)
-        {
-            unlink $dst;
-        MakeAlias($src, $dst);      # don't check errors, otherwise we fail on replacement
-    }
-        else
-        {
-            if (-e $dst)
-            {
-                #compare dates here
-                my($dst_moddate) = GetFileModDate($dst);
-                my($file_moddate) = GetFileModDate($src);
-            
-                if ($file_moddate > $dst_moddate)
-                {
-                    print "Updating older file $rel_path in $dir_name\n";
-                    unlink $dst;
-                    MakeAlias($src, $dst);
-                }
-                else
-                {
-                    print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
-                }
-            
-            }
-            else
-            {
-                MakeAlias($src, $dst);
-            }
-        }
-        
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# setupJarFile
-# 
-# setup a zip for writing
-#-------------------------------------------------------------------------------
-
-sub setupJarFile($$$)
-{
-    my($jar_id, $dest_path, $jar_hash) = @_;
-
-    # print "Creating jar file $jar_id at $jar_path\n";
-    
-    my($jar_file) = $jar_id;
-    $jar_file =~ s|/|:|g;           # slash to colons
-    my($full_jar_path) = full_path_to($dest_path.":".$jar_file);
-
-    if ($main::options{chrome_jars})
-    {
-        my($zip) = $jar_hash->{$jar_id};
-        if (!$zip)      # if we haven't made it already, do so
-        {
-	        my($zip) = Archive::Zip->new();
-	        $jar_hash->{$jar_id} = $zip;
-
-            # does the jar file exist already? If so, read it in
-            if (-e $full_jar_path)
-            {
-                print "Reading in jar file $jar_id\n";
-                if ($zip->read($full_jar_path) != Archive::Zip::AZ_OK) { die "Error: Failed to re-read $full_jar_path\n"; }
-                
-                # printZipContents($zip);
-            }
-
-        }
-    }
-    else
-    {
-        # installing files.
-        # nothing to do. MakeAlias creates dirs as needed.
-
-	    # add this jar to the list
-	    $jar_hash->{$jar_id} = 1;
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# closeJarFile
-# 
-# We're done with this jar file _for this jar.mn_. We may add more entries
-# to it later, so keep it open in the hash.
-#-------------------------------------------------------------------------------
-sub closeJarFile($$)
-{
-    my($jar_path, $jar_hash) = @_;
-
-    # print "Closing jar file $jar_path\n";
-
-    if ($main::options{chrome_jars})
-    {
-    
-    }
-    else
-    {
-        # installing files.
-        # nothing to do
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# WriteOutJarFiles
-# 
-# Now we dump out the jars
-#-------------------------------------------------------------------------------
-sub WriteOutJarFiles($$)
-{
-    my($chrome_dir, $jars) = @_;
-
-    unless ($main::options{chrome_jars}) { return; }
-    
-    my($full_chrome_path) = full_path_to($chrome_dir);
-
-    my($key);
-    foreach $key (keys %$jars)
-    {
-        my($zip) = $jars->{$key};
-        
-        my($rel_path) = $key;
-        $rel_path =~ s/\//:/g;
-        
-        my($output_path) = $full_chrome_path.":".$rel_path;
-        
-        print "Writing zip file $key to $output_path\n";
-
-        # ensure the target dirs exist
-        my($path) = $output_path;
-        $path =~ s/[^:]+$//;
-        mkpath($path);
-        
-        # unlink $output_path;        # remove any existing jar
-        safeSaveJarFile($zip, $output_path);
-        # $zip is invalid after this operation, so nuke it here
-        $jars->{$key} = 0;
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# registerChromePackage
-# 
-# Enter a chrome package into the installed-chrome.txt file
-#-------------------------------------------------------------------------------
-sub registerChromePackage($$$$$$)
-{
-    my($jar_file, $file_path, $chrome_dir, $jar_hash, $chrome_type, $pkg_name) = @_;
-
-    my($manifest_subdir) = $jar_file;
-    $manifest_subdir =~ s/:/\//g;
-    
-    my($chrome_entry);
-    
-    if ($main::options{use_jars}) {
-        $chrome_entry = "$chrome_type,install,url,jar:resource:/chrome/$manifest_subdir!/$chrome_type/$pkg_name";
-    } else {
-        $manifest_subdir =~ s/\.jar$//;
-        $chrome_entry = "$chrome_type,install,url,resource:/chrome/$manifest_subdir/$chrome_type/$pkg_name";
-    }
-
-    # print "Entering $chrome_entry in installed-chrome.txt\n";
-    
-    # ensure chrome_dir exists
-    mkpath($chrome_dir);
-    
-    my($inst_chrome) = ${chrome_dir}.":installed-chrome.txt";
-    
-    if (open(CHROMEFILE, "<$inst_chrome")) {
-        while (<CHROMEFILE>) {
-            chomp;
-            if ($_ eq $chrome_entry) {
-                # $chrome_entry already appears in installed-chrome.txt file
-                # just update the mod date
-                my $now = time;
-                utime($now, $now, $inst_chrome) || die "Error: Couldn't touch $inst_chrome";
-                print "+++ updating chrome $inst_chrome\n+++\t\t$chrome_entry\n";
-                close(CHROMEFILE) || die "Error: can't close $inst_chrome: $!";
-                return 0;
-            }
-        }
-        close(CHROMEFILE) || die "Error: can't close $inst_chrome: $!";
-    }
-    open(CHROMEFILE, ">>${inst_chrome}") || die "Error: Failed to open $inst_chrome\n";
-    print(CHROMEFILE "${chrome_entry}\n");
-    close(CHROMEFILE) || die "Error: Failed to close $inst_chrome\n";
-    print "+++ adding chrome $inst_chrome\n+++\t\t$chrome_entry\n";
-}
-
-#-------------------------------------------------------------------------------
-# Create or add to a jar file from a jar.mn file.
-# Both arguments are relative to the mozilla root dir.
-#
-#
-#-------------------------------------------------------------------------------
-sub CreateJarFromManifest($$$)
-{
-    my($jar_man_path, $dest_path, $jars) = @_;
-    
-    if ($main::options{chrome_jars}) {
-        print "Jarring from $jar_man_path\n";
-    }
-    if ($main::options{chrome_files}) {
-        print "Installing files from $jar_man_path\n";
-    }
-
-    $jar_man_path = full_path_to($jar_man_path);
-    $dest_path = full_path_to($dest_path);
-
-    # if the jars hash is empty, nuke installed-chrome.txt
-    if (! scalar(%$jars))
-    {
-        print "Nuking installed-chrome.txt\n";
-	    my($installed_chrome) = $dest_path.":installed-chrome.txt";
-	    # unlink $installed_chrome;
-    }
-    
-    my $jar_man_dir = "";
-    my $jar_man_file = "";
-    
-    if ($jar_man_path =~ /(.+):([^:]+)$/)
-    {
-        $jar_man_dir = $1;      # no trailing :
-        $jar_man_file = $2;
-    }
-
-    # Keep a hash of jar files, keyed on relative jar path (e.g. "packages/core.jar")
-    # Entries are open Archive::Zips (if zipping), and installed-chrome entries.
-    
-    my($jar_id) = "";       # Current foo/bar.jar from jar.mn file
-    my($jar_file) = "";     # relative path to jar file (from $dest_path), with mac separators
-    my($full_jar_path);
-    
-    open(FILE, "<$jar_man_path") || die "Error: could not open \"$jar_man_path\": $!";
-    while (<FILE>)
-    {
-        my($line) = $_;
-        chomp($line);
-        
-        # print "$line\n";
-        
-        if ($line =~ /^\s*\#.*$/) {     # skip comments
-            next;
-        }
-        
-        if ($line =~/^([\w\d.\-\_\\\/]+)\:\s*$/)                                  # line start jar file entries
-        {
-            $jar_id = $1;
-            $jar_file = $jar_id;
-            $jar_file =~ s|/|:|g;           # slash to colons
-            $full_jar_path = $dest_path.":".$jar_file;
-                        
-            setupJarFile($jar_id, $dest_path, $jars);
-
-        }
-        elsif ($line =~ /^(\+?)\s+([\w\d.\-\_\\\/]+)\s*(\([\w\d.\-\_\\\/]+\))?$\s*/)     # jar file entry
-        {
-            my($override) = ($1 eq "+");
-            my($file_dest) = $2;
-            my($file_src) = $3;
- 
-            if ($file_src) {  
-                $file_src = substr($file_src, 1, -1);      #strip the ()
-            } else {
-                $file_src = $file_dest;
-            }
-            
-            $file_src =~ s|/|:|g;
-            
-            if ($jar_file ne "")    # if jar is open, add to jar
-            {
-                if ($file_dest =~ /([\w\d.\-\_]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
-                {
-                    my $chrome_type = $1;
-                    my $pkg_name = $2;
-                    registerChromePackage($jar_file, $file_dest, $dest_path, $jars, $chrome_type, $pkg_name);
-                }
-                
-                addToJarFile($jar_id, $jar_man_dir, $file_src, $full_jar_path, $file_dest, $override, $jars);
-            }
-            else
-            {
-                die "Error: bad jar.mn format at $line\n";
-            }
-        }
-        elsif ($line =~ /^\s*$/ )                                               # blank line
-        {
-            if ($jar_file ne "")    #if a jar file is open, close it
-            {
-                closeJarFile($full_jar_path, $jars);
-                
-                $jar_file = "";
-                $full_jar_path = "";
-            }
-        }
-    }
-    
-    close(FILE);
-
-    if ($jar_file ne "")    #if a jar file is open, close it
-    {
-        closeJarFile($full_jar_path, $jars);
-    }
-
-}
-
-1;

mozilla/build/mac/build_scripts/Moz/MacCVS.pm

@@ -1,228 +0,0 @@
-#!perl -w
-package Moz::MacCVS;
-
-# package Mac::Apps::MacCVS; this should really be the name of the package
-# but due to our directory hierarchy in mozilla, I am not doing it
-
-require 5.004;
-require Exporter;
-
-use strict;
-use Exporter;
-
-use vars qw($VERSION @ISA @EXPORT);
-
-use Cwd;
-
-use File::Basename;
-
-use Mac::StandardFile;
-use Mac::AppleEvents;
-use Mac::AppleEvents::Simple;
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(new describe checkout update);
-$VERSION = "1.00";
-
-# If you want to understand the gobbldeygook that's used to build Apple Events,
-# you should start by reading the AEGizmos documentation.
-
-
-# Architecture:
-# cvs session object:
-# name - session name
-# session_file - session file
-# 
-# 
-
-my($last_error) = 0;
-my($gAppSig)    = 'Mcvs';   # MacCVS Pro
-
-#
-# utility routines
-#
-
-
-sub _checkForEventError($)
-{
-  my($evt) = @_;
-
-  if ($evt->{ERRNO} != 0)
-  {
-    print STDERR "Error. Script returned '$evt->{ERROR} (error $evt->{ERRNO})\n";
-    $last_error = $evt->{ERRNO};
-    return 0;
-  }
-  
-  return 1; # success
-}
-
-
-#
-# Session object methods
-#
-
-sub new
-{
-  my ( $proto, $session_file) = @_;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-
-  if ( defined($session_file) && ( -e $session_file) )
-  {
-    $self->{"name"} = basename( $session_file );
-    $self->{"session_file"} = $session_file;
-    bless $self, $class;
-    return $self;
-  }
-  else
-  {
-    print STDERR "MacCVS->new cvs file < $session_file > does not exist\n";
-    return;
-  }
-}
-
-# makes sure that the session is open
-# assertSessionOpen()
-# returns 1 on success
-sub assertSessionOpen()
-{
-  my ($self) = shift;
-
-  $last_error = 0;
-
-  my($prm) =
-    q"'----':obj {form:name, want:type(alis), seld:TEXT(@), from:'null'()}";
-
-  my($evt) = do_event(qw/aevt odoc/, $gAppSig, $prm, $self->{session_file});
-  return _checkForEventError($evt);
-}
-
-# prints the cvs object, used mostly for debugging
-sub describe
-{
-  my($self) = shift;
-  $last_error = 0;
-  print "MacCVS:: name: ", $self->{name}, " session file: ", $self->{session_file}, "\n";
-}
-
-# checkout( self, module, revision, date)
-# MacCVS checkout command
-# returns 1 on success.
-sub checkout()
-{
-  my($self, $module, $revision, $date ) = @_;
-  unless( defined ($module) ) { $module = ""; } # get rid of the pesky undefined warnings
-  unless( defined ($revision) ) { $revision = ""; }
-  unless( defined ($date) ) { $date = ""; }
-
-  $last_error = 0;
-    
-  $self->assertSessionOpen() || die "Error: failed to open MacCVS session file at $self->{session_file}\n";
-  
-  my($revstring) = ($revision ne "") ? $revision : "(none)";
-  my($datestring) = ($date ne "") ? $date : "(none)";
-  
-  print "Checking out $module with revision $revstring, date $datestring\n";
-
-  my($prm) =
-    q"'----':obj {form:name, want:type(docu), seld:TEXT(@), from:'null'()}, ".
-    q"modl:'TEXT'(@), tagr:'TEXT'(@), tagd:'TEXT'(@) ";
-  
-  my($evt) = do_event(qw/MCvs cout/, $gAppSig, $prm, $self->{name}, $module, $revision, $date);
-  return _checkForEventError($evt);
-}
-
-
-# update( self, branch tag, list of paths)
-# MacCVS udate command
-# returns 1 on success.
-# NOTE: MacCVS Pro does not correctly support this stuff yet (as of version 2.7d5).
-sub update()
-{
-  my($self, $branch, $paths ) = @_;
-
-  $last_error = 0;
-    
-  $self->assertSessionOpen() || die "Error: failed to open MacCVS session file at $self->{session_file}\n";
-
-  if ($branch eq "HEAD") {
-    $branch = "";
-  }
-  
-  my($paths_list) = "";
-  
-  my($path);
-  foreach $path (@$paths)
-  {
-    if ($paths_list ne "") {
-      $paths_list = $paths_list.", ";
-    }
-    
-    $paths_list = $paths_list."Ò".$path."Ó";
-  }
-    
-  my($prm) =
-    q"'----':obj {form:name, want:type(docu), seld:TEXT(@), from:'null'()}, ".
-    q"tagr:'TEXT'(@), tFls:[";
-
-  $prm = $prm.$paths_list."]";
-    
-  my($evt) = do_event(qw/MCvs updt/, $gAppSig, $prm, $self->{name}, $branch);
-  return _checkForEventError($evt);
-};
-
-
-sub getLastError()
-{
-  return $last_error;
-}
-
-1;
-=pod
-
-=head1 NAME
-
-MacCVS - Interface to MacCVS
-
-=head1 SYNOPSIS
-
-  use MacCVS;
-  $session = MacCVS->new( <session_file_path>) || die "cannot create session";
-  $session->checkout([module] [revision] [date]) || die "Could not check out";
-    
-=head1 DESCRIPTION
-
-This is a MacCVS interface for talking to MacCVS Pro client.
-MacCVSSession is the class used to manipulate the session
-
-=item new
-  MacCVS->new( <cvs session file path>);
-  
-  Creates a new session. Returns undef on failure.
-
-=item checkout( <module> [revision] [date] )
-
-  cvs checkout command. Revision and date are optional
-  returns 0 on failure
-  
-=cut
-
-=head1 SEE ALSO
-
-=over
-
-=item MacCVS Home Page
-
-http://www.maccvs.org/
-
-=back 
-
-=head1 AUTHORS
-
-Aleks Totic atotic@netscape.com
-Simon Fraser sfraser@netscape.com
-
-=cut
-
-__END__

mozilla/build/mac/build_scripts/Moz/Moz.pm

@@ -1,597 +0,0 @@
-=head1 NAME
-
-B<Moz> - routines for automating CodeWarrior builds, and some extra-curricular
-activities related to building Mozilla
-
-=head1 SYNOPSIS
-
-    use Moz;
-
-    OpenErrorLog(":::BuildLog");
-    StopForErrors();
-
-		$Moz::QUIET = 1;
-		InstallFromManifest(":projects:MANIFEST", $dist_dir);
-
-    BuildProjectClean(":projects:SomeProject.mcp", "SomeTarget");
-    MakeAlias(":projects:SomeProject.shlb", $dist_dir);
-
-    DontStopForErrors();
-
-    BuildProject(":projects:SomeOtherProject.mcp", "SomeTarget");
-
-=head1 DESCRIPTION
-
-B<Moz> comprises the routines needed to slap CodeWarrior around, force it
-to build a sequence of projects, report the results, and a few other things.
-This module should only contain functions that are generic to any build,
-not just the Mozilla build.
-
-=cut
-
-
-package			Moz::Moz;
-require			Exporter;
-
-use Cwd;
-
-use File::Copy;
-use File::Path;
-
-use Mac::Types;
-use Mac::Events;
-use Mac::Processes;
-
-use ExtUtils::Manifest 'maniread';
-
-use Moz::CodeWarriorLib;
-
-@ISA				= qw(Exporter);
-
-@EXPORT			= qw( LaunchCodeWarrior
-                  GetCodeWarriorRelativePath
-                  current_directory
-                  full_path_to
-                  BuildProject
-                  BuildProjectClean
-                  ImportXMLProject
-                  OpenErrorLog
-                  MakeAlias
-                  GetFileModDate
-                  StopForErrors
-                  DontStopForErrors
-                  InstallFromManifest
-                  InstallResources
-                  RedirectOutputToFile
-                  Delay
-                  ActivateApplication
-                  IsProcessRunning);
-
-@EXPORT_OK	= qw(CloseErrorLog QUIET);
-
-
-sub current_directory()
-	{
-		my $current_directory = cwd();
-		chop($current_directory) if ( $current_directory =~ m/:$/ );
-		return $current_directory;
-	}
-
-sub full_path_to($)
-	{
-		my ($path) = @_;
-		if ( $path =~ m/^[^:]+$/ )
-			{
-				$path = ":" . $path;
-			}
-
-		if ( $path =~ m/^:/ )
-			{
-				$path = current_directory() . $path;
-			}
-
-		return $path;
-	}
-
-$logging								= 0;
-$recent_errors_file			= "";
-$stop_on_1st_error			= 1;
-$QUIET									= 0;
-
-
-
-=head2 Logging all the errors and warnings - C<OpenErrorLog($log_file)>, C<CloseErrorLog()>
-
-The warnings and errors generated in the course of building projects can be logged to a file.
-Tinderbox uses this facility to show why a remote build failed.
-
-Logging is off by default.
-  Start logging at any point in your build process with C<OpenErrorLog($log_file)>.
-  Stop with C<CloseErrorLog()>.
-  You never need to close the log explicitly, unless you want to just log a couple of projects in the middle of a big list.
-  C<CloseErrorLog()> is not exported by default. 
-
-=cut
-
-sub CloseErrorLog()
-	{
-		if ( $logging )
-			{
-				close(ERROR_LOG);
-				$logging = 0;
-				StopForErrors() if $stop_on_1st_error;
-			}
-	}
-
-
-
-sub OpenErrorLog($)
-	{
-		my ($log_file) = @_;
-
-		CloseErrorLog();
-		if ( $log_file )
-			{
-				$log_file = full_path_to($log_file);
- 
-				open(ERROR_LOG, ">$log_file") || die "Error: Can't open $log_file\n";
-				MacPerl::SetFileInfo("CWIE", "TEXT", $log_file);
-
-				$log_file =~ m/.+:(.+)/;
-				$recent_errors_file = full_path_to("$1.part");
-				$logging = 1;
-			}
-	}
-
-
-=head2 Stopping before it's too late - C<StopForErrors()>, C<DontStopForErrors()>
-
-When building a long list of projects, you decide whether to continue building subsequent projects when one fails.
-  By default, your build script will C<die> after the first project that generates an error while building.
-  Change this behavior with C<DontStopForErrors()>.
-  Re-enable it with C<StopForErrors()>.
-
-=cut
-
-sub StopForErrors()
-	{
-		$stop_on_1st_error = 1;
-		
-			# Can't stop for errors unless we notice them.
-			# Can't notice them unless we are logging.
-			# If the user didn't explicitly request logging, log to a temporary file.
-
-		if ( ! $recent_errors_file )
-			{
-				OpenErrorLog("${TMPDIR}BuildResults");
-			}
-	}
-
-sub DontStopForErrors()
-	{
-		$stop_on_1st_error = 0;		
-	}
-
-sub log_message($)
-	{
-		if ( $logging )
-			{
-				my ($message) = @_;
-				print ERROR_LOG $message;
-			}
-	}
-
-sub log_message_with_time($)
-	{
-		if ( $logging )
-			{
-				my ($message) = @_;
-				my $time_stamp = localtime();
-				log_message("$message ($time_stamp)\n");
-			}
-	}
-
-sub log_recent_errors($)
-	{
-		my ($project_name) = @_;
-		my $found_errors = 0;
-	
-		if ( $logging )
-			{
-				open(RECENT_ERRORS, "<$recent_errors_file");
-
-				while( <RECENT_ERRORS> )
-					{
-						if ( /^Error/ || /^CouldnÕt find project file/ || /^Link Error/ )
-							{
-#								if (!$found_errors)
-#									print $_;
-								$found_errors = 1;
-							}
-						print ERROR_LOG $_;
-					}
-
-				close(RECENT_ERRORS);
-				unlink("$recent_errors_file");
-			}
-		
-		if ( $stop_on_1st_error && $found_errors )
-			{
-				print ERROR_LOG "### Build failed.\n";
-				die "### Errors encountered building \"$project_name\".\n";
-			}
-	}
-
-sub build_project($$$)
-	{
-		my ($project_path, $target_name, $clean_build) = @_;
-		$project_path = full_path_to($project_path);
-
-#		$project_path =~ m/.+:(.+)/;
-#		my $project_name = $1;
-
-		log_message_with_time("### Building \"$project_path\"");
-
-			# Check that the given project exists
-		if (! -e $project_path)
-			{
-				print ERROR_LOG "### Build failed.\n";
-				die "### Can't find project file \"$project_path\".\n";
-			}
-		
-		print "Building \"$project_path\[$target_name\]\"\n";
-		
-		$had_errors = Moz::CodeWarriorLib::build_project(
-			$project_path, $target_name, $recent_errors_file, $clean_build
-		);
-		WaitNextEvent();
-
-#		$had_errors =
-#MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
-#	tell (load script file "$CodeWarriorLib") to BuildProject("$project_path", "$project_name", "$target_name", "$recent_errors_file", $clean_build)
-#END_OF_APPLESCRIPT
-
-			# Append any errors to the globally accumulated log file
-#		if ( $had_errors ) # Removed this test, because we want warnings, too.  -- jrm
-			{
-				log_recent_errors($project_path);
-			}
-	}
-
-=head2 Getting CodeWarrior to build projects - C<BuildProject($project, $opt_target)>, C<BuildProjectClean($project, $opt_target)>
-
-C<BuildProject()> and C<BuildProjectClean()> are identical, except that the latter first removes object code.
-  In both, CodeWarrior opens the project if it wasn't already open; builds the given (or else current) target; and finally closes
- the project, if it wasn't already open.
-
-=cut
-
-sub BuildProject($;$)
-	{
-		my ($project_path, $target_name) = @_;
-		build_project($project_path, $target_name, 0);
-	}
-
-sub BuildProjectClean($;$)
-	{
-		my ($project_path, $target_name) = @_;
-		build_project($project_path, $target_name, 1);
-	}
-
-
-sub ImportXMLProject($$)
-{
-    my ($xml_path, $project_path) = @_;
-    my ($codewarrior_ide_name) = Moz::CodeWarriorLib::getCodeWarriorIDEName();
-#    my $ascript = <<EOS;
-#      tell application "$codewarrior_ide_name"
-#        make new (project document) as ("$project_path") with data ("$xml_path")
-#      end tell
-#EOS
-#    print $ascript."\n";
-#    my($result) = MacPerl::DoAppleScript($ascript);
-#    unless ($result) { die "Error: ImportXMLProject AppleScript failed $^E $result\n";  }
-#    
-
-    my($import_error) = Moz::CodeWarriorLib::import_project($xml_path, $project_path);
-    if ($import_error ne "") {
-      die "Error: ImportXMLProject failed with error $import_error\n";
-    }
-}
-
-
-=head2 Miscellaneous
-
-C<MakeAlias($old_file, $new_file)> functions like C<symlink()>, except with better argument defaulting and more explicit error messages.
-
-=cut
-
-sub MakeAlias($$)
-	{
-		my ($old_file, $new_file) = @_;
-
-			# if the directory to hold $new_file doesn't exist, create it
-		if ( ($new_file =~ m/(.+:)/) && !-d $1 )
-			{
-				mkpath($1);
-			}
-
-			# if a leaf name wasn't specified for $new_file, use the leaf from $old_file
-		if ( ($new_file =~ m/:$/) && ($old_file =~ m/.+:(.+)/) )
-			{
-				$new_file .= $1;
-			}
-
-		my $message = "Can't create a Finder alias (at \"$new_file\")\n for \"$old_file\"; because ";
-
-		die "Error: $message \"$old_file\" doesn't exist.\n" unless -e $old_file;
-		die "Error: $message I won't replace an existing (non-alias) file with an alias.\n" if ( -e $new_file && ! -l $new_file );
-
-			# now: $old_file exists; $new_file doesn't (or else, is an alias already)
-
-		if ( -l $new_file )
-			{
-					# ...then see if it already points to $old_file
-				my $current_target	= full_path_to(readlink($new_file));
-				my $new_target			= full_path_to($old_file);
-
-				return if ( $current_target eq $new_target );
-					# if the desired alias already exists and points to the right thing, then we're done
-				
-				unlink $new_file;
-			}
-		
-		symlink($old_file, $new_file) || die "Error: $message symlink returned an unexpected error.\n";
-	}
-	
-	
-=pod
-
-C<InstallFromManifest()>
-
-=cut
-
-sub InstallFromManifest($;$$)
-	{
-		my ($manifest_file, $dest_dir, $flat) = @_;
-		
-		$flat = 0 unless defined($flat); # if $flat, all rel. paths in MANIFEST get aliased to the root of $dest_dir
-
-		$dest_dir ||= ":";
-
-		$manifest_file =~ m/(.+):/;
-		my $source_dir =  $1;
-
-		chop($dest_dir) if $dest_dir =~ m/:$/;
-
-		#Mac::Events->import();
-		WaitNextEvent();
-		if ($flat)
-		{
-			print "Doing manifest on \"$manifest_file\" FLAT\n" unless $QUIET;
-		}
-		else
-		{
-			print "Doing manifest on \"$manifest_file\"\n" unless $QUIET;
-		}
-		
-		my $read = maniread(full_path_to($manifest_file));
-		foreach $file (keys %$read)
-			{
-				next unless $file;
-
-				$subdir = ":";
-				if (!$flat && ($file =~ /:.+:/ ))
-					{
-						$subdir = $&;
-					}
-
-				$file = ":$file" unless $file =~ m/^:/;
-				MakeAlias("$source_dir$file", "$dest_dir$subdir");
-			}
-	}
-
-
-=pod
-
-C<InstallResources()>
-
-=cut
-
-# parameters are path to MANIFEST file, destination dir, true (to make copies) or false (to make aliases)
-sub InstallResources($;$;$)
-	{
-		my ($manifest_file, $dest_dir, $copy_files) = @_;
-
-		$dest_dir ||= ":";
-		mkpath($dest_dir) if !-d $dest_dir;
-
-		$manifest_file =~ m/(.+):/;
-		my $source_dir =  $1;
-
-		chop($dest_dir) if $dest_dir =~ m/:$/;
-
-		WaitNextEvent();
-		print "Installing resources from \"$manifest_file\"\n" unless $QUIET;
-		
-		my $read = maniread(full_path_to($manifest_file));
-		foreach $file (keys %$read)
-			{
-				next unless $file;
-				
-				if ($copy_files)
-					{
-						copy("$source_dir:$file", "$dest_dir:$file");
-					}
-				else
-					{
-						MakeAlias("$source_dir:$file", "$dest_dir:$file");
-					}
-			}
-	}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Delay
-#//--------------------------------------------------------------------------------------------------
-sub Delay($)		
-{
-  my ($delay_seconds) = @_;
-
-  $now = time;
-  
-  $exit_time = $now + $delay_seconds;
-
-  while ($exit_time > $now) {
-     $now = time;
-  }
-	
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GetFileModDate
-#//--------------------------------------------------------------------------------------------------
-sub GetFileModDate($)
-{
-    my($filePath)=@_;
-    my($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
-        $atime,$mtime,$ctime,$blksize,$blocks) = stat($filePath);
-    return $mtime;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// LaunchCodeWarrior
-#//--------------------------------------------------------------------------------------------------
-sub LaunchCodeWarrior($)
-{
-  my($idepath_file) = @_;   # full path to IDE location file
-  my($cur_dir) = cwd();
-  
-  # this both launches and writes the IDE path file
-  Moz::CodeWarriorLib::activate($idepath_file);
-  
-  chdir($cur_dir);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GetCodeWarriorRelativePath
-#//--------------------------------------------------------------------------------------------------
-sub GetCodeWarriorRelativePath($)
-{
-  my($rel_path) = @_;
-  return Moz::CodeWarriorLib::getCodeWarriorPath($rel_path);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// RedirectOutputToFile
-#//--------------------------------------------------------------------------------------------------
-sub RedirectOutputToFile($)
-{
-    my($log_file) = @_;
-    
-    # ensure that folders in the path exist
-    my($logdir) = "";
-    my($logfile) = $log_file;
-    
-    if ($log_file =~ /(.+?:)([^:]+)$/)       # ? for non-greedy match
-    {
-        $logdir = $1;
-        $logfile = $2;
-        
-        mkpath($logdir);
-    }
-
-    print "Output is now being redirected to the file '$log_file'\n";
-    
-    open(STDOUT, "> $log_file") || die "Can't redirect stdout";
-    open(STDERR, ">&STDOUT") || die "Can't dup stdout";
-    select(STDERR); $| = 1;     # make unbuffered
-    select(STDOUT); $| = 1;     # make unbuffered
-    
-    MacPerl::SetFileInfo("CWIE", "TEXT", $log_file);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ActivateApplication
-#//--------------------------------------------------------------------------------------------------
-
-sub ActivateApplication($)
-{
-	my ($appSignature) = @_;
-	my ($psi, $found);
-	my ($appPSN);
-	
-	$found = 0;
-		
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-
-	if ($found == 0 || SameProcess($appPSN, GetFrontProcess()))
-	{
-		return;
-	}
-
-	SetFrontProcess($appPSN);
-
-	while (GetFrontProcess() != $appPSN)
-	{
-		WaitNextEvent();
-	}
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// IsProcessRunning
-#//--------------------------------------------------------------------------------------------------
-
-sub IsProcessRunning($)
-{
-    my($processName, $psn, $psi) = @_;
-    while ( ($psn, $psi) = each(%Process) ) {
-     if ($psi->processName eq $processName) { return 1; }
-    }
-    return 0;
-}
-
-
-1;
-
-=head1 AUTHORS
-
-Scott Collins <scc@netscape.com>, Simon Fraser <sfraser@netscape.com>, Chris Yeh <cyeh@netscape.com>
-
-=head1 SEE ALSO
-
-BuildMozillaDebug.pl (et al), BuildList.pm, CodeWarriorLib (an AppleScript library)
-
-=head1 COPYRIGHT
-
-The contents of this file are subject to the Netscape Public
-License Version 1.1 (the "License"); you may not use this file
-except in compliance with the License. You may obtain a copy of
-the License at http://www.mozilla.org/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-1999 Netscape Communications Corporation. All
-Rights Reserved.
-
-Contributor(s): 
-
-=cut

mozilla/build/mac/build_scripts/Moz/Prefs.pm

@@ -1,272 +0,0 @@
-
-package Moz::Prefs;
-
-require 5.004;
-require Exporter;
-
-# Package that attempts to read a file from the Preferences folder,
-# and get build settings out of it
-
-use strict;
-
-use Exporter;
-use File::Path;
-
-use Mac::Files;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA		  = qw(Exporter);
-@EXPORT 	= qw(ReadMozUserPrefs);
-
-
-#-------------------------------------------------------------------------------
-#
-# GetPrefsFolder
-#
-#-------------------------------------------------------------------------------
-
-sub GetPrefsFolder()
-{
-  my($prefs_folder) = FindFolder(kOnSystemDisk, kPreferencesFolderType, 1);
-  return $prefs_folder.":Mozilla build prefs";
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# SetArrayValue
-#
-#-------------------------------------------------------------------------------
-sub SetArrayValue($$$)
-{
-  my($array_ref, $index1, $index2) = @_;
-
-  my($index);
-  foreach $index (@$array_ref)
-  {
-    if ($index->[0] eq $index1)
-    {
-      $index->[1] = $index2;
-      return 1;
-    }
-  }
-  
-  return 0;
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# WriteDefaultPrefsFile
-#
-#-------------------------------------------------------------------------------
-
-sub WriteDefaultPrefsFile($)
-{
-  my($file_path) = @_;
-
-  my($file_contents);
-  $file_contents = <<'EOS';
-% You can use this file to customize the Mozilla build system.
-% The following kinds of lines are allowable:
-%   Comment lines, which start with a '%' in the first column
-%   Lines which modify the default build settings. For the list of flags,
-%   see MozBuildFlags.pm. Examples are:
-%
-%    build       pull            0                    % don't pull
-%    options     mng             1                    % turn mng on
-%   
-%   Line containing the special 'buildfrom' flag, which specifies
-%   where to start the build. Example:
-%   
-%    buildfrom   nglayout                % where to start the build
-%
-%   Lines which specify the location of the files used to store paths
-%   to the CodeWarrior IDE, and the MacCVS Pro session file. Note quoting
-%   of paths containing whitespace. Examples:
-%
-%    filepath   idepath         ::codewarrior.txt
-%    filepath   sessionpath     ":Some folder:MacCVS session path.txt"
-%
-%   Lines which modify the build settings like %main::DEBUG.
-%   Any lines which do not match either of the above are assumed
-%   to set variables on $main::. Examples:
-%   
-%    MOZILLA_OFFICIAL    1
-%
-EOS
-
-  $file_contents =~ s/%/#/g;
-   
-  local(*PREFS_FILE);
-
-  open(PREFS_FILE, "> $file_path") || die "Could not write default prefs file\n";
-  print PREFS_FILE ($file_contents);
-  close(PREFS_FILE);
-
-  MacPerl::SetFileInfo("McPL", "TEXT", $file_path);
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# HandlePrefSet
-#
-#-------------------------------------------------------------------------------
-sub HandlePrefSet($$$$)
-{
-  my($flags, $name, $value, $desc) = @_;
-
-  if (SetArrayValue($flags, $name, $value)) {
-    print "Prefs set $desc flag '$name' to '$value'\n";
-  } else {
-    die "$desc setting '$name' is not a valid option\n";
-  }
-
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# HandleBuildFromPref
-#
-#-------------------------------------------------------------------------------
-sub HandleBuildFromPref($$)
-{
-  my($build_array, $name) = @_;
-
-  my($setting) = 0;
-  my($index);
-  foreach $index (@$build_array)
-  {
-    if ($index->[0] eq $name) {
-      $setting = 1;
-    }
-    
-    $index->[1] = $setting;    
-  }
-
-  if ($setting == 1) {
-    print "Building from $name onwards, as specified by prefs\n";
-  } else {
-    printf "Failed to find buildfrom setting '$name'\n";
-  }
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# ReadPrefsFile
-#
-#-------------------------------------------------------------------------------
-
-sub ReadPrefsFile($$$$$)
-{
-  my($file_path, $build_flags, $options_flags, $filepath_flags, $create_if_missing) = @_;
-  
-  local(*PREFS_FILE);
-  
-  if (open(PREFS_FILE, "< $file_path"))
-  {
-    print "Reading build prefs from '$file_path'\n";
-  
-    while (<PREFS_FILE>)
-    {
-      my($line) = $_;
-      chomp($line);
-      
-      if ($line =~ /^\#/ || $line =~ /^\s*$/) {    # ignore comments and empty lines
-        next;
-      }
-            
-      if (($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+\"(.+)\"(\s+#.+)?/) ||
-          ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+\'(.+)\'(\s+#.+)?/) ||
-          ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+([^#\s]+)(\s+#.+)?/))
-      {
-        my($array_name) = $1;      
-        my($option_name) = $2;
-        my($option_value) = $3;      
-      
-        # print "Read '$array_name' '$option_name' '$option_value'\n";
-        
-        if ($array_name eq "build")
-        {
-          HandlePrefSet($build_flags, $option_name, $option_value, "Build");
-        }
-        elsif ($array_name eq "options")
-        {
-          HandlePrefSet($options_flags, $option_name, $option_value, "Options");
-        }
-        elsif ($array_name eq "filepath" && $option_name && $option_value)
-        {
-          HandlePrefSet($filepath_flags, $option_name, $option_value, "Filepath");
-        }
-        else
-        {
-          print "Unknown pref option at $line\n";
-        }
-      }
-      elsif ($line =~ /^\s*buildfrom\s+([^#\s]+)(\s+#.+)?/)
-      {
-        my($build_start) = $1;
-        HandleBuildFromPref($build_flags, $build_start);
-      }
-      elsif ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)(\s+#.+)?/)
-      {
-        my($build_var) = $1;
-        my($var_setting) = $2;
-        
-        print "Setting \$main::$build_var to $var_setting\n";
-        eval "\$main::$build_var = \"$var_setting\"";
-      }
-      else
-      {
-        print "Unrecognized input line at $line\n";
-      }
-      
-    }
-    
-    close(PREFS_FILE);  
-  }
-  elsif ($create_if_missing)
-  {
-    print "No prefs file found at $file_path; using defaults\n";
-    
-    my($folder_path) = $file_path;
-    $folder_path =~ s/[^:]+$//;
-    mkpath($folder_path);
-    WriteDefaultPrefsFile($file_path);
-  }
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# ReadMozUserPrefs
-#
-#-------------------------------------------------------------------------------
-
-sub ReadMozUserPrefs($$$$)
-{
-  my($prefs_file_name, $build_flags, $options_flags, $filepath_flags) = @_;
-  
-  if ($prefs_file_name eq "") { return; }
-  
-  # if local prefs exist, just use those. Othewise, look in the prefs folder
-  if (-e $prefs_file_name)
-  {
-    # read local prefs
-    ReadPrefsFile($prefs_file_name, $build_flags, $options_flags, $filepath_flags, 0);
-  }
-  else
-  {
-    # first read prefs folder prefs
-    my($prefs_path) = GetPrefsFolder();
-    $prefs_path .= ":$prefs_file_name";
-
-    ReadPrefsFile($prefs_path, $build_flags, $options_flags, $filepath_flags, 1);
-  }
-}
-
-1;

mozilla/build/mac/build_scripts/MozillaBuildFlags.txt

@@ -1,70 +0,0 @@
-#-------------------------------------------------------------------------------
-# These 3 lists are the 'master lists' to control what gets built.
-# 
-# Ordering in these arrays is important; it has to reflect the order in
-# which the build occurs.
-#
-# Setting containing spaces must be quoted with double quotes.
-#-------------------------------------------------------------------------------
-
-build_flags
-all             1
-pull            0
-dist            0
-xpidl           0
-idl             0
-stubs           0
-runtime         0
-common          0
-imglib          0
-libimg2         0
-necko           0
-security        0
-browserutils    0
-intl            0
-nglayout        0
-accessiblity    0
-editor          0
-embedding       0
-viewer          0
-xpapp           0
-extensions      0
-plugins         0
-mailnews        0
-apprunner       0
-resources       0
-
-options_flags
-chrome_jars     1
-chrome_files    0
-use_jars        1
-transformiix    0
-mathml          0
-svg             0
-mng             1
-ldap            1
-ldap_experimental 0
-xmlextras       1
-soap            0
-vixen           0
-inspector       0
-mailextras      1
-xptlink         0
-psm             0
-psm2            0
-embedding_test  1
-carbon          0
-cache           1
-useimg2         1
-lowmem          0
-accessible      1
-bidi            0
-p3p             0
-jsdebugger      0
-moz_logging     1
-
-filepath_flags
-idepath             ":CodeWarrior IDE Path.txt"
-sessionpath         ":Mozilla session path.txt"
-buildlogfilepath    ":Build Logs:Mozilla build log.txt"   # this is a path
-scriptlogfilepath   ":Build Logs:Mozilla script log.txt"

mozilla/build/mac/build_scripts/MozillaCheckoutList.txt

@@ -1,19 +0,0 @@
-# List of modules to check out. Format is
-#   module, (tag), (date)
-# where tag and date are optional (non-trailing commas are required)
-#
-# Examples:
-#   mozilla/nsprpub, NSPRPUB_CLIENT_BRANCH
-#   mozilla/gc, , 10/25/2000 12:00:00
-#
-
-mozilla/nsprpub,        NSPRPUB_CLIENT_BRANCH
-mozilla/security/nss,   NSS_CLIENT_TAG
-mozilla/security/psm,   
-mozilla/security/manager,
-mozilla/accessible,
-DirectorySDKSourceC,    LDAPCSDK_40_BRANCH
-mozilla/lib/mac/Instrumentation
-mozilla/gfx2
-mozilla/modules/libpr0n
-SeaMonkeyAll

mozilla/build/mac/build_scripts/PullMozilla.pl

@@ -1,78 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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.org code.
-#
-# 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): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla pull prefs";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "",
-  "buildmodule",    "MozillaBuildList.pm"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:");
-
-my($do_checkout)    = 1;
-my($do_build)       = 0;
-
-RunBuild($do_checkout, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/test/test5.cpp

@@ -1,4 +0,0 @@
-// test2.cpp
-
-as
-dfasdf

mozilla/build/startup-test.html

@@ -1,42 +0,0 @@
-<!-- Pick off begin time as a cgi argument and print it out -->
-
-<html>
-<head>
-<title>Mozilla Startup Timing Test</title>
-</head>
-
-<body>
-<script>
-
-// Pick off the time from the file URL.
-// file:///foo/startup.html?begin=986869269000
-function tokenizeQuery() {
-  var query = {};
-  var pairs = document.location.search.substring(1).split('&');
-  for (var i=0; i < pairs.length; i++) {
-    var pair = pairs[i].split('=');
-    query[pair[0]] = unescape(pair[1]);
-  }
-  return query;
-}
-
-// Dump startup time out to console.
-function phoneHome() {
-    var testFoo;
-    var now = (new Date()).getTime();  
-    var q = tokenizeQuery();
-    var begin    = q['begin'] || 0;       // when did perl launch this
-    var startupTime = now - begin;
-	document.write('\n\nStartup time = ' + startupTime + ' ms<br>');
-    if (window.dump) {
-	  dump('\n\n__startuptime,' + startupTime + '\n\n');
-	}
-}
-
-// As soon as page loads, print out time.
-window.onload = phoneHome();
-
-</script>
-</body>
-
-</html>

mozilla/build/unix/modules.mk

@@ -18,7 +18,8 @@
 #
 
 BUILD_MODULE_DIRS := config build include
-BUILD_MODULE_CVS = config build include
+_BUILD_MODS = 
+NSPRPUB_DIR =
 
 # client.mk does not have topsrcdir set
 ifndef topsrcdir
@@ -27,131 +28,42 @@ endif
 
 ifndef MOZ_NATIVE_NSPR
 # Do not regenerate Makefile for NSPR
+ifdef USE_NSPR_AUTOCONF
 NSPRPUB_DIR		= nsprpub
+else
+NSPRPUB_DIR		= $(topsrcdir)/nsprpub
+endif
 endif
-
-# BM_DIRS_mod: list of directories to traverse from toplevel Makefile 
-# BM_DEP_DIRS_mod: list of directories to run "export" over
-# BM_CVS_mod: list of directories to check out of cvs recursively
-# BM_CVS_NS_mod: list of directories to check out of cvs non-recursively
 
 ifneq ($(BUILD_MODULES),all)
 
-#
-# dbm
-#
-BM_DIRS_dbm	= $(NSPRPUB_DIR) dbm
-BM_CVS_dbm	= $(BM_DIRS_dbm)
+ifdef CROSS_COMPILE
+BUILD_MODULE_DIRS_js		= $(NSPRPUB_DIR)
+endif
 
-#
-# js
-#
-BM_DIRS_js	= $(NSPRPUB_DIR) js
-BM_CVS_js	= $(NSPRPUB_DIR)
-BM_CVS_NS_js 	= js js/src js/src/fdlibm
+BUILD_MODULE_DIRS_dbm 		= $(NSPRPUB_DIR) dbm
+BUILD_MODULE_DIRS_js		+= js
+BUILD_MODULE_DIRS_necko		= $(BUILD_MODULE_DIRS_xpcom) netwerk
+BUILD_MODULE_DIRS_transformiix	= extensions/transformiix
+BUILD_MODULE_DIRS_xpcom		= $(NSPRPUB_DIR) modules/libreg xpcom
+BUILD_MODULE_DIRS_xpconnect	= $(BUILD_MODULE_DIRS_xpcom) $(BUILD_MODULE_DIRS_js) js/src/xpconnect
 
-#
-# string
-#
-BM_DIRS_string	      = $(NSPRPUB_DIR) string
-BM_DEP_DIRS_string    = intl/unicharutil/public
-BM_CVS_string	      = $(NSPRPUB_DIR) string
 
-#
-# xpcom
-#
-BM_DIRS_xpcom		= $(NSPRPUB_DIR) modules/libreg string xpcom
-BM_DEP_DIRS_xpcom	= intl/unicharutil/public intl/uconv/public modules/libjar
-BM_CVS_NS_xpcom		= xpcom xpcom/typelib xpcom/typelib/xpidl intl/unicharutil/public intl/uconv/public
-BM_CVS_xpcom		= $(NSPRPUB_DIR) modules/libreg xpcom/typelib/xpt xpcom/base xpcom/ds xpcom/io xpcom/components xpcom/threads xpcom/reflect xpcom/proxy xpcom/build xpcom/tools xpcom/sample modules/libjar string
-
-#
-# xpconnect
-#
-BM_DIRS_xpconnect	= $(BM_DIRS_xpcom) $(BM_DIRS_js) js/src/xpconnect
-BM_DEP_DIRS_xpconnect   = $(BM_DEP_DIRS_xpcom)
-BM_CVS_xpconnect	= $(BM_CVS_xpcom) $(BM_CVS_js) js/src/xpconnect
-BM_CVS_NS_xpconnect	= $(BM_CVS_NS_xpcom) $(BM_CVS_NS_js) js/src/xpconnect
-
-#
-# necko
-#
-BM_DIRS_necko		= $(BM_DIRS_xpcom) $(BM_DIRS_dbm) netwerk
-BM_DEP_DIRS_necko	= $(BM_DEP_DIRS_xpcom) $(BM_DEP_DIRS_dbm) uriloader/exthandler intl/locale/idl intl/strres/public js/src modules/libpref/public
-BM_CVS_necko		= $(BM_CVS_xpcom) $(BM_CVS_dbm) netwerk uriloader/exthandler
-BM_CVS_NS_necko		= $(BM_CVS_NS_xpcom) intl/locale/idl intl/strres/public modules/libpref/public $(BM_CVS_NS_js)
-
-#
-# tranformiix
-#
-BM_DIRS_transformiix	= extensions/transformiix
-BM_CVS_transformiix     = extensions/transformiix
-
-#
-# psm2
-#
-BM_DIRS_psm2	= $(BM_DIRS_dbm) $(BM_DIRS_js) $(BM_DIRS_xpcom) security/manager
-BM_DEP_DIRS_psm2= \
-	$(BM_DEP_DIRS_xpcom) \
-	netwerk/base/public netwerk/protocol/http/public netwerk/build \
-	netwerk/socket/base \
-	uriloader/base \
-	intl/locale/idl intl/strres/public \
-	dom/public rdf/base/idl xpfe/appshell/public \
-	caps/idl \
-	layout/html/forms/public \
-	gfx/public gfx/idl widget/public layout/base/public docshell/base \
-	modules/libpref/public \
-	content/base/public \
-	intl/locale/public
-BM_CVS_psm2	= $(BM_CVS_dbm) $(BM_CVS_js) $(BM_CVS_xpcom) security/manager \
-	dom/public
-BM_CVS_NS_psm2	= \
-	$(BM_CVS_NS_dbm) \
-	$(BM_CVS_NS_js) \
-	$(BM_CVS_NS_xpcom) \
-	netwerk/base/public netwerk/protocol/http/public netwerk/build \
-	netwerk/socket/base \
-	uriloader/base \
-	intl/locale/idl intl/strres/public \
-	rdf/base/idl xpfe/appshell/public \
-	caps/idl \
-	layout/html/forms/public \
-	gfx/public gfx/idl widget/public layout/base/public docshell/base \
-	modules/libpref/public \
-	content/base/public \
-	intl/locale/public
-
-#
-# psm is obsolete.  Make it pull psm2 instead
-#
-BM_DIRS_psm	= $(BM_DIRS_psm2)
-BM_DEP_DIRS_psm = $(BM_DEP_DIRS_psm2)
-BM_CVS_psm	= $(BM_CVS_psm2)
-BM_CVS_NS_psm	= $(BM_CVS_NS_psm2)
-
-#
-# Tally
-#
-
-BUILD_MODULE_DIRS     += $(foreach mod,$(BUILD_MODULES), $(BM_DIRS_$(mod)))
-BUILD_MODULE_DEP_DIRS = $(foreach mod,$(BUILD_MODULES), $(BM_DEP_DIRS_$(mod)))
-BUILD_MODULE_CVS      += $(foreach mod,$(BUILD_MODULES), $(BM_CVS_$(mod)))
-BUILD_MODULE_CVS_NS   = $(foreach mod,$(BUILD_MODULES), $(BM_CVS_NS_$(mod)))
+BUILD_MODULE_DIRS += $(foreach mod,$(BUILD_MODULES), $(BUILD_MODULE_DIRS_$(mod)))
 
 # Remove dups from the list to speed up the build
 #
 ifdef PERL
-
-BUILD_MODULE_DIRS := $(shell $(PERL) $(topsrcdir)/build/unix/uniq.pl $(BUILD_MODULE_DIRS))
-BUILD_MODULE_DEP_DIRS := $(shell $(PERL) $(topsrcdir)/build/unix/uniq.pl $(BUILD_MODULE_DEP_DIRS))
-
+BUILD_MODULE_DIRS := $(shell $(PERL) -e 'undef @out; \
+    foreach $$d (@ARGV) { \
+	push @out, $$d if (!grep(/$$d/, @out)); \
+    }; \
+    print "@out\n"; ' $(BUILD_MODULE_DIRS))
 else
 # Since PERL isn't defined, client.mk must've called us so order doesn't matter
 BUILD_MODULE_DIRS := $(sort $(BUILD_MODULE_DIRS))
-BUILD_MODULE_DEP_DIRS := $(sort $(BUILD_MODULE_DEP_DIRS))
-BUILD_MODULE_CVS := $(sort $(BUILD_MODULE_CVS))
-BUILD_MODULE_CVS_NS := $(sort $(BUILD_MODULE_CVS_NS))
 endif
 
 endif # BUILD_MODULES
+
+

mozilla/build/unix/nspr_my_overrides.mk.in

@@ -1,12 +1,7 @@
 DIST=@MOZ_NSPRENV_DIST@
 MOZ_NSPRENV_OVERRIDE_MAKE=@MOZ_NSPRENV_OVERRIDE_MAKE@
-MOZ_NSPRENV_OVERRIDE_DSO_LDOPTS=@MOZ_NSPRENV_OVERRIDE_DSO_LDOPTS@
 
 ifdef MOZ_NSPRENV_OVERRIDE_MAKE
 MAKE=$(MOZ_NSPRENV_OVERRIDE_MAKE)
 endif
 
-ifdef MOZ_NSPRENV_OVERRIDE_DSO_LDOPTS
-DSO_LDOPTS=$(MOZ_NSPRENV_OVERRIDE_DSO_LDOPTS)
-endif
-

mozilla/build/unix/run-mozilla.sh

@@ -63,8 +63,6 @@ MOZ_DIST_BIN=`dirname $0`
 MOZ_APPRUNNER_NAME="./mozilla-bin"
 MOZ_VIEWER_NAME="./viewer"
 MOZ_PROGRAM=""
-
-exitcode=0
 #
 ##
 ## Functions
@@ -189,7 +187,6 @@ moz_run_program()
 	## Run the program
 	##
 	$prog ${1+"$@"}
-	exitcode=$?
 	if [ "$DEBUG_CORE_FILES" ]
 	then
 		if [ -f core ]
@@ -252,15 +249,12 @@ moz_debug_program()
         case `basename $debugger` in
             gdb) echo "$debugger $prog -x /tmp/mozargs$$"
                 $debugger $prog -x /tmp/mozargs$$
-		exitcode=$?
                 ;;
             ddd) echo "$debugger --debugger \"gdb -x /tmp/mozargs$$\" $prog"
                 $debugger --debugger "gdb -x /tmp/mozargs$$" $prog
-		exitcode=$?
                 ;;
             *) echo "$debugger $prog ${1+"$@"}"
                 $debugger $prog ${1+"$@"}
-		exitcode=$?
                 ;;
         esac
         /bin/rm /tmp/mozargs$$
@@ -343,15 +337,7 @@ MOZILLA_FIVE_HOME=$MOZ_DIST_BIN
 #
 ##
 ## Set LD_LIBRARY_PATH
-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-if [ -n "$LD_LIBRARYN32_PATH" ]
-then
-	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
-fi
-if [ -n "$LD_LIBRARYN64_PATH" ]
-then
-	LD_LIBRARYN64_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins${LD_LIBRARYN64_PATH+":$LD_LIBRARYN64_PATH"}
-fi
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
 #
 ## Set SHLIB_PATH for HPUX
 SHLIB_PATH=${MOZ_DIST_BIN}${SHLIB_PATH+":$SHLIB_PATH"}
@@ -367,14 +353,6 @@ ADDON_PATH=${MOZ_DIST_BIN}${ADDON_PATH+":$ADDON_PATH"}
 
 echo "MOZILLA_FIVE_HOME=$MOZILLA_FIVE_HOME"
 echo "  LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
-if [ -n "$LD_LIBRARYN32_PATH" ]
-then
-	echo "LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH"
-fi
-if [ -n "$LD_LIBRARYN64_PATH" ]
-then
-	echo "LD_LIBRARYN64_PATH=$LD_LIBRARYN64_PATH"
-fi
 echo "     LIBRARY_PATH=$LIBRARY_PATH"
 echo "       SHLIB_PATH=$SHLIB_PATH"
 echo "          LIBPATH=$LIBPATH"
@@ -393,5 +371,3 @@ then
 else
 	moz_run_program ${1+"$@"}
 fi
-
-exit $exitcode

mozilla/build/unix/uniq.pl

@@ -1,27 +0,0 @@
-#!/usr/bin/env perl
-
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/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 this file as it was released upon December 26, 2000.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 2000 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#         Christopher Seawood <cls@seawood.org>
-
-undef @out;
-foreach $d (@ARGV) { 
-    push @out, $d if (!grep(/$d/, @out));
-}
-print "@out\n"

mozilla/caps/idl/nsICodebasePrincipal.idl

@@ -34,7 +34,5 @@ interface nsICodebasePrincipal : nsISupports {
 	readonly attribute nsIURI URI;
 
 	readonly attribute string origin;
-
-	readonly attribute string spec;
 };