From b3c85debe1740e2d26b99643300d990024008d89 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Wed, 24 Mar 2004 23:31:22 +0000
Subject: [PATCH] Bug #238562 --> get DOM Inspector working as an optional
 component in the windows installer.

Add ADT xpi information to the windows installer
---
 mail/installer/windows/adt.jst       | 40 ++++++++++++++++++++++++++++
 mail/installer/windows/basemail-win  | 11 ++++++++
 mail/installer/windows/config.it     | 12 +++++++++
 mail/installer/windows/installer.cfg |  2 +-
 4 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 mail/installer/windows/adt.jst

diff --git a/mail/installer/windows/adt.jst b/mail/installer/windows/adt.jst
new file mode 100644
index 00000000000..b8b87513641
--- /dev/null
+++ b/mail/installer/windows/adt.jst
@@ -0,0 +1,40 @@
+var err = initInstall("Developer Tools", "Developer Tools", "$Version$"); 
+logComment("initInstall: " + err);
+
+// JavaScript Debugger
+// addFile("Venkman Service",
+//        "bin/components/venkman-service.js",
+//        getFolder("Components"),
+//        "");
+
+// addFile("Venkman Chrome",
+//        "bin/chrome/venkman.jar",   // jar source folder 
+//        getFolder("Chrome"),        // target folder
+//        "");                        // target subdir 
+
+// registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome","venkman.jar"), "content/venkman/");
+// registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","venkman.jar"), "skin/modern/venkman/");
+// registerChrome(LOCALE | DELAYED_CHROME, getFolder("Chrome","venkman.jar"), "locale/en-US/venkman/");
+
+// DOM Inspector
+var fProgram = getFolder("Program");
+logComment("fProgram: " + fProgram);
+
+err = addDirectory("", "$Version$", "thunderbird", fProgram, "", true);
+logComment("addDirectory: " + err);
+
+addFile("Inspector Command Line Handler",
+        "thunderbird/components/inspector-cmdline.js",
+        getFolder("Components"),
+        "");
+
+var jarFolder = getFolder("Chrome", "inspector.jar");
+registerChrome(PACKAGE | DELAYED_CHROME, jarFolder, "content/inspector/");
+registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/classic/inspector/");
+registerChrome(LOCALE | DELAYED_CHROME, jarFolder, "locale/en-US/inspector/");
+
+err = getLastError();
+if (err==SUCCESS)
+    performInstall(); 
+else
+    cancelInstall(err);
diff --git a/mail/installer/windows/basemail-win b/mail/installer/windows/basemail-win
index 2f3ecc5ff87..bb774276f58 100644
--- a/mail/installer/windows/basemail-win
+++ b/mail/installer/windows/basemail-win
@@ -40,6 +40,17 @@ thunderbird\mozz.dll
 [offline]
 thunderbird\chrome\offline.jar
 
+; [Additional Developer Tools]
+[adt]
+; [Document Inspector]
+thunderbird\components\inspector-cmdline.js
+thunderbird\components\inspector.dll
+thunderbird\components\inspector.xpt
+thunderbird\chrome\inspector.jar
+thunderbird\defaults\pref\inspector.js
+thunderbird\res\inspector\viewer-registry.rdf
+thunderbird\res\inspector\search-registry.rdf
+
 [mail]
 
 thunderbird\xpicleanup.exe
diff --git a/mail/installer/windows/config.it b/mail/installer/windows/config.it
index a741580d064..cc31be51b12 100644
--- a/mail/installer/windows/config.it
+++ b/mail/installer/windows/config.it
@@ -255,6 +255,7 @@ C3=Component US English Profile Defaults
 C4=Component En US lang pack
 C5=Component US region pack
 C6=Component Offline
+C7=Component ADT
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
 ; C8=Component QFA
@@ -660,6 +661,17 @@ Attributes=FORCE_UPGRADE|VISIBLE
 Force Upgrade File0=[SETUP PATH]\chrome\offline.jar
 FileCount=$FileCount$
 
+[Component ADT]
+Description Short=Developer Tools
+;*** LOCALIZE ME BABY ***
+Description Long=Tools for web developers including the Document Inspector. 
+Archive=adt.xpi
+$InstallSize$:adt
+$InstallSizeArchive$:adt.xpi
+Attributes=FORCE_UPGRADE|VISIBLE
+Force Upgrade File0=[SETUP PATH]\chrome\inspector.jar
+FileCount=$FileCount$
+
 [Component Uninstaller]
 Description Short=$CompanyName$ Uninstaller
 ;*** LOCALIZE ME BABY ***
diff --git a/mail/installer/windows/installer.cfg b/mail/installer/windows/installer.cfg
index 87fdcd4a9c6..822d97fa2da 100644
--- a/mail/installer/windows/installer.cfg
+++ b/mail/installer/windows/installer.cfg
@@ -10,5 +10,5 @@ FileMainEXE               = thunderbird.exe
 FileUninstall             = UninstallThunderbird.exe
 FileUninstallZIP          = UninstallThunderbird.zip
 FileInstallerNETRoot      = ThunderbirdNetSetup
-ComponentList             = xpcom,mail,deflenus,langenus,regus,offline
+ComponentList             = xpcom,mail,deflenus,langenus,regus,offline,adt
 LicenseFile               = mail/LICENSE.txt