Continuing to land the PACKAGING_20030906_BRANCH for bug 20640. Not part of the build, yet.

accessible/build/Makefile.in

@@ -36,6 +36,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsAccessibilityModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = accessibility.pkg
+
 REQUIRES	= xpcom \
 		  $(NULL)
 

build/Makefile.in

@@ -27,6 +27,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE = build
+PACKAGE_FILE = build.pkg
+
 ifeq (,$(filter WINNT OS2,$(OS_ARCH)))
 DIRS		= unix
 endif

build/package/Makefile.in

@@ -0,0 +1,109 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla packaging code.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <bsmedberg@covad.net>_.
+# Portions created by the Initial Developer are Copyright (C) 2003
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+# This makefile doesn't do anything by default. Use one of the special targets
+# below to stage and build packages.
+
+include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_DEBUG
+APP_NAME = MozillaDebug
+else
+APP_NAME = Mozilla
+endif
+
+# override these variables in special situations
+STAGE_DIR        = $(DEPTH)/stage$(if $*,/$*)
+STAGE_MACAPP_DIR = $(DEPTH)/stage$(if $*,/$*)/$(APP_NAME).app
+XPI_FILE         = $(DIST)/xpi/$*.xpi
+ZIP_FILE         = $(DIST)/$*.zip
+TGZ_FILE         = $(DIST)/$*.tar.gz
+BZ2_FILE         = $(DIST)/$*.tar.bz2
+DMG_FILE         = $(DIST)/$*.dmg
+
+PACKAGE_LIST = $(srcdir)/packages.list
+PACKAGE_FLAGS = 
+HANDLERS = xptmerge touch optional preprocess exec
+MAPPINGS = dist/bin=bin xpiroot/=
+
+MACAPP_MAPPINGS = dist/bin=Contents/MacOS approot=Contents
+
+dump-packages:
+	@$(PERL) $(srcdir)/dump-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -u $(PACKAGE_FLAGS)
+
+# This rule will stage any one package. If you need to stage multiple packages or
+# do ^packages (subtraction packages) use the stage-packages rule and set PACKAGES
+# on the command line
+stage-%:
+	$(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MAPPINGS)) $(addprefix -c ,$(HANDLERS)) -d $(PACKAGE_FLAGS) $*
+
+stagemacapp-%:
+	$(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_MACAPP_DIR) $(addprefix -m ,$(MACAPP_MAPPINGS)) $(addprefix -c ,$(HANDLERS)) -d $(PACKAGE_FLAGS) $*
+
+makexpi-%:
+	$(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MAPPINGS)) $(addprefix -c ,$(HANDLERS)) --make-package xpi=$(XPI_FILE) -d $(PACKAGE_FLAGS) $*
+
+makezip-%:
+	$(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MAPPINGS)) $(addprefix -c ,$(HANDLERS)) --make-package zip=$(ZIP_FILE) -d $(PACKAGE_FLAGS) $*
+
+maketgz-%:
+	$(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MAPPINGS)) $(addprefix -c ,$(HANDLERS)) --make-package tgz=$(TGZ_FILE) -d $(PACKAGE_FLAGS) $*
+
+makebz2-%:
+	$(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MAPPINGS)) $(addprefix -c ,$(HANDLERS)) --make-package bz2=$(BZ2_FILE) -d $(PACKAGE_FLAGS) $*
+
+makedmg-%:
+	$(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MACAPP_MAPPINGS)) $(addprefix -c ,$(HANDLERS)) --make-package dmg=$(DMG_FILE) -d $(PACKAGE_FLAGS) $*
+
+ifndef PACKAGES
+stage-packages makexpi-packages:
+	@echo "Please set PACKAGES on the makefile command line or environment."
+
+else #PACKAGES
+stage-packages:
+	$(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MAPPINGS)) $(apprefix -c ,$(HANDLERS)) $(PACKAGE_FLAGS) $(PACKAGES)
+
+makexpi-packages:
+	$(PERL) $(srcdir)/stage-packages.pl -o $(DEPTH) -l $(PACKAGE_LIST) -s $(STAGE_DIR) $(addprefix -m ,$(MAPPINGS)) $(apprefix -c ,$(HANDLERS)) --make-package xpi=$(XPI_FILE) -d $(PACKAGE_FLAGS) $(PACKAGES)
+
+endif

build/unix/Makefile.in

@@ -27,6 +27,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE       = build
+PACKAGE_FILE = unix.pkg
+
 include $(topsrcdir)/config/rules.mk
 
 # Hack to make sure that mozilla-config has the proper nspr dependencies

caps/src/Makefile.in

@@ -33,6 +33,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsSecurityManagerModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = caps.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  pref \

chrome/src/Makefile.in

@@ -32,6 +32,9 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT    = 1
 MODULE_NAME     = nsChromeModule
 GRE_MODULE      = 1
+
+PACKAGE_FILE = chrome.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  rdf \

db/mork/build/Makefile.in

@@ -31,6 +31,9 @@ LIBRARY_NAME	= mork
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMorkModule
+
+PACKAGE_FILE = mork.pkg
+
 REQUIRES	= xpcom \
 		  $(NULL)
 

dbm/tests/Makefile.in

@@ -27,6 +27,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dbm
+
+PACKAGE_FILE = dbmtest.pkg
+
 PROGRAM		= lots$(BIN_SUFFIX)
 
 CSRCS		= lots.c

directory/xpcom/base/src/Makefile.in

@@ -44,6 +44,9 @@ SHORT_LIBNAME	= mozldap
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLDAPProtocolModule
+
+PACKAGE_FILE = mozldap.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \

docshell/build/Makefile.in

@@ -33,6 +33,8 @@ LIBRARY_NAME	= docshell
 EXPORT_LIBRARY = 1
 GRE_MODULE	= 1
 
+PACKAGE_FILE = docshell.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \

dom/src/build/Makefile.in

@@ -1,84 +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		= dom
-LIBRARY_NAME	= jsdom
-EXPORT_LIBRARY = 1
-REQUIRES	= xpcom \
-		  string \
-		  js \
-		  xpconnect \
-		  widget \
-		  gfx \
-		  layout \
-		  content \
-		  caps \
-		  webbrwsr \
-		  commandhandler \
-		  xuldoc \
-		  docshell \
-		  plugin \
-		  necko \
-		  jsurl \
-		  uconv \
-		  $(NULL)
-
-IS_COMPONENT=1
-MODULE_NAME	= DOM_components
-
-ifeq ($(OS_ARCH),WINNT)
-EXTRA_DSO_LIBS	= gkgfx
-endif
-
-ifdef NS_TRACE_MALLOC
-EXTRA_DSO_LIBS	+= tracemalloc
-endif
-
-CPPSRCS		= \
-		nsDOMFactory.cpp \
-		nsScriptNameSpaceManager.cpp \
-		$(NULL)
-
-SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)jsdomevents_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)jsurl_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= -I$(srcdir)/../base
-

editor/composer/src/Makefile.in

@@ -31,6 +31,9 @@ LIBRARY_NAME	= composer
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsComposerModule
+
+PACKAGE_FILE = composer.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \

editor/libeditor/build/Makefile.in

@@ -35,6 +35,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsEditorModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = editor.pkg
+
 EXTRA_DSO_LIBS	= gkgfx
 
 EXTRA_DSO_LDOPTS = \

editor/txmgr/src/Makefile.in

@@ -31,6 +31,9 @@ LIBRARY_NAME	= txmgr
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsTransactionManagerModule
+
+PACKAGE_FILE = txmgr.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  $(NULL)

embedding/Makefile.in

@@ -25,6 +25,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE       = embed
+PACKAGE_FILE = embed.pkg
+
 DIRS = base components browser lite
 
 include $(topsrcdir)/config/rules.mk

embedding/browser/activex/src/Makefile.in

@@ -24,6 +24,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE = activex
+PACKAGE_FILE = activex.pkg
+
 DIRS = $(NULL)
 
 # Common

embedding/browser/activex/src/plugin/Makefile.in

@@ -1,5 +1,3 @@
-#!nmake
-#
 # 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
@@ -111,7 +109,6 @@ MOZ_ACTIVEX_PLUGIN_XPCONNECT = 1
 # Settings will also be read from this supplemental file if it exists
 -include $(srcdir)/plugin.mk
 
-
 ###############################################################################
 
 ifdef MOZ_ACTIVEX_PLUGIN_XPCONNECT
@@ -245,6 +242,13 @@ install-prefs: activex.js
 	$(INSTALL) $< $(DIST)/bin/defaults/pref
 
 ifdef MOZ_USE_ACTIVEX_PLUGIN
+PACKAGE_FILE = axplugin.pkg
+PACKAGE_VARS += \
+	MOZ_ACTIVEX_PLUGIN_LIVECONNECT \
+	MOZ_ACTIVEX_PLUGIN_XPCONNECT \
+	XPC_IDISPATCH_SUPPORT \
+	$(NULL)
+
 libs:: install-plugin install-prefs
 
 ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT

embedding/browser/build/Makefile.in

@@ -34,6 +34,8 @@ LIBRARY_NAME	= webbrwsr
 EXPORT_LIBRARY = 1
 GRE_MODULE	= 1
 
+PACKAGE_FILE = webbrowser.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  docshell \

embedding/browser/gtk/Makefile.in

@@ -28,4 +28,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= gtkembedmoz
 DIRS=src tests
 
+PACKAGE_FILE = gtkembed.pkg
+
 include $(topsrcdir)/config/rules.mk

embedding/components/build/Makefile.in

@@ -37,6 +37,9 @@ ifdef MOZ_PERF_METRICS
 EXTRA_DSO_LIBS	= mozutil_s
 endif
 
+PACKAGE_FILE = embedcomponents.pkg
+PACKAGE_VARS += MOZ_PROFILESHARING
+
 REQUIRES	= js \
 		  xpcom \
 		  string \

embedding/components/printingui/src/mac/printpde/Makefile.in

@@ -47,6 +47,9 @@ else
 BUILDSTYLE	= Deployment
 endif
 
+MODULE       = printpde
+PACKAGE_FILE = printpde.pkg
+
 include $(topsrcdir)/config/rules.mk
 
 ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)

embedding/lite/Makefile.in

@@ -29,6 +29,8 @@ IS_COMPONENT	  = 1
 
 include $(DEPTH)/config/autoconf.mk
 
+PACKAGE_FILE = embedlite.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  content \

embedding/tests/mfcembed/Makefile.in

@@ -38,6 +38,7 @@ PROGRAM		= mfcembed$(BIN_SUFFIX)
 RESFILE		= MfcEmbed.res
 
 MODULE = mfcEmbed
+PACKAGE_FILE = mfcembed.pkg
 
 # comment this out if for some reason you want to link against xpcom
 # directly instead of using the standalone glue

embedding/tests/winEmbed/Makefile.in

@@ -38,6 +38,9 @@ PROGRAM		= winEmbed$(BIN_SUFFIX)
 RESFILE		= winEmbed.res
 
 MODULE		= winEmbed
+
+PACKAGE_FILE = winembed.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  embed_base \

extensions/content-packs/Makefile.in

@@ -26,6 +26,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE       = content-packs
+PACKAGE_FILE = content-packs.pkg
+
 DIRS		= resources
 
 include $(topsrcdir)/config/rules.mk

extensions/cookie/Makefile.in

@@ -33,6 +33,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsCookieModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = cookie.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \

extensions/help/Makefile.in

@@ -26,6 +26,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE       = help
+PACKAGE_FILE = help.pkg
+
 DIRS = resources
 
 include $(topsrcdir)/config/rules.mk

extensions/inspector/build/src/Makefile.in

@@ -34,6 +34,9 @@ FORCE_SHARED_LIB = 1
 ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME = inspectr
 endif
+
+PACKAGE_FILE = inspector.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  gfx \

extensions/irc/Makefile.in

@@ -34,7 +34,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE       = chatzilla
+PACKAGE_FILE = chatzilla.pkg
+
 EXTRA_COMPONENTS = js/lib/chatzilla-service.js
 
 include $(topsrcdir)/config/rules.mk
-

extensions/p3p/src/Makefile.in

@@ -47,6 +47,8 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME	   = nsP3PModule
 
+PACKAGE_FILE = p3p.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \

extensions/pref/autoconfig/src/Makefile.in

@@ -48,6 +48,9 @@ endif
 EXPORT_LIBRARY   = 1
 IS_COMPONENT     = 1
 MODULE_NAME      = nsAutoConfigModule
+
+PACKAGE_FILE     = autoconfig.pkg
+
 REQUIRES         = xpcom string intl js xpconnect necko profile pref appshell embedcomponents windowwatcher
 
 include $(topsrcdir)/config/config.mk

extensions/spellcheck/src/Makefile.in

@@ -49,6 +49,9 @@ SHORT_LIBNAME = spellchk
 #EXPORT_LIBRARY  = 1
 FORCE_SHARED_LIB = 1
 IS_COMPONENT	= 1
+
+PACKAGE_FILE = spellcheck.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  editor \

extensions/transformiix/build/Makefile.in

@@ -32,6 +32,9 @@ EXPORT_LIBRARY = 1
 ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME	= t8iix
 endif
+
+PACKAGE_FILE = transformiix.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \

extensions/tridentprofile/src/Makefile.in

@@ -50,6 +50,8 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME    = nsTridentProfile
 
+PACKAGE_FILE = tridentprofile.pkg
+
 REQUIRES = xpcom  \
 	necko \
 	string \

extensions/typeaheadfind/src/Makefile.in

@@ -38,6 +38,8 @@ SHORT_LIBNAME = typahead
 endif
 GRE_MODULE	= 1
 
+PACKAGE_FILE = typeaheadfind.pkg
+
 REQUIRES	= appcomps \
 		  embedcomponents \
 		  content \

extensions/universalchardet/src/Makefile.in

@@ -40,6 +40,8 @@ REQUIRES	= xpcom \
 		  chardet \
 		  $(NULL)
 
+PACKAGE_FILE = universalchardet.pkg
+
 CPPSRCS = \
 		CharDistribution.cpp \
 		JpCntx.cpp \

extensions/venkman/Makefile.in

@@ -38,6 +38,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE       = venkman
+PACKAGE_FILE = venkman.pkg
+
 DIRS        = resources
 
 EXTRA_COMPONENTS = js/venkman-service.js

extensions/wallet/build/Makefile.in

@@ -32,6 +32,9 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= wlltvwrs
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWalletViewerModule
+
+PACKAGE_FILE = walletviewer.pkg
+
 REQUIRES	= xpcom \
 		  $(NULL)
 

extensions/wallet/src/Makefile.in

@@ -33,6 +33,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsWalletModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = wallet.pkg
+
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
 		  string \

extensions/webservices/build/src/Makefile.in

@@ -32,6 +32,8 @@ EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
 MODULE_NAME     = nsWebServicesModule
 
+PACKAGE_FILE    = webservices.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \

extensions/xml-rpc/src/Makefile.in

@@ -23,6 +23,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE       = xml-rpc
+PACKAGE_FILE = xml-rpc.pkg
+
 EXTRA_COMPONENTS = \
                 $(srcdir)/nsDictionary.js \
                 $(srcdir)/nsXmlRpcClient.js \

extensions/xmlextras/build/src/Makefile.in

@@ -36,6 +36,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsXMLExtrasModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = xmlextras.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \

gfx/src/Makefile.in

@@ -30,6 +30,9 @@ MODULE      = gfx
 LIBRARY_NAME    = gkgfx
 EXPORT_LIBRARY = 1
 GRE_MODULE	= 1
+
+PACKAGE_FILE = gfx.pkg
+
 REQUIRES	= xpcom \
 		  windowwatcher \
 		  dom \
@@ -147,4 +150,3 @@ FORCE_USE_PIC = 1
 include $(topsrcdir)/config/rules.mk
 
 DEFINES     += -D_IMPL_NS_GFX
-

gfx/src/beos/Makefile.in

@@ -33,6 +33,8 @@ IS_COMPONENT   = 1
 MODULE_NAME	= nsGfxBeOSModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = gfxbeos.pkg
+
 CPPSRCS		= \
 		nsDeviceContextBeOS.cpp \
 		nsDeviceContextSpecFactoryB.cpp \

gfx/src/mac/Makefile.in

@@ -30,6 +30,8 @@ IS_COMPONENT    = 1
 MODULE_NAME     = nsGfxMacModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE  = gfxmac.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  widget \
@@ -87,7 +89,6 @@ LOCAL_INCLUDES	= \
 
 include $(topsrcdir)/config/rules.mk
 
-        
 CXXFLAGS    += $(TK_CFLAGS)
 CFLAGS      += $(TK_CFLAGS)
 INCLUDES    += $(TK_CFLAGS) -I$(srcdir)/..

gfx/src/os2/Makefile.in

@@ -34,6 +34,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxOS2Module
 GRE_MODULE	= 1
 
+PACKAGE_FILE = gfxos2.pkg
+
 REQUIRES = xpcom \
 		  string \
 		  widget \

gfx/src/photon/Makefile.in

@@ -31,6 +31,9 @@ LIBRARY_NAME	= gfx_photon
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxPhModule
+
+PACKAGE_FILE = photon.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  widget \

gfx/src/xlibrgb/Makefile.in

@@ -32,6 +32,8 @@ LIBRARY_NAME	= xlibrgb
 EXPORT_LIBRARY = 1
 GRE_MODULE	= 1
 
+PACKAGE_FILE = xlibrgb.pkg
+
 CSRCS		= xlibrgb.c
 
 EXPORTS		= xlibrgb.h

htmlparser/src/Makefile.in

@@ -33,6 +33,8 @@ MODULE_NAME	   = nsParserModule
 SHORT_LIBNAME  = gkparser
 GRE_MODULE	= 1
 
+PACKAGE_FILE = parser.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \

intl/build/Makefile.in

@@ -30,6 +30,9 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsI18nModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = intl.pkg
+PACKAGE_VARS = MOZ_MATHML
+
 REQUIRES	= xpcom \
 		  string \
 		  unicharutil \

intl/compatibility/src/Makefile.in

@@ -32,6 +32,8 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= I18nCompatibility
 
+PACKAGE_FILE = intlcmpt.pkg
+
 REQUIRES	= \
 		xpcom \
 		string \

intl/ctl/src/Makefile.in

@@ -35,6 +35,8 @@ EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsCtlLEModule
 
+PACKAGE_FILE = ctl.pkg
+
 REQUIRES	= \
 		  xpcom \
 		  string \

intl/uconv/src/Makefile.in

@@ -37,6 +37,9 @@ ifneq ($(OS_ARCH),WINNT)
 # To avoid conflict with OS/2 system uconv.dll
 SHORT_LIBNAME  = mozuconv
 endif
+
+PACKAGE_FILE = uconv.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  intl \

intl/uconv/ucvmath/Makefile.in

@@ -33,6 +33,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsUCvMathModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = ucvmath.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  uconv \

ipc/ipcd/Makefile.in

@@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= ipcd
 
+PACKAGE_FILE = ipc.pkg
+
 DIRS		= \
 			util \
 			shared/src \

js/jsd/Makefile.in

@@ -48,6 +48,8 @@ REQUIRES += \
 		  widget \
 		  dom \
 		  $(NULL)
+
+PACKAGE_FILE = jsd.pkg
 endif
 
 EXTRA_DSO_LDOPTS += \

js/src/Makefile.in

@@ -54,6 +54,8 @@ LIBRARY_NAME	= js$(MOZ_BITS)$(VERSION_NUMBER)
 RESFILE		= js$(MOZ_BITS)40.res
 endif
 
+PACKAGE_FILE = js.pkg
+
 # JavaScript must be built shared, even for static builds, as it is used by
 # other modules which are always built shared. Failure to do so results in
 # the js code getting copied into xpinstall and jsd as well as mozilla-bin,

js/src/liveconnect/Makefile.in

@@ -53,6 +53,8 @@ endif
 JNI_GEN_DIR	= _jni
 GRE_MODULE	= 1
 
+PACKAGE_FILE = liveconnect.pkg
+
 REQUIRES	= js \
 		  xpcom \
 		  xpconnect \

js/src/xpconnect/src/Makefile.in

@@ -56,6 +56,8 @@ LIBRARY_NAME	= xpc$(MOZ_BITS)$(VERSION_NUMBER)
 SHORT_LIBNAME	= xpc$(MOZ_BITS)$(VERSION_NUMBER)
 endif
 
+PACKAGE_FILE = xpconnect.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  js \

layout/build/Makefile.in

@@ -35,6 +35,9 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = layout.pkg
+PACKAGE_VARS += MOZ_XUL
+
 EXTRA_DSO_LIBS	= gkgfx
 ifdef MOZ_PERF_METRICS
 EXTRA_DSO_LIBS	+= mozutil_s

layout/mathml/base/src/Makefile.in

@@ -29,6 +29,9 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = layout
 LIBRARY_NAME = gkmathmlbase_s
+
+PACKAGE_FILE = mathml.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \

mailnews/Makefile.in

@@ -26,6 +26,13 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE       = mailnews
+PACKAGE_FILE = mailnews.pkg
+PACKAGE_VARS += \
+		MOZ_MOVEMAIL \
+		MOZ_STATIC_MAIL_BUILD \
+		$(NULL)
+
 DIRS		= public base db/msgdb news local mime compose imap addrbook import extensions
 
 ifeq ($(OS_ARCH),WINNT)

mailnews/addrbook/build/Makefile.in

@@ -32,6 +32,9 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsAbModule
+
+PACKAGE_FILE = addrbook.pkg
+
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
 		  string \

mailnews/base/build/Makefile.in

@@ -36,6 +36,9 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgBaseModule
+
+PACKAGE_FILE = msgbase.pkg
+
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
 		  string \

mailnews/base/util/Makefile.in

@@ -38,6 +38,8 @@ endif
 
 META_COMPONENT = mail
 
+PACKAGE_FILE = msgbaseutil.pkg
+
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
 		  string \

mailnews/compose/build/Makefile.in

@@ -36,6 +36,9 @@ MODULE_NAME	= nsMsgComposeModule
 ifeq ($(OS_ARCH),WINNT)
 XPIDL_MODULE	= msgcompo
 endif
+
+PACKAGE_FILE = msgcompose.pkg
+
 REQUIRES	= xpcom \
                   xpcom_obsolete \
 		  string \

mailnews/db/msgdb/build/Makefile.in

@@ -32,6 +32,9 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgDBModule
+
+PACKAGE_FILE = msgdb.pkg
+
 REQUIRES	= xpcom \
                   xpcom_obsolete \
 		  string \

mailnews/extensions/bayesian-spam-filter/build/Makefile.in

@@ -33,6 +33,9 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= bayesflt
 IS_COMPONENT	= 1
 MODULE_NAME	= nsBayesianFilterModule
+
+PACKAGE_FILE = bayesian.pkg
+
 REQUIRES	= xpcom \
 		  mailnews \
 		  msgbase \

mailnews/extensions/mailviews/Makefile.in

@@ -28,6 +28,9 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mailview
 
+PACKAGE_FILE = mailviews.pkg
+PACKAGE_VARS += MOZ_STATIC_MAIL_BUILD
+
 DIRS		= public src resources
 
 ifndef MOZ_STATIC_MAIL_BUILD

mailnews/extensions/mailviews/resources/content/Makefile.in

@@ -26,6 +26,9 @@ srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE       = mailview
+PACKAGE_FILE = mailviewdef.pkg
+
 EXPORT_DIR	= $(DIST)/bin/defaults/messenger
 EXPORT_L10N_DIR	= $(EXPORT_DIR)/US
 

mailnews/extensions/mdn/Makefile.in

@@ -27,6 +27,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgmdn
+PACKAGE_FILE = mdn.pkg
+PACKAGE_VARS = MOZ_STATIC_MAIL_BUILD
+
 DIRS		= src
 
 ifndef MOZ_STATIC_MAIL_BUILD

mailnews/extensions/offline-startup/Makefile.in

@@ -34,6 +34,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= offline-startup
+PACKAGE_FILE = offline-startup.pkg
 
 DIRS        = resources
 

mailnews/extensions/palmsync/Makefile.in

@@ -33,6 +33,8 @@ DIRS		= build public src
 ifdef PALM_CDK_DIR
 DIRS		+= conduit
 
+PACKAGE_FILE = palmsync.pkg
+
 install:: $(README)
 	$(INSTALL) $< $(DIST)/bin
 

mailnews/extensions/smime/build/Makefile.in

@@ -33,6 +33,9 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= msgsmime
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgSMIMEModule
+
+PACKAGE_FILE = smime.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  mime \

mailnews/imap/build/Makefile.in

@@ -32,6 +32,9 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= IMAP_factory
+
+PACKAGE_FILE = msgimap.pkg
+
 REQUIRES	= xpcom \
                   xpcom_obsolete \
 		  string \

mailnews/import/Makefile.in

@@ -28,6 +28,9 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= import
 
+PACKAGE_FILE = msgimport.pkg
+PACKAGE_VARS += MOZ_STATIC_MAIL_BUILD
+
 DIRS		= public src text comm4x
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))

mailnews/import/comm4x/src/Makefile.in

@@ -65,6 +65,8 @@ LIBRARY_NAME   = imp4mail_s
 
 endif
 
+PACKAGE_FILE = importcomm4x.pkg
+
 META_COMPONENT  = mail
 REQUIRES	= xpcom \
 		  xpcom_obsolete \

mailnews/import/eudora/src/Makefile.in

@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impEudra
+PACKAGE_FILE = importeudora.pkg
 
 ifndef MOZ_STATIC_MAIL_BUILD
 

mailnews/import/oexpress/Makefile.in

@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= importOE
+PACKAGE_FILE = importoe.pkg
 
 ifndef MOZ_STATIC_MAIL_BUILD
 

mailnews/import/outlook/src/Makefile.in

@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impOutlk
+PACKAGE_FILE = importoutlook.pkg
 
 ifndef MOZ_STATIC_MAIL_BUILD
 

mailnews/import/text/src/Makefile.in

@@ -27,6 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impText
+PACKAGE_FILE = importtext.pkg
 
 ifndef MOZ_STATIC_MAIL_BUILD
 

mailnews/local/build/Makefile.in

@@ -33,6 +33,9 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME 	= msglocal
 IS_COMPONENT	= 1
 MODULE_NAME	= local_mail_services
+
+PACKAGE_FILE = msglocal.pkg
+
 REQUIRES	= xpcom \
                   xpcom_obsolete \
 		  string \

mailnews/mapi/Makefile.in

@@ -26,6 +26,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE = msgMapi
+PACKAGE_FILE = mapi.pkg
+
 DIRS	= resources mapiDll mapihook
 
 include $(topsrcdir)/config/rules.mk

mailnews/mime/build/Makefile.in

@@ -32,6 +32,9 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= mime_services
+
+PACKAGE_FILE = mime.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \

mailnews/mime/cthandlers/smimestub/Makefile.in

@@ -32,6 +32,9 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsSMIMEModule
+
+PACKAGE_FILE = smimetb.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  mime \

mailnews/mime/cthandlers/vcard/Makefile.in

@@ -38,6 +38,8 @@ else
 LIBRARY_NAME = vcard_s
 endif
 
+PACKAGE_FILE = vcard.pkg
+
 META_COMPONENT = mail
 
 REQUIRES	= xpcom \

mailnews/mime/emitters/build/Makefile.in

@@ -33,6 +33,9 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= emitter
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMimeEmitterModule
+
+PACKAGE_FILE = mimeemitter.pkg
+
 REQUIRES	= xpcom \
                   xpcom_obsolete \
 		  string \

mailnews/news/build/Makefile.in

@@ -32,6 +32,9 @@ META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgNewsModule
+
+PACKAGE_FILE = msgnews.pkg
+
 REQUIRES	= xpcom \
                   xpcom_obsolete \
 		  string \

modules/libjar/Makefile.in

@@ -46,6 +46,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsJarModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = libjar.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  caps \

modules/libpr0n/build/Makefile.in

@@ -33,6 +33,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsImageLib2Module
 GRE_MODULE	= 1
 
+PACKAGE_FILE = imglib2.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \

modules/libutil/public/Makefile.in

@@ -29,6 +29,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= util
 XPIDL_MODULE	= util
 
+PACKAGE_FILE = libutil.pkg
+
 EXPORTS		= $(srcdir)/xp_obs.h \
               $(srcdir)/stopwatch.h \
 			  $(srcdir)/nsTimer.h

modules/oji/src/Makefile.in

@@ -31,6 +31,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsCJVMManagerModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = oji.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  liveconnect \

modules/plugin/base/src/Makefile.in

@@ -34,6 +34,9 @@ IS_COMPONENT    = 1
 MODULE_NAME	= nsPluginModule
 GRE_MODULE	= 1
 
+PACKAGE_FILE = plugin.pkg
+PACKAGE_VARS += MOZ_ENABLE_GTK
+
 REQUIRES	= xpcom \
 		  xpconnect \
 		  string \

modules/plugin/samples/default/mac/Makefile.in

@@ -42,6 +42,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE      = plugin
+
 ifdef MOZ_DEBUG
 BUILDSTYLE	= Development
 else
@@ -54,6 +56,8 @@ endif
 
 TARGET		= "Default Plugin"
 
+PACKAGE_FILE = npnul.pkg
+
 include $(topsrcdir)/config/rules.mk
 
 # decodes resource files from AppleSingle to Resource Manager format.

modules/plugin/samples/default/os2/Makefile.in

@@ -30,6 +30,9 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= plugin
 LIBRARY_NAME	= npnulos2
 RESFILE		= npnulos2.res
+
+PACKAGE_FILE = npnul.pkg
+
 REQUIRES	= java \
 		  plugin \
 		  $(NULL)

modules/plugin/samples/default/unix/Makefile.in

@@ -26,9 +26,11 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-#MODULE		= plugin
+MODULE       = plugin
-LIBRARY_NAME	= nullplugin
+LIBRARY_NAME = nullplugin
-GRE_MODULE	= 1
+GRE_MODULE   = 1
+
+PACKAGE_FILE = npnul.pkg
 
 REQUIRES	= java \
 		  plugin \

modules/plugin/samples/default/windows/Makefile.in

@@ -32,6 +32,8 @@ RESFILE		= npnul32.res
 DEFFILE		= $(srcdir)/npnul32.def
 GRE_MODULE	= 1
 
+PACKAGE_FILE = npnul.pkg
+
 REQUIRES	= java \
 		  xpcom \
 		  pref \

modules/zlib/src/Makefile.in

@@ -31,6 +31,8 @@ MODULE		= zlib
 LIBRARY_NAME	= mozz
 GRE_MODULE	= 1
 
+PACKAGE_FILE = zlib.pkg
+
 ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 MAPFILE	= $(LIBRARY_NAME).map

netwerk/build/Makefile.in

@@ -33,6 +33,12 @@ IS_COMPONENT	= 1
 MODULE_NAME	= necko_core_and_primary_protocols
 GRE_MODULE	= 1
 
+PACKAGE_FILE = necko.pkg
+
+ifdef ENABLE_TESTS
+PACKAGE_FILE += necko-tests.pkg
+endif
+
 REQUIRES	= xpcom \
 		  string \
 		  nkcache \

netwerk/build2/Makefile.in

@@ -39,6 +39,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= necko_secondary_protocols
 GRE_MODULE	= 1
 
+PACKAGE_FILE = necko2.pkg
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \