commiting patch from bsmedberg@covad.net that fixes bug 162079 - installer: lack of objdir support. r=ssu, sr=dveditz

xpinstall/packager/make_stage.pl

@@ -63,11 +63,12 @@ $inProductName    = undef;
 $inStagingScript  = undef;
 $inOs             = undef;
 $gDirMozRoot      = StageUtils::GetAbsPath("moz_root");
-$inDirSrcDist     = StageUtils::GetAbsPath("moz_dist");
 $inDirDestStage   = "$gDirMozRoot/stage";
 
 ParseArgV(@ARGV);
 
+$inDirSrcDist     = StageUtils::GetAbsPath("moz_dist") if !defined($inDirSrcDist);
+
 if(!$inProductName || !$inOs)
 {
   PrintUsage();

xpinstall/packager/win_gre/makeall.pl

@@ -97,9 +97,9 @@ $gDirStageProduct     = "$inStagePath/gre";
 
 # Create the stage area here.
 # If -sd is not used, the default stage dir will be: $topsrcdir/stage
-if(system("perl \"$gDirPackager/make_stage.pl\" -pn gre -os win -sd \"$inStagePath\""))
+if(system("perl \"$gDirPackager/make_stage.pl\" -pn gre -os win -sd \"$inStagePath\" -dd \"$inDistPath\""))
 {
-  die "\n Error: perl \"$gDirPackager/make_stage.pl\" -pn gre -os win -sd \"$inStagePath\"\n";
+  die "\n Error: perl \"$gDirPackager/make_stage.pl\" -pn gre -os win -sd \"$inStagePath\" -dd \"$inDistPath\"\n";
 }
 
 $seiFileNameGeneric       = "nsinstall.exe";

xpinstall/wizard/windows/builder/build.pl

@@ -41,8 +41,7 @@ use File::Basename;
 
 $DEPTH         = "../../../..";
 $topsrcdir     = GetTopSrcDir();
-$inStagePath   = "$topsrcdir/stage";
-$inDistPath    = "$topsrcdir/dist";
+$topobjdir     = "$topsrcdir";
 $inXpiURL      = "ftp://not.supplied.invalid";
 $inRedirIniURL = $inXpiURL;
 
@@ -54,6 +53,8 @@ require StageUtils;
 ParseArgv(@ARGV);
 
 $DEPTH            = "$topsrcdir" if !defined($DEPTH);
+$inStagePath      = "$topobjdir/stage" if !defined($inStagePath);
+$inDistPath       = "$topobjdir/dist" if !defined($inDistPath);
 $cwdBuilder       = "$topsrcdir/xpinstall/wizard/windows/builder";
 $gDistInstallPath = "$inDistPath/install";
 $gPackagerPath    = "$topsrcdir/xpinstall/packager";
@@ -92,6 +93,8 @@ sub PrintUsage
 
            -h                - this usage.
 
+           -objDir <path>    - the build directory (defaults to a srcdir build)
+
            -stagePath <path> - Full path to where the mozilla stage dir is at.
                                Default path, if one is not set, is:
                                  [mozilla]/stage
@@ -125,6 +128,14 @@ sub ParseArgv
     {
       PrintUsage();
     }
+    elsif($myArgv[$counter] =~ /^[-,\/]objDir$/i)
+    {
+      if($#myArgv >= ($counter + 1))
+      {
+        ++$counter;
+        $topobjdir = $myArgv[$counter];
+      }
+    }
     elsif($myArgv[$counter] =~ /^[-,\/]stagePath$/i)
     {
       if($#myArgv >= ($counter + 1))