From f472cba512951a07b09e42b112a23be172e6432e Mon Sep 17 00:00:00 2001 From: "cmp%mozilla.org" Date: Thu, 10 Mar 2005 00:35:32 +0000 Subject: [PATCH] Backing out attachment 176056 from bug 282335. creature's orange and this check-in appears to be the cause. Backing out should fix it. --- xpinstall/packager/Makefile.in | 4 ---- xpinstall/packager/make_stage.pl | 15 ++++++++++++--- xpinstall/packager/os2/makeall.pl | 4 ++-- xpinstall/packager/stage_mozilla.pl | 25 ++++++------------------- 4 files changed, 20 insertions(+), 28 deletions(-) diff --git a/xpinstall/packager/Makefile.in b/xpinstall/packager/Makefile.in index adaf1b9ce04..1c54bc8b19a 100644 --- a/xpinstall/packager/Makefile.in +++ b/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 diff --git a/xpinstall/packager/make_stage.pl b/xpinstall/packager/make_stage.pl index a05151fe443..96808785537 100644 --- a/xpinstall/packager/make_stage.pl +++ b/xpinstall/packager/make_stage.pl @@ -59,6 +59,7 @@ $gDirCwd = cwd(); push(@INC, $gDirScripts); require StageUtils; +$gOsPkg = undef; $inProductName = undef; $inStagingScript = undef; $inOs = undef; @@ -88,6 +89,15 @@ if(!$inProductName || !$inOs) PrintUsage(); } +if($inOs =~ /^win$/i) +{ + $gOsPkg = "dos"; +} +else +{ + $gOsPkg = $inOs; +} + if(!$inStagingScript) { # Look for the stage script in cwd first, then look at the @@ -118,7 +128,7 @@ else } # This is where the stage area is actually created. -&StageProduct($inDirSrcDist, $inDirDestStage, $inProductName, $inOs); +&StageProduct($inDirSrcDist, $inDirDestStage, $inProductName, $gOsPkg); chdir($gDirCwd); exit(0); @@ -185,7 +195,6 @@ sub ParseArgV ++$counter; if(($myArgv[$counter] =~ /^win$/i) || ($myArgv[$counter] =~ /^mac$/i) || - ($myArgv[$counter] =~ /^os2$/i) || ($myArgv[$counter] =~ /^unix$/i)) { $inOs = $myArgv[$counter]; @@ -242,7 +251,7 @@ sub PrintUsage mozilla * -os - win, mac, unix, os2 + win, mac, unix '*' indicates required parameters. \n"; diff --git a/xpinstall/packager/os2/makeall.pl b/xpinstall/packager/os2/makeall.pl index e428908de92..a61c27eb633 100644 --- a/xpinstall/packager/os2/makeall.pl +++ b/xpinstall/packager/os2/makeall.pl @@ -81,7 +81,7 @@ $inRedirIniURL = $inXpiURL if !defined($inRedirIni if(defined($ENV{DEBUG_INSTALLER_BUILD})) { - print " os2/makeall.pl\n"; + print " windows/makeall.pl\n"; print " topobjdir : $topobjdir\n"; print " topsrcdir : $topsrcdir\n"; print " inStagePath: $inStagePath\n"; @@ -135,7 +135,7 @@ $gDirDistInstall = "$inDistPath/install"; if(defined($ENV{DEBUG_INSTALLER_BUILD})) { - print " back in os2/makeall.pl\n"; + print " back in windows/makeall.pl\n"; print " inStagePath: $inStagePath\n"; print " inDistPath : $inDistPath\n"; } diff --git a/xpinstall/packager/stage_mozilla.pl b/xpinstall/packager/stage_mozilla.pl index 26ad879ccdc..bd95becb6b3 100644 --- a/xpinstall/packager/stage_mozilla.pl +++ b/xpinstall/packager/stage_mozilla.pl @@ -41,7 +41,7 @@ return(1); sub StageProduct { - my($aDirSrcDist, $aDirStage, $aProductName, $aInOs) = @_; + my($aDirSrcDist, $aDirStage, $aProductName, $aOsPkg) = @_; my($dirDistPackagesProductName) = "$aDirSrcDist/packages/$aProductName"; my($dirStageProductName) = "$aDirStage/$aProductName"; my($dirMozRoot) = StageUtils::GetAbsPath("moz_root"); @@ -53,37 +53,24 @@ sub StageProduct print " aDirSrcDist : $aDirSrcDist\n"; print " aDirStage : $aDirStage\n"; print " aProductName : $aProductName\n"; - print " aInOs : $aInOs\n"; + print " aOsPkg : $aOsPkg\n"; print " dirDistPackagesProductName : $dirDistPackagesProductName\n"; print " dirStageProductName : $dirStageProductName\n"; print " dirMozRoot : $dirMozRoot\n"; print " dirMozPackager : $dirMozPackager\n"; } - my($osPkg); - my($osPkgFile); - if($aInOs =~ /^win$/i) - { - $osPkg = "dos"; - $osPkgFile = "win"; - } - else - { - $osPkg = $aInOs; - $osPkgFile = $aInOs; - } - StageUtils::CleanupStage($aDirStage, $aProductName); StageUtils::CleanupDistPackages("$aDirSrcDist/packages", $aProductName); - StageUtils::CopyAdditionalPackage("$dirMozPackager/xpcom-$osPkgFile.pkg", $dirDistPackagesProductName); - StageUtils::CopyAdditionalPackage("$dirMozPackager/packages-$osPkgFile", $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. - StageUtils::CreateStage($aDirSrcDist, $dirStageProductName, $dirDistPackagesProductName, $osPkg); + StageUtils::CreateStage($aDirSrcDist, $dirStageProductName, $dirDistPackagesProductName, $aOsPkg); # consolidate the .xpt files for each xpi into one file - system("perl \"$dirMozPackager/xptlink.pl\" --source \"$aDirSrcDist\" --destination \"$dirStageProductName\" -o $osPkg --verbose"); + system("perl \"$dirMozPackager/xptlink.pl\" --source \"$aDirSrcDist\" --destination \"$dirStageProductName\" -o $aOsPkg --verbose"); }