зеркало из https://github.com/mozilla/pjs.git
Bug 106507
Enable S/MIME for users that are already building PSM.
This commit is contained in:
Родитель
4d6ab44fdd
Коммит
81608ca2a0
|
@ -51,7 +51,7 @@ soap 0 MOZ_SOAP
|
||||||
inspector 0
|
inspector 0
|
||||||
mailextras 1
|
mailextras 1
|
||||||
xptlink 0
|
xptlink 0
|
||||||
psm 0
|
psm 0 ENABLE_SMIME
|
||||||
embedding_test 1
|
embedding_test 1
|
||||||
embedding_test_carbon 0
|
embedding_test_carbon 0
|
||||||
carbon 0 TARGET_CARBON
|
carbon 0 TARGET_CARBON
|
||||||
|
@ -73,7 +73,7 @@ static_build 0 MOZ_STATIC_COMPONENT_LIBS
|
||||||
string_debug 0 DEBUG_STRING
|
string_debug 0 DEBUG_STRING
|
||||||
string_stats 0 DEBUG_STRING_STATS
|
string_stats 0 DEBUG_STRING_STATS
|
||||||
xpctools 0 XPC_TOOLS_SUPPORT
|
xpctools 0 XPC_TOOLS_SUPPORT
|
||||||
smime 0 ENABLE_SMIME
|
smime 1
|
||||||
|
|
||||||
filepath_flags
|
filepath_flags
|
||||||
idepath ":CodeWarrior IDE Path.txt"
|
idepath ":CodeWarrior IDE Path.txt"
|
||||||
|
|
|
@ -361,7 +361,7 @@ sub ProcessJarManifests()
|
||||||
CreateJarFromManifest(":mozilla:layout:html:forms:src:jar.mn", $chrome_dir, \%jars);
|
CreateJarFromManifest(":mozilla:layout:html:forms:src:jar.mn", $chrome_dir, \%jars);
|
||||||
CreateJarFromManifest(":mozilla:layout:html:base:src:jar.mn", $chrome_dir, \%jars);
|
CreateJarFromManifest(":mozilla:layout:html:base:src:jar.mn", $chrome_dir, \%jars);
|
||||||
CreateJarFromManifest(":mozilla:mailnews:jar.mn", $chrome_dir, \%jars);
|
CreateJarFromManifest(":mozilla:mailnews:jar.mn", $chrome_dir, \%jars);
|
||||||
if ($main::options{smime}) {
|
if ($main::options{smime} && $main::options{psm}) {
|
||||||
CreateJarFromManifest(":mozilla:mailnews:extensions:smime:jar.mn", $chrome_dir, \%jars);
|
CreateJarFromManifest(":mozilla:mailnews:extensions:smime:jar.mn", $chrome_dir, \%jars);
|
||||||
}
|
}
|
||||||
CreateJarFromManifest(":mozilla:netwerk:resources:jar.mn", $chrome_dir, \%jars);
|
CreateJarFromManifest(":mozilla:netwerk:resources:jar.mn", $chrome_dir, \%jars);
|
||||||
|
@ -1167,7 +1167,7 @@ sub BuildIDLProjects()
|
||||||
BuildIDLProject(":mozilla:mailnews:imap:macbuild:msgimapIDL.mcp", "MsgImap");
|
BuildIDLProject(":mozilla:mailnews:imap:macbuild:msgimapIDL.mcp", "MsgImap");
|
||||||
BuildIDLProject(":mozilla:mailnews:mime:macbuild:mimeIDL.mcp", "Mime");
|
BuildIDLProject(":mozilla:mailnews:mime:macbuild:mimeIDL.mcp", "Mime");
|
||||||
BuildIDLProject(":mozilla:mailnews:import:macbuild:msgImportIDL.mcp", "msgImport");
|
BuildIDLProject(":mozilla:mailnews:import:macbuild:msgImportIDL.mcp", "msgImport");
|
||||||
if ($main::options{smime}) {
|
if ($main::options{smime} && $main::options(psm)) {
|
||||||
BuildIDLProject(":mozilla:mailnews:extensions:smime:macbuild:msgsmimeIDL.mcp", "msgsmime");
|
BuildIDLProject(":mozilla:mailnews:extensions:smime:macbuild:msgsmimeIDL.mcp", "msgsmime");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1991,7 +1991,7 @@ sub BuildMailNewsProjects()
|
||||||
}
|
}
|
||||||
|
|
||||||
InstallResources(":mozilla:mailnews:addrbook:src:MANIFEST_COMPONENTS", "${dist_dir}Components");
|
InstallResources(":mozilla:mailnews:addrbook:src:MANIFEST_COMPONENTS", "${dist_dir}Components");
|
||||||
if ($main::options{smime}) {
|
if ($main::options{smime} && $main::options{psm}) {
|
||||||
BuildOneProject(":mozilla:mailnews:extensions:smime:macbuild:smime.mcp", "msgsmime$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
|
BuildOneProject(":mozilla:mailnews:extensions:smime:macbuild:smime.mcp", "msgsmime$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
|
||||||
InstallResources(":mozilla:mailnews:extensions:smime:src:MANIFEST", "${dist_dir}Components");
|
InstallResources(":mozilla:mailnews:extensions:smime:src:MANIFEST", "${dist_dir}Components");
|
||||||
} else {
|
} else {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче