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

Remove references to PSM1 from the build so that we can cvs remove the PSM1 dirs.

Browse Source 
Bug #78975 r=leaf sr=sfraser
This commit is contained in:
cls%seawood.org 2001-08-16 00:11:40 +00:00
parent e5c006594c
commit b8987cb0d7
5 changed files with 13 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
allmakefiles.sh
View File

@ -770,47 +770,6 @@ content/base/public/Makefile
intl/locale/public/Makefile
"
MAKEFILES_security="
security/Makefile
security/psm/Makefile
security/psm/lib/Makefile
security/psm/lib/client/Makefile
security/psm/lib/protocol/Makefile
intl/strres/public/Makefile
intl/locale/idl/Makefile
intl/locale/public/Makefile
"
MAKEFILES_psm_glue="
extensions/psm-glue/public/Makefile
extensions/psm-glue/Makefile
extensions/psm-glue/src/Makefile
netwerk/base/public/Makefile
netwerk/build/Makefile
netwerk/socket/base/Makefile
dom/public/Makefile
uriloader/base/Makefile
modules/libpref/public/Makefile
profile/public/Makefile
caps/idl/Makefile
caps/include/Makefile
netwerk/protocol/http/public/Makefile
widget/public/Makefile
rdf/base/idl/Makefile
xpfe/appshell/public/Makefile
gfx/idl/Makefile
gfx/public/Makefile
docshell/base/Makefile
layout/html/forms/public/Makefile
layout/base/public/Makefile
content/base/public/Makefile
dom/src/base/Makefile
modules/oji/public/Makefile
gfx2/public/Makefile
embedding/components/windowwatcher/public/Makefile
"
MAKEFILES_inspector="
extensions/inspector/Makefile
extensions/inspector/base/Makefile
@ -1142,8 +1101,6 @@ else
necko) add_makefiles "
$MAKEFILES_netwerk $MAKEFILES_dbm $MAKEFILES_xpcom"
;;
psm) add_makefiles "$MAKEFILES_dbm $MAKEFILES_xpcom $MAKEFILES_security $MAKEFILES_js $MAKEFILES_psm_glue"
;;
psm2) add_makefiles "$MAKEFILES_dbm $MAKEFILES_js $MAKEFILES_xpcom $MAKEFILES_psm2"
;;
string) add_makefiles "$MAKEFILES_string"

1
build/mac/build_scripts/MozillaBuildFlags.txt
View File

@ -52,7 +52,6 @@ inspector 0
mailextras 1
xptlink 0
psm 0
psm2 0
embedding_test 1
carbon 0 TARGET_CARBON
useimg2 1 USE_IMG2

77
build/mac/build_scripts/MozillaBuildList.pm
View File

@ -385,7 +385,7 @@ sub ProcessJarManifests()
CreateJarFromManifest(":mozilla:xpinstall:res:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:embedding:components:ui:jar.mn", $chrome_dir, \%jars);
if ($main::options{psm2}) {
if ($main::options{psm}) {
CreateJarFromManifest(":mozilla:security:manager:ssl:resources:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:security:manager:pki:resources:jar.mn", $chrome_dir, \%jars);
}
@ -653,13 +653,6 @@ sub BuildClientDist()
InstallFromManifest(":mozilla:netwerk:cache:public:MANIFEST", "$distdirectory:idl:");
InstallFromManifest(":mozilla:netwerk:mime:public:MANIFEST", "$distdirectory:netwerk:");
#SECURITY
InstallFromManifest(":mozilla:extensions:psm-glue:public:MANIFEST", "$distdirectory:idl:");
InstallFromManifest(":mozilla:extensions:psm-glue:src:MANIFEST", "$distdirectory:include:");
InstallFromManifest(":mozilla:security:psm:lib:client:MANIFEST", "$distdirectory:security:");
InstallFromManifest(":mozilla:security:psm:lib:protocol:MANIFEST", "$distdirectory:security:");
#EXTENSIONS
InstallFromManifest(":mozilla:extensions:cookie:MANIFEST_IDL", "$distdirectory:idl:");
InstallFromManifest(":mozilla:extensions:cookie:MANIFEST", "$distdirectory:cookie:");
@ -1045,15 +1038,11 @@ sub BuildIDLProjects()
BuildIDLProject(":mozilla:netwerk:macbuild:netwerkIDL.mcp","necko");
BuildIDLProject(":mozilla:uriloader:macbuild:uriLoaderIDL.mcp", "uriLoader");
BuildIDLProject(":mozilla:netwerk:macbuild:cacheIDL.mcp", "cache");
if ($main::options{psm}) {
# psm glue
BuildIDLProject(":mozilla:extensions:psm-glue:macbuild:psmglueIDL.mcp", "psmglue");
}
if ($main::options{psm2}) {
if ($main::options{psm}) {
BuildIDLProject(":mozilla:security:manager:ssl:macbuild:pipnssIDL.mcp", "pipnss");
BuildIDLProject(":mozilla:security:manager:pki:macbuild:pippkiIDL.mcp", "pippki");
}
}
BuildIDLProject(":mozilla:modules:libpref:macbuild:libprefIDL.mcp", "libpref");
BuildIDLProject(":mozilla:modules:libutil:macbuild:libutilIDL.mcp", "libutil");
@ -1437,16 +1426,9 @@ sub BuildNeckoProjects()
#// Build Security projects
#//--------------------------------------------------------------------------------------------------
sub makeprops
{
@ARGV = @_;
do ":mozilla:security:psm:ui:makeprops.pl";
}
sub BuildSecurityProjects()
{
unless( $main::build{security} && ($main::options{psm} || $main::options{psm2})) { return; }
unless( $main::build{security} && $main::options{psm}) { return; }
# $D becomes a suffix to target names for selecting either the debug or non-debug target of a project
my($D) = $main::DEBUG ? "Debug" : "";
@ -1455,49 +1437,16 @@ sub BuildSecurityProjects()
StartBuildModule("security");
BuildOneProject(":mozilla:security:nss:macbuild:NSS.mcp","NSS$D.o", 0, 0, 0);
if($main::options{psm2}) {
BuildOneProject(":mozilla:security:manager:ssl:macbuild:PIPNSS.mcp", "PIPNSS$D.shlb", 1, $main::ALIAS_SYM_FILES, 1);
BuildOneProject(":mozilla:security:manager:pki:macbuild:PIPPKI.mcp", "PIPPKI$D.shlb", 1, $main::ALIAS_SYM_FILES, 1);
} else {
BuildOneProject(":mozilla:security:psm:lib:macbuild:PSMClient.mcp","PSMClient$D.o", 0, 0, 0);
BuildOneProject(":mozilla:security:psm:lib:macbuild:PSMProtocol.mcp","PSMProtocol$D.o", 0, 0, 0);
BuildOneProject(":mozilla:security:psm:macbuild:PersonalSecurityMgr.mcp","PSM$D.shlb", 1, $main::ALIAS_SYM_FILES, 0);
BuildOneProject(":mozilla:extensions:psm-glue:macbuild:PSMGlue.mcp","PSMGlue$D.shlb", 1, $main::ALIAS_SYM_FILES, 1);
BuildOneProject(":mozilla:security:manager:ssl:macbuild:PIPNSS.mcp", "PIPNSS$D.shlb", 1, $main::ALIAS_SYM_FILES, 1);
BuildOneProject(":mozilla:security:manager:pki:macbuild:PIPPKI.mcp", "PIPPKI$D.shlb", 1, $main::ALIAS_SYM_FILES, 1);
#Build the loadable module that contains the root certs.
# make properties files for PSM User Interface
my($src_dir) = ":mozilla:security:psm:ui:";
opendir(DIR,$src_dir) || die "can't open directory $src_dir\n";
my(@prop_files) = grep { /\.properties.in$/ } readdir(DIR);
closedir DIR;
my($psm_data_dir) = $dist_dir."psmdata:";
mkdir($psm_data_dir, 0);
my($dest_dir) = $psm_data_dir."UI:";
mkdir($dest_dir, 0);
my($file);
foreach $file (@prop_files) {
$file =~ /(.+\.properties)\.in$/;
&makeprops($src_dir.$file, $dest_dir.$1);
}
my($doc_dir) = $psm_data_dir."doc:";
mkdir($doc_dir, 0);
opendir(DOC_DIR,":mozilla:security:psm:doc") || die ("Unable to open PSM doc directory");
my(@doc_files);
@doc_files = readdir(DOC_DIR);
closedir(DOC_DIR);
foreach $file (@doc_files) {
copy(":mozilla:security:psm:doc:".$file, $doc_dir.$file);
}
}
#Build the loadable module that contains the root certs.
BuildOneProject(":mozilla:security:nss:macbuild:NSSckfw.mcp", "NSSckfw$D.o", 0, 0, 0);
BuildOneProject(":mozilla:security:nss:macbuild:LoadableRoots.mcp", "NSSckbi$D.shlb", 0, $main::ALIAS_SYM_FILES, 0);
# NSS doesn't properly load the shared library created above if it's an alias, so we'll just copy it so that
# all builds will just work. It's 140K optimized and 164K debug so it's not too much disk space.
copy(":mozilla:security:nss:macbuild:NSSckbi$D.shlb",$dist_dir."Essential Files:NSSckbi$D.shlb");
BuildOneProject(":mozilla:security:nss:macbuild:NSSckfw.mcp", "NSSckfw$D.o", 0, 0, 0);
BuildOneProject(":mozilla:security:nss:macbuild:LoadableRoots.mcp", "NSSckbi$D.shlb", 0, $main::ALIAS_SYM_FILES, 0);
# NSS doesn't properly load the shared library created above if it's an alias, so we'll just copy it so that
# all builds will just work. It's 140K optimized and 164K debug so it's not too much disk space.
copy(":mozilla:security:nss:macbuild:NSSckbi$D.shlb",$dist_dir."Essential Files:NSSckbi$D.shlb");
EndBuildModule("security");
} # Security

1
build/mac/build_scripts/MozillaCheckoutList.txt
View File

@ -9,7 +9,6 @@
mozilla/nsprpub, NSPRPUB_CLIENT_TAG
mozilla/security/nss, NSS_CLIENT_TAG
mozilla/security/psm,
mozilla/security/manager,
mozilla/accessible,
DirectorySDKSourceC, LDAPCSDK_40_BRANCH

3
extensions/makefile.win
View File

@ -27,9 +27,6 @@ DIRS = wallet \
irc \
content-packs \
help \
!if defined(BUILD_PSM)
psm-glue \
!endif
!if !defined(DISABLE_XSLT)
transformiix \
!endif