240277 - help not packaged with installer builds. Patch from Jeff Walden <jwalden+fxhelp@mit.edu>. r=ben@mozilla.org. Also correct the objdir/srcdir variables in the installer generation makefile

browser/installer/windows/Makefile.in

@@ -43,8 +43,8 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 CONFIG_DIR=$(shell cygpath -a $(srcdir))
-OBJ_DIR=$(shell cygpath -a $(topsrcdir))
+OBJ_DIR=$(shell cygpath -a $(DEPTH))
-SRC_DIR=$(shell cygpath -a $(DEPTH))
+SRC_DIR=$(shell cygpath -a $(topsrcdir))
 
 installer:
 	cd $(topsrcdir)/toolkit/mozapps/installer && perl build_static.pl -config "$(CONFIG_DIR)" -srcDir "$(SRC_DIR)" -objDir "$(OBJ_DIR)"

browser/installer/windows/config.it

@@ -235,9 +235,10 @@ C2=Component Uninstaller
 C3=Component US English Profile Defaults
 C4=Component En US lang pack
 C5=Component US region pack
+C6=Component Help
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
-; C6=Component QFA
+; C7=Component QFA
 
 [Setup Type1]
 ;*** LOCALIZE ME BABY ***
@@ -256,9 +257,10 @@ C4=Component Uninstaller
 C5=Component US English Profile Defaults
 C6=Component En US lang pack
 C7=Component US region pack
+C8=Component Help
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
-; C8=Component QFA
+; C9=Component QFA
 
 [Dialog Select Components]
 Show Dialog=TRUE
@@ -642,6 +644,17 @@ Attributes=FORCE_UPGRADE|VISIBLE
 Force Upgrade File0=[SETUP PATH]\chrome\inspector.jar
 FileCount=$FileCount$
 
+[Component Help]
+Description Short=$ProductName$ Help
+;*** LOCALIZE ME BABY ***
+Description Long=Offline Help for learning about and using $ProductName$.
+Archive=help.xpi
+$InstallSize$:help
+$InstallSizeArchive$:help.xpi
+Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
+Force Upgrade File0=[SETUP PATH]\chrome\help.jar
+FileCount=$FileCount$
+
 [Component Uninstaller]
 Description Short=$CompanyName$ Uninstaller
 ;*** LOCALIZE ME BABY ***

browser/installer/windows/installer.cfg

@@ -8,6 +8,6 @@ FileMainEXE               = firefox.exe
 FileUninstall             = UninstallFirefox.exe
 FileUninstallZIP          = UninstallFirefox.zip
 FileInstallerNETRoot      = FirefoxNetSetup
-ComponentList             = xpcom,browser,deflenus,langenus,regus,abe,adt
+ComponentList             = xpcom,browser,deflenus,langenus,regus,abe,adt,help
 LicenseFile               = browser/LICENSE
 7ZipSFXModule             = other-licenses/7zstub/firefox/7zSD.sfx

browser/installer/windows/packages-static

@@ -276,6 +276,10 @@ bin\res\inspector\search-registry.rdf
 ; bin\components\venkman-service.js
 ; bin\chrome\venkman.jar
 
+; [Help]
+[help]
+bin\chrome\help.jar
+
 ; [Additional Browsing Enhancements]
 [abe]