102574 - enable DOM Inspector in the default builds, r=leaf, sr=shaver

build/mac/build_scripts/MozillaBuildFlags.txt

@@ -48,7 +48,7 @@ ldap            1      MOZ_LDAP_XPCOM
 ldap_experimental 0    MOZ_LDAP_XPCOM_EXPERIMENTAL
 xmlextras       1
 soap            0      MOZ_SOAP
-inspector       0
+inspector       1
 mailextras      1
 xptlink         0
 psm             0      ENABLE_SMIME

configure

@@ -10005,8 +10005,8 @@ fi
 
 
 
-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help transformiix venkman"
-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm inspector access-builtin ctl" 
+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help transformiix venkman inspector"
+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin ctl" 
 
 if test -n "$SUNCTL"; then
   MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl"

configure.in

@@ -2794,8 +2794,8 @@ dnl ========================================================
 dnl Need cookie and wallet to build mozilla, this should
 dnl not be the case, 18352 has been filed.
 dnl http://bugzilla.mozilla.org/show_bug.cgi?id=18352
-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help transformiix venkman"
-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm inspector access-builtin ctl" 
+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help transformiix venkman inspector"
+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin ctl" 
 
 dnl Check if Thai Rendering Extension needs to be enabled
 if test -n "$SUNCTL"; then

extensions/makefile.win

@@ -24,6 +24,7 @@ include <$(DEPTH)/config/config.mak>
 
 DIRS = wallet \
 	cookie \
+	inspector \
 	irc \
 !if !defined(DISABLE_JSD) && !defined(DISABLE_VENKMAN)
     venkman \

xpinstall/packager/mac/inspector.jst

@@ -0,0 +1,24 @@
+var err = initInstall("DOM Inspector", "Inspector", "$Version$"); 
+logComment("initInstall: " + err);
+
+var fProgram = getFolder("Program");
+var srDest = $SpaceRequired$;
+
+if (verifyDiskSpace(fProgram, srDest))
+{
+  err = addDirectory("", "$Version$", "bin", fProgram, "", true);
+  logComment("addDirectory: " + err);
+  
+  var jarFolder = getFolder("Chrome", "inspector.jar");
+  registerChrome(PACKAGE | DELAYED_CHROME, jarFolder, "content/inspector/");
+  registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/modern/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(INSUFFICIENT_DISK_SPACE);
+

xpinstall/packager/packages-mac

@@ -336,3 +336,11 @@ viewer:chrome:venkman.jar
 ; distribution so that it can be seamlessly replaced with a
 ; legitimate one for milestone builds, without breaking the
 ; installer nor having to rebuild it.
+
+[inspector]
+viewer:Components:inspector.shlb
+viewer:Components:inspector.xpt
+viewer:chrome:inspector.jar
+viewer:defaults:pref:inspector.js
+viewer:res:inspector:viewer-registry.rdf
+viewer:res:inspector:search-registry.rdf

xpinstall/packager/packages-static-unix

@@ -252,3 +252,11 @@ bin/components/pippki.xpt
 bin/chrome/pipnss.jar
 bin/chrome/pippki.jar
 bin/res/nssifail.txt
+
+[inspector]
+bin/components/inspector.so
+bin/components/inspector.xpt
+bin/chrome/inspector.jar
+bin/defaults/pref/inspector.js
+bin/res/inspector/viewer-registry.rdf
+bin/res/inspector/search-registry.rdf

xpinstall/packager/packages-static-win

@@ -262,3 +262,10 @@ bin\chrome\pipnss.jar
 bin\chrome\pippki.jar
 bin\res\nssifail.txt
 
+[inspector]
+bin\components\inspector.dll
+bin\components\inspector.xpt
+bin\chrome\inspector.jar
+bin\defaults\pref\inspector.js
+bin\res\inspector\viewer-registry.rdf
+bin\res\inspector\search-registry.rdf

xpinstall/packager/packages-unix

@@ -361,3 +361,11 @@ bin/components/pippki.xpt
 bin/chrome/pipnss.jar
 bin/chrome/pippki.jar
 bin/res/nssifail.txt
+
+[inspector]
+bin/components/inspector.so
+bin/components/inspector.xpt
+bin/chrome/inspector.jar
+bin/defaults/pref/inspector.js
+bin/res/inspector/viewer-registry.rdf
+bin/res/inspector/search-registry.rdf

xpinstall/packager/packages-win

@@ -369,3 +369,10 @@ bin\chrome\pipnss.jar
 bin\chrome\pippki.jar
 bin\res\nssifail.txt
 
+[inspector]
+bin\components\inspector.dll
+bin\components\inspector.xpt
+bin\chrome\inspector.jar
+bin\defaults\pref\inspector.js
+bin\res\inspector\viewer-registry.rdf
+bin\res\inspector\search-registry.rdf

xpinstall/packager/unix/config.it

@@ -48,7 +48,7 @@ C7=Component8
 ; *** LOCALIZE ME BABY ***
 Description Short=Complete
 ; *** LOCALIZE ME BABY ***
-Description Long=Navigator, Mail & News, Chatzilla, and Debugger
+Description Long=Navigator, Mail & News, Chatzilla, Debugger, and Inspector
 C0=Component0
 C1=Component1
 C2=Component2
@@ -59,6 +59,7 @@ C6=Component6
 C7=Component7
 C8=Component8
 C9=Component9
+C10=Component10
 
 [Setup Type2]
 ; *** LOCALIZE ME BABY ***
@@ -88,6 +89,7 @@ C6=Component6
 C7=Component7
 C8=Component8
 C9=Component9
+C10=Component10
 
 
 ;-------------------------------------------------------------------------
@@ -198,6 +200,16 @@ $InstallSizeArchive$:venkman.xpi
 Attributes=SELECTED
 URL0=$URLPath$
 
+[Component10]
+Description Short=Inspector
+; *** LOCALIZE ME BABY ***
+Description Long=DOM Inspector
+Archive=inspector.xpi
+$InstallSize$:inspector
+$InstallSizeArchive$:inspector.xpi
+Attributes=SELECTED
+URL0=$URLPath$
+
 ;-------------------------------------------------------------------------
 [Dialog Start Install]
 ;-------------------------------------------------------------------------

xpinstall/packager/unix/inspector.jst

@@ -0,0 +1,25 @@
+var err = initInstall("DOM Inspector", "Inspector", "$Version$"); 
+logComment("initInstall: " + err);
+
+var fProgram = getFolder("Program");
+var srDest = $SpaceRequired$;
+
+if (verifyDiskSpace(fProgram, srDest))
+{
+  err = addDirectory("", "$Version$", "bin", fProgram, "", true);
+  logComment("addDirectory: " + err);
+  
+  var jarFolder = getFolder("Chrome", "inspector.jar");
+  registerChrome(PACKAGE | DELAYED_CHROME, jarFolder, "content/inspector/");
+  registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/modern/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);
+}
+else
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/windows/config.it

@@ -195,7 +195,8 @@ C8=Component En US lang pack
 C9=Component US region pack
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
-C10=Component QFA
+C10=Component DOM Inspector
+C11=Component QFA
 
 [Setup Type2]
 ;*** LOCALIZE ME BABY ***
@@ -220,7 +221,8 @@ C8=Component En US lang pack
 C9=Component US region pack
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
-C10=Component QFA
+C10=Component DOM Inspector
+C11=Component QFA
 
 
 
@@ -661,6 +663,17 @@ $InstallSizeArchive$:venkman.xpi
 Attributes=SELECTED|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\Chrome\venkman.jar
 
+[Component DOM Inspector]
+Description Short=Inspector
+;*** LOCALIZE ME BABY ***
+Description Long=DOM Inspector
+Archive=inspector.xpi
+$InstallSize$:inspector
+$InstallSizeSystem$
+$InstallSizeArchive$:inspector.xpi
+Attributes=SELECTED|FORCE_UPGRADE
+Force Upgrade File0=[SETUP PATH]\Chrome\inspector.jar
+
 [Component US English Profile Defaults]
 Description Short=US English profile defaults
 ;*** LOCALIZE ME BABY ***

xpinstall/packager/windows/inspector.jst

@@ -0,0 +1,24 @@
+$Ren8dot3List$
+
+var err = initInstall("DOM Inspector", "Inspector", "$Version$"); 
+logComment("initInstall: " + err);
+
+$Ren8dot3Call$
+
+var fProgram = getFolder("Program");
+logComment("fProgram: " + fProgram);
+
+err = addDirectory("", "$Version$", "bin", fProgram, "", true);
+logComment("addDirectory: " + err);
+
+var jarFolder = getFolder("Chrome", "inspector.jar");
+registerChrome(PACKAGE | DELAYED_CHROME, jarFolder, "content/inspector/");
+registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/modern/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);

xpinstall/packager/windows/makeall.pl

@@ -97,7 +97,8 @@ if(!(-d "$inStagePath"))
                    "deflenus",
                    "langenus",
                    "regus",
-                   "venkman");
+                   "venkman",
+                   "inspector");
 
 if(VerifyComponents()) # return value of 0 means no errors encountered
 {

xpinstall/wizard/mac/macbuild/config.ini_tmpl

@@ -45,6 +45,7 @@ C5=Component5
 C6=Component6
 C7=Component7
 C8=Component8
+C9=Component9
 
 [Dialog Select Components]
 ; *** LOCALIZE ME BABY ***
@@ -131,6 +132,15 @@ Install Size=<#venkman_actualSize>
 Archive Size=<#venkman_archiveSize>
 Attributes=SELECTED
 
+[Component9]
+Description Short=Inspector
+; *** LOCALIZE ME BABY ***
+Description Long=DOM Inspector
+Archive=inspector.xpi
+Install Size=<#inspector_actualSize>
+Archive Size=<#inspector_archiveSize>
+Attributes=SELECTED
+
 [Dialog Start Install]
 ; *** LOCALIZE ME BABY ***
 Message0=Click the Install button to download and install the selected components.