зеркало из https://github.com/mozilla/pjs.git
Fix build scripts to work when using BuildNGLayout{Debug}.pl to both pull and build (configure after the checkout), and fix MozJar.pm to generate correct paths in installed-chrome.txt when not using jar files.
This commit is contained in:
Родитель
2ddd8e4418
Коммит
408c4b2f00
|
@ -193,10 +193,10 @@ else
|
||||||
Moz::StopForErrors();
|
Moz::StopForErrors();
|
||||||
#Moz::DontStopForErrors();
|
#Moz::DontStopForErrors();
|
||||||
|
|
||||||
ConfigureBuildSystem();
|
|
||||||
|
|
||||||
Checkout();
|
Checkout();
|
||||||
|
|
||||||
|
ConfigureBuildSystem();
|
||||||
|
|
||||||
my(@gen_files) = (
|
my(@gen_files) = (
|
||||||
":mozilla:xpfe:appshell:public:nsBuildID.h",
|
":mozilla:xpfe:appshell:public:nsBuildID.h",
|
||||||
":mozilla:xpfe:browser:resources:locale:en-US:navigator.dtd"
|
":mozilla:xpfe:browser:resources:locale:en-US:navigator.dtd"
|
||||||
|
|
|
@ -190,10 +190,10 @@ else
|
||||||
Moz::StopForErrors();
|
Moz::StopForErrors();
|
||||||
#Moz::DontStopForErrors();
|
#Moz::DontStopForErrors();
|
||||||
|
|
||||||
ConfigureBuildSystem();
|
|
||||||
|
|
||||||
Checkout();
|
Checkout();
|
||||||
|
|
||||||
|
ConfigureBuildSystem();
|
||||||
|
|
||||||
chdir($MOZ_SRC);
|
chdir($MOZ_SRC);
|
||||||
BuildDist();
|
BuildDist();
|
||||||
|
|
||||||
|
|
|
@ -418,7 +418,7 @@ sub registerChromePackage($$$$$$)
|
||||||
if ($main::options{use_jars}) {
|
if ($main::options{use_jars}) {
|
||||||
$chrome_entry = "$chrome_type,install,url,jar:resource:/chrome/$manifest_subdir!/$chrome_type/$pkg_name";
|
$chrome_entry = "$chrome_type,install,url,jar:resource:/chrome/$manifest_subdir!/$chrome_type/$pkg_name";
|
||||||
} else {
|
} else {
|
||||||
$manifest_subdir =~ s/\.jar$/\//;
|
$manifest_subdir =~ s/\.jar$//;
|
||||||
$chrome_entry = "$chrome_type,install,url,resource:/chrome/$manifest_subdir/$chrome_type/$pkg_name";
|
$chrome_entry = "$chrome_type,install,url,resource:/chrome/$manifest_subdir/$chrome_type/$pkg_name";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче