Bug 1029513 - Stop building Venkman because Bug 800200 removes JSD1 which Venkman depends on. r=neil on a CLOSED TREE
authorEdmund Wong <ewong@pw-wspx.org>
Tue, 15 Jul 2014 08:37:49 +0800
changeset 20525 c81b39ef6c40f51f966c09ae33cfec6cee2b08a6
parent 20524 491e0cb863461fc1fc913b9853b98301bf27f37a
child 20526 39029ec3c358877029bc1165eb676a7c7fdb242e
push idunknown
push userunknown
push dateunknown
reviewersneil
bugs1029513, 800200
Bug 1029513 - Stop building Venkman because Bug 800200 removes JSD1 which Venkman depends on. r=neil on a CLOSED TREE
client.py
suite/app/Makefile.in
suite/branding/nightly/Makefile.in
suite/branding/nightly/icons/gtk/venkman-window.png
suite/branding/nightly/icons/gtk/venkman-window16.png
suite/branding/nightly/icons/gtk/venkman-window48.png
suite/branding/nightly/icons/windows/venkman-window.ico
suite/common/tests/chrome/test_idcheck.xul
suite/confvars.sh
suite/installer/package-manifest.in
suite/installer/removed-files.in
suite/installer/windows/nsis/custom.nsi
suite/installer/windows/nsis/installer.nsi
suite/locales/Makefile.in
suite/locales/en-US/installer/windows/custom.properties
--- a/client.py
+++ b/client.py
@@ -24,21 +24,16 @@ DEFAULTS = {
   # The stable revision to use for the next branch
 #  'CHATZILLA_REV':  'SEA2_26_RELBRANCH',
 
   # URL of the default hg repository to clone for DOM Inspector.
   'INSPECTOR_REPO': 'https://hg.mozilla.org/dom-inspector/',
   # The stable revision to use for the next branch
 #  'INSPECTOR_REV':  'SEA2_26_RELBRANCH',
 
-  # URL of the default hg repository to clone for Venkman.
-  'VENKMAN_REPO': 'https://hg.mozilla.org/venkman/',
-  # The stable revision to use for the next branch
-#  'VENKMAN_REV':  'SEA2_26_RELBRANCH',
-
   # URL of the default hg repository to clone for Mozilla.
   'MOZILLA_REPO': 'https://hg.mozilla.org/mozilla-central/',
 }
 
 REPO_SHORT_NAMES = {
 'mozilla-central':  'moz',
 'dom-inspector':    'dom',
 'ldap-sdks':        'ldap',
@@ -385,17 +380,16 @@ def do_apply_patch(hg, patch, repo):
     return
 
 import glob
 def do_apply_patches(topsrcdir, hg):
     prefix_map = {
         'mozilla': 'mozilla',
         'chatzilla': os.path.join('mozilla', 'extensions', 'irc'),
         'inspector': os.path.join('mozilla', 'extensions', 'inspector'),
-        'venkman':   os.path.join('mozilla', 'extensions', 'venkman'),
         'ldap':      os.path.join('ldap', 'sdks'),
     }
 
     for prefix in prefix_map.keys():
         prefix_dir = prefix_map.get(prefix)
         files = glob.glob("%s*.patch" % prefix)
         files.sort()
         for file in files:
@@ -452,26 +446,16 @@ o.add_option("--chatzilla-repo", dest = 
              help = "URL of ChatZilla repository to pull from (default: use hg default in mozilla/extensions/irc/.hg/hgrc; or if that file doesn't exist, use \"" + DEFAULTS['CHATZILLA_REPO'] + "\".)")
 o.add_option("--skip-chatzilla", dest="skip_chatzilla",
              action="store_true", default=False,
              help="Skip pulling the ChatZilla repository.")
 o.add_option("--chatzilla-rev", dest = "chatzilla_rev",
              default = None,
              help = "Revision of ChatZilla repository to update to. Default: \"" + get_DEFAULT_tag('CHATZILLA_REV') + "\"")
 
-o.add_option("--venkman-repo", dest = "venkman_repo",
-             default = None,
-             help = "URL of Venkman repository to pull from (default: use hg default in mozilla/extensions/venkman/.hg/hgrc; or if that file doesn't exist, use \"" + DEFAULTS['VENKMAN_REPO'] + "\".)")
-o.add_option("--skip-venkman", dest="skip_venkman",
-             action="store_true", default=False,
-             help="Skip pulling the Venkman repository.")
-o.add_option("--venkman-rev", dest = "venkman_rev",
-             default = None,
-             help = "Revision of Venkman repository to update to. Default: \"" + get_DEFAULT_tag('VENKMAN_REV') + "\"")
-
 o.add_option("--hg", dest="hg", default=os.environ.get('HG', 'hg'),
              help="The location of the hg binary")
 o.add_option("-v", "--verbose", dest="verbose",
              action="store_true", default=False,
              help="Enable verbose output on hg updates")
 o.add_option("--hgtool", dest="hgtool",
              default=None,
              help="Path to hgtool, if wanted")
@@ -582,33 +566,16 @@ def fixup_inspector_repo_options(options
     # Mozilla hg repository.
     if options.inspector_repo is None and \
             not os.path.exists(os.path.join(topsrcdir, 'mozilla', 'extensions', 'inspector')):
         options.inspector_repo = DEFAULTS['INSPECTOR_REPO']
 
     if options.inspector_rev is None:
         options.inspector_rev = get_DEFAULT_tag("INSPECTOR_REV")
 
-def fixup_venkman_repo_options(options):
-    """Handle special case: initial hg checkout of Venkman.
-
-    See fixup_comm_repo_options().
-    backup_cvs_extension() is also called.
-    """
-
-    extensionPath = os.path.join(topsrcdir, 'mozilla', 'extensions', 'venkman')
-
-    backup_cvs_extension('Venkman', 'venkman', extensionPath)
-
-    if options.venkman_repo is None and not os.path.exists(extensionPath):
-        options.venkman_repo = DEFAULTS['VENKMAN_REPO']
-
-    if options.venkman_rev is None:
-        options.venkman_rev = get_DEFAULT_tag("VENKMAN_REV")
-
 def fixup_ldap_repo_options(options):
     """Handle special case: initial checkout of LDAP.
 
     See fixup_comm_repo_options().
     """
 
     # No cvs backup needed as LDAP directory name changed when it moved to hg
     if options.ldap_repo is None and \
@@ -633,17 +600,17 @@ try:
     (options, (action,)) = o.parse_args()
 except ValueError:
     o.print_help()
     sys.exit(2)
 
 if options.default_rev:
   # We now wish to override all the DEFAULTS.
   DEFAULTS['REV'] = options.default_rev
-  for index in ['CHATZILLA', 'INSPECTOR', 'VENKMAN', 'COMM', 'MOZILLA',
+  for index in ['CHATZILLA', 'INSPECTOR', 'COMM', 'MOZILLA',
                 'LDAPSDKS']:
     index += "_REV"
     # Clear the rest from file-defaults
     if index in DEFAULTS:
       del DEFAULTS[index]
 
 if action in ('checkout', 'co'):
     # Update Comm repository configuration.
@@ -677,18 +644,14 @@ if action in ('checkout', 'co'):
     if not options.skip_inspector:
         fixup_inspector_repo_options(options)
         do_hg_pull(os.path.join('mozilla', 'extensions', 'inspector'), options.inspector_repo, options.hg, options.inspector_rev)
 
     if not options.skip_ldap:
         fixup_ldap_repo_options(options)
         do_hg_pull(os.path.join('ldap', 'sdks'), options.ldap_repo, options.hg, options.ldap_rev)
 
-    if not options.skip_venkman:
-        fixup_venkman_repo_options(options)
-        do_hg_pull(os.path.join('mozilla', 'extensions', 'venkman'), options.venkman_repo, options.hg, options.venkman_rev)
-
     if options.apply_patches:
         do_apply_patches(topsrcdir, options.hg)
 
 else:
     o.print_help()
     sys.exit(2)
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -126,33 +126,31 @@ endif
 
 ifdef MOZ_OMNIJAR
 # Make extensions end up as XPIs instead of flat chrome when doing omni.jar.
 # APP_EXTENSIONS exist only bundled with the application,
 # PROFILE_EXTENSIONS will be copied to the profile in installed builds.
 # NOTE: This is a hack to run this at the end of compilation, would be nicer
 # if this was done right away for built-in extensions in omnijar mode.
 # Listed extension GUIDs:
-# 972ce4c6-... Classic Theme, 59c81df5-... ChatZilla, f13b157f-... Venkman
+# 972ce4c6-... Classic Theme, 59c81df5-... ChatZilla
 APP_EXTENSIONS = \
   {972ce4c6-7e08-4474-a285-3208198ce6fd} \
   modern@themes.mozilla.org \
   $(NULL)
 
 PROFILE_EXTENSIONS = \
   debugQA@mozilla.org \
   {59c81df5-4b7a-477b-912d-4e0fdf64e5f2} \
-  {f13b157f-b174-47e7-a34d-4815ddfdfeb8} \
   inspector@mozilla.org \
   $(NULL)
 
 ifneq (en-US, $(AB_CD))
 PROFILE_EXTENSIONS += \
   langpack-$(AB_CD)@chatzilla.mozilla.org \
-  langpack-$(AB_CD)@venkman.mozilla.org \
   $(NULL)
 endif
 
 ABS_DIST = $(abspath $(STAGEDIST))
 
 define _PACKAGE_APP_EXTENSIONS
 @echo "Packaging $(dir).xpi..."
 if test -d "$(ABS_DIST)/extensions/$(dir)"; then \
--- a/suite/branding/nightly/Makefile.in
+++ b/suite/branding/nightly/Makefile.in
@@ -35,17 +35,16 @@ DESKTOP_ICONS = \
 	findBookmarkWindow \
 	findHistoryWindow \
 	history-window \
 	JSConsoleWindow \
 	main-window \
 	messengerWindow \
 	msgcomposeWindow \
 	places \
-	venkman-window \
 	$(NULL) 
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 # Windows icons
 DESKTOP_ICONS += \
 	gif-file \
 	html-file \
 	misc-file \
deleted file mode 100644
index d432c6817dd6f8b474c72e88e78aac79b55c0193..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5560c4cc2d0f6fbd1a6620eb26210a30b200ae57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1b5696a73d4872d887c373cb333e3e1ee4297fb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 069dcc23716f6fe1621c3070fd370a4c87f3dc1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/suite/common/tests/chrome/test_idcheck.xul
+++ b/suite/common/tests/chrome/test_idcheck.xul
@@ -285,22 +285,16 @@
             []
           ],
         // DOM Inspector
         "chrome://inspector/content/inspector.xul":
           [
             window.CheckGenerics,
             []
           ],
-        // Venkman
-        "chrome://venkman/content/venkman.xul":
-          [
-            window.CheckGenerics,
-            []
-          ],
       };
 
       // run test
       for (var uri in uriList)
       {
         // load the window, but postpone the id check until it's fully loaded
         window.gLoadedWindows[uri] = uriList[uri][1]; // ignore these ids
         var win = openDialog(uri, "", "chrome,titlebar,dialog=no,resizable");
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -8,17 +8,17 @@ MOZ_APP_VENDOR=Mozilla
 MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
 MOZ_LDAP_XPCOM=1
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_COMPOSER=1
 MOZ_SUITE=1
 MOZ_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
-MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs"
+MOZ_EXTENSIONS_DEFAULT=" inspector irc gnomevfs"
 MOZ_UPDATER=1
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=seamonkey-comm-central
 MOZ_HELP_VIEWER=1
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -582,24 +582,16 @@
 @BINPATH@/chrome/icons/default/JSConsoleWindow.ico
 @BINPATH@/chrome/icons/default/main-window.ico
 @BINPATH@/chrome/icons/default/misc-file.ico
 @BINPATH@/chrome/icons/default/places.ico
 @BINPATH@/chrome/icons/default/script-file.ico
 @BINPATH@/chrome/icons/default/xml-file.ico
 @BINPATH@/chrome/icons/default/xul-file.ico
 #endif
-; Although venkman-window is an extension, its icon is still suite-specific
-#ifdef MOZ_GTK2
-@BINPATH@/chrome/icons/default/venkman-window.png
-@BINPATH@/chrome/icons/default/venkman-window16.png
-@BINPATH@/chrome/icons/default/venkman-window48.png
-#elifdef XP_WIN32
-@BINPATH@/chrome/icons/default/venkman-window.ico
-#endif
 
 ; [Default Preferences]
 ; All the browser/general pref files must be part of base to prevent migration bugs
 @BINPATH@/@PREF_DIR@/browser-prefs.js
 #ifdef LIBXUL_SDK
 @BINPATH@/@PREF_DIR@/channel-prefs.js
 #endif
 #ifdef MOZ_SERVICES_SYNC
@@ -865,37 +857,16 @@ bin/libfreebl_32int64_3.so
 #else
 @BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome/chatzilla@JAREXT@
 @BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome.manifest
 @BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.js
 @BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.rdf
 #endif
 #endif
 
-[venkman]
-#ifdef MOZ_OMNIJAR
-@BINPATH@/distribution/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi
-#else
-@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome/venkman@JAREXT@
-@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome.manifest
-@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/components/components.list
-@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/components/venkman-service.js
-@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/install.rdf
-#endif
-#ifdef LOCALE_BUILD
-#ifdef MOZ_OMNIJAR
-@BINPATH@/distribution/extensions/langpack-@AB_CD@@venkman.mozilla.org.xpi
-#else
-@BINPATH@/extensions/langpack-@AB_CD@@venkman.mozilla.org/chrome/venkman@JAREXT@
-@BINPATH@/extensions/langpack-@AB_CD@@venkman.mozilla.org/chrome.manifest
-@BINPATH@/extensions/langpack-@AB_CD@@venkman.mozilla.org/install.js
-@BINPATH@/extensions/langpack-@AB_CD@@venkman.mozilla.org/install.rdf
-#endif
-#endif
-
 [inspector]
 #ifdef MOZ_OMNIJAR
 @BINPATH@/distribution/extensions/inspector@mozilla.org.xpi
 #else
 @BINPATH@/extensions/inspector@mozilla.org/install.rdf
 @BINPATH@/extensions/inspector@mozilla.org/chrome.manifest
 @BINPATH@/extensions/inspector@mozilla.org/chrome/inspector@JAREXT@
 #ifdef MOZ_GTK2
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -85,16 +85,29 @@ chrome/icons/default/main-window.xpm
 chrome/icons/default/main-window16.xpm
 chrome/icons/default/messengerWindow.xpm
 chrome/icons/default/messengerWindow16.xpm
 chrome/icons/default/msgcomposeWindow.xpm
 chrome/icons/default/msgcomposeWindow16.xpm
 chrome/icons/default/venkman-window.xpm
 chrome/icons/default/venkman-window16.xpm
 chrome/installed-chrome.txt
+#ifdef MOZ_OMNIJAR
+distribution/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi
+#ifdef LOCALE_BUILD
+distribution/extensions/langpack-@AB_CD@@venkman.mozilla.org.xpi
+#endif
+#endif
+#ifdef MOZ_GTK2
+chrome/icons/default/venkman-window.png
+chrome/icons/default/venkman-window16.png
+chrome/icons/default/venkman-window48.png
+#elifdef XP_WIN32
+chrome/icons/default/venkman-window.ico
+#endif
 #ifndef ENABLE_TESTS
 chrome/layoutdebug.jar
 #else
 #ifndef MOZ_DEBUG
 chrome/layoutdebug.jar
 #endif
 #endif
 chrome/reporter.jar
@@ -106,16 +119,17 @@ components/bookmarks.xpt
 components/BrowserElementAPI.js
 components/@DLL_PREFIX@caps@DLL_SUFFIX@
 components/chatzilla-service.js
 components/@DLL_PREFIX@chrome@DLL_SUFFIX@
 components/components.list
 components/compreg.dat
 components/crashreporter.xpt
 components/downloadmanager.xpt
+components/jsdservice.xpt
 components/@DLL_PREFIX@intlapp@DLL_SUFFIX@
 components/@DLL_PREFIX@jar50@DLL_SUFFIX@
 components/mozbrwsr.xpt
 components/@DLL_PREFIX@mozfind@DLL_SUFFIX@
 components/@DLL_PREFIX@myspell@DLL_SUFFIX@
 components/nsCloseAllWindows.js
 components/nsDictionary.js
 components/nsDownloadProgressListener.js
--- a/suite/installer/windows/nsis/custom.nsi
+++ b/suite/installer/windows/nsis/custom.nsi
@@ -85,39 +85,16 @@
     IntOp $R1 $R1 + 1
     IntOp $R2 $R2 + $R4
     IntOp $R3 $R3 + $R4
   ${Else}
     ; Hide debugQA in the components page if it isn't available.
     SectionSetText ${DEBUG_IDX} ""
   ${EndIf}
 
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type   "checkbox"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text   "$(VENKMAN_TITLE)"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left   "15"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" State  "1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Flags  "GROUP"
-    ${GetSize} "$EXEDIR\optional\distribution\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi" "/S=0K" $0 $8 $9
-    ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\langpack-${AB_CD}@venkman.mozilla.org.xpi"
-      ${GetSize} "$EXEDIR\optional\distribution\extensions\langpack-${AB_CD}@venkman.mozilla.org.xpi" "/S=0K" $1 $8 $9
-      IntOp $0 $0 + $1
-    ${EndIf}
-    SectionSetSize ${VENKMAN_IDX} $0
-    IntOp $R1 $R1 + 1
-    IntOp $R2 $R2 + $R4
-    IntOp $R3 $R3 + $R4
-  ${Else}
-    ; Hide Venkman in the components page if it isn't available.
-    SectionSetText ${VENKMAN_IDX} ""
-  ${EndIf}
-
   ; Set new values for the top and bottom of labels
   ; Top of label box
   StrCpy $R2 27
   ; Bottom of label box
   StrCpy $R3 47
 
   ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type   "label"
@@ -150,22 +127,11 @@
     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
     IntOp $R1 $R1 + 1
     IntOp $R2 $R2 + $R4
     IntOp $R3 $R3 + $R4
   ${EndIf}
 
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type   "label"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text   "$(VENKMAN_TEXT)"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left   "30"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
-    IntOp $R2 $R2 + $R4
-    IntOp $R3 $R3 + $R4
-  ${EndIf}
-
   WriteINIStr "$PLUGINSDIR\components.ini" "Settings" NumFields "$R1"
 
 !macroend
--- a/suite/installer/windows/nsis/installer.nsi
+++ b/suite/installer/windows/nsis/installer.nsi
@@ -238,33 +238,16 @@ Section "-InstallStartCleanup"
     ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\debugQA@mozilla.org.xpi"
       ${DeleteFile} "$INSTDIR\distribution\extensions\debugQA@mozilla.org.xpi"
       ${DeleteFile} "$INSTDIR\extensions\debugQA@mozilla.org.xpi"
       ${If} ${FileExists} "$INSTDIR\extensions\debugQA@mozilla.org"
         RmDir /r "$INSTDIR\extensions\debugQA@mozilla.org"
       ${EndIf}
     ${EndIf}
 
-    ; If Venkman is installed and this install includes Venkman remove it
-    ; from the installation directory. This will remove it if the user
-    ; deselected Venkman on the components page.
-    ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
-      ${DeleteFile} "$INSTDIR\distribution\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
-      ${DeleteFile} "$INSTDIR\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
-      ${If} ${FileExists} "$INSTDIR\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
-        RmDir /r "$INSTDIR\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
-      ${EndIf}
-    ${EndIf}
-    ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\langpack-${AB_CD}@venkman.mozilla.org.xpi"
-      ${DeleteFile} "$INSTDIR\distribution\extensions\langpack-${AB_CD}@venkman.mozilla.org.xpi"
-      ${DeleteFile} "$INSTDIR\extensions\langpack-${AB_CD}@venkman.mozilla.org.xpi"
-      ${If} ${FileExists} "$INSTDIR\extensions\langpack-${AB_CD}@venkman.mozilla.org"
-        RmDir /r "$INSTDIR\extensions\langpack-${AB_CD}@venkman.mozilla.org"
-      ${EndIf}
-    ${EndIf}
   ${EndIf}
 
   ; setup the application model id registration value
   ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
 
   ; Remove the updates directory for Vista and above
   ${CleanUpdateDirectories} "Mozilla\SeaMonkey" "Mozilla\updates"
 
@@ -552,39 +535,16 @@ Section /o "Debug and QA Tools" DEBUG_ID
     ${DeleteFile} "$INSTDIR\distribution\extensions\debugQA@mozilla.org.xpi"
     ClearErrors
     ${LogHeader} "Installing Debug and QA Tools"
     CopyFiles /SILENT "$EXEDIR\optional\distribution\extensions\debugQA@mozilla.org.xpi" \
                       "$INSTDIR\distribution\extensions\"
   ${EndIf}
 SectionEnd
 
-Section /o "JavaScript Debugger" VENKMAN_IDX 
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
-    SetDetailsPrint both 
-    DetailPrint $(STATUS_INSTALL_OPTIONAL)
-    SetDetailsPrint none
-
-    ${RemoveDir} "$INSTDIR\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
-    ${RemoveDir} "$INSTDIR\extensions\langpack-${AB_CD}@venkman.mozilla.org"
-    ${DeleteFile} "$INSTDIR\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
-    ${DeleteFile} "$INSTDIR\extensions\langpack-${AB_CD}@venkman.mozilla.org.xpi"
-    ${DeleteFile} "$INSTDIR\distribution\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
-    ${DeleteFile} "$INSTDIR\distribution\extensions\langpack-${AB_CD}@venkman.mozilla.org.xpi"
-    ClearErrors
-    ${LogHeader} "Installing JavaScript Debugger"
-    CopyFiles /SILENT "$EXEDIR\optional\distribution\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi" \
-                      "$INSTDIR\distribution\extensions\"
-    ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\langpack-${AB_CD}@venkman.mozilla.org.xpi"
-      CopyFiles /SILENT "$EXEDIR\optional\distribution\extensions\langpack-${AB_CD}@venkman.mozilla.org.xpi" \
-                        "$INSTDIR\distribution\extensions\"
-    ${EndIf}
-  ${EndIf}
-SectionEnd
-
 ; Cleanup operations to perform at the end of the installation.
 Section "-InstallEndCleanup"
   SetDetailsPrint both
   DetailPrint "$(STATUS_CLEANUP)"
   SetDetailsPrint none
 
   ; Refresh desktop icons
   System::Call "shell32::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)"
@@ -769,25 +729,16 @@ Function leaveComponents
     ; State will be 1 for checked and 0 for unchecked so we can use that to set
     ; the section flags for installation.
     SectionSetFlags ${DEBUG_IDX} $R0
     IntOp $R1 $R1 + 1
   ${Else}
     SectionSetFlags ${DEBUG_IDX} 0 ; Disable install for debugQA
   ${EndIf}
 
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
-    ${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field $R1" "State"
-    ; State will be 1 for checked and 0 for unchecked so we can use that to set
-    ; the section flags for installation.
-    SectionSetFlags ${VENKMAN_IDX} $R0
-    IntOp $R1 $R1 + 1
-  ${Else}
-    SectionSetFlags ${VENKMAN_IDX} 0 ; Disable install for venkman
-  ${EndIf}
 FunctionEnd
 
 Function preDirectory
   ${PreDirectoryCommon}
 FunctionEnd
 
 Function leaveDirectory
   ${If} $InstallType == ${INSTALLTYPE_BASIC}
@@ -899,26 +850,25 @@ Function preSummary
 
   !insertmacro MUI_HEADER_TEXT "$(SUMMARY_PAGE_TITLE)" "$(SUMMARY_PAGE_SUBTITLE)"
 
   ; The Summary custom page has a textbox that will automatically receive
   ; focus. This sets the focus to the Install button instead.
   !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "summary.ini"
   GetDlgItem $0 $HWNDPARENT 1
   System::Call "user32::SetFocus(i r0, i 0x0007, i,i)i"
-  ${MUI_INSTALLOPTIONS_READ} $1 "summary.ini" "Field 2" "HWND"                  
-  SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR"      
+  ${MUI_INSTALLOPTIONS_READ} $1 "summary.ini" "Field 2" "HWND"
+  SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR"
   !insertmacro MUI_INSTALLOPTIONS_SHOW
 FunctionEnd
 
 Function leaveSummary
   ${If} $InstallType != ${INSTALLTYPE_CUSTOM}
-    ; Set DOM Inspector, Venkman, ChatZilla to be installed
+    ; Set DOM Inspector, ChatZilla to be installed
     SectionSetFlags ${DOMI_IDX} 1
-    SectionSetFlags ${VENKMAN_IDX} 1
     SectionSetFlags ${CZ_IDX} 1
   ${EndIf}
   ; Try to delete the app executable and if we can't delete it try to find the
   ; app's message window and prompt the user to close the app. This allows
   ; running an instance that is located in another directory. If for whatever
   ; reason there is no message window we will just rename the app's files and
   ; then remove them on restart.
   ClearErrors
@@ -1038,9 +988,8 @@ Function .onInit
   ; Initialize $hHeaderBitmap to prevent redundant changing of the bitmap if
   ; the user clicks the back button
   StrCpy $hHeaderBitmap ""
 FunctionEnd
 
 Function .onGUIEnd
   ${OnEndCommon}
 FunctionEnd
-
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -132,29 +132,25 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
 
 install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
 
 # Extend l10n.mk clobber-% target for our localised extensions
 clobber-%:
 	$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi
-	$(RM) -rf $(DIST)/xpi-stage/venkman-$* $(DIST)/xpi-stage/venkman-*.$*.xpi
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../mozilla/toolkit/locales libs-$*
 	@$(MAKE) -C ../../mozilla/services/sync/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$*
 	@if test -d ../../mozilla/extensions/irc; then \
 	  $(MAKE) -C ../../mozilla/extensions/irc/locales libs-$*; \
 	fi
-	@if test -d ../../mozilla/extensions/venkman; then \
-	  $(MAKE) -C ../../mozilla/extensions/venkman/locales libs-$*; \
-	fi
 	@$(MAKE) -C ../../mozilla/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../mozilla/intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 
 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
 repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES)
 	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
 	$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
@@ -195,19 +191,16 @@ clobber-zip:
 	  $(STAGEDIST)/distribution/extensions/langpack-$(AB_CD)@* \
 
 repackage-zip: repackage-extensions
 
 repackage-extensions: $(STAGEDIST)
 	if test -d ../../mozilla/extensions/irc; then \
 	  $(MAKE) -C ../../mozilla/extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST); \
 	fi
-	if test -d ../../mozilla/extensions/venkman; then \
-	  $(MAKE) -C ../../mozilla/extensions/venkman/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST); \
-	fi
 ifdef MOZ_OMNIJAR
 	$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST);
 endif
 
 repackage-zip-%: $(call ESCAPE_WILDCARD,$(ZIP_IN)) $(STAGEDIST) libs-%
 	@$(MAKE) repackage-zip AB_CD=$* ZIP_IN=$(ZIP_IN)
 
 langpack: langpack-$(AB_CD)
--- a/suite/locales/en-US/installer/windows/custom.properties
+++ b/suite/locales/en-US/installer/windows/custom.properties
@@ -21,18 +21,16 @@
 REG_APP_DESC=$BrandShortName delivers safe, easy web browsing. A familiar user interface, enhanced security features including protection from online identity theft, and integrated search let you get the most out of the web.
 OPTIONAL_COMPONENTS_TITLE=Choose Optional Components
 OPTIONAL_COMPONENTS_SUBTITLE=Choose which features of $BrandFullNameDA you want to install.
 OPTIONAL_COMPONENTS_LABEL=Optional Components:
 DOMI_TITLE=DOM Inspector
 DOMI_TEXT=Inspects the structure and properties of a window and its contents.
 DEBUGQA_TITLE=Debug and QA UI
 DEBUGQA_TEXT=Provides additional debug and QA UI for $BrandShortName development.
-VENKMAN_TITLE=JavaScript Debugger
-VENKMAN_TEXT=JavaScript debugger and profiler
 CHATZILLA_TITLE=ChatZilla
 CHATZILLA_TEXT=A clean, easy to use and highly extensible IRC client.
 CONTEXT_OPTIONS=$BrandShortName &Options
 CONTEXT_SAFE_MODE=$BrandShortName &Safe Mode
 SAFE_MODE=Safe Mode
 # MAILNEWS_TEXT appears in Windows (All) Programs menu as "SeaMonkey $(MAILNEWS_TEXT)"
 MAILNEWS_TEXT=Mail
 PROFILE_TEXT=Profile Manager