зеркало из https://github.com/mozilla/gecko-dev.git
Fix the check for $main::options{xptlink} to get the release builds to create xptlink correctly. Also comment out a non-existent manifest file line. a=jj
This commit is contained in:
Родитель
6b35919567
Коммит
ee6b46957c
|
@ -656,7 +656,7 @@ sub BuildClientDist()
|
||||||
|
|
||||||
#EMBEDDING
|
#EMBEDDING
|
||||||
InstallFromManifest(":mozilla:embedding:browser:webbrowser:MANIFEST_IDL", "$distdirectory:idl:");
|
InstallFromManifest(":mozilla:embedding:browser:webbrowser:MANIFEST_IDL", "$distdirectory:idl:");
|
||||||
InstallFromManifest(":mozilla:embedding:browser:setup:MANIFEST_IDL", "$distdirectory:idl:");
|
# InstallFromManifest(":mozilla:embedding:browser:setup:MANIFEST_IDL", "$distdirectory:idl:");
|
||||||
|
|
||||||
#WIDGET
|
#WIDGET
|
||||||
InstallFromManifest(":mozilla:widget:public:MANIFEST", "$distdirectory:widget:");
|
InstallFromManifest(":mozilla:widget:public:MANIFEST", "$distdirectory:widget:");
|
||||||
|
@ -880,7 +880,7 @@ sub BuildXPIDLCompiler()
|
||||||
}
|
}
|
||||||
|
|
||||||
# xpt_link MPW tool, needed for merging xpt files (release build)
|
# xpt_link MPW tool, needed for merging xpt files (release build)
|
||||||
if ($main::options_flags{xptlink})
|
if ($main::options{xptlink})
|
||||||
{
|
{
|
||||||
my($codewarrior_msl) = GetCodeWarriorRelativePath("MSL:MSL_C:MSL_MacOS:");
|
my($codewarrior_msl) = GetCodeWarriorRelativePath("MSL:MSL_C:MSL_MacOS:");
|
||||||
if ( ! -e $codewarrior_msl . "Lib:PPC:MSL C.PPC MPW(NL).Lib") {
|
if ( ! -e $codewarrior_msl . "Lib:PPC:MSL C.PPC MPW(NL).Lib") {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче