Backing out to see if it fixes the creature orange

xpinstall/packager/Makefile.in

@@ -55,11 +55,7 @@ MOZ_PKG_FORMAT	= DMG
 else
 ifeq (,$(filter-out OS2 WINNT, $(OS_ARCH)))
 MOZ_PKG_FORMAT  = ZIP
-ifeq (,$(filter-out OS2, $(OS_ARCH)))
-INSTALLER_DIR   = os2
-else
 INSTALLER_DIR   = windows
-endif
 else
 ifeq (,$(filter-out SunOS, $(OS_ARCH)))
 MOZ_PKG_FORMAT	= BZ2

xpinstall/packager/make_stage.pl

@@ -89,7 +89,7 @@ if(!$inProductName || !$inOs)
   PrintUsage();
 }
 
-if(($inOs eq 'win') || ($inOs eq 'os2'))
+if($inOs =~ /^win$/i)
 {
   $gOsPkg = "dos";
 }
@@ -128,7 +128,7 @@ else
 }
 
 # This is where the stage area is actually created.
-&StageProduct($inDirSrcDist, $inDirDestStage, $inProductName, $gOsPkg, $inOs);
+&StageProduct($inDirSrcDist, $inDirDestStage, $inProductName, $gOsPkg);
 chdir($gDirCwd);
 
 exit(0);
@@ -193,10 +193,9 @@ sub ParseArgV
       if($#myArgv >= ($counter + 1))
       {
         ++$counter;
-        if(($myArgv[$counter] eq 'win') ||
-           ($myArgv[$counter] eq 'mac') ||
-           ($myArgv[$counter] eq 'unix') ||
-           ($myArgv[$counter] eq 'os2'))
+        if(($myArgv[$counter] =~ /^win$/i) ||
+           ($myArgv[$counter] =~ /^mac$/i) ||
+           ($myArgv[$counter] =~ /^unix$/i))
         {
           $inOs = $myArgv[$counter];
         }

xpinstall/packager/stage_mozilla.pl

@@ -41,7 +41,7 @@ return(1);
 
 sub StageProduct
 {
-  my($aDirSrcDist, $aDirStage, $aProductName, $aOsPkg, $aInOs) = @_;
+  my($aDirSrcDist, $aDirStage, $aProductName, $aOsPkg) = @_;
   my($dirDistPackagesProductName) = "$aDirSrcDist/packages/$aProductName";
   my($dirStageProductName)        = "$aDirStage/$aProductName";
   my($dirMozRoot)                 = StageUtils::GetAbsPath("moz_root");
@@ -62,9 +62,9 @@ sub StageProduct
 
   StageUtils::CleanupStage($aDirStage, $aProductName);
   StageUtils::CleanupDistPackages("$aDirSrcDist/packages", $aProductName);
-  StageUtils::CopyAdditionalPackage("$dirMozPackager/xpcom-$aInOs",                   $dirDistPackagesProductName);
-  StageUtils::CopyAdditionalPackage("$dirMozPackager/packages-$aInOs",                    $dirDistPackagesProductName);
-#  StageUtils::GeneratePackagesFromSinglePackage($inOs, "$dirMozPackager/packages-$aInOs", $dirDistPackagesProductName);
+  StageUtils::CopyAdditionalPackage("$dirMozPackager/xpcom-win.pkg",                   $dirDistPackagesProductName);
+  StageUtils::CopyAdditionalPackage("$dirMozPackager/packages-win",                    $dirDistPackagesProductName);
+#  StageUtils::GeneratePackagesFromSinglePackage($inOs, "$dirMozPackager/packages-win", $dirDistPackagesProductName);
 
   # Call CreateStage() to create the aProductName stage dir using the packages
   # in dist/packages.