Bug 380846 - "Make the build system friendlier for XULRunner apps and extensions." r=bsmedberg. Adds confvars.sh files for all major apps and makefiles.sh for all extensions.
authorbent.mozilla@gmail.com
Wed, 23 May 2007 13:08:44 -0700
changeset 1796 0dc2656e5f08b83dfee3cfe9c1ee6e11c570c8ab
parent 1795 5c3fd4c56510087f8f45e66a0ed6741cb7da9908
child 1797 03a5c5b2746647d5d5c589722ba1d6b9ae021d56
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs380846
milestone1.9a5pre
Bug 380846 - "Make the build system friendlier for XULRunner apps and extensions." r=bsmedberg. Adds confvars.sh files for all major apps and makefiles.sh for all extensions.
allmakefiles.sh
browser/confvars.sh
config/rules.mk
configure.in
content/xslt/confvars.sh
extensions/access-builtin/makefiles.sh
extensions/cookie/makefiles.sh
extensions/gnomevfs/makefiles.sh
extensions/inspector/makefiles.sh
extensions/layout-debug/makefiles.sh
extensions/metrics/makefiles.sh
extensions/permissions/makefiles.sh
extensions/pref/makefiles.sh
extensions/python/dom/makefiles.sh
extensions/python/makefiles.sh
extensions/python/xpcom/makefiles.sh
extensions/reporter/makefiles.sh
netwerk/confvars.sh
tools/update-packaging/confvars.sh
xulrunner/confvars.sh
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -403,21 +403,16 @@ modules/plugin/tools/sdk/Makefile
 modules/plugin/tools/sdk/samples/Makefile
 modules/plugin/tools/sdk/samples/common/Makefile
 modules/plugin/tools/sdk/samples/basic/windows/Makefile
 modules/plugin/tools/sdk/samples/scriptable/windows/Makefile
 modules/plugin/tools/sdk/samples/simple/Makefile
 modules/plugin/tools/sdk/samples/winless/windows/Makefile
 "
 
-MAKEFILES_access_builtin="
-extensions/access-builtin/Makefile
-extensions/access-builtin/accessproxy/Makefile
-"
-
 MAKEFILES_netwerk="
 netwerk/Makefile
 netwerk/base/Makefile
 netwerk/base/public/Makefile
 netwerk/base/src/Makefile
 netwerk/build/Makefile
 netwerk/cache/Makefile
 netwerk/cache/public/Makefile
@@ -834,57 +829,16 @@ caps/idl/Makefile
 gfx/public/Makefile
 gfx/idl/Makefile
 widget/public/Makefile
 modules/libpref/public/Makefile
 content/base/public/Makefile
 intl/locale/public/Makefile
 "
 
-MAKEFILES_inspector="
-extensions/inspector/Makefile
-extensions/inspector/base/Makefile
-extensions/inspector/build/Makefile
-extensions/inspector/resources/Makefile
-extensions/inspector/resources/locale/Makefile
-"
-
-MAKEFILES_spatialnavigation="
-extensions/spatialnavigation/Makefile
-extensions/spatialnavigation/public/Makefile
-extensions/spatialnavigation/src/Makefile
-"
-
-MAKEFILES_sroaming="
-extensions/sroaming/Makefile
-extensions/sroaming/src/Makefile
-"
-
-MAKEFILES_tridentprofile="
-extensions/tridentprofile/Makefile
-extensions/tridentprofile/public/Makefile
-extensions/tridentprofile/resources/Makefile
-extensions/tridentprofile/src/Makefile
-"
-
-MAKEFILES_typeaheadfind="
-extensions/typeaheadfind/public/Makefile
-extensions/typeaheadfind/resources/Makefile
-extensions/typeaheadfind/src/Makefile
-extensions/typeaheadfind/Makefile
-"
-
-MAKEFILES_metrics="
-extensions/metrics/Makefile
-extensions/metrics/build/Makefile
-extensions/metrics/public/Makefile
-extensions/metrics/src/Makefile
-extensions/metrics/test/Makefile
-"
-
 MAKEFILES_phoenix="
 browser/Makefile
 browser/app/Makefile
 browser/app/profile/extensions/Makefile
 browser/base/Makefile
 browser/components/Makefile
 browser/components/bookmarks/Makefile
 browser/components/bookmarks/public/Makefile
@@ -1098,33 +1052,16 @@ calendar/sunbird/base/Makefile
 "
 
 MAKEFILES_macbrowser="
 camino/Makefile
 camino/flashblock/Makefile
 camino/installer/Makefile
 "
 
-MAKEFILES_sql="
-extensions/sql/Makefile
-extensions/sql/base/Makefile
-extensions/sql/base/public/Makefile
-extensions/sql/base/src/Makefile
-extensions/sql/base/resources/Makefile
-extensions/sql/pgsql/public/Makefile
-extensions/sql/pgsql/src/Makefile
-extensions/sql/odbc/Makefile
-extensions/sql/odbc/public/Makefile
-extensions/sql/odbc/src/Makefile
-extensions/sql/build/Makefile
-extensions/sql/build/src/Makefile
-extensions/sql/sqltest/Makefile
-extensions/sql/tests/Makefile
-"
-
 if [ "$MOZ_MAIL_NEWS" ]; then
     if [ -f ${srcdir}/mailnews/makefiles ]; then
         MAKEFILES_mailnews=`cat ${srcdir}/mailnews/makefiles`
     fi
 fi
 
 MAKEFILES_ipcd="
 ipc/ipcd/Makefile
@@ -1407,152 +1344,23 @@ else
 if [ "$MOZ_STATIC_COMPONENTS" -o "$MOZ_META_COMPONENTS" ]; then
     MAKEFILES_static_components="$MAKEFILES_static_components
 	modules/staticmod/Makefile
 "
 fi
 fi
 
 if [ "$MOZ_PREF_EXTENSIONS" ]; then
-    MAKEFILES_extensions="$MAKEFILES_extensions
-        extensions/pref/Makefile
-        extensions/pref/autoconfig/Makefile
-        extensions/pref/autoconfig/public/Makefile
-        extensions/pref/autoconfig/src/Makefile
-        extensions/pref/autoconfig/resources/Makefile
-"
+  MOZ_EXTENSIONS="$MOZ_EXTENSIONS pref"
 fi
 
 for extension in $MOZ_EXTENSIONS; do
-    case "$extension" in
-        access-builtin ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/access-builtin/Makefile
-            extensions/access-builtin/accessproxy/Makefile
-            " ;;
-        cookie ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/cookie/Makefile
-            " ;;
-        cview ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/cview/Makefile
-            extensions/cview/resources/Makefile
-            " ;;
-        datetime ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/datetime/Makefile
-            " ;;
-        finger ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/finger/Makefile
-            " ;;
-        gnomevfs ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/gnomevfs/Makefile
-            " ;;
-        help ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/help/Makefile
-            extensions/help/resources/Makefile
-            " ;;
-        inspector ) MAKEFILES_extensions="$MAKEFILES_extensions
-            $MAKEFILES_inspector"
-            ;;
-        spatialnavigation ) MAKEFILES_extensions="$MAKEFILES_extensions
-            $MAKEFILES_spatialnavigation"
-            ;;
-        typeaheadfind ) MAKEFILES_extensions="$MAKEFILES_extensions
-            $MAKEFILES_typeaheadfind"
-            ;;
-        irc ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/irc/Makefile
-            " ;;
-        layout-debug ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/layout-debug/Makefile
-            extensions/layout-debug/src/Makefile
-            extensions/layout-debug/ui/Makefile
-            " ;;
-        p3p ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/p3p/Makefile
-            extensions/p3p/public/Makefile
-            extensions/p3p/src/Makefile
-            " ;;
-        reporter ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/reporter/Makefile
-	    extensions/reporter/locales/Makefile
-            " ;;
-
-        tasks ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/tasks/Makefile
-            " ;;
-        sroaming ) MAKEFILES_extensions="$MAKEFILES_extensions
-            $MAKEFILES_sroaming"
-            ;;
-        transformiix ) MAKEFILES_extensions="$MAKEFILES_extensions
-            $MAKEFILES_transformiix"
-            ;;
-        tridentprofile ) MAKEFILES_extensions="$MAKEFILES_extensions
-            $MAKEFILES_tridentprofile"
-            ;;
-        venkman ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/venkman/Makefile
-            extensions/venkman/resources/Makefile
-            " ;;
-        wallet ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/wallet/Makefile
-            extensions/wallet/public/Makefile
-            extensions/wallet/src/Makefile
-            extensions/wallet/editor/Makefile
-            extensions/wallet/signonviewer/Makefile
-            extensions/wallet/walletpreview/Makefile
-            extensions/wallet/build/Makefile
-            " ;;
-        xforms ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/xforms/Makefile
-            " ;;
-        xml-rpc ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/xml-rpc/Makefile
-            extensions/xml-rpc/idl/Makefile
-            extensions/xml-rpc/src/Makefile
-            " ;;
-        xmlterm ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/xmlterm/Makefile
-            extensions/xmlterm/base/Makefile
-            extensions/xmlterm/geckoterm/Makefile
-            extensions/xmlterm/linetest/Makefile
-            extensions/xmlterm/scripts/Makefile
-            extensions/xmlterm/tests/Makefile
-            extensions/xmlterm/ui/Makefile
-            " ;;
-        python ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/python/Makefile
-            " ;;
-        python/xpcom ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/python/xpcom/Makefile
-            extensions/python/xpcom/components/Makefile
-            extensions/python/xpcom/src/Makefile
-            extensions/python/xpcom/src/loader/Makefile
-            extensions/python/xpcom/src/module/Makefile
-            extensions/python/xpcom/test/Makefile
-            extensions/python/xpcom/test/test_component/Makefile
-            " ;;
-        python/dom ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/python/dom/Makefile
-            extensions/python/dom/test/Makefile
-            extensions/python/dom/test/pyxultest/Makefile
-            extensions/python/dom/src/Makefile
-            extensions/python/dom/nsdom/Makefile
-            extensions/python/dom/nsdom/test/Makefile
-            " ;;
-        sql ) MAKEFILES_extensions="$MAKEFILES_extensions
-            $MAKEFILES_sql"
-            ;;
-        schema-validation ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/schema-validation/Makefile
-            extensions/schema-validation/public/Makefile
-            extensions/schema-validation/src/Makefile
-            " ;;
-        permissions ) MAKEFILES_extensions="$MAKEFILES_extensions
-            extensions/permissions/Makefile
-            " ;;
-    esac
+  if [ -f "${srcdir}/extensions/${extension}/makefiles.sh" ]; then
+    source "${srcdir}/extensions/${extension}/makefiles.sh"
+  fi
 done
 
 MAKEFILES_themes=`cat ${srcdir}/themes/makefiles`
 
 add_makefiles "
 $MAKEFILES_caps
 $MAKEFILES_chrome
 $MAKEFILES_db
@@ -1673,8 +1481,12 @@ fi
 
 if test -n "$MOZ_ENABLE_GTK2"; then
     add_makefiles "$MAKEFILES_gnome"
 fi
 
 if test -n "$MOZ_STORAGE"; then
     add_makefiles "$MAKEFILES_storage"
 fi
+
+if test -f "${srcdir}/${MOZ_BUILD_APP}/makefiles.sh"; then
+  source "${srcdir}/${MOZ_BUILD_APP}/makefiles.sh"
+fi
new file mode 100755
--- /dev/null
+++ b/browser/confvars.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+MOZ_APP_NAME=firefox
+MOZ_XUL_APP=1
+MOZ_UPDATER=1
+MOZ_PHOENIX=1
+MOZ_PLACES=1
+MOZ_PLACES_BOOKMARKS=1
+# always enabled for form history
+MOZ_MORKREADER=1
+MOZ_SAFE_BROWSING=1
+MOZ_APP_VERSION=$FIREFOX_VERSION
+MOZ_NO_XPCOM_OBSOLETE=1
+MOZ_EXTENSIONS_DEFAULT=" xml-rpc inspector gnomevfs reporter"
+# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -2079,16 +2079,19 @@ FORCE:
 .LIBPATTERNS = $(if $(IMPORT_LIB_SUFFIX),$(LIB_PREFIX)%.$(IMPORT_LIB_SUFFIX)) $(LIB_PREFIX)%.$(LIB_SUFFIX) $(DLL_PREFIX)%$(DLL_SUFFIX) 
 
 tags: TAGS
 
 TAGS: $(SUBMAKEFILES) $(CSRCS) $(CPPSRCS) $(wildcard *.h)
 	-etags $(CSRCS) $(CPPSRCS) $(wildcard *.h)
 	+$(LOOP_OVER_DIRS)
 
+echo-variable-%:
+	@echo $($*)
+
 echo-tiers:
 	@echo $(TIERS)
 
 echo-dirs:
 	@echo $(DIRS)
 
 echo-module:
 	@echo $(MODULE)
--- a/configure.in
+++ b/configure.in
@@ -36,16 +36,17 @@ dnl   Seth Spitzer <sspitzer@netscape.co
 dnl   xpctools support
 dnl   Benjamin Smedberg <benjamin@smedbergs.us>
 dnl   Howard Chu <hyc@symas.com>
 dnl   MSYS support
 dnl   Mark Mentovai <mark@moxienet.com>:
 dnl   Mac OS X 10.4 support
 dnl   Giorgio Maone <g.maone@informaction.com>
 dnl   MSVC l10n compatible version check
+dnl   Ben Turner <mozilla@songbirdnest.com>
 dnl
 dnl Alternatively, the contents of this file may be used under the terms of
 dnl either the GNU General Public License Version 2 or later (the "GPL"), or
 dnl the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 dnl in which case the provisions of the GPL or the LGPL are applicable instead
 dnl of those above. If you wish to allow use of your version of this file only
 dnl under the terms of either the GPL or the LGPL, and not to allow others to
 dnl use your version of this file under the terms of the MPL, indicate your
@@ -4162,16 +4163,17 @@ MOZ_ARG_ENABLE_STRING(application,
                             content/xslt (Standalone Transformiix XSLT)
                             netwerk (Standalone Necko)
                             tools/update-packaging (AUS-related packaging tools)
                             standalone (use this for standalone
                               xpcom/xpconnect or to manually drive a build)],
 [ MOZ_BUILD_APP=$enableval ] )
 
 if test "$MOZ_BUILD_APP" = "macbrowser"; then
+    AC_MSG_WARN([--enable-application=macbrowser is deprecated. Use --enable-application=camino.])
     MOZ_BUILD_APP=camino
 fi
 
 case "$MOZ_BUILD_APP" in
 minimo)
   MOZ_EMBEDDING_PROFILE=basic
   ;;
 
@@ -4301,198 +4303,98 @@ minimal)
   AC_MSG_ERROR([Unrecognized value: --with-embedding-profile=$MOZ_EMBEDDING_PROFILE])
   ;;
 esac
 
 AC_SUBST(MOZ_EMBEDDING_LEVEL_DEFAULT)
 AC_SUBST(MOZ_EMBEDDING_LEVEL_BASIC)
 AC_SUBST(MOZ_EMBEDDING_LEVEL_MINIMAL)
 
+if test -z "$MOZ_BUILD_APP"; then
+  AC_MSG_ERROR([--enable-application=APP was not specified and is required.])
+else
+  # We have a valid application only if it has a build.mk file in its top
+  # directory.
+  if test ! -f "${srcdir}/${MOZ_BUILD_APP}/build.mk" ; then
+    AC_MSG_ERROR([--enable-application value not recognized (${MOZ_BUILD_APP}/build.mk does not exist).])
+  fi
+fi
+
+# Allow the application to influence configure with a confvars.sh script.
+
+AC_MSG_CHECKING([if app-specific confvars.sh exists])
+if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then
+  AC_MSG_RESULT([${srcdir}/${MOZ_BUILD_APP}/confvars.sh])
+  source "${srcdir}/${MOZ_BUILD_APP}/confvars.sh"
+else
+  AC_MSG_RESULT([no])
+fi
+
+# Now is a good time to test for logic errors, define mismatches, etc.
+case "$MOZ_BUILD_APP" in
+xulrunner)
+  if test "$LIBXUL_SDK"; then
+    AC_MSG_ERROR([Building XULRunner --with-libxul-sdk doesn't make sense; XULRunner provides the libxul SDK.])
+  fi
+  ;;
+*)
+  # Fix this case for folks who forget. Warn them.
+  if test -n "$LIBXUL_SDK" -a -z "$MOZ_XUL_APP"; then
+    AC_MSG_WARN([Setting MOZ_XUL_APP since LIBXUL_SDK was set. Add to confvars.sh!])
+    MOZ_XUL_APP=1
+  fi
+  ;;
+esac
+
+# Special cases where we need to AC_DEFINE something. Also a holdover for apps
+# that haven't made a confvars.sh yet. Don't add new stuff here, use
+# MOZ_BUILD_APP.
 case "$MOZ_BUILD_APP" in
 suite)
-  MOZ_APP_NAME=seamonkey
-  MOZ_APP_DISPLAYNAME=SeaMonkey
-  MOZ_MAIL_NEWS=1
-  MOZ_LDAP_XPCOM=1
-  MOZ_COMPOSER=1
-  MOZ_SUITE=1
-  MOZ_PROFILESHARING=
-  MOZ_APP_VERSION=$SEAMONKEY_VERSION
-  if test "$MOZ_XUL_APP"; then
-    MOZ_NO_XPCOM_OBSOLETE=1
-    MOZ_EXTENSIONS_DEFAULT=" wallet xml-rpc venkman inspector irc typeaheadfind gnomevfs reporter"
-  else
-    MOZ_EXTENSIONS_DEFAULT=" wallet xml-rpc help venkman inspector irc typeaheadfind gnomevfs sroaming reporter"
-  fi
   AC_DEFINE(MOZ_SUITE)
   ;;
 
 browser)
-  MOZ_APP_NAME=firefox
-  MOZ_XUL_APP=1
-  MOZ_UPDATER=1
-  MOZ_PHOENIX=1
-  MOZ_PLACES=1
-  MOZ_PLACES_BOOKMARKS=1
-  # always enabled for form history
-  MOZ_MORKREADER=1
-  MOZ_SAFE_BROWSING=1
-  MOZ_APP_VERSION=$FIREFOX_VERSION
-  MOZ_NO_XPCOM_OBSOLETE=1
-  MOZ_EXTENSIONS_DEFAULT=" xml-rpc inspector gnomevfs reporter"
   AC_DEFINE(MOZ_PHOENIX)
-  # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
   ;;
 
 minimo)
-  MOZ_APP_NAME=minimo
-  MOZ_APP_DISPLAYNAME=minimo
   AC_DEFINE(MINIMO)
-  MINIMO=1
-  MOZ_APP_VERSION=`cat $topsrcdir/minimo/config/version.txt`
   ;;
 
 mail)
-  MOZ_APP_NAME=thunderbird
-  MOZ_APP_DISPLAYNAME=Thunderbird
-  MOZ_XUL_APP=1
-  MOZ_UPDATER=1
-  MOZ_THUNDERBIRD=1
-  MOZ_MATHML=
-  MOZ_NO_ACTIVEX_SUPPORT=1
-  MOZ_ACTIVEX_SCRIPTING_SUPPORT=
-  ENABLE_TESTS=
-  MOZ_OJI=
-  NECKO_DISK_CACHE=
-  NECKO_PROTOCOLS_DEFAULT="http file viewsource res data"
-  MOZ_ENABLE_CANVAS=
-  MOZ_IMG_DECODERS_DEFAULT=`echo "$MOZ_IMG_DECODERS_DEFAULT" | sed "s/ xbm//"`
-  MOZ_MAIL_NEWS=1
-  MOZ_LDAP_XPCOM=1
-  MOZ_STATIC_MAIL_BUILD=1
-  MOZ_COMPOSER=1
-  MOZ_SAFE_BROWSING=1
-  MOZ_SVG=
-  MOZ_APP_VERSION=$THUNDERBIRD_VERSION
-  MOZ_EXTENSIONS_DEFAULT=" wallet"
   AC_DEFINE(MOZ_THUNDERBIRD)
   ;;
 
 composer)
-  MOZ_APP_NAME=nvu
-  MOZ_APP_DISPLAYNAME=NVU
-  MOZ_XUL_APP=1
-  MOZ_UPDATER=1
-  MOZ_STANDALONE_COMPOSER=1
-  MOZ_COMPOSER=1
-  MOZ_APP_VERSION=0.17+
   AC_DEFINE(MOZ_STANDALONE_COMPOSER)
   ;;
 
 calendar)
-  MOZ_APP_NAME=sunbird
-  MOZ_APP_DISPLAYNAME=Calendar
-  MOZ_XUL_APP=1
-  MOZ_UPDATER=1
-  MOZ_SUNBIRD=1
-  MOZ_CALENDAR=1
-  MOZ_APP_VERSION=$SUNBIRD_VERSION
-  MOZ_PLAINTEXT_EDITOR_ONLY=1
-  NECKO_PROTOCOLS_DEFAULT="about http ftp file res viewsource"
-  MOZ_NO_ACTIVEX_SUPPORT=1
-  MOZ_ACTIVEX_SCRIPTING_SUPPORT=
-  MOZ_INSTALLER=
-  MOZ_MATHML=
-  NECKO_DISK_CACHE=
-  MOZ_OJI=
-  MOZ_PLUGINS=
-  NECKO_COOKIES=
-  MOZ_NO_XPCOM_OBSOLETE=1
-  MOZ_EXTENSIONS_DEFAULT=
-  MOZ_UNIVERSALCHARDET=
   AC_DEFINE(MOZ_SUNBIRD)
   ;;
 
 xulrunner)
-  MOZ_APP_NAME=xulrunner
-  MOZ_APP_DISPLAYNAME=XULRunner
-  MOZ_XUL_APP=1
-  MOZ_UPDATER=1
-  MOZ_XULRUNNER=1
-  MOZ_ENABLE_LIBXUL=1
-  MOZ_APP_VERSION=$MOZILLA_VERSION
-  MOZ_JAVAXPCOM=1
-  if test "$MOZ_STORAGE"; then
-    MOZ_PLACES=1
-  fi
-  MOZ_EXTENSIONS_DEFAULT=" xml-rpc gnomevfs"
-  MOZ_NO_XPCOM_OBSOLETE=1
   AC_DEFINE(MOZ_XULRUNNER)
-
-  if test "$LIBXUL_SDK"; then
-    AC_MSG_ERROR([Building XULRunner --with-libxul-sdk doesn't make sense; XULRunner provides the libxul SDK.])
-  fi
   ;;
 
 camino) 
-  MOZ_APP_NAME=mozilla
-  ENABLE_TESTS=
-  ACCESSIBILITY=
-  MOZ_JSDEBUGGER=
-  MOZ_SINGLE_PROFILE=1
-  MOZ_PROFILESHARING=
-  MOZ_APP_DISPLAYNAME=Mozilla
-  MOZ_APP_VERSION=$MOZILLA_VERSION
-  MOZ_EXTENSIONS_DEFAULT=" typeaheadfind"
-# MOZ_XUL_APP=1
-  MOZ_PREF_EXTENSIONS=
-  MOZ_WEBSERVICES=
   AC_DEFINE(MOZ_MACBROWSER)
   ;;
 
 content/xslt)
-  MOZ_APP_NAME=mozilla
-  MOZ_EXTENSIONS_DEFAULT=""
   AC_DEFINE(TX_EXE)
-  MOZ_XSLT_STANDALONE=1
-  MOZ_APP_VERSION=$MOZILLA_VERSION
-  ;;
-
-netwerk)
-  MOZ_APP_NAME=mozilla
-  MOZ_EXTENSIONS_DEFAULT=""
-  MOZ_APP_VERSION=$MOZILLA_VERSION
-  MOZ_NO_XPCOM_OBSOLETE=1
-  MOZ_SINGLE_PROFILE=1
-  MOZ_PROFILESHARING=
-  MOZ_XPINSTALL=
   ;;
 
 standalone) 
   MOZ_APP_NAME=mozilla
   MOZ_APP_DISPLAYNAME=Mozilla
   MOZ_APP_VERSION=$MOZILLA_VERSION
   ;;
 
-tools/update-packaging)
-  MOZ_APP_NAME=mozilla
-  MOZ_APP_DISPLAYNAME=Mozilla
-  MOZ_APP_VERSION=$MOZILLA_VERSION
-  MOZ_UPDATE_PACKAGING=1
-  MOZ_UPDATER=1
-  ;;
-
-*)
-  if test -z "$MOZ_BUILD_APP"; then
-    AC_MSG_ERROR([--enable-application=APP is required.])
-  else
-    AC_MSG_ERROR([--enable-application value not recognized.])
-  fi
-  ;;
-
 esac
 
 AC_SUBST(MOZ_BUILD_APP)
 AC_SUBST(MOZ_XUL_APP)
 AC_SUBST(MOZ_SUITE)
 AC_SUBST(MOZ_PHOENIX)
 AC_SUBST(MOZ_THUNDERBIRD)
 AC_SUBST(MOZ_STANDALONE_COMPOSER)
new file mode 100755
--- /dev/null
+++ b/content/xslt/confvars.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+MOZ_APP_NAME=mozilla
+MOZ_EXTENSIONS_DEFAULT=""
+MOZ_XSLT_STANDALONE=1
+MOZ_APP_VERSION=$MOZILLA_VERSION
new file mode 100755
--- /dev/null
+++ b/extensions/access-builtin/makefiles.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/access-builtin/Makefile
+  extensions/access-builtin/accessproxy/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/extensions/cookie/makefiles.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/cookie/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/extensions/gnomevfs/makefiles.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/gnomevfs/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/extensions/inspector/makefiles.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/inspector/Makefile
+  extensions/inspector/base/Makefile
+  extensions/inspector/build/Makefile
+  extensions/inspector/resources/Makefile
+  extensions/inspector/resources/locale/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/extensions/layout-debug/makefiles.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/layout-debug/Makefile
+  extensions/layout-debug/src/Makefile
+  extensions/layout-debug/ui/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/extensions/metrics/makefiles.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/metrics/Makefile
+  extensions/metrics/build/Makefile
+  extensions/metrics/public/Makefile
+  extensions/metrics/src/Makefile
+  extensions/metrics/test/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/extensions/permissions/makefiles.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/permissions/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/extensions/pref/makefiles.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/pref/Makefile
+  extensions/pref/autoconfig/Makefile
+  extensions/pref/autoconfig/public/Makefile
+  extensions/pref/autoconfig/src/Makefile
+  extensions/pref/autoconfig/resources/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/extensions/python/dom/makefiles.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/python/dom/Makefile
+  extensions/python/dom/test/Makefile
+  extensions/python/dom/test/pyxultest/Makefile
+  extensions/python/dom/src/Makefile
+  extensions/python/dom/nsdom/Makefile
+  extensions/python/dom/nsdom/test/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/extensions/python/makefiles.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/python/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/extensions/python/xpcom/makefiles.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/python/xpcom/Makefile
+  extensions/python/xpcom/components/Makefile
+  extensions/python/xpcom/src/Makefile
+  extensions/python/xpcom/src/loader/Makefile
+  extensions/python/xpcom/src/module/Makefile
+  extensions/python/xpcom/test/Makefile
+  extensions/python/xpcom/test/test_component/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/extensions/reporter/makefiles.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+add_makefiles "
+  extensions/reporter/Makefile
+  extensions/reporter/locales/Makefile
+"
new file mode 100755
--- /dev/null
+++ b/netwerk/confvars.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+MOZ_APP_NAME=mozilla
+MOZ_EXTENSIONS_DEFAULT=""
+MOZ_APP_VERSION=$MOZILLA_VERSION
+MOZ_NO_XPCOM_OBSOLETE=1
+MOZ_SINGLE_PROFILE=1
+MOZ_PROFILESHARING=
+MOZ_XPINSTALL=
new file mode 100755
--- /dev/null
+++ b/tools/update-packaging/confvars.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+MOZ_APP_NAME=mozilla
+MOZ_APP_DISPLAYNAME=Mozilla
+MOZ_APP_VERSION=$MOZILLA_VERSION
+MOZ_UPDATE_PACKAGING=1
+MOZ_UPDATER=1
new file mode 100755
--- /dev/null
+++ b/xulrunner/confvars.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# ***** 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 Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# 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 *****
+
+MOZ_APP_NAME=xulrunner
+MOZ_APP_DISPLAYNAME=XULRunner
+MOZ_XUL_APP=1
+MOZ_UPDATER=1
+MOZ_XULRUNNER=1
+MOZ_ENABLE_LIBXUL=1
+MOZ_APP_VERSION=$MOZILLA_VERSION
+MOZ_JAVAXPCOM=1
+if test "$MOZ_STORAGE"; then
+  MOZ_PLACES=1
+fi
+MOZ_EXTENSIONS_DEFAULT=" xml-rpc gnomevfs"
+MOZ_NO_XPCOM_OBSOLETE=1