Fix scripts that build the installer. These are for developers to run

after a build is complete.  They are not part of the build system.
This commit is contained in:
dprice%netscape.com 2002-08-07 09:37:44 +00:00
parent 844a01e44f
commit 4d54280061
2 changed files with 85 additions and 42 deletions

View File

@ -65,18 +65,21 @@ $cwdPackager = GetCwd("packager", $DEPTH, $cwdBuilder);
$verPartial = "5.0.0.";
$ver = $verPartial . GetVersion($DEPTH);
if(-d "$cwdDist\\stage")
if(-d "$DEPTH\\stage")
{
system("perl $cwdPackager\\windows\\rdir.pl $cwdDist\\stage");
system("perl $cwdPackager\\windows\\rdir.pl $DEPTH\\stage");
}
mkdir("$cwdDist\\stage", 775);
system("perl $cwdPackager\\pkgcp.pl -s $cwdDistWin -d $cwdDist\\stage -f $cwdPackager\\packages-win -o dos -v");
# The destination cannot be a sub directory of the source.
# pkgcp.pl will get very unhappy.
mkdir("$DEPTH\\stage", 775);
system("perl $cwdPackager\\pkgcp.pl -s $cwdDistWin -d $DEPTH\\stage -f $cwdPackager\\packages-win -o dos -v");
chdir("$cwdPackager\\windows");
if(system("perl makeall.pl $ver $cwdDist\\stage $cwdDistWin\\install -aurl $inXpiURL -rurl $inRedirIniURL"))
if(system("perl makeall.pl $ver $DEPTH\\stage $cwdDistWin\\install -aurl $inXpiURL -rurl $inRedirIniURL"))
{
print "\n Error: perl makeall.pl $ver $cwdDist\\stage $cwdDistWin\\install $inXpiURL $inRedirIniURL\n";
print "\n Error: perl makeall.pl $ver $DEPTH\\stage $cwdDistWin\\install $inXpiURL $inRedirIniURL\n";
exit(1);
}
@ -165,14 +168,23 @@ sub GetCwd
my($distWinPathName);
my($distPath);
# determine if build is debug or optimized
if($ENV{MOZ_DEBUG} eq "")
# determine if build was built via gmake
if(-e "$depthPath\\dist\\install")
{
$distWinPathName = "Win32_o.obj";
$distWinPathName = "dist";
}
else
{
$distWinPathName = "Win32_d.obj";
# determine if build is debug or optimized
# (used only for nmake builds)
if($ENV{MOZ_DEBUG} eq "")
{
$distWinPathName = "dist\\Win32_o.obj";
}
else
{
$distWinPathName = "dist\\Win32_d.obj";
}
}
if($whichPath eq "dist")
@ -189,24 +201,24 @@ sub GetCwd
elsif($whichPath eq "distwin")
{
# verify the existance of path
if(!(-e "$depthPath\\dist\\$distWinPathName"))
if(!(-e "$depthPath\\$distWinPathName"))
{
print "path not found: $depthPath\\dist\\$distWinPathName\n";
print "path not found: $depthPath\\$distWinPathName\n";
exit(1);
}
$distPath = "$depthPath\\dist\\$distWinPathName";
$distPath = "$depthPath\\$distWinPathName";
}
elsif($whichPath eq "install")
{
# verify the existance of path
if(!(-e "$depthPath\\dist\\$distWinPathName\\install"))
if(!(-e "$depthPath\\$distWinPathName\\install"))
{
print "path not found: $depthPath\\dist\\$distWinPathName\\install\n";
print "path not found: $depthPath\\$distWinPathName\\install\n";
exit(1);
}
$distPath = "$depthPath\\dist\\$distWinPathName\\install";
$distPath = "$depthPath\\$distWinPathName\\install";
}
elsif($whichPath eq "packager")
{
@ -236,17 +248,27 @@ sub GetVersion
my($dd);
my($hh);
# determine if build is debug or optimized
if($ENV{MOZ_DEBUG} eq "")
# determine if build was built via gmake
if(-e "$depthPath\\dist\\install")
{
$distWinPathName = "Win32_o.obj";
$distWinPathName = "dist";
}
else
{
$distWinPathName = "Win32_d.obj";
# determine if build is debug or optimized
# (used only for nmake builds)
if($ENV{MOZ_DEBUG} eq "")
{
$distWinPathName = "dist\\Win32_o.obj";
}
else
{
$distWinPathName = "dist\\Win32_d.obj";
}
}
$fileMozilla = "$depthPath\\dist\\$distWinPathName\\bin\\mozilla.exe";
$fileMozilla = "$depthPath\\$distWinPathName\\bin\\mozilla.exe";
# verify the existance of file
if(!(-e "$fileMozilla"))
{

View File

@ -64,18 +64,21 @@ $cwdPackager = GetCwd("packager", $DEPTH, $cwdBuilder);
$verPartial = "5.0.0.";
$ver = $verPartial . GetVersion($DEPTH);
if(-d "$cwdDist\\stage")
if(-d "$DEPTH\\stage")
{
system("perl $cwdPackager\\windows\\rdir.pl $cwdDist\\stage");
system("perl $cwdPackager\\windows\\rdir.pl $DEPTH\\stage");
}
mkdir("$cwdDist\\stage", 775);
system("perl $cwdPackager\\pkgcp.pl -s $cwdDistWin -d $cwdDist\\stage -f $cwdPackager\\packages-static-win -o dos -v");
# The destination cannot be a sub directory of the source
# pkgcp.pl will get very unhappy
mkdir("$DEPTH\\stage", 775);
system("perl $cwdPackager\\pkgcp.pl -s $cwdDistWin -d $DEPTH\\stage -f $cwdPackager\\packages-static-win -o dos -v");
chdir("$cwdPackager\\windows");
if(system("perl makeall.pl $ver $cwdDist\\stage $cwdDistWin\\install -aurl $inXpiURL -rurl $inRedirIniURL"))
if(system("perl makeall.pl $ver $DEPTH\\stage $cwdDistWin\\install -aurl $inXpiURL -rurl $inRedirIniURL"))
{
print "\n Error: perl makeall.pl $ver $cwdDist\\stage $cwdDistWin\\install $inXpiURL $inRedirIniURL\n";
print "\n Error: perl makeall.pl $ver $DEPTH\\stage $cwdDistWin\\install $inXpiURL $inRedirIniURL\n";
exit(1);
}
@ -164,14 +167,23 @@ sub GetCwd
my($distWinPathName);
my($distPath);
# determine if build is debug or optimized
if($ENV{MOZ_DEBUG} eq "")
# determine if build was built via gmake
if(-e "$depthPath\\dist\\install")
{
$distWinPathName = "Win32_o.obj";
$distWinPathName = "dist";
}
else
{
$distWinPathName = "Win32_d.obj";
# determine if build is debug or optimized
# (used only for nmake builds)
if($ENV{MOZ_DEBUG} eq "")
{
$distWinPathName = "dist\\Win32_o.obj";
}
else
{
$distWinPathName = "dist\\Win32_d.obj";
}
}
if($whichPath eq "dist")
@ -188,24 +200,24 @@ sub GetCwd
elsif($whichPath eq "distwin")
{
# verify the existance of path
if(!(-e "$depthPath\\dist\\$distWinPathName"))
if(!(-e "$depthPath\\$distWinPathName"))
{
print "path not found: $depthPath\\dist\\$distWinPathName\n";
print "path not found: $depthPath\\$distWinPathName\n";
exit(1);
}
$distPath = "$depthPath\\dist\\$distWinPathName";
$distPath = "$depthPath\\$distWinPathName";
}
elsif($whichPath eq "install")
{
# verify the existance of path
if(!(-e "$depthPath\\dist\\$distWinPathName\\install"))
if(!(-e "$depthPath\\$distWinPathName\\install"))
{
print "path not found: $depthPath\\dist\\$distWinPathName\\install\n";
print "path not found: $depthPath\\$distWinPathName\\install\n";
exit(1);
}
$distPath = "$depthPath\\dist\\$distWinPathName\\install";
$distPath = "$depthPath\\$distWinPathName\\install";
}
elsif($whichPath eq "packager")
{
@ -235,17 +247,26 @@ sub GetVersion
my($dd);
my($hh);
# determine if build is debug or optimized
if($ENV{MOZ_DEBUG} eq "")
# determine if build was built via gmake
if(-e "$depthPath\\dist\\install")
{
$distWinPathName = "Win32_o.obj";
$distWinPathName = "dist";
}
else
{
$distWinPathName = "Win32_d.obj";
# determine if build is debug or optimized
# (used only for nmake builds)
if($ENV{MOZ_DEBUG} eq "")
{
$distWinPathName = "dist\\Win32_o.obj";
}
else
{
$distWinPathName = "dist\\Win32_d.obj";
}
}
$fileMozilla = "$depthPath\\dist\\$distWinPathName\\bin\\mozilla.exe";
$fileMozilla = "$depthPath\\$distWinPathName\\bin\\mozilla.exe";
# verify the existance of file
if(!(-e "$fileMozilla"))
{