Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

script changes to build_static.pl to make it work with thunderbird

Browse Source 
use the new installer generation scripts on windows for thunderbird
This commit is contained in:
scott%scott-macgregor.org 2004-05-26 21:29:59 +00:00
parent fcc0479bd1
commit 4ab947a486
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mail/installer/windows/Makefile.in
View File

@ -42,17 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MOZ_SRC=$(shell cygpath -wa $(topsrcdir)/..)
export MOZ_SRC
CONFIG_DIR=$(shell cygpath -wa $(srcdir))
CONFIG_DIR=$(shell cygpath -a $(srcdir))
OBJ_DIR=$(shell cygpath -a $(topsrcdir))
SRC_DIR=$(shell cygpath -a $(DEPTH))
ifeq (,$(INSTALLER_URL))
INSTALLER_URL = "http://ftp.mozilla.org/pub/mozilla.org/pub/thunderbird/nightly/latest-trunk/windows-xpi"
endif
installer:
cd $(topsrcdir)/toolkit/mozapps/installer/windows && perl build_static.pl -config "$(CONFIG_DIR)" -aurl $(INSTALLER_URL)
cd $(topsrcdir)/toolkit/mozapps/installer && perl build_static.pl -config "$(CONFIG_DIR)" -srcDir "$(SRC_DIR)" -objDir "$(OBJ_DIR)" -aurl "$(INSTALLER_URL)"
include $(topsrcdir)/config/rules.mk

13
toolkit/mozapps/installer/build_static.pl
View File

@ -104,7 +104,7 @@ mkdir($STAGE, 0775);
#-------------------------------------------------------------------------
#// call pkgcp.pl
chdir("$inSrcDir/xpinstall/packager");
system("perl pkgcp.pl -o $platform -s $DIST -d $STAGE -f $inConfigFiles/packages-static -v");
system("perl pkgcp.pl -o $platform -s $DIST -d $STAGE -f $inConfigFiles/$ENV{WIZ_packagesFile} -v");
spew("Completed copying build files");
#// call xptlink.pl to make big .xpt files/component
@ -143,6 +143,9 @@ sub copy
sub ParseInstallerCfg
{
$ENV{WIZ_distSubdir} = "bin";
$ENV{WIZ_packagesFile} = "packages-static";
open(fpInstallCfg, "$inConfigFiles/installer.cfg") || die"\ncould not open $inConfigFiles/installer.cfg: $!\n";
while ($line = <fpInstallCfg>)
@ -189,6 +192,12 @@ sub ParseInstallerCfg
elsif ($prop eq "7ZipSFXModule") {
$ENV{WIZ_sfxModule} = $value;
}
elsif ($prop eq "DistSubdir") {
$ENV{WIZ_distSubdir} = $value;
}
elsif ($prop eq "packagesFile") {
$ENV{WIZ_packagesFile} = $value;
}
}
close(fpInstallCfg);
@ -263,7 +272,7 @@ sub GetVersion
$distWinPathName = "dist";
$fileMozilla = "$depthPath/$distWinPathName/bin/$ENV{WIZ_fileMainExe}";
$fileMozilla = "$depthPath/$distWinPathName/$ENV{WIZ_distSubdir}/$ENV{WIZ_fileMainExe}";
# verify the existance of file
if(!(-e "$fileMozilla"))