Move Tag forward to include Kai's changes.

Use NSS shared libraries on Unix.


git-svn-id: svn://10.0.0.236/branches/PSM_FOR_NSS_3_4@109378 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/build/mac/build_scripts/BuildMozilla.pl

@@ -1,80 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla opt build prefs";
-my($config_header_file_name) = ":mozilla:config:mac:DefinesOptions.h";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "¥ Mozilla opt progress",
-  "buildmodule",    "MozillaBuildList.pm",
-  "checkouttime",   "Mozilla last checkout"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:", $config_header_file_name);
-
-my($do_checkout)    = 0;
-my($do_build)       = 1;
-
-RunBuild($do_checkout, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/build_scripts/BuildMozillaDebug.pl

@@ -1,80 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla debug build prefs";
-my($config_header_file_name) = ":mozilla:config:mac:DefinesOptionsDebug.h";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "¥ Mozilla debug progress",
-  "buildmodule",    "MozillaBuildList.pm",
-  "checkouttime",   "Mozilla last checkout"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(1, ":mozilla:dist:viewer_debug:", $config_header_file_name);
-
-my($do_pull)        = 0;    # overridden by flags and prefs
-my($do_build)       = 1;
-
-RunBuild($do_pull, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/build_scripts/Moz/BuildCore.pm

@@ -1,595 +0,0 @@
-#!perl -w
-package Moz::BuildCore;
-
-require 5.004;
-require Exporter;
-
-use strict;
-use vars qw( @ISA @EXPORT );
-
-# perl includes
-use Cwd;
-use POSIX;
-use Time::Local;
-use File::Basename;
-use LWP::Simple;
-
-# homegrown
-use Moz::Moz;
-use Moz::Jar;
-use Moz::BuildFlags;
-use Moz::BuildUtils;
-use Moz::CodeWarriorLib;
-
-# use MozillaBuildList;   # eventually, this should go away, and be replaced by data input
-
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(
-                    RunBuild
-                );
-
-
-#//--------------------------------------------------------------------------------------------------
-#// DoPrebuildCheck
-#//
-#// Check the build tools etc before running the build.
-#//--------------------------------------------------------------------------------------------------
-sub DoPrebuildCheck()
-{
-    SanityCheckBuildOptions();
-
-    # launch codewarrior and persist its location. Have to call this before first
-    # call to getCodeWarriorPath().
-    my($ide_path_file) = $main::filepaths{"idepath"};
-    $ide_path_file = full_path_to($ide_path_file);
-    LaunchCodeWarrior($ide_path_file);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// SanityCheckBuildOptions
-#//--------------------------------------------------------------------------------------------------
-sub SanityCheckBuildOptions()
-{
-    my($bad_options) = 0;
-
-    # Jar options
-    if (!$main::options{chrome_jars} && !$main::options{chrome_files})
-    {
-        print "Warning: Both \$options{chrome_jars} and \$options{chrome_files} are off. You won't get any chrome.\n";
-        $bad_options = 1;
-    }
-
-    if (!$main::options{chrome_jars} && $main::options{use_jars})
-    {
-        print "Warning: \$options{chrome_jars} is off but \$options{use_jars} is on. Your build won't run (expects jars, got files).\n";
-        $bad_options = 1;
-    }
-
-    if (!$main::options{chrome_files} && !$main::options{use_jars})
-    {
-        print "Warning: \$options{chrome_jars} is off but \$options{chrome_files} is on. Your build won't run (expects files, got jars).\n";
-        $bad_options = 1;
-    }
-
-    if ($main::options{ldap_experimental} && !$main::options{ldap})
-    {
-        print "Warning: \$options{ldap_experimental} is on but \$options{ldap} is off. LDAP experimental features will not be built.\n";
-        $bad_options = 1;
-    }
-
-    if ($main::options{wsp} && !$main::options{xmlextras})
-    {
-        print "Warning: \$options{wsp} is on but \$options{xmlextras} is off. wsp will not be built.\n";
-        $bad_options = 1;
-    }
-
-    if ($bad_options) {
-        print "Build will start in 5 seconds. Press command-. to stop\n";
-        
-        DelayFor(5);
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GenBuildSystemInfo
-#//--------------------------------------------------------------------------------------------------
-
-sub GenBuildSystemInfo()
-{
-    # always rebuild the configuration program.
-    BuildProjectClean(":mozilla:build:mac:tools:BuildSystemInfo:BuildSystemInfo.mcp", "BuildSystemInfo");
-
-    # delete the configuration file.
-    unlink(":mozilla:build:mac:BuildSystemInfo.pm");
-    
-    # run the program.
-    system(":mozilla:build:mac:BuildSystemInfo");
-
-    # wait for the file to be created.
-    while (!(-e ":mozilla:build:mac:BuildSystemInfo.pm")) { WaitNextEvent(); }
-    
-    # wait for BuildSystemInfo to finish, so that we see correct results.
-    while (IsProcessRunning("BuildSystemInfo")) { WaitNextEvent(); }
-
-    # now, evaluate the contents of the file.
-    open(F, ":mozilla:build:mac:BuildSystemInfo.pm");
-    while (<F>) { eval; }
-    close(F);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Make library aliases
-#//--------------------------------------------------------------------------------------------------
-
-sub MakeLibAliases()
-{
-    my($dist_dir) = GetBinDirectory();
-
-    #// ProfilerLib
-    if ($main::PROFILE)
-    {
-        my($profilerlibpath) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:Profiler:Profiler Common:ProfilerLib");
-        MakeAlias("$profilerlibpath", "$dist_dir"."Essential Files:");
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ConfigureBuildSystem
-#//
-#// defines some build-system configuration variables.
-#//--------------------------------------------------------------------------------------------------
-sub ConfigureBuildSystem()
-{
-    #// In the future, we may want to do configurations based on the actual build system itself.
-    #// GenBuildSystemInfo();
-        
-    #// For now, if we discover a newer header file than existed in Universal Interfaces 3.2,
-    #// we'll assume that 3.3 or later is in use.
-    my($universal_interfaces) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:Universal:Interfaces:CIncludes:");
-    if (-e ($universal_interfaces . "ControlDefinitions.h")) {
-        $main::UNIVERSAL_INTERFACES_VERSION = 0x0330;
-    }
-
-    #// Rename IC SDK folder in the Mac OS Support folder
-    my($ic_sdk_folder) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:ICProgKit2.0.2");
-    if( -e $ic_sdk_folder)
-    {
-        my($new_ic_folder_name) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:(ICProgKit2.0.2)");
-        rename ($ic_sdk_folder, $new_ic_folder_name);
-        # note that CodeWarrior doesn't descend into folders with () the name
-        print "Mozilla no longer needs the Internet Config SDK to build:\n  Renaming the 'ICProgKit2.0.2' folder to '(ICProgKit2.0.2)'\n";
-    }
-
-    printf("UNIVERSAL_INTERFACES_VERSION = 0x%04X\n", $main::UNIVERSAL_INTERFACES_VERSION);
-
-    # alias required CodeWarrior libs into the Essential Files folder (only the Profiler lib now)
-    MakeLibAliases();
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// CheckOutModule. Takes variable number of args; first two are required
-#//--------------------------------------------------------------------------------------------------
-sub CheckOutModule($$$$)
-{
-    my($session, $module, $revision, $date) = @_;
-
-    my($result) = $session->checkout($module, $revision, $date);
-    
-    # result of 1 is success
-    if ($result) { return; }
-    
-    my($checkout_err) = $session->getLastError();
-    if ($checkout_err == 708) {
-        die "Error: Checkout was cancelled.\n";
-    } elsif ($checkout_err == 911) {
-        die "Error: CVS session settings are incorrect. Check your password, and the CVS root settings.\n";
-    } elsif ($checkout_err == 703) {
-        die "Error: CVS checkout failed. Unknown module, unknown tag, bad username, or other CVS error.\n";
-    } elsif ($checkout_err == 711) {
-        print "Checkout of '$module' failed.\n";
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getScriptFolder
-#//--------------------------------------------------------------------------------------------------
-sub getScriptFolder()
-{
-    return dirname($0);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getScriptFolder
-#//--------------------------------------------------------------------------------------------------
-sub get_url_contents($)
-{
-    my($url) = @_;
-
-    my($url_contents) = LWP::Simple::get($url);
-    $url_contents =~ s/\r\n/\n/g;     # normalize linebreaks
-    $url_contents =~ s/\r/\n/g;       # normalize linebreaks
-    return $url_contents;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// get_files_from_content
-#//--------------------------------------------------------------------------------------------------
-sub uniq
-{
-    my $lastval;
-    grep(($_ ne $lastval, $lastval = $_)[$[], @_);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// get_files_from_content
-#//--------------------------------------------------------------------------------------------------
-sub get_files_from_content($)
-{
-    my($content) = @_;
-  
-    my(@jscalls) = grep (/return js_file_menu[^{]*/, split(/\n/, $content));
-    my $i;
-  
-    for ($i = 0; $i < @jscalls ; $i++)
-    {
-        $jscalls[$i] =~ s/.*\(|\).*//g;
-        my(@callparams) = split(/,/, $jscalls[$i]);
-        my ($repos, $dir, $file, $rev) = grep(s/['\s]//g, @callparams);
-        $jscalls[$i] = "$dir/$file";
-    }
-
-  &uniq(sort(@jscalls));
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getLastUpdateTime
-#// 
-#// Get the last time we updated. Return 0 on failure
-#//--------------------------------------------------------------------------------------------------
-sub getLastUpdateTime($)
-{
-    my($timestamp_file) = @_;
- 
-    my($time_string);
-    
-    local(*TIMESTAMP_FILE);  
-    unless (open(TIMESTAMP_FILE, "< $timestamp_file")) { return 0; }
-
-    while (<TIMESTAMP_FILE>)
-    {
-        my($line) = $_;
-        chomp($line);
-
-        # ignore comments and empty lines
-        if ($line =~ /^\#/ || $line =~ /^\s*$/) {
-            next;
-        }
-        
-        $time_string = $line;
-    }
-
-    # get the epoch seconds
-    my($last_update_secs) = $time_string;
-    $last_update_secs =~ s/\s#.+$//;
-    
-    print "FAST_UPDATE found that you last updated at ".localtime($last_update_secs)."\n";
-    
-    # how long ago was this, in hours?
-    my($gm_now) = time();
-    my($update_hours) = 1 + ceil(($gm_now - $last_update_secs) / (60 * 60));
-    
-    return $update_hours;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// saveCheckoutTimestamp
-#// 
-#// Create a file on disk containing the current time. Param is time(), which is an Epoch seconds
-#// (and therefore in GMT).
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub saveCheckoutTimestamp($$)
-{
-    my($gm_secs, $timestamp_file) = @_;
-        
-    local(*TIMESTAMP_FILE);
-    open(TIMESTAMP_FILE, ">$timestamp_file") || die "Failed to open $timestamp_file\n";
-    print(TIMESTAMP_FILE "# time of last checkout or update, in GMT. Used by FAST_UPDATE\n");
-    print(TIMESTAMP_FILE "$gm_secs \# around ".localtime()." local time\n");
-    close(TIMESTAMP_FILE);
-
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// FastUpdate
-#// 
-#// Use Bonsai url data to update only those dirs which have new files
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub FastUpdate($$)
-{
-    my($modules, $timestamp_file) = @_;          # list of modules to check out
-
-    my($num_hours) = getLastUpdateTime($timestamp_file);
-    if ($num_hours == 0 || $num_hours > 170) {
-        print "Can't fast_update; last update was too long ago, or never. Doing normal checkout.\n";
-        return 0;
-    }
-
-    print "Doing fast update, pulling files changed in the last $num_hours hours\n";
-
-    my($cvsfile) = AskAndPersistFile($main::filepaths{"sessionpath"});
-    my($session) = Moz::MacCVS->new( $cvsfile );
-    unless (defined($session)) { die "Error: Checkout aborted. Cannot create session file: $session" }
-
-    # activate MacCVS
-    ActivateApplication('Mcvs');
-    
-    my($checkout_start_time) = time();
-
-    #print "Time now is $checkout_start_time ($checkout_start_time + 0)\n";
-    
-    my($this_co);
-    foreach $this_co (@$modules)
-    {
-        my($module, $revision, $date) = ($this_co->[0], $this_co->[1], $this_co->[2]);        
-        
-        # assume that things pulled by date wont change
-        if ($date ne "") {
-            print "$module is pulled by date, so ignoring in FastUpdate.\n";
-            next;
-        }
-
-        my($search_type) = "hours";
-        my($min_date) = "";
-        my($max_date) = "";
-        my($url) = "http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=${module}&branch=${revision}&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=${num_hours}&date=${search_type}&mindate=${min_date}&maxdate=${max_date}&cvsroot=%2Fcvsroot";
-
-        if ($revision eq "") {
-            print "Getting list of checkins to $module from Bonsai...\n";
-        } else {
-            print "Getting list of checkins to $module on branch $revision from Bonsai...\n";
-        }
-        my(@files) = &get_files_from_content(&get_url_contents($url));
-
-        if ($#files > 0)
-        {
-           my(@cvs_co_list);
-        
-           my($co_file);
-           foreach $co_file (@files)
-           {
-               print "Updating $co_file\n";
-               push(@cvs_co_list, $co_file);
-           }
-
-            my($result) = $session->update($revision, \@cvs_co_list);
-            # result of 1 is success
-            if (!$result) { die "Error: Fast update failed\n"; }
-        } else {
-            print "No files in this module changed\n";        
-        }
-    }
-    
-    saveCheckoutTimestamp($checkout_start_time, $timestamp_file);
-    return 1;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Checkout
-#//--------------------------------------------------------------------------------------------------
-sub CheckoutModules($$$)
-{
-    my($modules, $pull_date, $timestamp_file) = @_;          # list of modules to check out
-
-    my($start_time) = TimeStart();
-
-#    assertRightDirectory();
-    my($cvsfile) = AskAndPersistFile($main::filepaths{"sessionpath"});
-    my($session) = Moz::MacCVS->new( $cvsfile );
-    unless (defined($session)) { die "Error: Checkout aborted. Cannot create session file: $session" }
-
-    my($checkout_start_time) = time();
-    
-    # activate MacCVS
-    ActivateApplication('Mcvs');
-
-    my($this_co);
-    foreach $this_co (@$modules)
-    {
-        my($module, $revision, $date) = ($this_co->[0], $this_co->[1], $this_co->[2]);
-        if ($date eq "") {
-            $date = $pull_date;
-        }
-        CheckOutModule($session, $module, $revision, $date);
-        # print "Checking out $module with ref $revision, date $date\n";
-    }
-
-    saveCheckoutTimestamp($checkout_start_time, $timestamp_file);
-    TimeEnd($start_time, "Checkout");
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ReadCheckoutModulesFile
-#//--------------------------------------------------------------------------------------------------
-sub ReadCheckoutModulesFile($$)
-{
-    my($modules_file, $co_list) = @_;
-
-    my($checkout_file) = getScriptFolder().":".$modules_file;
-    local(*CHECKOUT_FILE);  
-    open(CHECKOUT_FILE, "< $checkout_file") || die "Error: failed to open checkout list $checkout_file\n";
-    while (<CHECKOUT_FILE>)
-    {
-        my($line) = $_;
-        chomp($line);
-    
-        # ignore comments and empty lines
-        if ($line =~ /^\#/ || $line =~ /^\s*$/) {
-            next;
-        }
-    
-        my(@cvs_co) = ["", "", ""];
-        
-        my($module, $revision, $date) = (0, 1, 2);
-        
-        if ($line =~ /\s*([^#,\s]+)\s*\,\s*([^#,\s]+)\s*\,\s*([^#]+)/)
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$revision] = $2;
-            @cvs_co[$date] = $3;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)\s*\,\s*([^#,\s]+)\s*(#.+)?/)
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$revision] = $2;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)\s*\,\s*,\s*([^#,]+)/)       
-        {
-            @cvs_co[$module] = $1;
-            @cvs_co[$date] = $2;
-        }
-        elsif ($line =~ /\s*([^#,\s]+)/)
-        {
-            @cvs_co[$module] = $1;
-        }
-        else
-        {
-            die "Error: unrecognized line '$line' in $modules_file\n";
-        }
-        
-        # strip surrounding space from date
-        @cvs_co[$date] =~ s/^\s*|\s*$//g;
-        
-        # print "Going to check out '@cvs_co[$module]', '@cvs_co[$revision]', '@cvs_co[$date]'\n";
-        push(@$co_list, \@cvs_co);
-    }
-
-    close(CHECKOUT_FILE);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// PullFromCVS
-#//--------------------------------------------------------------------------------------------------
-sub PullFromCVS($$)
-{
-    unless ( $main::build{pull} ) { return; }
-    
-    my($modules_file, $timestamp_file) = @_;
-
-    StartBuildModule("pull");
-    
-    my(@cvs_co_list);
-    ReadCheckoutModulesFile($modules_file, \@cvs_co_list);
-
-    if ($main::FAST_UPDATE && $main::options{pull_by_date})
-    {
-        die "Error: you can't use FAST_UPDATE if you are pulling by date.\n";
-    }
-
-    my($did_fast_update) = $main::FAST_UPDATE && FastUpdate(\@cvs_co_list, $timestamp_file);
-    if (!$did_fast_update)
-    {
-        my($pull_date) = "";
-        if ($main::options{pull_by_date})
-        {
-            # acceptable CVS date formats are (in local time):
-            # ISO8601 (e.g. "1972-09-24 20:05") and Internet (e.g. "24 Sep 1972 20:05").
-            # Perl's localtime() string format also seems to work.
-            $pull_date = localtime().""; # force string interp.
-            print "Pulling by date $pull_date\n";
-        }
-
-        CheckoutModules(\@cvs_co_list, $pull_date, $timestamp_file);
-    }
-
-    EndBuildModule("pull");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// RunBuild
-#//--------------------------------------------------------------------------------------------------
-sub RunBuild($$$$)
-{
-    my($do_pull, $do_build, $input_files, $build_prefs) = @_;
-
-    InitBuildProgress($input_files->{"buildprogress"});
-    
-    # if we are pulling, we probably want to do a full build, so clear the build progress
-    if ($do_pull) {
-        ClearBuildProgress();    
-    }
-    
-    # read local prefs, and the build progress file, and set flags to say what to build
-    SetupBuildParams(\%main::build,
-                     \%main::options,
-                     \%main::optiondefines,
-                     \%main::filepaths,
-                     $input_files->{"buildflags"},
-                     $build_prefs);
-    
-    # If we were told to pull, make sure we do, overriding prefs etc.
-    if ($do_pull)
-    {
-        $main::build{"pull"} = 1;
-    }
-    
-    # transfer this flag
-    $CodeWarriorLib::CLOSE_PROJECTS_FIRST = $main::CLOSE_PROJECTS_FIRST;
-    
-    # setup the build log
-    SetupBuildLog($main::filepaths{"buildlogfilepath"}, $main::USE_TIMESTAMPED_LOGS);
-    StopForErrors();
-    
-    if ($main::LOG_TO_FILE) {
-        RedirectOutputToFile($main::filepaths{"scriptlogfilepath"});
-    }
-        
-    # run a pre-build check to see that the tools etc are in order
-    DoPrebuildCheck();
-    
-    # do the pull
-    PullFromCVS($input_files->{"checkoutdata"}, $input_files->{"checkouttime"});
-    
-    unless ($do_build) { return; }
-
-    my($build_start) = TimeStart();
-
-    # check the build environment
-    ConfigureBuildSystem();
-
-    # here we load and call methods in the build module indirectly.
-    # we have to use indirection because the build module can be named
-    # differently for different builds.
-    chdir(dirname($0));     # change to the script dir
-    my($build_module) = $input_files->{"buildmodule"};
-    # load the build module
-    require $build_module;
-    {   # scope for no strict 'refs'
-        no strict 'refs';
-        
-        my($package_name) = $build_module;
-        $package_name =~ s/\.pm$//;
-        
-        chdir($main::MOZ_SRC);
-        &{$package_name."::BuildDist"}();
-        
-        chdir($main::MOZ_SRC);
-        &{$package_name."::BuildProjects"}();
-    }
-    
-    # the build finished, so clear the build progress state
-    ClearBuildProgress();
-    
-    TimeEnd($build_start, "Build");
-    print "Build complete\n";
-}
-
-1;

mozilla/build/mac/build_scripts/Moz/BuildFlags.pm

@@ -1,425 +0,0 @@
-#!perl -w
-package Moz::BuildFlags;
-
-require 5.004;
-require Exporter;
-
-# Package that attempts to read a file from the Preferences folder,
-# and get build settings out of it
-
-use strict;
-use Exporter;
-
-use Cwd;
-use File::Basename;
-
-use Moz::Moz;
-use Moz::Prefs;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA      = qw(Exporter);
-@EXPORT   = qw(
-                SetupBuildParams
-                InitBuildProgress
-                WriteBuildProgress
-                ClearBuildProgress
-                ReadBuildProgress
-              );
-
-
-my(@build_flags);
-my(@options_flags);
-my(@filepath_flags);
-
-my(%arrays_list) = (
-  "build_flags",    \@build_flags,
-  "options_flags",  \@options_flags,
-  "filepath_flags", \@filepath_flags
-);
-
-my($progress_file) = "¥ÊBuild progress";
-
-#-------------------------------------------------------------------------------
-# appendArrayFlag
-# 
-# Set a flag in the array
-#-------------------------------------------------------------------------------
-sub appendArrayFlag(@)
-{
-  my($array_name) = shift;
-  my($setting) = shift;
-  my($value) = shift;
-  
-  my(@optional_values);
-  foreach (@_) {
-    push(@optional_values, $_);
-  }
-
-  my(@this_flag) = [$setting, $value, @optional_values];
-  my($flags_array) = $arrays_list{$array_name};
-  if ($flags_array)
-  {
-    push(@{$flags_array}, @this_flag) || die "Failed to append\n";
-  }
-  else
-  {
-    die "Error: unknown build flags array $array_name\n";
-  }
-}
-
-#-------------------------------------------------------------------------------
-# readFlagsFile
-# 
-# Read the file of build flags from disk. File path is relative to the
-# script directory.
-#-------------------------------------------------------------------------------
-sub readFlagsFile($)
-{
-  my($flags_file) = @_;
-
-  my($file_path) = $0;
-  $file_path =~ s/[^:]+$/$flags_file/;
-  
-  print "Reading build flags from '$file_path'\n";
-
-  local(*FLAGS_FILE);
-  open(FLAGS_FILE, "< $file_path") || die "Error: failed to open flags file $file_path\n";
-
-  my($cur_array) = "";
-  
-  while(<FLAGS_FILE>)
-  {
-      my($line) = $_;
-      chomp($line);
-      
-      # ignore comments and empty lines  
-      if ($line =~ /^\#/ || $line =~ /^\s*$/) {
-        next;
-      }
-
-      # 1-word line, probably array name
-      if ($line =~ /^([^#\s]+)\s*$/)
-      {
-        $cur_array = $1;
-        next;  
-      }
-      elsif ($line =~ /^([^#\s]+)\s+\"(.+)\"(\s+#.+)?$/)    # quoted option, possible comment
-      {
-        my($flag) = $1;
-        my($setting) = $2;
-        
-        appendArrayFlag($cur_array, $flag, $setting);
-      }
-      elsif ($line =~ /^([^#\s]+)((\s+[^#\s]+)+)(\s+#.+)?$/)  # multiple word line, possible comment
-      {
-        my($flag) = $1;
-        
-        appendArrayFlag($cur_array, $flag, split(' ', $2));
-      }
-      else
-      {
-        die "Error: unknown build flag at '$line'\n";
-      }
-  
-  }
-  
-  close(FLAGS_FILE);
-}
-
-
-
-#-------------------------------------------------------------------------------
-# flagsArrayToHash
-# 
-# Utility routine to migrate flag from a 2D array to a hash, where
-# item[n][0] is the hash entry name, and item[n][1] is the hash entry value.
-#-------------------------------------------------------------------------------
-
-sub flagsArrayToHash($$)
-{
-  my($src_array, $dest_hash) = @_;
-  
-  my($item);
-  foreach $item (@$src_array)
-  {
-    $dest_hash->{$item->[0]} = $item->[1];
-  }
-}
-
-#-----------------------------------------------
-# printHash
-#
-# Utility routine to print a hash
-#-----------------------------------------------
-sub printHash($)
-{
-  my($hash_ref) = @_;
- 
-  print "Printing hash:\n";
-  
-  my($key, $value);
-  
-  while (($key, $value) = each (%$hash_ref))
-  {
-    print "  $key $value\n";
-  }
-}
-
-
-#-----------------------------------------------
-# printBuildArray
-#
-# Utility routine to print a 2D array
-#-----------------------------------------------
-sub printBuildArray($)
-{
-  my($build_array) = @_;
-  
-  my($entry);
-  foreach $entry (@$build_array)
-  {  
-    print "$entry->[0] = $entry->[1]\n";
-  }
-
-}
-
-#-------------------------------------------------------------------------------
-# SetBuildFlags
-#-------------------------------------------------------------------------------
-sub SetBuildFlags($)
-{
-  my($build) = @_;
-
-  flagsArrayToHash(\@build_flags, $build);
-}
-
-#-------------------------------------------------------------------------------
-# SetBuildOptions
-#-------------------------------------------------------------------------------
-sub SetBuildOptions($)
-{
-  my($options) = @_;
-
-  flagsArrayToHash(\@options_flags, $options);
-}
-
-#-------------------------------------------------------------------------------
-# SetFilepathFlags
-#-------------------------------------------------------------------------------
-sub SetFilepathFlags($)
-{
-  my($filepath) = @_;
-
-  flagsArrayToHash(\@filepath_flags, $filepath);
-}
-
-#-------------------------------------------------------------------------------
-# SetOptionDefines
-#-------------------------------------------------------------------------------
-sub SetOptionDefines($)
-{
-  my($optiondefines) = @_;
-
-  foreach my $entry (@options_flags)
-  {
-    if (defined($entry->[2])) {
-      $optiondefines->{$entry->[0]}{$entry->[2]} = 1;
-    }
-  }
-}
-
-
-#-------------------------------------------------------------------------------
-# PropagateAllFlags
-#-------------------------------------------------------------------------------
-sub PropagateAllFlags($)
-{
-  my($build_array) = @_;
-  
-  # if "all" is set, set all the flags to 1
-  unless ($build_array->[0][0] eq "all") { die "Error: 'all' must come first in the flags array\n"; }
-  
-  if ($build_array->[0][1] == 1)
-  {
-    my($index);
-    foreach $index (@$build_array)
-    {
-      $index->[1] = 1;
-    }
-  }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// _getBuildProgressFile
-#//--------------------------------------------------------------------------------------------------
-sub _getBuildProgressFile()
-{
-  return $progress_file;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// setBuildProgressStart
-#// 
-#// This automagically sets $build{"all"} to 0
-#//--------------------------------------------------------------------------------------------------
-sub setBuildProgressStart($$)
-{
-  my($build_array, $name) = @_;
-
-  my($index);
-  foreach $index (@$build_array)
-  {
-    $index->[1] = 0;
-    if ($index->[0] eq $name) {
-      last;
-    }    
-  }
-
-  print "Building from module after $name, as specified by build progress\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// InitBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub InitBuildProgress($)
-{
-  my($prog_file) = @_;
-  if ($prog_file ne "") {
-    $progress_file = full_path_to($prog_file);
-    print "Writing build progress to $progress_file\n";
-  }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// WriteBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub WriteBuildProgress($)
-{
-  my($module_built) = @_;
-
-  my($progress_file) = _getBuildProgressFile();
-  
-  if ($progress_file ne "")
-  {
-    open(PROGRESS_FILE, ">>$progress_file") || die "Failed to open $progress_file\n";
-    print(PROGRESS_FILE "$module_built\n");
-    close(PROGRESS_FILE);
-  }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// ClearBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub ClearBuildProgress()
-{
-  my($progress_file) = _getBuildProgressFile();
-  if ($progress_file ne "") {
-    unlink $progress_file;
-  }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// WipeBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub WipeBuildProgress()
-{
-  print "Ignoring build progress\n";
-  ClearBuildProgress();
-  $progress_file = "";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ReadBuildProgress
-#//--------------------------------------------------------------------------------------------------
-sub ReadBuildProgress($)
-{
-  my($build_array) = @_;
-  my($progress_file) = _getBuildProgressFile();
-
-  my($last_module);
-  
-  if (open(PROGRESS_FILE, "< $progress_file"))
-  {
-    print "Getting build progress from $progress_file\n";
-    
-    while (<PROGRESS_FILE>)
-    {
-      my($line) = $_;
-      chomp($line);
-      $last_module = $line;
-    }
-    
-    close(PROGRESS_FILE);
-  }
-  
-  if ($last_module)
-  {
-    setBuildProgressStart($build_array, $last_module);
-  }
-}
-
-#-------------------------------------------------------------------------------
-# clearOldBuildSettings
-#-------------------------------------------------------------------------------
-sub clearOldBuildSettings($$$$)
-{
-  my($build, $options, $optiondefines, $filepaths) = @_;
-
-  # empty the arrays in case we're being called twice
-  @build_flags = ();
-  @options_flags = ();
-  @filepath_flags = ();
-  
-  # and empty the hashes
-  %$build = ();
-  %$options = ();
-  %$optiondefines = ();
-  %$filepaths = ();
-}
-
-#-------------------------------------------------------------------------------
-# SetupBuildParams
-#-------------------------------------------------------------------------------
-sub SetupBuildParams($$$$$$)
-{
-  my($build, $options, $optiondefines, $filepaths, $flags_file, $prefs_file) = @_;
-  
-  # Empty the hashes and arrays, to wipe out any stale data.
-  # Needed because these structures persist across two build scripts
-  # called using 'do' from a parent script.
-  clearOldBuildSettings($build, $options, $optiondefines, $filepaths);
-  
-  # Read from the flags file, which sets up the various arrays
-  readFlagsFile($flags_file);
-  
-  # If 'all' is set in the build array, propagate that to all entries
-  PropagateAllFlags(\@build_flags);
-  
-  # read the user pref file, that can change values in the array
-  ReadMozUserPrefs($prefs_file, \@build_flags, \@options_flags, \@filepath_flags);
-
-  # If build progress exists, this clears flags in the array up to a certain point
-  if ($main::USE_BUILD_PROGRESS) {
-    ReadBuildProgress(\@build_flags);
-  } else {
-    WipeBuildProgress();
-  }
-  
-#  printBuildArray(\@build_flags);
-#  printBuildArray(\@options_flags);
-  
-  SetBuildFlags($build);
-  SetBuildOptions($options);
-  SetOptionDefines($optiondefines);
-  SetFilepathFlags($filepaths);
-  
-#  printHash($build);
-#  printHash($options);
-}
-
-
-1;

mozilla/build/mac/build_scripts/Moz/BuildUtils.pm

@@ -1,786 +0,0 @@
-
-package Moz::BuildUtils;
-
-require 5.004;
-require Exporter;
-
-# Package that contains build util functions specific to the Mozilla build
-# process.
-
-use strict;
-use Exporter;
-
-use Cwd;
-use File::Path;
-use File::Basename;
-
-use Mac::Events;
-use Mac::StandardFile;
-
-use Moz::Moz;
-use Moz::BuildFlags;
-use Moz::MacCVS;
-#use Moz::ProjectXML;  #optional; required for static build only
-
-use vars qw(@ISA @EXPORT);
-
-@ISA      = qw(Exporter);
-@EXPORT   = qw(
-                SetupDefaultBuildOptions
-                SetupBuildRootDir
-                StartBuildModule
-                EndBuildModule
-                GetBinDirectory
-                BuildOneProjectWithOutput
-                BuildOneProject
-                BuildProject
-                BuildProjectClean
-                BuildIDLProject
-                BuildFolderResourceAliases
-                AskAndPersistFile
-                DelayFor
-                TimeStart
-                TimeEnd
-                EmptyTree
-                SetupBuildLog
-                SetBuildNumber
-                SetTimeBomb
-                UpdateConfigHeader
-              );
-
-#//--------------------------------------------------------------------------------------------------
-#// SetupDefaultBuildOptions
-#//--------------------------------------------------------------------------------------------------
-sub SetupDefaultBuildOptions($$$)
-{
-    my($debug, $bin_dir, $config_header_file_name) = @_;
-
-    # Here we set up defaults for the various build flags.
-    # If you want to override any of these, it's best to do
-    # so via the relevant preferences file, which lives in
-    # System Folder:Preferences:Mozilla build prefs:{build prefs file}.
-    # For the name of the prefs file, see the .pl script that you
-    # run to start this build. The prefs files are created when
-    # you run the build, and contain some documentation.
-    
-    #-------------------------------------------------------------
-    # configuration variables that globally affect what is built
-    #-------------------------------------------------------------
-    $main::DEBUG                  = $debug;
-    $main::PROFILE                = 0;
-    $main::RUNTIME                = 0;    # turn on to just build runtime support and NSPR projects
-    $main::GC_LEAK_DETECTOR       = 0;    # turn on to use GC leak detection
-    $main::MOZILLA_OFFICIAL       = 0;    # generate build number
-    $main::LOG_TO_FILE            = 0;    # write perl output to a file
-    
-    #-------------------------------------------------------------
-    # configuration variables that affect the manner of building, 
-    # but possibly affecting the outcome.
-    #-------------------------------------------------------------    
-    $main::ALIAS_SYM_FILES        = $main::DEBUG;
-    $main::CLOBBER_LIBS           = 1;      # turn on to clobber existing libs and .xSYM files before
-                                            # building each project                         
-    # The following two options will delete all dist files (if you have $main::build{dist} turned on),
-    # but leave the directory structure intact.
-    $main::CLOBBER_DIST_ALL       = 1;    # turn on to clobber all aliases/files inside dist (headers/xsym/libs)
-    $main::CLOBBER_DIST_LIBS      = 0;    # turn on to clobber only aliases/files for libraries/sym files in dist
-    $main::CLOBBER_IDL_PROJECTS   = 0;    # turn on to clobber all IDL projects.
-    $main::CLOBBER_PROJECTS       = 0;    # turn on to remove object code from each project before building it
-    
-    $main::UNIVERSAL_INTERFACES_VERSION = 0x0320;
-    
-    #-------------------------------------------------------------
-    # configuration variables that are preferences for the build,
-    # style and do not affect what is built.
-    #-------------------------------------------------------------
-    $main::CLOSE_PROJECTS_FIRST   = 0;
-                                    # 1 = close then make (for development),
-                                    # 0 = make then close (for tinderbox).
-    $main::USE_TIMESTAMPED_LOGS   = 0;
-    $main::USE_BUILD_PROGRESS     = 1;    # track build progress for restartable builds
-    #-------------------------------------------------------------
-    # END OF CONFIG SWITCHES
-    #-------------------------------------------------------------
-    
-    $main::BIN_DIRECTORY = $bin_dir;
-    $main::DEFINESOPTIONS_FILE = $config_header_file_name;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// SetupBuildRootDir
-#//--------------------------------------------------------------------------------------------------
-sub SetupBuildRootDir($)
-{
-    my($rel_path_to_script) = @_;
-
-    my($cur_dir) = cwd();
-    $cur_dir =~ s/$rel_path_to_script$//;
-    chdir($cur_dir) || die "Error: failed to set build root directory to '$cur_dir'.\nYou probably need to put 'mozilla' one level down (in a folder).\n";
-    $main::MOZ_SRC = cwd();
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// StartBuildModule
-#//--------------------------------------------------------------------------------------------------
-sub StartBuildModule($)
-{
-    my($module) = @_;
-
-    print("---- Start of $module ----\n");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// EndBuildModule
-#//--------------------------------------------------------------------------------------------------
-sub EndBuildModule($)
-{
-    my($module) = @_;
-    WriteBuildProgress($module);
-    print("---- End of $module ----\n");
-}
-
-#--------------------------------------------------------------------------------------------------
-# GetBinDirectory
-#--------------------------------------------------------------------------------------------------
-sub GetBinDirectory()
-{
-    if ($main::BIN_DIRECTORY eq "") { die "Dist directory not set\n"; }
-    return $main::BIN_DIRECTORY;
-}
-
-#--------------------------------------------------------------------------------------------------
-# AskAndPersistFile stores the information about the user pick inside
-# the file $session_storage
-#--------------------------------------------------------------------------------------------------
-sub AskAndPersistFile($)
-{
-    my ($sessionStorage) = @_;
-    my $cvsfile;
-
-    if (( -e $sessionStorage) &&
-        open( SESSIONFILE, $sessionStorage ))
-    {
-    # Read in the path if available
-        $cvsfile = <SESSIONFILE>;
-        chomp $cvsfile;
-        close SESSIONFILE;
-        if ( ! -e $cvsfile )
-        {
-            print STDERR "$cvsfile has disappeared\n";
-            undef $cvsfile;
-        }
-    }
-    unless (defined ($cvsfile))
-    {
-        # make sure that MacPerl is a front process
-        ActivateApplication('McPL');
-        MacPerl::Answer("Could not find your MacCVS session file. Please choose one", "OK");
-        
-        # prompt user for the file name, and store it
-        my $macFile = StandardGetFile( 0, "McvD");  
-        if ( $macFile->sfGood() )
-        {
-            $cvsfile = $macFile->sfFile();
-            # save the choice if we can
-            if ( open (SESSIONFILE, ">" . $sessionStorage))
-            {
-                printf SESSIONFILE $cvsfile, "\n";
-                close SESSIONFILE;
-            }
-            else
-            {
-                print STDERR "Could not open storage file $sessionStorage for saving $cvsfile\n";
-            }
-        }
-    }
-    return $cvsfile;
-}
-
-
-#--------------------------------------------------------------------------------------------------
-# BuildIDLProject
-#
-#--------------------------------------------------------------------------------------------------
-
-sub BuildIDLProject($$)
-{
-    my ($project_path, $module_name) = @_;
-
-    if ($main::CLOBBER_IDL_PROJECTS)
-    {
-        my (@suffix_list) = (".mcp", ".xml");
-        my ($project_name, $project_dir, $suffix) = fileparse($project_path, @suffix_list);
-        if ($suffix eq "") { die "Error: Project, $project_path must end in .xml or .mcp\n"; }
-
-        my($datafolder_path);
-        if ($suffix eq ".xml")
-        {
-            $datafolder_path = $project_dir . "_" . $project_name . " Data:";
-        }
-        else {
-            $datafolder_path = $project_dir . $project_name . " Data:";
-        }
-
-        print STDERR "Deleting IDL data folder: $datafolder_path\n";
-        EmptyTree($datafolder_path);
-    }
-
-    BuildOneProject($project_path,  "headers", 0, 0, 0);
-    BuildOneProject($project_path,  $module_name.".xpt", 1, 0, 1);
-}
-
-
-#--------------------------------------------------------------------------------------------------
-# CreateStaticLibTargets
-#
-#--------------------------------------------------------------------------------------------------
-sub CreateXMLStaticLibTargets($)
-{
-    my($xml_path) = @_;
-
-    my (@suffix_list) = (".xml");
-    my ($project_name, $project_dir, $suffix) = fileparse($xml_path, @suffix_list);
-    if ($suffix eq "") { die "XML munging: $xml_path must end in .xml\n"; }
-
-    #sniff the file to see if we need to fix up broken Pro5-exported XML
-    print "Parsing $xml_path\n";
-    
-    my $ide_version = Moz::ProjectXML::SniffProjectXMLIDEVersion($xml_path);
-    if ($ide_version eq "4.0")
-    {
-        my $new_file = $project_dir.$project_name."2.xml";
-        
-        print "Cleaning up Pro 5 xml to $new_file\n";
-        
-        Moz::ProjectXML::CleanupPro5XML($xml_path, $new_file);
-
-        unlink $xml_path;
-        rename ($new_file, $xml_path);
-    }
-    
-    my $doc = Moz::ProjectXML::ParseXMLDocument($xml_path);
-    my @target_list = Moz::ProjectXML::GetTargetsList($doc);
-    my $target;
-    
-    my %target_hash;    # for easy lookups below
-    foreach $target (@target_list) { $target_hash{$target} = 1; }
-    
-    foreach $target (@target_list)
-    {
-        if ($target =~ /(.+).shlb$/)        # if this is a shared lib target
-        {
-            my $target_base = $1;
-            my $static_target = $target_base.".o";
-            
-            # ensure that this does not exist already
-            if ($target_hash{$static_target}) {
-                print "Static target $static_target already exists in project. Not making\n";
-                next;
-            }
-            
-            print "Making static target '$static_target' from target '$target'\n";
-
-            Moz::ProjectXML::CloneTarget($doc, $target, $static_target);
-            Moz::ProjectXML::SetAsStaticLibraryTarget($doc, $static_target, $static_target);
-        }
-    }
-    
-    print "Writing XML file to $xml_path\n";
-    my $temp_path = $project_dir."_".$project_name.".xml";
-    Moz::ProjectXML::WriteXMLDocument($doc, $temp_path, $ide_version);
-    Moz::ProjectXML::DisposeXMLDocument($doc);
-    
-    if (-e $temp_path)
-    {
-        unlink $xml_path;
-        rename ($temp_path, $xml_path);
-    }
-    else
-    {
-        die "Error: Failed to add new targets to XML project\n";
-    }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ProcessProjectXML
-#// 
-#// Helper routine to allow for XML pre-processing. This should read in the XML, process it,
-#// and replace the original file with the processed version.
-#//--------------------------------------------------------------------------------------------------
-sub ProcessProjectXML($)
-{
-    my($xml_path) = @_;
-  
-    # we need to manually load Moz::ProjectXML, becaues not everyone will have the
-    # required perl modules in their distro.
-    my($cur_dir) = cwd();
-    
-    chdir(dirname($0));     # change to the script dir
-    eval "require Moz::ProjectXML";
-    if ($@) { die "Error: could not do Project XML munging because you do not have the correct XML modules installed. Error is:\n################\n $@################"; }
-    
-    chdir($cur_dir);
-    
-    CreateXMLStaticLibTargets($xml_path);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Build one project, and make the alias. Parameters are project path, target name, shared  library
-#// name, make shlb alias (boolean), make xSYM alias (boolean), and is component (boolean).
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildOneProjectWithOutput($$$$$$)
-{
-    my ($project_path, $target_name, $output_name, $alias_lib, $alias_xSYM, $component) = @_;
-
-    unless ($project_path =~ m/^$main::BUILD_ROOT.+/) { return; }
-
-    my (@suffix_list) = (".mcp", ".xml");
-    my ($project_name, $project_dir, $suffix) = fileparse($project_path, @suffix_list);
-    if ($suffix eq "") { die "Error: Project, $project_path must end in .xml or .mcp\n"; }
-    
-    my($dist_dir) = GetBinDirectory();
-    
-    # Put libraries in "Essential Files" folder, Components in "Components" folder
-    my($output_dir)  = $component ? "Components:" : "Essential Files:";
-    my($output_path) = $dist_dir.$output_dir;
-
-    if ($main::options{static_build})
-    {      
-      if ($output_name =~ /\.o$/ || $output_name =~ /\.[Ll]ib$/)
-      {
-        $alias_xSYM = 0;
-        $alias_lib  = 1;
-        $output_path = $main::DEBUG ? ":mozilla:dist:static_libs_debug:" : ":mozilla:dist:static_libs:";
-      }
-    }
-
-    # if the flag is on to export projects to XML, export and munge them
-    if ($main::EXPORT_PROJECTS && !($project_path =~ /IDL\.mcp$/))
-    {
-        my $xml_out_path = $project_path;
-
-        $xml_out_path =~ s/\.mcp$/\.xml/;
-
-        # only do this if project is newer?
-        if (! -e $xml_out_path)
-        {
-          ExportProjectToXML(full_path_to($project_path), full_path_to($xml_out_path));
-          ProcessProjectXML($xml_out_path);
-        }
-    }
-        
-    # if the flag is set to use XML projects, default to XML if the file 
-    # is present.
-    if ($main::USE_XML_PROJECTS && !($project_path =~ /IDL\.mcp$/))
-    {
-      my $xml_project_path = $project_dir.$project_name.".xml";
-      if (-e $xml_project_path)
-      {
-        $project_path = $xml_project_path;
-        $suffix = ".xml";
-      }
-    }
-    
-    if ($suffix eq ".xml")
-    {
-        my($xml_path) = $project_path;
-        # Prepend an "_" onto the name of the generated project file so it doesn't conflict
-        $project_path = $project_dir . "_" . $project_name . ".mcp";
-        my($project_modtime) = (-e $project_path ? GetFileModDate($project_path) : 0);
-        my($xml_modtime) = (-e $xml_path ? GetFileModDate($xml_path) : 0);
-
-        if ($xml_modtime > $project_modtime)
-        {
-            print("Importing $project_path from $project_name.xml.\n");
-            unlink($project_path);
-            # Might want to delete the "xxx.mcp Data" dir ???
-            ImportXMLProject(full_path_to($xml_path), full_path_to($project_path));
-        }
-    }
-
-
-    if ($main::CLOBBER_LIBS)
-    {
-        unlink "$project_dir$output_name";              # it's OK if these fail
-        unlink "$project_dir$output_name.xSYM";
-    }
-    
-    DoBuildProject($project_path, $target_name, $main::CLOBBER_PROJECTS);
-    
-    $alias_lib  ? MakeAlias("$project_dir$output_name",      "$output_path") : 0;
-    $alias_xSYM ? MakeAlias("$project_dir$output_name.xSYM", "$output_path") : 0;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// For compatiblity with existing scripts, BuildOneProject now just calls
-#// BuildOneProjectWithOutput, with the output name and target name identical.
-#// Note that this routine assumes that the target name and the shared libary name
-#// are the same.
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildOneProject($$$$$)
-{
-    my ($project_path, $target_name, $alias_lib, $alias_xSYM, $component) = @_;
-    
-	BuildOneProjectWithOutput($project_path, $target_name, $target_name,
-							  $alias_lib, $alias_xSYM, $component);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// For compatiblity with existing scripts, BuildProject now just calls
-#// BuildOneProjectWithOutput, with the output name and target name identical.
-#// Note that this routine assumes that the target name and the shared libary name
-#// are the same. No aliases of the output are made.
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildProject($$)
-{
-    my ($project_path, $target_name) = @_;
-    
-	BuildOneProjectWithOutput($project_path, $target_name, $target_name, 0, 0, 0);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Identical to BuildProject but clobbers the project before building it.
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildProjectClean($$)
-{
-    my ($project_path, $target_name) = @_;
-    my ($save_clobber_flag) = $main::CLOBBER_PROJECTS;
-    $main::CLOBBER_PROJECTS = 1;
-	BuildOneProjectWithOutput($project_path, $target_name, $target_name, 0, 0, 0);
-	$main::CLOBBER_PROJECTS = $save_clobber_flag;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Make resource aliases for one directory
-#//--------------------------------------------------------------------------------------------------
-
-sub BuildFolderResourceAliases($$)
-{
-    my($src_dir, $dest_dir) = @_;
-        
-    # get a list of all the resource files
-    opendir(SRCDIR, $src_dir) || die("can't open $src_dir");
-    my(@resource_files) = readdir(SRCDIR);
-    closedir(SRCDIR);
-    
-    # make aliases for each one into the dest directory
-    print("Placing aliases to all files from $src_dir in $dest_dir\n");
-    for ( @resource_files )
-    {
-        next if $_ eq "CVS";
-        #print("    Doing $_\n");
-        if (-l $src_dir.$_)
-        {
-            print("     $_ is an alias\n");
-            next;
-        }
-        my($file_name) = $src_dir . $_; 
-        MakeAlias($file_name, $dest_dir);
-    }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// DelayFor
-#//
-#// Delay for the given number of seconds, allowing the script to be cancelled
-#//--------------------------------------------------------------------------------------------------
-
-sub DelayFor($)
-{
-  my($delay_secs) = @_;
-  
-  STDOUT->autoflush(1);
-  
-  my($end_time) = time() + $delay_secs;
-    
-  my($last_time) = 0;
-  my($cur_time) = time();
-  
-  while ($cur_time < $end_time)
-  {
-    $cur_time = time();
-    if ($cur_time > $last_time)
-    {
-      print ".";
-      $last_time = $cur_time;
-    }
-    
-    WaitNextEvent();
-  }
-
-  print "\n";
-  STDOUT->autoflush(0);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// TimeStart
-#//--------------------------------------------------------------------------------------------------
-sub TimeStart()
-{
-    return time();
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// TimeEnd
-#//--------------------------------------------------------------------------------------------------
-sub TimeEnd($$)
-{
-    use integer;
-    
-    my($start_time, $operation_name) = @_;
-    my($end_time) = time();
-    
-    my($tot_sec) = $end_time - $start_time;
-    
-    my($seconds) = $tot_sec;
-    
-    my($hours) = $seconds / (60 * 60);
-    $seconds -= $hours * (60 * 60);
-    
-    my($minutes) = $seconds / 60;
-    $seconds -= $minutes * 60;
-        
-    print "$operation_name took $hours hours $minutes minutes and $seconds seconds\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Remove all files from a tree, leaving directories intact (except "CVS").
-#//--------------------------------------------------------------------------------------------------
-
-sub EmptyTree($)
-{
-    my ($root) = @_; 
-    #print "EmptyTree($root)\n";
-    opendir(DIR, $root);
-    my $sub;
-    foreach $sub (readdir(DIR))
-    {
-        my $fullpathname = $root.$sub; # -f, -d only work on full paths
-
-        # Don't call empty tree for the alias of a directory.
-        # -d returns true for the alias of a directory, false for a broken alias)
-
-        if (-d $fullpathname)
-        {
-            if (-l $fullpathname)   # delete aliases
-            {
-                unlink $fullpathname;
-                next;
-            }
-            EmptyTree($fullpathname.":");
-            if ($sub eq "CVS")
-            {
-                #print "rmdir $fullpathname\n";
-                rmdir $fullpathname;
-            }
-        }
-        else
-        {
-            unless (unlink $fullpathname) { die "Failed to delete $fullpathname\n"; }
-        }
-    }
-    closedir(DIR);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Recurse through a directory hierarchy, looking for MANIFEST files.
-#// Currently unused.
-#//--------------------------------------------------------------------------------------------------
-
-sub ScanForManifestFiles($$$$)
-{
-    my($dir, $theme_root, $theme_name, $dist_dir) = @_;
-
-    opendir(DIR, $dir) or die "Cannot open dir $dir\n";
-    my @files = readdir(DIR);
-    closedir DIR;
-
-    my $file;
-
-    foreach $file (@files)
-    {    
-        my $filepath = $dir.":".$file;
-
-        if (-d $filepath)
-        {
-            # print "Looking for MANIFEST files in $filepath\n";        
-            ScanForManifestFiles($filepath, $theme_root, $theme_name, $dist_dir);
-        }
-        elsif ($file eq "MANIFEST")
-        {
-            # print "Doing manifest file $filepath\n";
-
-            # Get the dest path from the first line of the file
-
-            open(MANIFEST, $filepath) || die "Could not open file $file";
-            # Read in the path if available
-            my($dest_line) = <MANIFEST>;
-            chomp $dest_line;
-            close MANIFEST;
-
-            $dest_line =~ s|^#!dest[\t ]+|| || die "No destination line found in $filepath\n";
-
-            my($dest_path) = $dist_dir."chrome:skins:$theme_name:$dest_line";
-            # print " Destination is $dest_path\n";
-
-            InstallResources($filepath, "$dest_path", 0);
-        }
-    }
-}
-
-
-#-----------------------------------------------
-# SetupBuildLog
-#-----------------------------------------------
-sub SetupBuildLog($$)
-{
-    my($logfile_path, $timestamped_log) = @_;
-    
-    my($logdir) = "";
-    my($logfile) = $logfile_path;
-    
-    if ($logfile_path =~ /(.+?:)([^:]+)$/)       # ? for non-greedy match
-    {
-        $logdir = $1;
-        $logfile = $2;
-        
-        mkpath($logdir);
-    }
-    
-    if ($timestamped_log)
-    {
-        #Use time-stamped names so that you don't clobber your previous log file!
-        my $now = localtime();
-        while ($now =~ s@:@.@) {} # replace all colons by periods
-        OpenErrorLog("${logdir}${now}");
-    }
-    else
-    {
-        OpenErrorLog("${logdir}${logfile}");
-    }
-}
-
-#-----------------------------------------------
-# SetBuildNumber
-#-----------------------------------------------
-sub SetBuildNumber($$)
-{
-    my($build_num_file, $files_to_touch) = @_;
-
-    # Make sure we add the config dir to search, to pick up mozBDate.pm
-    # Need to do this dynamically, because this module can be used before
-    # mozilla/config has been checked out.
-    
-    my ($inc_path) = $0;        # $0 is the path to the parent script
-    $inc_path =~ s/:build:mac:build_scripts:.+$/:config/;
-    push(@INC, $inc_path);
-
-    require mozBDate;
-    
-    mozBDate::UpdateBuildNumber($build_num_file, $main::MOZILLA_OFFICIAL);
-   
-    my($file);
-    foreach $file (@$files_to_touch)
-    {
-        print "Writing build number to $file from ${file}.in\n";
-        mozBDate::SubstituteBuildNumber($file, $build_num_file, "${file}.in");
-    }
-}
-
-#-----------------------------------------------
-# SetTimeBomb
-#-----------------------------------------------
-sub SetTimeBomb($$)		
-{
-  my ($warn_days, $bomb_days) = @_;
-  
-  system("perl :mozilla:config:mac-set-timebomb.pl $warn_days $bomb_days");
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// Regenerate a configuration header file if necessary
-#//--------------------------------------------------------------------------------------------------
-sub UpdateConfigHeader($)
-{
-    my($config_path) = @_;
-    
-    my($config, $oldconfig) = ("", "");
-    my($define, $definevalue, $defines);
-    my($k, $l,);
-
-    foreach $k (keys(%main::options))
-    {
-        if ($main::options{$k})
-        {
-            foreach $l (keys(%{$main::optiondefines{$k}}))
-            {
-                $my::defines{$l} = $main::optiondefines{$k}{$l};
-                print "Setting up my::defines{$l}\n";
-            }
-        }
-    }
-
-    my $config_headerfile = current_directory().$config_path;
-    if (-e $config_headerfile)
-    {
-        open(CONFIG_HEADER, "< $config_headerfile") || die "$config_headerfile: $!\n";
-        my($line);
-        while ($line = <CONFIG_HEADER>)
-        {
-            if ($line =~ m/#define\s+([^\s]*)\s+([^\s]*)\s*\n/)
-            {
-                $define = $1;
-                $definevalue = $2;
-                
-                #canonicalize so that whitespace changes are not significant
-                my $canon_value = "#define " . $define . " " . $definevalue . "\n";
-                $oldconfig .= $canon_value;
-                
-                if (exists ($my::defines{$define}) and ($my::defines{$define} == $definevalue))
-                {
-                    delete $my::defines{$define};
-                    $config .= $canon_value;
-                }
-            }
-        }
-        close(CONFIG_HEADER);
-    }
-
-    if (%my::defines)
-    {
-        foreach $k (keys(%my::defines))
-        {
-            $config .= "#define " . $k . " " . $my::defines{$k} . "\n";
-        }
-    }
-
-    my $file_name = basename($config_headerfile);
-    if (($config ne $oldconfig) || (!-e $config_headerfile))
-    {
-        printf("Writing new configuration header $file_name\n");
-        open(CONFIG_HEADER, "> $config_headerfile") || die "$config_headerfile: $!\n";
-        print(CONFIG_HEADER "/* This file is auto-generated based on build options. Do not edit. */\n");
-        print CONFIG_HEADER ($config);
-        close(CONFIG_HEADER);
-
-        MacPerl::SetFileInfo("CWIE", "TEXT", $config_headerfile);
-    }
-    else
-    {
-        printf("Configuration header $file_name is up-to-date\n");
-    }
-}
-
-
-1;
-

mozilla/build/mac/build_scripts/Moz/CodeWarriorLib.pm

@@ -1,660 +0,0 @@
-#!perl
-package Moz::CodeWarriorLib;
-
-=pod
-
-=head1 NAME
-
-CodeWarriorLib - supply interface to CodeWarrior
-
-=head1 SYNOPSIS
-
-	#!perl
-	use CodeWarriorLib;
-	CodeWarriorLib::activate();
-	$had_errors = CodeWarriorLib::build_project(
-		$project_path, $target_name, $recent_errors_file, $clean_build
-	);
-
-=head1 DESCRIPTION
-
-Replaces the AppleScript library I<CodeWarriorLib>.
-
-=over 4
-
-=cut
-
-use strict;
-
-use Cwd;
-use File::Basename;
-
-use Mac::Types;
-use Mac::Events;
-use Mac::AppleEvents;
-use Mac::AppleEvents::Simple;
-use Mac::Processes;
-use Mac::MoreFiles;
-use Mac::StandardFile;
-
-
-use vars qw($VERSION);
-$VERSION = '1.02';
-
-my($app)  = 'CWIE';
-my($scriptDir) = cwd();         # could use $0 for this
-my($ide_loc_file) = "";
-
-# 0 == don't switch CWIE to front app in do_event(), 1 == do switch
-# note: activate() still switches when called
-$Mac::AppleEvents::Simple::SWITCH = 0;
-# $Mac::AppleEvents::Simple::WARN = 1;
-
-# supply your own path to the source here
-#_test('PowerPudgeIV:mozilla:mozilla:');
-
-# If you want to understand the gobbldeygook that's used to build Apple Events,
-# you should start by reading the AEGizmos documentation.
-
-=pod
-
-=item _get_project($full_path)
-
-A private routine returning a reference to the open project with the given name,
-or else the empty string (when that project is not open)
-
-full_path is a string identifying the project to be built and is of the form, 
-e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
-
-=cut
-
-sub _get_project ($) {
-	my(
-		$full_path, $candidate_projects
-	) = @_;
-	$candidate_projects = _doc_named(basename($full_path, '*'));
-	if ($candidate_projects) {
-		my($cps) = _get_dobj($candidate_projects);
-		my($num) = AECountItems($cps);
-		if ($num) {  # is a list
-			foreach (1 .. AECountItems($cps)) {
-				my($cp) = AEGetNthDesc($cps, $_);
-				if (lc $full_path eq lc _full_path($cp)) {
-					return($cp);
-				}
-			}
-		} else {     # is only one, not a list
-			if (lc $full_path eq lc _full_path($cps)) {
-				return($cps);
-			}
-		}
-	}
-	return;
-}
-
-=pod
-
-=item build_project
-
-Build a selected target of a project, saving any errors to a file, if supplied.
-	
-full_path is a string identifying the project to be built and is of the form, 
-e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
-
-If target_name is the empty string, the current target of the selected project 
-will be built, else, target_name should be a string matching a target name in 
-the selected project.
-	
-If error_path is the empty string, errors will not be saved to a file,
-else, error_path should be the full path of a file to save error messages into.
-
-=cut
-
-$CodeWarriorLib::CLOSE_PROJECTS_FIRST = 0; # If true we close then make. If false, make then close.
-my $last_project_built = "";
-my $last_project_was_closed = 0;
-
-sub build_project ($;$$$) {
-	my(
-		$full_path, $target_name, $error_path,
-		$remove_object, $p, $project_was_closed, $had_errors
-	) = @_;
-	_close_errors_window();
-
-	if ($CodeWarriorLib::CLOSE_PROJECTS_FIRST && ($last_project_built ne $full_path))
-	{
-		# If we're in "close first" mode, we don't close if the current project
-		# is the same as the previous one.
-		if ($last_project_was_closed) {
-			$p = _get_project($last_project_built);
-			_close($p);
-		}
-		$last_project_built = $full_path;
-		$last_project_was_closed = 0; # now refers to the new project
-	}
-	$project_was_closed = 0;
-	while (1) {
-		$p = _get_project($full_path);
-		if (!$p) {
-			if ($project_was_closed) {
-				print "### Error - request for project document failed after opening\n";
-				die "### possibly CW Pro 4 bug: be sure to close your Find window\n";
-			}
-			$project_was_closed = 1;
-			$last_project_was_closed = 1;
-			_open_file($full_path);
-		} else {
-			last;
-		}
-	}
-
-	$had_errors = 0;
-	if ($target_name eq '') {
-		if ($remove_object) {_remove_object($p)}
-		_build($p);
-	} else {
-		if ($remove_object) {_remove_object($p, $target_name)}
-		_build($p, $target_name);
-	}
-
-	if ($error_path ne '') {
-		_save_errors_window($error_path);
-	}
-	$had_errors = _close_errors_window();
-
-	if (!$CodeWarriorLib::CLOSE_PROJECTS_FIRST)
-	{
-		if ($project_was_closed) {
-			$p = _get_project($full_path);
-			_close($p);
-		}
-	}
-
-	return($had_errors);
-}
-
-=pod
-
-=item appIsRunning()
-
-=cut
-sub _appIsRunning($)
-{
-	my ($appSignature) = @_;
-	my ($psi);
-	my ($found) = 0;
-	my ($appPSN);
-
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-	
-	return $found;
-}
-
-=pod
-
-=item appIsFrontmost()
-
-=cut
-sub _appIsFrontmost($)
-{
-	my ($appSignature) = @_;
-	my ($psi);
-	my ($found) = 0;
-	my ($appPSN);
-
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-	
-	return (GetFrontProcess() == $appPSN);
-}
-
-
-=pod
-
-=item activate()
-
-Launches CodeWarrior and brings it to the front.
-
-Once found, path will be saved in $idepath_file for future reference.
-Edit or delete this file to change the location of the IDE.  If app is
-moved, C<activate()> will prompt for a new location.
-
-First looks for an open CodeWarrior app.  Second, tries to open previously
-saved location in ':idepath.txt'.  Third, tries to find it and allow user
-to choose it with Navigation Services (if present).  Fourth, uses good old
-GUSI routines built-in to MacPerl for a Choose Directory dialog box.
-
-=cut
-
-sub activate ($) {
-
-    $ide_loc_file = $_[0];     # save in global
-        
-	my($filepath, $appath, $psi) = ($ide_loc_file);
-
-	foreach $psi (values(%Process)) {
-		if ($psi->processSignature() eq $app) {
-			$appath = $psi->processAppSpec();
-			_save_appath($filepath, $appath);
-			last;
-		}
-	}
-
-	if (!$appath || !-x $appath) {
-		$appath = _read_appath($filepath);
-	}
-	
-	if (!$appath || ! -x $appath)
-	{
-		# make sure that MacPerl is a front process
-		#ActivateApplication('McPL');
-		MacPerl::Answer("Please locate the CodeWarrior application.", "OK");
-		
-		# prompt user for the file name, and store it
-		my $macFile = StandardGetFile( 0, "APPL");
-		if ( $macFile->sfGood() )
-		{
-			$appath = $macFile->sfFile();
-		}
-		else
-		{
-			die "Operation canceled\n";
-		}
-	
-#		if (eval {require Mac::Navigation}) {
-#			my($options, $nav);
-#			Mac::Navigation->import();
-#			$options = NavGetDefaultDialogOptions();
-#			$options->message('Where is CodeWarrior IDE?');
-#			$options->windowTitle('Find CodeWarrior IDE');
-#			$nav = NavChooseObject($Application{$app}, $options);
-#			die "CodeWarrior IDE not found.\n" if (!$nav || !$nav->file(1));
-#			$appath = $nav->file(1);
-#		} else {
-#			local(*D);
-#			my $cwd = `pwd`;
-#			$appath = _get_folder(
-#                               'Where is the CW IDE folder?',
-#				dirname($Application{$app})
-#			);
-#			die "CodeWarrior IDE not found.\n" if !$appath;
-#			opendir(D, $appath) or die $!;
-#			chdir($appath);
-#			foreach my $file (sort readdir (D)) {
-#				my(@app) = MacPerl::GetFileInfo($file);
-#				if ($app[0] && $app[1] &&
-#					$app[1] eq 'APPL' && $app[0] eq $app
-#				) {
-#					$appath .= $file;
-#					last;
-#				}
-#			}
-#			chomp($cwd);
-#			chdir($cwd);
-#		}
-		_save_appath($filepath, $appath);
-	}
-
-	my($lp) = LaunchParam->new(
-		launchAppSpec => $appath,
-		launchControlFlags => launchContinue() + launchNoFileFlags()
-	);
-	
-	unless (LaunchApplication($lp)) {
-		unlink($filepath);
-		die $^E;
-	}
-	
-	# wait for CodeWarrior to show up in the list of processes
-	while (!_appIsRunning('CWIE'))
-	{
-		WaitNextEvent();
-	}
-
-	# wait for CodeWarrior to come to the front
-	while (!_appIsFrontmost('CWIE'))
-	{
-		WaitNextEvent();
-	}
-}
-
-=pod
-
-=item getCodeWarriorPath()
-
-Returns a file path relative to the CodeWarrior folder
-
-=cut
-
-sub getCodeWarriorPath($)
-{
-    my($subfolder)=@_;
-    
-    my($app_path) = _read_appath($ide_loc_file);
-    if ($app_path eq "") { die "Error: Failed to get CodeWarrior IDE path\n"; }
-    
-    my($codewarrior_root) = $app_path;
-    $codewarrior_root =~ s/[^:]*$//;
-    return ($codewarrior_root . $subfolder);
-}
-
-
-=pod
-
-=item getCodeWarriorIDEName()
-
-Returns the name of the CodeWarrior application
-
-=cut
-
-sub getCodeWarriorIDEName()
-{
-    my($subfolder)=@_;
-
-    my($app_path) = _read_appath($ide_loc_file);
-    if ($app_path eq "") { die "Error: Failed to get CodeWarrior IDE path\n"; }
-
-    my(@codewarrior_path) = split(/:/, $app_path);
-    return pop(@codewarrior_path);
-}
-
-
-=pod
-
-=item quit()
-
-Quits CodeWarrior.
-
-=cut
-
-sub quit() {
-
-	$last_project_built = "";
-	$last_project_was_closed = 0;
-
-	my($evt) = do_event(qw/aevt quit/, $app);
-}
-
-
-sub _build ($;$) {
-	my($evt);
-	if ($_[1]) {
-		my($prm) =
-			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
-			AEPrint($_[0]) . '}';
-		$evt = do_event(qw/CWIE MAKE/, $app, $prm, $_[1]);
-	} else {
-		my($prm) = q"'----':" . AEPrint($_[0]);
-		$evt = do_event(qw/CWIE MAKE/, $app, $prm);
-	}
-}
-
-sub _remove_object ($;$) {
-	my($evt);
-	if ($_[1]) {
-		my($prm) =
-			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
-			AEPrint($_[0]) . '}';
-		$evt = do_event(qw/CWIE RMOB/, $app, $prm, $_[1]);
-	} else {
-		my($prm) = q"'----':" . AEPrint($_[0]);
-		$evt = do_event(qw/CWIE RMOB/, $app, $prm);
-	}
-}
-
-sub _open_file ($) {
-	my($prm) =
-		q"'----':obj {form:name, want:type(alis), " .
-		q"seld:TEXT(@), from:'null'()}";
-
-	do_event(qw/aevt odoc/, $app, $prm, $_[0]);
-}
-
-sub import_project ($$) {
-	my($xml_file, $project_path) = @_;
-	
-	my($prm) = "kocl:type(PRJD), rtyp:TEXT(@), data:TEXT(@), &subj:'null'()";
-	
-	my($evt) = do_event(qw/core crel/, $app, $prm, $project_path, $xml_file);    
-	my($result) = _get_event_result($evt);
-	
-	if ($result eq "") {
-		_close(_get_project($project_path));
-	}
-	return $result;
-}
-
-sub export_project ($$) {
-	my($project_path, $xml_out_path) = @_;
-	my($p, $project_was_closed);
-	
-	$project_was_closed = 0;
-	while (1) {
-		$p = _get_project($project_path);
-		if (!$p) {
-			if ($project_was_closed) {
-				print "### Error - request for project document failed after opening\n";
-				die "### possibly CW bug: be sure to close your Find window\n";
-}
-			$project_was_closed = 1;
-			_open_file($project_path);
-		} else {
-			last;
-		}
-	}
-
-    # avoid problems with the Project Messages window
-    _close_named_window("Project Messages");
-    
-	my($prm) =
-		q"'----':obj {form:indx, want:type(PRJD), " .
-		q"seld:1, from:'null'()}, kfil:TEXT(@)";
-
-	my($evt) = do_event(qw/CWIE EXPT/, $app, $prm, $xml_out_path);    
-	
-	if ($project_was_closed) {
-		$p = _get_project($project_path);
-		_close($p);
-	}
-	
-	return _get_event_result($evt);
-}
-
-sub _doc_named ($) {
-	my($prm) =
-		q"'----':obj {form:test, want:type(docu), from:'null'(), " .
-		q"seld:cmpd{relo:'=   ', 'obj1':obj {form:prop, want:type" .
-		q"(prop), seld:type(pnam), from:'exmn'()}, 'obj2':TEXT(@)}}";
-
-	my($evt) = do_event(qw/core getd/, $app, $prm, $_[0]);
-	return($evt->{REPLY} eq 'aevt\ansr{}' ? undef : $evt);
-}
-
-sub _full_path ($) {
-	my($obj) = $_[0];
-	my($prm) =
-		q"'----':obj {form:prop, want:type(prop), seld:type(FILE), " .
-		q"from:" . AEPrint($_[0]) . q"}, rtyp:type(TEXT)";
-	my($evt) = do_event(qw/core getd/, $app, $prm);
-
-	return MacPerl::MakePath(
-		MacUnpack('fss ', (
-			AEGetParamDesc($evt->{REP}, keyDirectObject()))->data()->get()
-		)
-	);
-}
-
-sub _save_errors_window ($) {
-	my($prm) = 
-		q"'----':obj {form:name, want:type(alis), seld:TEXT(@), from:'null'()}";
-	do_event(qw/MMPR SvMs/, $app, $prm, $_[0]);
-}
-
-
-sub _close_errors_window () {
-    return _close_named_window('Errors & Warnings');
-}
-
-
-sub _close_named_window ($) {
-    my($window_name) = @_;
-    
-	my($prm) =
-		q"'----':obj {form:name, want:type(cwin), " .
-		q"seld:TEXT(@), from:'null'()}";
-
-	my($evt) = do_event(qw/core clos/, $app, $prm, $window_name);
-	return($evt->{REPLY} eq 'aevt\ansr{}' ? 1 : 0);
-}
-
-sub _close () {
-	my($prm) = q"'----':" . AEPrint($_[0]);
-	do_event(qw/core clos/, $app, $prm);
-}
-
-sub _get_dobj ($) {
-	return(AEGetParamDesc($_[0]->{REP}, keyDirectObject()));
-}
-
-sub _get_folder ($$) {
-    require 'GUSI.ph';
-    my($prompt, $default) = @_;
-    MacPerl::Choose(
-        GUSI::AF_FILE(), 0, $prompt, '',
-        GUSI::CHOOSE_DIR() + ($default ? &GUSI::CHOOSE_DEFAULT : 0),
-        $default
-    );
-}
-
-sub _get_event_result ($)
-{
-    my($evt) = @_;
-
-    my($result) = $evt->{ERROR};
-    
-    if ( $result eq "" && $evt->{ERRNO} != 0 )
-    {
-        $result = "unknown error (".$evt->{ERRNO}.")";
-    }
-    
-    return $result;
-}
-
-
-sub _save_appath ($$) {
-
-	my($cwd) = cwd();	# remember the current working dir
-	chdir($scriptDir);	# change dir to the script dir
-
-	local(*F);
-	open(F, '>' . $_[0]) or die $!;
-	print F $_[1];
-	close(F);
-		
-	chdir($cwd);		# restore the cwd
-}
-
-sub _read_appath ($) {
-
-	my($filepath) = @_;
-
-	my($cwd) = cwd();	# remember the current working dir
-	chdir($scriptDir);	# change dir to the script dir
-	
-	if (! -e $filepath) {
-		return "";
-	}
-
-	local(*F);
-	open(F, $filepath);
-	my($appath) = <F>;
-	close(F);
-		
-	chdir($cwd);		# restore the cwd
-	return($appath);
-}
-
-
-sub _test ($) {
-	activate($ide_loc_file);
-	my($path) = $_[0];
-	build_project(
-	  "${path}modules:xml:macbuild:XML.mcp", '',
-	  "${path}build:mac:Mozilla.BuildLog.part"
-	);
-}
-
-1;
-
-=pod
-
-=back
-
-=head1 HISTORY
-
-=over 4
-
-=item v1.02, September 23, 1998
-
-Made fixes in finding and saving location of CodeWarrior IDE.
-
-=item v1.01, June 1, 1998
-
-Made fixes to C<chdir()> in C<activate()>, made C<activate()> more robust 
-in finding CodeWarrior IDE, added global variable to NOT switch to IDE
-for each sent event, a few other fixes.
-
-=item v1.00, May 30, 1998
-
-First shot
-
-=back
-
-
-=head1 AUTHORS
-
-Chris Nandor F<E<lt>pudge@pobox.comE<gt>>, and the author of the
-original I<CodeWarriorLib>, Scott Collins F<E<lt>scc@netscape.comE<gt>>.
-
-=head1 SEE ALSO
-
-BuildProject L<Moz>.
-
-=head1 COPYRIGHT
-
-The contents of this file are subject to the Netscape Public
-License Version 1.1 (the "License"); you may not use this file
-except in compliance with the License. You may obtain a copy of
-the License at http://www.mozilla.org/NPL/
-
-Software distributed under the License is distributed on an "AS
-IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-implied. See the License for the specific language governing
-rights and limitations under the License.
-
-The Original Code is Mozilla Communicator client code, released
-March 31, 1998.
-
-The Initial Developer of the Original Code is Netscape
-Communications Corporation. Portions created by Netscape are
-Copyright (C) 1998-1999 Netscape Communications Corporation. All
-Rights Reserved.
-
-Contributor(s): 
-
-=cut

mozilla/build/mac/build_scripts/Moz/Jar.pm

@@ -1,573 +0,0 @@
-#!perl -w
-package Moz::Jar;
-
-#
-# Module for creating jar files, either using a jar manifest, or
-# simply jarring up folders on disk.
-#
-
-require 5.004;
-require Exporter;
-
-use strict;
-use Archive::Zip;
-use File::Path;
-
-use Mac::Files;
-
-use Moz::Moz;
-
-use vars qw( @ISA @EXPORT );
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(
-                    CreateJarFileFromDirectory
-                    CreateJarFromManifest
-                    WriteOutJarFiles
-                    SanityCheckJarOptions
-                );
-
-
-#-------------------------------------------------------------------------------
-# Add the contents of a directory to the zip file
-#
-#-------------------------------------------------------------------------------
-sub _addDirToJar($$$$)
-{
-    my($dir, $jar_root, $zip, $compress) = @_;
-
-    opendir(DIR, $dir) or die "Error: Cannot open dir $dir\n";
-    my @files = readdir(DIR);
-    closedir DIR;
-    
-    my $unix_jar_root = $jar_root;
-    $unix_jar_root =~ s|:|/|g;       # colon to slash conversion
-    
-    my $file;
-    
-    foreach $file (@files)
-    {        
-        my $filepath = $dir.":".$file;
-        
-        if (-d $filepath)
-        {
-            print "Adding files to jar from $filepath\n";            
-            _addDirToJar($filepath, $jar_root, $zip, $compress);
-        }
-        else
-        {
-            my $member = Archive::Zip::Member->newFromFile($filepath);
-            die "Error: Failed to create zip file member $filepath\n" unless $member;
-            
-            my $unixName = $filepath;
-            $unixName =~ s|:|/|g;               # colon to slash conversion
-            $unixName =~ s|^$unix_jar_root||;   # relativise
-            
-            $member->fileName($unixName);
-            
-            # print "Adding $file as $unixName\n";
-            
-            if ($compress) {
-                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
-            } else {
-                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
-            }
-            
-            $zip->addMember($member);
-        }
-    }
-}
-
-#-------------------------------------------------------------------------------
-# Add the contents of a directory to the zip file
-#
-#-------------------------------------------------------------------------------
-
-sub CreateJarFileFromDirectory($$$)
-{
-    my($srcdir, $jarpath, $compress) = @_;
-
-    my $zip = Archive::Zip->new();
-
-    _addDirToJar($srcdir, $srcdir, $zip, $compress);
-
-    print "Saving zip file...\n";
-    my $status = $zip->writeToFileNamed($jarpath);
-    if ($status == 0) {
-        print "Zipping completed successfully\n";
-    } else {
-        print "Error saving zip file\n";
-    }
-    
-    # set the file type/creator to something reasonable
-    MacPerl::SetFileInfo("ZIP ", "ZIP ", $jarpath);
-}
-
-
-#-------------------------------------------------------------------------------
-# printZipContents
-# 
-#-------------------------------------------------------------------------------
-sub printZipContents($)
-{
-    my($zip) = @_;
-
-    my(@members) = $zip->memberNames();
-    
-    print "Zip contains:\n";
-    
-    my($member);
-    foreach $member (@members)
-    {
-        print "  $member\n";
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# safeSaveJarFile
-# 
-# Archive::Zip has a problem where you cannot save a zip file on top of
-# an existing zip file that it has open, because it holds references
-# into that zip. So we have to save to a temp file, then do a swap.
-# 
-# Note that the zip will become invalid after this operation.
-# If you want to do further operations on it, you'll have to reread it.
-#-------------------------------------------------------------------------------
-sub safeSaveJarFile($$)
-{
-    my($zip, $full_dest_path) = @_;
-    
-    my($temp_file_name) = $full_dest_path."_temp";
-
-    ($zip->writeToFileNamed($temp_file_name) == Archive::Zip::AZ_OK) || die "Error: died writing jar to temp file $temp_file_name\n";
-    
-    unlink $full_dest_path;
-    
-    (rename $temp_file_name, $full_dest_path) || die "Error: Failed to rename $temp_file_name\n";
-    
-    MacPerl::SetFileInfo("ZIP ", "ZIP ", $full_dest_path);
-}
-
-
-#-------------------------------------------------------------------------------
-# addToJarFile
-# 
-# Add a file to a jar file
-#
-# Parameters:
-#   1. Jar ID. Unix path of jar file inside chrome.
-#   2. Abs path to jar.mn file (i.e. source)    (mac breaks)
-#   3. File source, relative to jar.mn path     (mac breaks)
-#   4. Abs path to the resulting .jar file      (mac breaks)
-#   5. Relative file path within the jar        (unix breaks)
-#   6. Reference to hash of jar files
-#
-#-------------------------------------------------------------------------------
-
-sub addToJarFile($$$$$$$)
-{
-    my($jar_id, $jar_man_dir, $file_src, $jar_path, $file_jar_path, $override, $jars) = @_;
-
-    # print "addToJarFile with:\n  $jar_man_dir\n  $file_src\n  $jar_path\n  $file_jar_path\n";
-
-    unless ($jar_path =~ m/(.+:)([^:]+)$/) { die "Error: Bad jar path $jar_path\n"; }
-    
-    my($target_dir) = $1;
-    my($jar_name) = $2;
-
-    $target_dir =~ s/[^:]+$//;
-    
-    # print "¥ $target_dir $jar_name\n";
-
-    # find the source file
-    my($src) = $jar_man_dir.":".$file_src;
-    if ((!-e $src) && ($file_src =~ m/.+:([^:]+)$/))    # src does not exist. Fall back to looking for src in jar.mn dir
-    {
-        $file_src = $1;
-        $src = $jar_man_dir.":".$file_src;
-        
-        if (!-e $src) {
-            die "Error: Can't find chrome file $src\n";
-        }
-    }
-    
-    if ($main::options{chrome_jars})
-    {
-        my($zip) = $jars->{$jar_id};
-        unless ($zip) { die "Error: Can't find Zip entry for $jar_id\n"; }
-        
-        # print "Adding $file_src to jar file $jar_path at $file_jar_path\n";
-        my($member) = Archive::Zip::Member->newFromFile($src);
-        unless ($member) { die "Error: Failed to create zip file member $src\n"; }
-
-        $member->fileName($file_jar_path);    
-    
-        my($compress) = 1;
-        if ($compress) {
-            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
-            $member->desiredCompressionLevel(Archive::Zip::COMPRESSION_LEVEL_DEFAULT);   # defaults to 6
-        } else {
-            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
-        }
-
-        my($old_member) = $zip->memberNamed($file_jar_path);
-        
-        if ($override)
-        {
-            if ($old_member)
-            {
-                # print "Overriding $file_jar_path in jar file $jar_id\n";
-                # need to compare mod dates or use the + here
-                $zip->removeMember($old_member);
-            }
-        
-            $zip->addMember($member);
-        }
-        else
-        {
-            if ($old_member)
-            {
-                #compare dates here
-                my($member_moddate) = $old_member->lastModTime();
-                my($file_moddate) = GetFileModDate($src);
-            
-                if ($file_moddate > $member_moddate)
-                {
-                    print "Updating older file $file_jar_path in $jar_id\n";
-                    $zip->removeMember($old_member);
-                    $zip->addMember($member);
-                }
-                else
-                {
-                    print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
-                }
-            }
-            else
-            {
-                $zip->addMember($member);
-            }
-        }
-    }
-    
-    if ($main::options{chrome_files})  # we install raw files too
-    {
-        my($rel_path) = $file_jar_path;
-        $rel_path =~ s|/|:|g;       # slash to colons
-        
-        my($dir_name) = $jar_name;
-        $dir_name =~ s/\.jar$//;
-        
-        my($dst) = $target_dir.$dir_name.":".$rel_path;
-                
-        # print "Aliassing $src\n to\n$dst\n";        
-        if ($override)
-        {
-            unlink $dst;
-        MakeAlias($src, $dst);      # don't check errors, otherwise we fail on replacement
-    }
-        else
-        {
-            if (-e $dst)
-            {
-                #compare dates here
-                my($dst_moddate) = GetFileModDate($dst);
-                my($file_moddate) = GetFileModDate($src);
-            
-                if ($file_moddate > $dst_moddate)
-                {
-                    print "Updating older file $rel_path in $dir_name\n";
-                    unlink $dst;
-                    MakeAlias($src, $dst);
-                }
-                else
-                {
-                    print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
-                }
-            
-            }
-            else
-            {
-                MakeAlias($src, $dst);
-            }
-        }
-        
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# setupJarFile
-# 
-# setup a zip for writing
-#-------------------------------------------------------------------------------
-
-sub setupJarFile($$$)
-{
-    my($jar_id, $dest_path, $jar_hash) = @_;
-
-    # print "Creating jar file $jar_id at $jar_path\n";
-    
-    my($jar_file) = $jar_id;
-    $jar_file =~ s|/|:|g;           # slash to colons
-    my($full_jar_path) = full_path_to($dest_path.":".$jar_file);
-
-    if ($main::options{chrome_jars})
-    {
-        my($zip) = $jar_hash->{$jar_id};
-        if (!$zip)      # if we haven't made it already, do so
-        {
-	        my($zip) = Archive::Zip->new();
-	        $jar_hash->{$jar_id} = $zip;
-
-            # does the jar file exist already? If so, read it in
-            if (-e $full_jar_path)
-            {
-                print "Reading in jar file $jar_id\n";
-                if ($zip->read($full_jar_path) != Archive::Zip::AZ_OK) { die "Error: Failed to re-read $full_jar_path\n"; }
-                
-                # printZipContents($zip);
-            }
-
-        }
-    }
-    else
-    {
-        # installing files.
-        # nothing to do. MakeAlias creates dirs as needed.
-
-	    # add this jar to the list
-	    $jar_hash->{$jar_id} = 1;
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# closeJarFile
-# 
-# We're done with this jar file _for this jar.mn_. We may add more entries
-# to it later, so keep it open in the hash.
-#-------------------------------------------------------------------------------
-sub closeJarFile($$)
-{
-    my($jar_path, $jar_hash) = @_;
-
-    # print "Closing jar file $jar_path\n";
-
-    if ($main::options{chrome_jars})
-    {
-    
-    }
-    else
-    {
-        # installing files.
-        # nothing to do
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# WriteOutJarFiles
-# 
-# Now we dump out the jars
-#-------------------------------------------------------------------------------
-sub WriteOutJarFiles($$)
-{
-    my($chrome_dir, $jars) = @_;
-
-    unless ($main::options{chrome_jars}) { return; }
-    
-    my($full_chrome_path) = full_path_to($chrome_dir);
-
-    my($key);
-    foreach $key (keys %$jars)
-    {
-        my($zip) = $jars->{$key};
-        
-        my($rel_path) = $key;
-        $rel_path =~ s/\//:/g;
-        
-        my($output_path) = $full_chrome_path.":".$rel_path;
-        
-        print "Writing zip file $key to $output_path\n";
-
-        # ensure the target dirs exist
-        my($path) = $output_path;
-        $path =~ s/[^:]+$//;
-        mkpath($path);
-        
-        # unlink $output_path;        # remove any existing jar
-        safeSaveJarFile($zip, $output_path);
-        # $zip is invalid after this operation, so nuke it here
-        $jars->{$key} = 0;
-    }
-}
-
-
-#-------------------------------------------------------------------------------
-# registerChromePackage
-# 
-# Enter a chrome package into the installed-chrome.txt file
-#-------------------------------------------------------------------------------
-sub registerChromePackage($$$$$$)
-{
-    my($jar_file, $file_path, $chrome_dir, $jar_hash, $chrome_type, $pkg_name) = @_;
-
-    my($manifest_subdir) = $jar_file;
-    $manifest_subdir =~ s/:/\//g;
-    
-    my($chrome_entry);
-    
-    if ($main::options{use_jars}) {
-        $chrome_entry = "$chrome_type,install,url,jar:resource:/chrome/$manifest_subdir!/$chrome_type/$pkg_name";
-    } else {
-        $manifest_subdir =~ s/\.jar$//;
-        $chrome_entry = "$chrome_type,install,url,resource:/chrome/$manifest_subdir/$chrome_type/$pkg_name";
-    }
-
-    # print "Entering $chrome_entry in installed-chrome.txt\n";
-    
-    # ensure chrome_dir exists
-    mkpath($chrome_dir);
-    
-    my($inst_chrome) = ${chrome_dir}.":installed-chrome.txt";
-    
-    if (open(CHROMEFILE, "<$inst_chrome")) {
-        while (<CHROMEFILE>) {
-            chomp;
-            if ($_ eq $chrome_entry) {
-                # $chrome_entry already appears in installed-chrome.txt file
-                # just update the mod date
-                my $now = time;
-                utime($now, $now, $inst_chrome) || die "Error: Couldn't touch $inst_chrome";
-                print "+++ updating chrome $inst_chrome\n+++\t\t$chrome_entry\n";
-                close(CHROMEFILE) || die "Error: can't close $inst_chrome: $!";
-                return 0;
-            }
-        }
-        close(CHROMEFILE) || die "Error: can't close $inst_chrome: $!";
-    }
-    open(CHROMEFILE, ">>${inst_chrome}") || die "Error: Failed to open $inst_chrome\n";
-    print(CHROMEFILE "${chrome_entry}\n");
-    close(CHROMEFILE) || die "Error: Failed to close $inst_chrome\n";
-    print "+++ adding chrome $inst_chrome\n+++\t\t$chrome_entry\n";
-}
-
-#-------------------------------------------------------------------------------
-# Create or add to a jar file from a jar.mn file.
-# Both arguments are relative to the mozilla root dir.
-#
-#
-#-------------------------------------------------------------------------------
-sub CreateJarFromManifest($$$)
-{
-    my($jar_man_path, $dest_path, $jars) = @_;
-    
-    if ($main::options{chrome_jars}) {
-        print "Jarring from $jar_man_path\n";
-    }
-    if ($main::options{chrome_files}) {
-        print "Installing files from $jar_man_path\n";
-    }
-
-    $jar_man_path = full_path_to($jar_man_path);
-    $dest_path = full_path_to($dest_path);
-
-    # if the jars hash is empty, nuke installed-chrome.txt
-    if (! scalar(%$jars))
-    {
-        print "Nuking installed-chrome.txt\n";
-	    my($installed_chrome) = $dest_path.":installed-chrome.txt";
-	    # unlink $installed_chrome;
-    }
-    
-    my $jar_man_dir = "";
-    my $jar_man_file = "";
-    
-    if ($jar_man_path =~ /(.+):([^:]+)$/)
-    {
-        $jar_man_dir = $1;      # no trailing :
-        $jar_man_file = $2;
-    }
-
-    # Keep a hash of jar files, keyed on relative jar path (e.g. "packages/core.jar")
-    # Entries are open Archive::Zips (if zipping), and installed-chrome entries.
-    
-    my($jar_id) = "";       # Current foo/bar.jar from jar.mn file
-    my($jar_file) = "";     # relative path to jar file (from $dest_path), with mac separators
-    my($full_jar_path);
-    
-    open(FILE, "<$jar_man_path") || die "Error: could not open \"$jar_man_path\": $!";
-    while (<FILE>)
-    {
-        my($line) = $_;
-        chomp($line);
-        
-        # print "$line\n";
-        
-        if ($line =~ /^\s*\#.*$/) {     # skip comments
-            next;
-        }
-        
-        if ($line =~/^([\w\d.\-\_\\\/]+)\:\s*$/)                                  # line start jar file entries
-        {
-            $jar_id = $1;
-            $jar_file = $jar_id;
-            $jar_file =~ s|/|:|g;           # slash to colons
-            $full_jar_path = $dest_path.":".$jar_file;
-                        
-            setupJarFile($jar_id, $dest_path, $jars);
-
-        }
-        elsif ($line =~ /^(\+?)\s+([\w\d.\-\_\\\/]+)\s*(\([\w\d.\-\_\\\/]+\))?$\s*/)     # jar file entry
-        {
-            my($override) = ($1 eq "+");
-            my($file_dest) = $2;
-            my($file_src) = $3;
- 
-            if ($file_src) {  
-                $file_src = substr($file_src, 1, -1);      #strip the ()
-            } else {
-                $file_src = $file_dest;
-            }
-            
-            $file_src =~ s|/|:|g;
-            
-            if ($jar_file ne "")    # if jar is open, add to jar
-            {
-                if ($file_dest =~ /([\w\d.\-\_]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
-                {
-                    my $chrome_type = $1;
-                    my $pkg_name = $2;
-                    registerChromePackage($jar_file, $file_dest, $dest_path, $jars, $chrome_type, $pkg_name);
-                }
-                
-                addToJarFile($jar_id, $jar_man_dir, $file_src, $full_jar_path, $file_dest, $override, $jars);
-            }
-            else
-            {
-                die "Error: bad jar.mn format at $line\n";
-            }
-        }
-        elsif ($line =~ /^\s*$/ )                                               # blank line
-        {
-            if ($jar_file ne "")    #if a jar file is open, close it
-            {
-                closeJarFile($full_jar_path, $jars);
-                
-                $jar_file = "";
-                $full_jar_path = "";
-            }
-        }
-    }
-    
-    close(FILE);
-
-    if ($jar_file ne "")    #if a jar file is open, close it
-    {
-        closeJarFile($full_jar_path, $jars);
-    }
-
-}
-
-1;

mozilla/build/mac/build_scripts/Moz/MacCVS.pm

@@ -1,228 +0,0 @@
-#!perl -w
-package Moz::MacCVS;
-
-# package Mac::Apps::MacCVS; this should really be the name of the package
-# but due to our directory hierarchy in mozilla, I am not doing it
-
-require 5.004;
-require Exporter;
-
-use strict;
-use Exporter;
-
-use vars qw($VERSION @ISA @EXPORT);
-
-use Cwd;
-
-use File::Basename;
-
-use Mac::StandardFile;
-use Mac::AppleEvents;
-use Mac::AppleEvents::Simple;
-
-@ISA        = qw(Exporter);
-@EXPORT     = qw(new describe checkout update);
-$VERSION = "1.00";
-
-# If you want to understand the gobbldeygook that's used to build Apple Events,
-# you should start by reading the AEGizmos documentation.
-
-
-# Architecture:
-# cvs session object:
-# name - session name
-# session_file - session file
-# 
-# 
-
-my($last_error) = 0;
-my($gAppSig)    = 'Mcvs';   # MacCVS Pro
-
-#
-# utility routines
-#
-
-
-sub _checkForEventError($)
-{
-  my($evt) = @_;
-
-  if ($evt->{ERRNO} != 0)
-  {
-    print STDERR "Error. Script returned '$evt->{ERROR} (error $evt->{ERRNO})\n";
-    $last_error = $evt->{ERRNO};
-    return 0;
-  }
-  
-  return 1; # success
-}
-
-
-#
-# Session object methods
-#
-
-sub new
-{
-  my ( $proto, $session_file) = @_;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-
-  if ( defined($session_file) && ( -e $session_file) )
-  {
-    $self->{"name"} = basename( $session_file );
-    $self->{"session_file"} = $session_file;
-    bless $self, $class;
-    return $self;
-  }
-  else
-  {
-    print STDERR "MacCVS->new cvs file < $session_file > does not exist\n";
-    return;
-  }
-}
-
-# makes sure that the session is open
-# assertSessionOpen()
-# returns 1 on success
-sub assertSessionOpen()
-{
-  my ($self) = shift;
-
-  $last_error = 0;
-
-  my($prm) =
-    q"'----':obj {form:name, want:type(alis), seld:TEXT(@), from:'null'()}";
-
-  my($evt) = do_event(qw/aevt odoc/, $gAppSig, $prm, $self->{session_file});
-  return _checkForEventError($evt);
-}
-
-# prints the cvs object, used mostly for debugging
-sub describe
-{
-  my($self) = shift;
-  $last_error = 0;
-  print "MacCVS:: name: ", $self->{name}, " session file: ", $self->{session_file}, "\n";
-}
-
-# checkout( self, module, revision, date)
-# MacCVS checkout command
-# returns 1 on success.
-sub checkout()
-{
-  my($self, $module, $revision, $date ) = @_;
-  unless( defined ($module) ) { $module = ""; } # get rid of the pesky undefined warnings
-  unless( defined ($revision) ) { $revision = ""; }
-  unless( defined ($date) ) { $date = ""; }
-
-  $last_error = 0;
-    
-  $self->assertSessionOpen() || die "Error: failed to open MacCVS session file at $self->{session_file}\n";
-  
-  my($revstring) = ($revision ne "") ? $revision : "(none)";
-  my($datestring) = ($date ne "") ? $date : "(none)";
-  
-  print "Checking out $module with revision $revstring, date $datestring\n";
-
-  my($prm) =
-    q"'----':obj {form:name, want:type(docu), seld:TEXT(@), from:'null'()}, ".
-    q"modl:'TEXT'(@), tagr:'TEXT'(@), tagd:'TEXT'(@) ";
-  
-  my($evt) = do_event(qw/MCvs cout/, $gAppSig, $prm, $self->{name}, $module, $revision, $date);
-  return _checkForEventError($evt);
-}
-
-
-# update( self, branch tag, list of paths)
-# MacCVS udate command
-# returns 1 on success.
-# NOTE: MacCVS Pro does not correctly support this stuff yet (as of version 2.7d5).
-sub update()
-{
-  my($self, $branch, $paths ) = @_;
-
-  $last_error = 0;
-    
-  $self->assertSessionOpen() || die "Error: failed to open MacCVS session file at $self->{session_file}\n";
-
-  if ($branch eq "HEAD") {
-    $branch = "";
-  }
-  
-  my($paths_list) = "";
-  
-  my($path);
-  foreach $path (@$paths)
-  {
-    if ($paths_list ne "") {
-      $paths_list = $paths_list.", ";
-    }
-    
-    $paths_list = $paths_list."Ò".$path."Ó";
-  }
-    
-  my($prm) =
-    q"'----':obj {form:name, want:type(docu), seld:TEXT(@), from:'null'()}, ".
-    q"tagr:'TEXT'(@), tFls:[";
-
-  $prm = $prm.$paths_list."]";
-    
-  my($evt) = do_event(qw/MCvs updt/, $gAppSig, $prm, $self->{name}, $branch);
-  return _checkForEventError($evt);
-};
-
-
-sub getLastError()
-{
-  return $last_error;
-}
-
-1;
-=pod
-
-=head1 NAME
-
-MacCVS - Interface to MacCVS
-
-=head1 SYNOPSIS
-
-  use MacCVS;
-  $session = MacCVS->new( <session_file_path>) || die "cannot create session";
-  $session->checkout([module] [revision] [date]) || die "Could not check out";
-    
-=head1 DESCRIPTION
-
-This is a MacCVS interface for talking to MacCVS Pro client.
-MacCVSSession is the class used to manipulate the session
-
-=item new
-  MacCVS->new( <cvs session file path>);
-  
-  Creates a new session. Returns undef on failure.
-
-=item checkout( <module> [revision] [date] )
-
-  cvs checkout command. Revision and date are optional
-  returns 0 on failure
-  
-=cut
-
-=head1 SEE ALSO
-
-=over
-
-=item MacCVS Home Page
-
-http://www.maccvs.org/
-
-=back 
-
-=head1 AUTHORS
-
-Aleks Totic atotic@netscape.com
-Simon Fraser sfraser@netscape.com
-
-=cut
-
-__END__

mozilla/build/mac/build_scripts/Moz/Moz.pm

@@ -1,603 +0,0 @@
-=head1 NAME
-
-B<Moz> - routines for automating CodeWarrior builds, and some extra-curricular
-activities related to building Mozilla
-
-=head1 SYNOPSIS
-
-    use Moz;
-
-    OpenErrorLog(":::BuildLog");
-    StopForErrors();
-
-		$Moz::QUIET = 1;
-		InstallFromManifest(":projects:MANIFEST", $dist_dir);
-
-    BuildProjectClean(":projects:SomeProject.mcp", "SomeTarget");
-    MakeAlias(":projects:SomeProject.shlb", $dist_dir);
-
-    DontStopForErrors();
-
-    BuildProject(":projects:SomeOtherProject.mcp", "SomeTarget");
-
-=head1 DESCRIPTION
-
-B<Moz> comprises the routines needed to slap CodeWarrior around, force it
-to build a sequence of projects, report the results, and a few other things.
-This module should only contain functions that are generic to any build,
-not just the Mozilla build.
-
-=cut
-
-
-package			Moz::Moz;
-require			Exporter;
-
-use Cwd;
-
-use File::Copy;
-use File::Path;
-use File::Basename;
-
-use Mac::Types;
-use Mac::Events;
-use Mac::Processes;
-
-use ExtUtils::Manifest 'maniread';
-
-use Moz::CodeWarriorLib;
-
-@ISA				= qw(Exporter);
-
-@EXPORT			= qw( LaunchCodeWarrior
-                  GetCodeWarriorRelativePath
-                  current_directory
-                  full_path_to
-                  DoBuildProject
-                  ImportXMLProject
-                  ExportProjectToXML
-                  OpenErrorLog
-                  MakeAlias
-                  GetFileModDate
-                  StopForErrors
-                  DontStopForErrors
-                  InstallFromManifest
-                  InstallResources
-                  RedirectOutputToFile
-                  Delay
-                  ActivateApplication
-                  IsProcessRunning);
-
-@EXPORT_OK	= qw(CloseErrorLog QUIET);
-
-
-sub current_directory()
-	{
-		my $current_directory = cwd();
-		chop($current_directory) if ( $current_directory =~ m/:$/ );
-		return $current_directory;
-	}
-
-sub full_path_to($)
-	{
-		my ($path) = @_;
-		if ( $path =~ m/^[^:]+$/ )
-			{
-				$path = ":" . $path;
-			}
-
-		if ( $path =~ m/^:/ )
-			{
-				$path = current_directory() . $path;
-			}
-
-		return $path;
-	}
-
-$logging								= 0;
-$recent_errors_file			= "";
-$stop_on_1st_error			= 1;
-$QUIET									= 0;
-
-
-
-=head2 Logging all the errors and warnings - C<OpenErrorLog($log_file)>, C<CloseErrorLog()>
-
-The warnings and errors generated in the course of building projects can be logged to a file.
-Tinderbox uses this facility to show why a remote build failed.
-
-Logging is off by default.
-  Start logging at any point in your build process with C<OpenErrorLog($log_file)>.
-  Stop with C<CloseErrorLog()>.
-  You never need to close the log explicitly, unless you want to just log a couple of projects in the middle of a big list.
-  C<CloseErrorLog()> is not exported by default. 
-
-=cut
-
-sub CloseErrorLog()
-	{
-		if ( $logging )
-			{
-				close(ERROR_LOG);
-				$logging = 0;
-				StopForErrors() if $stop_on_1st_error;
-			}
-	}
-
-
-
-sub OpenErrorLog($)
-	{
-		my ($log_file) = @_;
-
-		CloseErrorLog();
-		if ( $log_file )
-			{
-				$log_file = full_path_to($log_file);
- 
-				open(ERROR_LOG, ">$log_file") || die "Error: Can't open $log_file\n";
-				MacPerl::SetFileInfo("CWIE", "TEXT", $log_file);
-
-				$log_file =~ m/.+:(.+)/;
-				$recent_errors_file = full_path_to("$1.part");
-				$logging = 1;
-			}
-	}
-
-
-=head2 Stopping before it's too late - C<StopForErrors()>, C<DontStopForErrors()>
-
-When building a long list of projects, you decide whether to continue building subsequent projects when one fails.
-  By default, your build script will C<die> after the first project that generates an error while building.
-  Change this behavior with C<DontStopForErrors()>.
-  Re-enable it with C<StopForErrors()>.
-
-=cut
-
-sub StopForErrors()
-	{
-		$stop_on_1st_error = 1;
-		
-			# Can't stop for errors unless we notice them.
-			# Can't notice them unless we are logging.
-			# If the user didn't explicitly request logging, log to a temporary file.
-
-		if ( ! $recent_errors_file )
-			{
-				OpenErrorLog("${TMPDIR}BuildResults");
-			}
-	}
-
-sub DontStopForErrors()
-	{
-		$stop_on_1st_error = 0;		
-	}
-
-sub log_message($)
-	{
-		if ( $logging )
-			{
-				my ($message) = @_;
-				print ERROR_LOG $message;
-			}
-	}
-
-sub log_message_with_time($)
-	{
-		if ( $logging )
-			{
-				my ($message) = @_;
-				my $time_stamp = localtime();
-				log_message("$message ($time_stamp)\n");
-			}
-	}
-
-sub log_recent_errors($)
-	{
-		my ($project_name) = @_;
-		my $found_errors = 0;
-	
-		if ( $logging )
-			{
-				open(RECENT_ERRORS, "<$recent_errors_file");
-
-				while( <RECENT_ERRORS> )
-					{
-						if ( /^Error/ || /^CouldnÕt find project file/ || /^Link Error/ )
-							{
-#								if (!$found_errors)
-#									print $_;
-								$found_errors = 1;
-							}
-						print ERROR_LOG $_;
-					}
-
-				close(RECENT_ERRORS);
-				unlink("$recent_errors_file");
-			}
-		
-		if ( $stop_on_1st_error && $found_errors )
-			{
-				print ERROR_LOG "### Build failed.\n";
-				die "### Errors encountered building \"$project_name\".\n";
-			}
-	}
-	
-sub DoBuildProject($$$)
-	{
-		my ($project_path, $target_name, $clean_build) = @_;
-		$project_path = full_path_to($project_path);
-
-#		$project_path =~ m/.+:(.+)/;
-#		my $project_name = $1;
-
-		log_message_with_time("### Building \"$project_path\"");
-
-			# Check that the given project exists
-		if (! -e $project_path)
-			{
-				print ERROR_LOG "### Build failed.\n";
-				die "### Can't find project file \"$project_path\".\n";
-			}
-		
-		print "Building \"$project_path\[$target_name\]\"\n";
-		
-		$had_errors = Moz::CodeWarriorLib::build_project(
-			$project_path, $target_name, $recent_errors_file, $clean_build
-		);
-		WaitNextEvent();
-
-#		$had_errors =
-#MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
-#	tell (load script file "$CodeWarriorLib") to BuildProject("$project_path", "$project_name", "$target_name", "$recent_errors_file", $clean_build)
-#END_OF_APPLESCRIPT
-
-			# Append any errors to the globally accumulated log file
-#		if ( $had_errors ) # Removed this test, because we want warnings, too.  -- jrm
-			{
-				log_recent_errors($project_path);
-			}
-	}
-
-
-sub ImportXMLProject($$)
-{
-    my ($xml_path, $project_path) = @_;
-
-#    my ($codewarrior_ide_name) = Moz::CodeWarriorLib::getCodeWarriorIDEName();
-#    my $ascript = <<EOS;
-#      tell application "$codewarrior_ide_name"
-#        make new (project document) as ("$project_path") with data ("$xml_path")
-#      end tell
-#EOS
-#    print $ascript."\n";
-#    my($result) = MacPerl::DoAppleScript($ascript);
-#    unless ($result) { die "Error: ImportXMLProject AppleScript failed $^E $result\n";  }
-#    
-
-    my($import_error) = Moz::CodeWarriorLib::import_project($xml_path, $project_path);
-    if ($import_error ne "") {
-      die "Error: ImportXMLProject failed with error $import_error\n";
-    }
-}
-
-sub ExportProjectToXML($$)
-{
-    my ($project_path, $xml_path) = @_;
-
-    my (@suffix_list) = (".mcp");
-    my ($project_name, $project_dir, $suffix) = fileparse($project_path, @suffix_list);
-    if ($suffix eq "") { die "Project: $project_path doesn't look like a project file.\n"; }
-    
-    if (-e $xml_path) {
-        print "$xml_path exists - not exporting $project_path\n";
-    }
-    else {
-        print "Exporting $project_path to $xml_path\n";
-        my($export_error) = Moz::CodeWarriorLib::export_project($project_path, $xml_path);
-        if ($export_error ne "") {
-            die "Error: export_project failed with error '$export_error'\n";
-        }
-        
-        if (! -e $xml_path) {
-          die "Error: XML export to $xml_path failed\n";
-        }
-    }
-}
-
-
-=head2 Miscellaneous
-
-C<MakeAlias($old_file, $new_file)> functions like C<symlink()>, except with better argument defaulting and more explicit error messages.
-
-=cut
-
-sub MakeAlias($$)
-	{
-		my ($old_file, $new_file) = @_;
-
-			# if the directory to hold $new_file doesn't exist, create it
-		if ( ($new_file =~ m/(.+:)/) && !-d $1 )
-			{
-				mkpath($1);
-			}
-
-			# if a leaf name wasn't specified for $new_file, use the leaf from $old_file
-		if ( ($new_file =~ m/:$/) && ($old_file =~ m/.+:(.+)/) )
-			{
-				$new_file .= $1;
-			}
-
-		my $message = "Can't create a Finder alias (at \"$new_file\")\n for \"$old_file\"; because ";
-
-		die "Error: $message \"$old_file\" doesn't exist.\n" unless -e $old_file;
-		die "Error: $message I won't replace an existing (non-alias) file with an alias.\n" if ( -e $new_file && ! -l $new_file );
-
-			# now: $old_file exists; $new_file doesn't (or else, is an alias already)
-
-		if ( -l $new_file )
-			{
-					# ...then see if it already points to $old_file
-				my $current_target	= full_path_to(readlink($new_file));
-				my $new_target			= full_path_to($old_file);
-
-				return if ( $current_target eq $new_target );
-					# if the desired alias already exists and points to the right thing, then we're done
-				
-				unlink $new_file;
-			}
-		
-		symlink($old_file, $new_file) || die "Error: $message symlink returned an unexpected error.\n";
-	}
-	
-	
-=pod
-
-C<InstallFromManifest()>
-
-=cut
-
-sub InstallFromManifest($;$$)
-	{
-		my ($manifest_file, $dest_dir, $flat) = @_;
-		
-		$flat = 0 unless defined($flat); # if $flat, all rel. paths in MANIFEST get aliased to the root of $dest_dir
-
-		$dest_dir ||= ":";
-
-		$manifest_file =~ m/(.+):/;
-		my $source_dir =  $1;
-
-		chop($dest_dir) if $dest_dir =~ m/:$/;
-
-		#Mac::Events->import();
-		WaitNextEvent();
-		if ($flat)
-		{
-			print "Doing manifest on \"$manifest_file\" FLAT\n" unless $QUIET;
-		}
-		else
-		{
-			print "Doing manifest on \"$manifest_file\"\n" unless $QUIET;
-		}
-		
-		my $read = maniread(full_path_to($manifest_file));
-		foreach $file (keys %$read)
-			{
-				next unless $file;
-
-				$subdir = ":";
-				if (!$flat && ($file =~ /:.+:/ ))
-					{
-						$subdir = $&;
-					}
-
-				$file = ":$file" unless $file =~ m/^:/;
-				MakeAlias("$source_dir$file", "$dest_dir$subdir");
-			}
-	}
-
-
-=pod
-
-C<InstallResources()>
-
-=cut
-
-# parameters are path to MANIFEST file, destination dir, true (to make copies) or false (to make aliases)
-sub InstallResources($;$;$)
-	{
-		my ($manifest_file, $dest_dir, $copy_files) = @_;
-
-		$dest_dir ||= ":";
-		mkpath($dest_dir) if !-d $dest_dir;
-
-		$manifest_file =~ m/(.+):/;
-		my $source_dir =  $1;
-
-		chop($dest_dir) if $dest_dir =~ m/:$/;
-
-		WaitNextEvent();
-		print "Installing resources from \"$manifest_file\"\n" unless $QUIET;
-		
-		my $read = maniread(full_path_to($manifest_file));
-		foreach $file (keys %$read)
-			{
-				next unless $file;
-				
-				if ($copy_files)
-					{
-						copy("$source_dir:$file", "$dest_dir:$file");
-					}
-				else
-					{
-						MakeAlias("$source_dir:$file", "$dest_dir:$file");
-					}
-			}
-	}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// Delay
-#//--------------------------------------------------------------------------------------------------
-sub Delay($)		
-{
-  my ($delay_seconds) = @_;
-
-  $now = time;
-  
-  $exit_time = $now + $delay_seconds;
-
-  while ($exit_time > $now) {
-     $now = time;
-  }
-	
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GetFileModDate
-#//--------------------------------------------------------------------------------------------------
-sub GetFileModDate($)
-{
-    my($filePath)=@_;
-    my($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
-        $atime,$mtime,$ctime,$blksize,$blocks) = stat($filePath);
-    return $mtime;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// LaunchCodeWarrior
-#//--------------------------------------------------------------------------------------------------
-sub LaunchCodeWarrior($)
-{
-  my($idepath_file) = @_;   # full path to IDE location file
-  my($cur_dir) = cwd();
-  
-  # this both launches and writes the IDE path file
-  Moz::CodeWarriorLib::activate($idepath_file);
-  
-  chdir($cur_dir);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GetCodeWarriorRelativePath
-#//--------------------------------------------------------------------------------------------------
-sub GetCodeWarriorRelativePath($)
-{
-  my($rel_path) = @_;
-  return Moz::CodeWarriorLib::getCodeWarriorPath($rel_path);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// RedirectOutputToFile
-#//--------------------------------------------------------------------------------------------------
-sub RedirectOutputToFile($)
-{
-    my($log_file) = @_;
-    
-    # ensure that folders in the path exist
-    my($logdir) = "";
-    my($logfile) = $log_file;
-    
-    if ($log_file =~ /(.+?:)([^:]+)$/)       # ? for non-greedy match
-    {
-        $logdir = $1;
-        $logfile = $2;
-        
-        mkpath($logdir);
-    }
-
-    print "Output is now being redirected to the file '$log_file'\n";
-    
-    open(STDOUT, "> $log_file") || die "Can't redirect stdout";
-    open(STDERR, ">&STDOUT") || die "Can't dup stdout";
-    select(STDERR); $| = 1;     # make unbuffered
-    select(STDOUT); $| = 1;     # make unbuffered
-    
-    MacPerl::SetFileInfo("CWIE", "TEXT", $log_file);
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// ActivateApplication
-#//--------------------------------------------------------------------------------------------------
-
-sub ActivateApplication($)
-{
-	my ($appSignature) = @_;
-	my ($psi, $found);
-	my ($appPSN);
-	
-	$found = 0;
-		
-	foreach $psi (values(%Process))
-	{
-		if ($psi->processSignature() eq $appSignature)
-		{
-			$appPSN = $psi->processNumber();
-			$found = 1;
-            last;
-		}
-	}
-
-	if ($found == 0 || SameProcess($appPSN, GetFrontProcess()))
-	{
-		return;
-	}
-
-	SetFrontProcess($appPSN);
-
-	while (GetFrontProcess() != $appPSN)
-	{
-		WaitNextEvent();
-	}
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// IsProcessRunning
-#//--------------------------------------------------------------------------------------------------
-
-sub IsProcessRunning($)
-{
-    my($processName, $psn, $psi) = @_;
-    while ( ($psn, $psi) = each(%Process) ) {
-     if ($psi->processName eq $processName) { return 1; }
-    }
-    return 0;
-}
-
-
-1;
-
-=head1 AUTHORS
-
-Scott Collins <scc@netscape.com>, Simon Fraser <sfraser@netscape.com>, Chris Yeh <cyeh@netscape.com>
-
-=head1 SEE ALSO
-
-BuildMozillaDebug.pl (et al), BuildList.pm, CodeWarriorLib (an AppleScript library)
-
-=head1 COPYRIGHT
-
-The contents of this file are subject to the Netscape Public
-License Version 1.1 (the "License"); you may not use this file
-except in compliance with the License. You may obtain a copy of
-the License at http://www.mozilla.org/NPL/
-
-Software distributed under the License is distributed on an "AS
-IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-implied. See the License for the specific language governing
-rights and limitations under the License.
-
-The Original Code is Mozilla Communicator client code, released
-March 31, 1998.
-
-The Initial Developer of the Original Code is Netscape
-Communications Corporation. Portions created by Netscape are
-Copyright (C) 1998-1999 Netscape Communications Corporation. All
-Rights Reserved.
-
-Contributor(s): 
-
-=cut

mozilla/build/mac/build_scripts/Moz/Prefs.pm

@@ -1,272 +0,0 @@
-
-package Moz::Prefs;
-
-require 5.004;
-require Exporter;
-
-# Package that attempts to read a file from the Preferences folder,
-# and get build settings out of it
-
-use strict;
-
-use Exporter;
-use File::Path;
-
-use Mac::Files;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA		  = qw(Exporter);
-@EXPORT 	= qw(ReadMozUserPrefs);
-
-
-#-------------------------------------------------------------------------------
-#
-# GetPrefsFolder
-#
-#-------------------------------------------------------------------------------
-
-sub GetPrefsFolder()
-{
-  my($prefs_folder) = FindFolder(kOnSystemDisk, kPreferencesFolderType, 1);
-  return $prefs_folder.":Mozilla build prefs";
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# SetArrayValue
-#
-#-------------------------------------------------------------------------------
-sub SetArrayValue($$$)
-{
-  my($array_ref, $index1, $index2) = @_;
-
-  my($index);
-  foreach $index (@$array_ref)
-  {
-    if ($index->[0] eq $index1)
-    {
-      $index->[1] = $index2;
-      return 1;
-    }
-  }
-  
-  return 0;
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# WriteDefaultPrefsFile
-#
-#-------------------------------------------------------------------------------
-
-sub WriteDefaultPrefsFile($)
-{
-  my($file_path) = @_;
-
-  my($file_contents);
-  $file_contents = <<'EOS';
-% You can use this file to customize the Mozilla build system.
-% The following kinds of lines are allowable:
-%   Comment lines, which start with a '%' in the first column
-%   Lines which modify the default build settings. For the list of flags,
-%   see MozBuildFlags.pm. Examples are:
-%
-%    build       pull            0                    % don't pull
-%    options     mng             1                    % turn mng on
-%   
-%   Line containing the special 'buildfrom' flag, which specifies
-%   where to start the build. Example:
-%   
-%    buildfrom   nglayout                % where to start the build
-%
-%   Lines which specify the location of the files used to store paths
-%   to the CodeWarrior IDE, and the MacCVS Pro session file. Note quoting
-%   of paths containing whitespace. Examples:
-%
-%    filepath   idepath         ::codewarrior.txt
-%    filepath   sessionpath     ":Some folder:MacCVS session path.txt"
-%
-%   Lines which modify the build settings like %main::DEBUG.
-%   Any lines which do not match either of the above are assumed
-%   to set variables on $main::. Examples:
-%   
-%    MOZILLA_OFFICIAL    1
-%
-EOS
-
-  $file_contents =~ s/%/#/g;
-   
-  local(*PREFS_FILE);
-
-  open(PREFS_FILE, "> $file_path") || die "Could not write default prefs file\n";
-  print PREFS_FILE ($file_contents);
-  close(PREFS_FILE);
-
-  MacPerl::SetFileInfo("McPL", "TEXT", $file_path);
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# HandlePrefSet
-#
-#-------------------------------------------------------------------------------
-sub HandlePrefSet($$$$)
-{
-  my($flags, $name, $value, $desc) = @_;
-
-  if (SetArrayValue($flags, $name, $value)) {
-    print "Prefs set $desc flag '$name' to '$value'\n";
-  } else {
-    die "$desc setting '$name' is not a valid option\n";
-  }
-
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# HandleBuildFromPref
-#
-#-------------------------------------------------------------------------------
-sub HandleBuildFromPref($$)
-{
-  my($build_array, $name) = @_;
-
-  my($setting) = 0;
-  my($index);
-  foreach $index (@$build_array)
-  {
-    if ($index->[0] eq $name) {
-      $setting = 1;
-    }
-    
-    $index->[1] = $setting;    
-  }
-
-  if ($setting == 1) {
-    print "Building from $name onwards, as specified by prefs\n";
-  } else {
-    printf "Failed to find buildfrom setting '$name'\n";
-  }
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# ReadPrefsFile
-#
-#-------------------------------------------------------------------------------
-
-sub ReadPrefsFile($$$$$)
-{
-  my($file_path, $build_flags, $options_flags, $filepath_flags, $create_if_missing) = @_;
-  
-  local(*PREFS_FILE);
-  
-  if (open(PREFS_FILE, "< $file_path"))
-  {
-    print "Reading build prefs from '$file_path'\n";
-  
-    while (<PREFS_FILE>)
-    {
-      my($line) = $_;
-      chomp($line);
-      
-      if ($line =~ /^\#/ || $line =~ /^\s*$/) {    # ignore comments and empty lines
-        next;
-      }
-            
-      if (($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+\"(.+)\"(\s+#.+)?/) ||
-          ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+\'(.+)\'(\s+#.+)?/) ||
-          ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+([^#\s]+)(\s+#.+)?/))
-      {
-        my($array_name) = $1;      
-        my($option_name) = $2;
-        my($option_value) = $3;      
-      
-        # print "Read '$array_name' '$option_name' '$option_value'\n";
-        
-        if ($array_name eq "build")
-        {
-          HandlePrefSet($build_flags, $option_name, $option_value, "Build");
-        }
-        elsif ($array_name eq "options")
-        {
-          HandlePrefSet($options_flags, $option_name, $option_value, "Options");
-        }
-        elsif ($array_name eq "filepath" && $option_name && $option_value)
-        {
-          HandlePrefSet($filepath_flags, $option_name, $option_value, "Filepath");
-        }
-        else
-        {
-          print "Unknown pref option at $line\n";
-        }
-      }
-      elsif ($line =~ /^\s*buildfrom\s+([^#\s]+)(\s+#.+)?/)
-      {
-        my($build_start) = $1;
-        HandleBuildFromPref($build_flags, $build_start);
-      }
-      elsif ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)(\s+#.+)?/)
-      {
-        my($build_var) = $1;
-        my($var_setting) = $2;
-        
-        print "Setting \$main::$build_var to $var_setting\n";
-        eval "\$main::$build_var = \"$var_setting\"";
-      }
-      else
-      {
-        print "Unrecognized input line at $line\n";
-      }
-      
-    }
-    
-    close(PREFS_FILE);  
-  }
-  elsif ($create_if_missing)
-  {
-    print "No prefs file found at $file_path; using defaults\n";
-    
-    my($folder_path) = $file_path;
-    $folder_path =~ s/[^:]+$//;
-    mkpath($folder_path);
-    WriteDefaultPrefsFile($file_path);
-  }
-}
-
-
-#-------------------------------------------------------------------------------
-#
-# ReadMozUserPrefs
-#
-#-------------------------------------------------------------------------------
-
-sub ReadMozUserPrefs($$$$)
-{
-  my($prefs_file_name, $build_flags, $options_flags, $filepath_flags) = @_;
-  
-  if ($prefs_file_name eq "") { return; }
-  
-  # if local prefs exist, just use those. Othewise, look in the prefs folder
-  if (-e $prefs_file_name)
-  {
-    # read local prefs
-    ReadPrefsFile($prefs_file_name, $build_flags, $options_flags, $filepath_flags, 0);
-  }
-  else
-  {
-    # first read prefs folder prefs
-    my($prefs_path) = GetPrefsFolder();
-    $prefs_path .= ":$prefs_file_name";
-
-    ReadPrefsFile($prefs_path, $build_flags, $options_flags, $filepath_flags, 1);
-  }
-}
-
-1;

mozilla/build/mac/build_scripts/Moz/ProjectXML.pm

@@ -1,932 +0,0 @@
-#!/usr/bin/perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-package Moz::ProjectXML;
-
-require 5.004;
-require Exporter;
-
-use strict;
-use Exporter;
-
-use Cwd;
-use XML::DOM;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA      = qw(Exporter);
-@EXPORT   = qw(
-                ParseXMLDocument
-                DisposeXMLDocument
-                WriteXMLDocument
-                CleanupPro5XML
-                GetTargetsList
-                CloneTarget
-                SetAsSharedLibraryTarget
-                SetAsStaticLibraryTarget
-                AddTarget
-                RemoveTarget
-                GetTargetSetting
-                SetTargetSetting
-                getChildElementTextContents
-              );
-
-
-#--------------------------------------------------------------------------------------------------
-# A module for reading, manipulating, and writing XML-format CodeWarrior project files.
-# 
-# Sample usage:
-# 
-# use ProjectXML;
-# 
-# my $doc = ProjectXML::ParseXMLDocument("Test.mcp.xml");
-# ProjectXML::CloneTarget($doc, "Test.shlb", "Test.lib");
-# ProjectXML::SetAsStaticLibraryTarget($doc, "Test.lib", "TestOutput.lib");
-# ProjectXML::WriteXMLDocument($doc, "Test_out.xml");
-# ProjectXML::DisposeXMLDocument($doc);
-# 
-#--------------------------------------------------------------------------------------------------
-
-
-#//--------------------------------------------------------------------------------------------------
-#// ParseXMLDocument
-#// Note that the caller must call DisposeXMLDocument on the returned doc
-#//--------------------------------------------------------------------------------------------------
-sub ParseXMLDocument($)
-{
-  my($doc_path) = @_;
-
-  my $parser = new XML::DOM::Parser(ErrorContext => 2);
-  my $doc = $parser->parsefile($doc_path);
-
-  return $doc;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// DisposeXMLDocument
-#// Needed to avoid memory leaks - cleanup circular references for garbage collection
-#//--------------------------------------------------------------------------------------------------
-sub DisposeXMLDocument($)
-{
-  my($doc) = @_;
-  
-  $doc->dispose();
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// WriteXMLDocument
-#//--------------------------------------------------------------------------------------------------
-
-sub _pro5_tag_compression($$)
-{
-   return 1;    # Pro 5 is broken and can't import XML with <foo/> style tags
-}
-
-sub _pro6plus_tag_compression($$)
-{
-   return 0;    # Pro 6 can deal with empty XML tags like <foo/>
-}
-
-sub WriteXMLDocument($$$)
-{
-  my($doc, $file_path, $ide_version) = @_;
-
-  if ($ide_version eq "4.0")
-  {
-    XML::DOM::setTagCompression(\&_pro5_tag_compression);
-  }
-  else
-  {
-    XML::DOM::setTagCompression(\&_pro6plus_tag_compression);
-  }
-
-  $doc->printToFile($file_path);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// CleanupPro5XML
-#// XML Projects exported by Pro 5 contain garbage data under the MWMerge_MacOS_skipResources
-#// setting. This routine cleans this up, saving the result to a new file
-#//--------------------------------------------------------------------------------------------------
-sub CleanupPro5XML($$)
-{
-  my($xml_path, $out_path) = @_;
-  
-  local(*XML_FILE);
-  open(XML_FILE, "< $xml_path") || die "Error: failed to open file $xml_path\n";
-  
-  local(*CLEANED_FILE);
-  open(CLEANED_FILE, "> $out_path") || die "Error: failed to open file $out_path for writing\n";
-  
-  my $in_skip_resources_settings = 0;
-  
-  while(<XML_FILE>)
-  {
-      my($line) = $_;
-
-      if ($line =~ /^<\?codewarrior/)    # is processing inst line
-      {
-        my $test_line = $line;
-        chomp($test_line);
-  
-        my $out_line = $test_line;
-        if ($test_line =~ /^<\?codewarrior\s+exportversion=\"(.+)\"\s+ideversion=\"(.+)\"\s*\?>$/)
-        {
-          my $export_version = $1;
-          my $ide_version    = $2;
-
-          $ide_version = "4.0_mozilla";   # pseudo IDE version so we know we touched it
-          $out_line = "<?codewarrior exportversion=\"".$export_version."\" ideversion=\"".$ide_version."\"?>";
-        }
-
-        print CLEANED_FILE "$out_line\n";
-        next;
-      }
-      
-      if ($line =~ /MWMerge_MacOS_skipResources/)
-      {
-        $in_skip_resources_settings = 1;
-        print CLEANED_FILE "$line";
-      }
-      elsif($in_skip_resources_settings && $line =~ /<!-- Settings for/)
-      {
-        # leaving bad settings lines. Write closing tag
-        print CLEANED_FILE "                    <!-- Corrupted setting entries removed by script -->\n";
-        print CLEANED_FILE "                </SETTING>\n\n";
-        
-        print CLEANED_FILE "$line";
-
-        $in_skip_resources_settings = 0;
-      }
-      elsif (!$in_skip_resources_settings)
-      {      
-        print CLEANED_FILE "$line";
-      }
-  }
-  
-  close(XML_FILE);
-  close(CLEANED_FILE);
-
-}
-
-#--------------------------------------------------------------------------------------------------
-# SniffProjectXMLIDEVersion
-#
-#--------------------------------------------------------------------------------------------------
-sub SniffProjectXMLIDEVersion($)
-{
-  my($xml_path) = @_;
-  
-  my $found_version = "";
-  
-  local(*XML_FILE);
-  open(XML_FILE, "< $xml_path") || die "Error: failed to open file $xml_path\n";
-  
-  while(<XML_FILE>)
-  {
-      my($line) = $_;
-      chomp($line);
-      
-      if ($line =~ /^<\?codewarrior/)    # is processing inst line
-      {
-        unless ($line =~ /^<\?codewarrior\s+exportversion=\"(.+)\"\s+ideversion=\"(.+)\"\s*\?>$/)
-        {
-          die "Error: Failed to find ideversion in $xml_path in line $line\n";
-        }
-        
-        my $export_version = $1;
-        my $ide_version    = $2;
-
-        $found_version = $ide_version;         
-        last;
-      }
-  }
-  
-  close(XML_FILE);
-
-  return $found_version;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetsList
-#// Returns an array of target names
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetsList($)
-{
-  my($doc) = @_;
-
-  my $nodes = $doc->getElementsByTagName("TARGET");
-  my $n = $nodes->getLength;
-  
-  my @target_names;
-  
-  for (my $i = 0; $i < $n; $i++)
-  {
-    my ($node) = $nodes->item($i);   
-   
-    my($target_name) = getChildElementTextContents($node, "NAME");
-    push(@target_names, $target_name);
-  }
-
-  return @target_names;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// CloneTarget
-#// Clone the named target, renaming it to 'new_name'
-#//--------------------------------------------------------------------------------------------------
-sub CloneTarget($$$)
-{
-  my($doc, $target_name, $new_name) = @_;
-
-  my $target_node   = getTargetNode($doc, $target_name);
-
-  # clone here
-  my $target_clone  = $target_node->cloneNode(1);   # deep clone
-  
-  # -- munge target settings --
-
-  # set the target name field
-  setChildElementTextContents($doc, $target_clone, "NAME", $new_name);
-  
-  # set the targetname pref
-  setTargetNodeSetting($doc, $target_clone, "Targetname", $new_name);
-
-  # -- insert new target subtree --
-  
-  my $target_list   = $target_node->getParentNode();
-  $target_list->appendChild($target_clone);
-  
-  # -- now add to targetorder --
-  my (@target_order_nodes) = getChildOfDocument($doc, "TARGETORDER");
-  
-  my $target_order = @target_order_nodes[0];
-  
-  my $new_order     = $doc->createElement("ORDEREDTARGET");
-  my $order_name    = $doc->createElement("NAME");
-  
-  $new_order->appendChild($order_name);
-
-  setChildElementTextContents($doc, $new_order, "NAME", $new_name);
-  $target_order->appendChild($new_order);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// SetAsSharedLibraryTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub SetAsSharedLibraryTarget($$$)
-{
-  my($doc, $target_name, $output_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_type", "SharedLibrary");
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_filetype", "1936223330"); #'shlb'
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_outfile", $output_name);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// AddFileToTarget
-#// 
-#// Add a file to the specified target(s).
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub AddFileToTarget($$$)
-{
-  my($doc, $target_list, $file_name) = @_;
-
-  # the file must be added in 3 places:
-  # 1. in <TARGET><FILELIST><FILE> (with linkage flags if necessary)
-  # 2. in <TARGET><LINKORDER><FILEREF>
-  # 3. in <GROUPLIST><GROUP><FILEREF>
-  die "Write me\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// RemoveFileFromTarget
-#// 
-#// Remove a file from the specified target, removing it from the entire project
-#// if no other targets reference it.
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub RemoveFileFromTarget($$$)
-{
-  my($doc, $target_node, $file_name) = @_;
-  
-  # the file must be removed in 3 places:
-  # 1. in <TARGET><FILELIST><FILE>
-  # 2. in <TARGET><LINKORDER><FILEREF>
-  # 3. in <GROUPLIST><GROUP><FILEREF>
-  
-  # first, remove from <FILELIST>
-  my $filelist_node = getFirstChildElement($target_node, "FILELIST");
-  unless ($filelist_node) { die "Error: failed to find FILELIST node\n"; }
-  
-  my $file_node = getChildNodeByGrandchildContents($doc, $filelist_node, "FILE", "PATH", $file_name);
-  unless ($file_node) { return; }
-
-  $filelist_node->removeChild($file_node);
-  
-  # next, remove from <LINKORDER>
-  my $linkorder_node = getFirstChildElement($target_node, "LINKORDER");
-  unless ($linkorder_node) { die "Error: failed to find LINKORDER node\n"; }
-  
-  my $fileref_node = getChildNodeByGrandchildContents($doc, $linkorder_node, "FILEREF", "PATH", $file_name);
-  unless ($fileref_node) { die "Error: link order node for file $file_name not found\n"; }
-
-  $linkorder_node->removeChild($fileref_node);
-  
-  # last, remove from <GROUPLIST>
-  # <GROUPLIST> is cross-target, so we have to be careful here.
-  my $grouplist_node = getChildOfDocument($doc, "GROUPLIST");
-  unless ($grouplist_node) { die "Error: failed to find GROUPLIST node\n"; }
-
-  # if the file isn't in any other targets, remove it from the groups
-  if (!GetFileInUse($doc, $file_name))
-  {
-    print "File $file_name is in no other targest. Removing from project\n";
-
-    my @group_nodes;
-    getChildElementsOfType($doc, $grouplist_node, "GROUP", \@group_nodes);
-    my $group_node;
-    foreach $group_node (@group_nodes)
-    {
-      my @fileref_nodes;
-      getChildElementsOfType($doc, $group_node, "FILEREF", \@fileref_nodes);
-  
-      my $fileref_node;
-      foreach $fileref_node (@fileref_nodes)
-      {
-        my $path_name = getChildElementTextContents($fileref_node, "PATH");
-        if ($path_name eq $file_name)
-        {
-          print "Removing $file_name from project group list\n";
-          $group_node->removeChild($fileref_node);
-          last;
-        }
-      }
-      
-      # can a file appear in more than one group?
-    }
-  }
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// SetAsStaticLibraryTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub SetAsStaticLibraryTarget($$$)
-{
-  my($doc, $target_name, $output_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_type", "Library");
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_filetype", "1061109567"); #'????'
-  setTargetNodeSetting($doc, $target_node, "MWProject_PPC_outfile", $output_name);
-
-  # static targets don't need any library linkage, so we can remove linkage
-  # with all .shlb and .Lib files.
-  
-  my(@obsolete_files) = ("NSStdLibStubs", "InterfacesStubs", "InterfaceLib", "InternetConfigLib");
-
-  print " Removing libraries etc. from target\n";
-
-  # get all files in target
-  my @target_files = GetTargetFilesList($doc, $target_name);
-  my $target_file;
-  foreach $target_file (@target_files)
-  {
-    if ($target_file =~ /(\.shlb|\.lib|\.Lib|\.o|\.exp)$/)
-    {
-      RemoveFileFromTarget($doc, $target_node, $target_file);
-    }
-  }
-  
-  print " Removing stub libraries from target\n";
-  
-  # then remove files with known names
-  my $obs_file;
-  foreach $obs_file (@obsolete_files)
-  {
-    RemoveFileFromTarget($doc, $target_node, $obs_file);
-  }
-
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// AddTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub AddTarget($$)
-{
-  my($doc, $target_name) = @_;
-
-  die "Write me\n";
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// RemoveTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub RemoveTarget($$)
-{
-  my($doc, $target_name) = @_;
-
-  die "Write me\n";
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetSetting
-#// Get the value for the specified setting in the specified target
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetSetting($$$)
-{
-  my($doc, $target_name, $setting_name) = @_;
-
-  my $target_node   = getTargetNode($doc, $target_name);
-  return getTargetNodeSetting($target_node, "VALUE");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// SetTargetSetting
-#// Set the value for the specified setting in the specified target
-#//--------------------------------------------------------------------------------------------------
-sub SetTargetSetting($$$$)
-{
-  my($doc, $target_name, $setting_name, $new_value) = @_;
-
-  my $target_node   = getTargetNode($doc, $target_name);
-  setTargetNodeSetting($doc, $target_node, "VALUE", $new_value);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetFilesList
-#// Return an array of the files in the target (in filelist order)
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetFilesList($$)
-{
-  my($doc, $target_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-
-  my @files_list;
-    
-  my $filelist_node = getFirstChildElement($target_node, "FILELIST");
-  unless ($filelist_node) { die "Error: failed to find FILELIST node\n"; }
-
-  my @file_nodes;
-  getChildElementsOfType($doc, $filelist_node, "FILE", \@file_nodes);
-  
-  my $node;
-  foreach $node (@file_nodes)
-  {
-    my $file_name = getChildElementTextContents($node, "PATH");
-    push(@files_list, $file_name);
-  }
-  
-  return @files_list;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// FileIsInTarget
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub FileIsInTarget($$$)
-{
-  my($doc, $file_name, $target_name) = @_;
-
-  my $target_node = getTargetNode($doc, $target_name);
-  unless ($target_node) { die "Error: no target found called $target_name\n"; }
-
-  my $file_node = GetTargetFileNode($doc, $target_node, $file_name);
-  if ($file_node) {
-    return 1;
-  }
-  
-  return 0;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetFileTargetsList
-#// Return an array of the targets that a file is in (expensive)
-#//--------------------------------------------------------------------------------------------------
-sub GetFileTargetsList($$)
-{
-  my ($doc, $file_name) = @_;
-
-  my @target_list;
-
-  my @targets = GetTargetsList($doc);
-  my $target;
-  
-  foreach $target (@targets)
-  {
-    if (FileIsInTarget($doc, $file_name, $target))
-    {
-      push(@target_list, $target);
-    }
-  }
-  
-  return @target_list;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetTargetFileNode
-#// 
-#//--------------------------------------------------------------------------------------------------
-sub GetTargetFileNode($$$)
-{
-  my($doc, $target_node, $file_name) = @_;
-
-  my $filelist_node = getFirstChildElement($target_node, "FILELIST");
-  unless ($filelist_node) { die "Error: failed to find FILELIST node\n"; }
-  
-  my $file_node = getChildNodeByGrandchildContents($doc, $filelist_node, "FILE", "PATH", $file_name);
-
-  return $file_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// GetFileInUse
-#// Return true if the file is used by any target
-#//--------------------------------------------------------------------------------------------------
-sub GetFileInUse($$)
-{
-  my($doc, $file_name) = @_;
-
-  my $targetlist_node = getChildOfDocument($doc, "TARGETLIST");
-
-  my $target_node = $targetlist_node->getFirstChild();
- 
-  while ($target_node)
-  {
-    if ($target_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $target_node->getTagName() eq "TARGET")
-    {
-      # if this is a target node
-      my $file_node = GetTargetFileNode($doc, $target_node, $file_name);
-      if ($file_node) {
-        return 1;   # found it
-      }      
-    }
-
-    $target_node = $target_node->getNextSibling();
-  }
-  
-  # not found
-  return 0;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildOfDocument
-#//--------------------------------------------------------------------------------------------------
-sub getChildOfDocument($$)
-{
-  my($doc, $child_type) = @_;
-
-  return getFirstChildElement($doc->getDocumentElement(), $child_type);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getFirstChildElement
-#//--------------------------------------------------------------------------------------------------
-sub getFirstChildElement($$)
-{
-  my($node, $element_name) = @_;
-
-  my $found_node;
-  
-  unless ($node) { die "getFirstChildElement called with empty node\n"; }
-  
-  #look for the first "element_name" child
-
-  my $child_node = $node->getFirstChild();
- 
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $child_node->getTagName() eq $element_name)
-    {
-      $found_node = $child_node;
-      last;
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-   
-  return $found_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildElementsOfType
-#// 
-#// Return an array of refs to child nodes of the given type
-#//--------------------------------------------------------------------------------------------------
-sub getChildElementsOfType($$$$)
-{
-  my($doc, $node, $child_type, $array_ref) = @_;
-
-  my $child_node = $node->getFirstChild();
- 
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $child_node->getTagName() eq $child_type)
-    {
-      push(@$array_ref, $child_node);
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildElementTextContents
-#//--------------------------------------------------------------------------------------------------
-#
-# Given <FOOPY><NERD>Hi!</NERD></FOOPY>, where $node is <FOOPY>,
-# returns "Hi!". If > 1 <NERD> node, returns the contents of the first.
-#
-sub getChildElementTextContents($$)
-{
-  my($node, $tag_name) = @_;
-
-  my $first_element = getFirstChildElement($node, $tag_name);  
-  my $text_node     = $first_element->getFirstChild();
-  
-  my $text_contents = "";
-  
-  # concat adjacent text nodes
-  while ($text_node)
-  {
-    if ($text_node->getNodeTypeName() ne "TEXT_NODE")
-    {
-      last;
-    }
-
-    $text_contents = $text_contents.$text_node->getData();
-    $text_node = $text_node->getNextSibling();
-  }
-
-  return $text_contents;
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// setChildElementTextContents
-#//--------------------------------------------------------------------------------------------------
-sub setChildElementTextContents($$$$)
-{
-  my($doc, $node, $tag_name, $contents_text) = @_;
-  
-  my $first_element = getFirstChildElement($node, $tag_name);  
-  my $new_text_node = $doc->createTextNode($contents_text);
-  
-  # replace all child elements with a text element
-  removeAllChildren($first_element);
-  
-  $first_element->appendChild($new_text_node);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getChildNodeByContents
-#// 
-#// Consider <foo><bar><baz>Foopy</baz></bar><bar><baz>Loopy</baz></bar></foo>
-#// This function, when called with getChildNodeByContents($foonode, "bar", "baz", "Loopy")
-#// returns the second <bar> node.
-#//--------------------------------------------------------------------------------------------------
-sub getChildNodeByGrandchildContents($$$$$)
-{
-  my($doc, $node, $child_type, $gc_type, $gc_contents) = @_;    # gc = grandchild
-
-  my $found_node;
-  my $child_node = $node->getFirstChild();
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName eq "ELEMENT_NODE" &&
-        $child_node->getTagName() eq $child_type)
-    {
-      # check for a child of this node of type 
-      my $child_contents = getChildElementTextContents($child_node, $gc_type);
-
-      if ($child_contents eq $gc_contents)
-      {
-        $found_node = $child_node;
-        last;
-      }
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-
-  return $found_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getTargetNode
-#//--------------------------------------------------------------------------------------------------
-sub getTargetNode($$)
-{
-  my($doc, $target_name) = @_;
-
-  my $targetlist_node = getChildOfDocument($doc, "TARGETLIST");
-  return getChildNodeByGrandchildContents($doc, $targetlist_node, "TARGET", "NAME", $target_name);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getTargetNamedSettingNode
-#//--------------------------------------------------------------------------------------------------
-sub getTargetNamedSettingNode($$)
-{
-  my($target_node, $setting_name) = @_;
-
-  my $setting_node;
-
-  my $settinglist_node = getFirstChildElement($target_node, "SETTINGLIST");
-  my $child_node = $settinglist_node->getFirstChild();
- 
-  while ($child_node)
-  {
-    if ($child_node->getNodeTypeName ne "ELEMENT_NODE")
-    {
-      $child_node = $child_node->getNextSibling();
-      next;
-    }
-    
-    if ($child_node->getTagName() eq "SETTING")
-    {
-      my $set_name = getChildElementTextContents($child_node, "NAME");
-
-      if ($set_name eq $setting_name)
-      {
-        $setting_node = $child_node;
-        last;
-      }
-    }
-
-    $child_node = $child_node->getNextSibling();
-  }
-
-  return $setting_node;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// getTargetNodeSetting
-#//--------------------------------------------------------------------------------------------------
-sub getTargetNodeSetting($$)
-{
-  my($target_node, $setting_name) = @_;
-  
-  my $setting_node  = getTargetNamedSettingNode($target_node, $setting_name);
-  return getChildElementTextContents($setting_node, "VALUE");
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// setTargetNodeSetting
-#//--------------------------------------------------------------------------------------------------
-sub setTargetNodeSetting($$$$)
-{
-  my($doc, $target_node, $setting_name, $new_value) = @_;
-
-  my $setting_node  = getTargetNamedSettingNode($target_node, $setting_name);
-
-  setChildElementTextContents($doc, $setting_node, "VALUE", $new_value);
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// elementInArray
-#//--------------------------------------------------------------------------------------------------
-sub elementInArray($$)
-{
-  my($element, $array) = @_;
-  my $test;
-  foreach $test (@$array)
-  {
-    if ($test eq $element) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// removeAllChildren
-#//--------------------------------------------------------------------------------------------------
-sub removeAllChildren($)
-{
-  my($node) = @_;
-  
-  my $child_node = $node->getFirstChild();
-  
-  while ($child_node)
-  {
-    $node->removeChild($child_node);
-    $child_node = $node->getFirstChild();
-  }
-}
-
-
-#//--------------------------------------------------------------------------------------------------
-#// dumpNodeData
-#//--------------------------------------------------------------------------------------------------
-sub dumpNodeData($)
-{
-  my($node) = @_;
-  
-  unless ($node) { die "Null node passed to dumpNodeData\n"; }
-  
-  print "Dumping node $node\n";
-  
-  my($node_type) = $node->getNodeTypeName();
-  
-  if ($node_type eq "ELEMENT_NODE")
-  {
-    my($node_name) = $node->getTagName();
-    print "Element $node_name\n";
-  }
-  elsif ($node_type eq "TEXT_NODE")
-  {
-    my($node_data) = $node->getData;
-    # my(@node_vals) = unpack("C*", $node_data);
-    print "Text '$node_data'\n";    # may contain LF chars
-  }
-  else
-  {
-    print "Node $node_type\n";
-  }
-
-}
-
-#//--------------------------------------------------------------------------------------------------
-#// dumpNodeTree
-#//--------------------------------------------------------------------------------------------------
-sub dumpNodeTree($)
-{
-  my($node) = @_;
-  
-  my($child_node) = $node->getFirstChild();
-  
-  unless ($child_node) { return; }
-
-  # recurse
-  dumpNodeData($child_node);
-  
-  # then go through child nodes
-  while ($child_node)
-  {
-    dumpNodeTree($child_node);
-  
-    $child_node = $child_node->getNextSibling();
-  }
-}
-
-
-
-
-1;
-

mozilla/build/mac/build_scripts/MozillaBuildFlags.txt

@@ -1,90 +0,0 @@
-#-------------------------------------------------------------------------------
-# These 3 lists are the 'master lists' to control what gets built.
-# 
-# Ordering in these arrays is important; it has to reflect the order in
-# which the build occurs.
-#
-# Setting containing spaces must be quoted with double quotes.
-#-------------------------------------------------------------------------------
-
-build_flags
-all             1
-pull            0
-dist            0
-config          0
-xpidl           0
-idl             0
-stubs           0
-runtime         0
-common          0
-imglib          0
-libimg2         0
-necko           0
-security        0
-browserutils    0
-intl            0
-nglayout        0
-accessiblity    0
-editor          0
-embedding       0
-viewer          0
-xpapp           0
-extensions      0
-plugins         0
-mailnews        0
-apprunner       0
-resources       0
-
-options_flags
-pull_by_date    0
-chrome_jars     1
-chrome_files    0
-use_jars        1
-transformiix    1
-mathml          0      MOZ_MATHML
-svg             0      MOZ_SVG
-# svg requires libart, which is an lgpl library. You need to pull it 
-# explicitly.
-libart_lgpl     0
-mng             1
-ldap            1      MOZ_LDAP_XPCOM
-ldap_experimental 0    MOZ_LDAP_XPCOM_EXPERIMENTAL
-xmlextras       1
-wsp             0      MOZ_WSP
-inspector       1
-mailextras      1
-xptlink         0
-psm             0      MOZ_PSM
-embedding_test  1
-embedding_chrome 0
-embedding_xulprefs 0
-embedding_xulsecurity 0
-carbon          0      TARGET_CARBON
-useimg2         1      USE_IMG2
-lowmem          0      MOZ_MAC_LOWMEM
-accessible      1      ACCESSIBILITY
-bidi            1      IBMBIDI
-p3p             0
-jsd             1
-venkman         1
-moz_logging     1      MOZ_LOGGING
-chatzilla       1
-content_packs   1
-xml_rpc         1
-cview           1
-help            1
-timeline        0      MOZ_TIMELINE
-static_build    0      MOZ_STATIC_COMPONENT_LIBS
-string_debug    0      DEBUG_STRING
-string_stats    0      DEBUG_STRING_STATS
-xpctools        0      XPC_TOOLS_SUPPORT
-smime           1
-mdn             1
-print_preview   1      NS_PRINT_PREVIEW
-moz_xul         1      MOZ_XUL
-
-filepath_flags
-idepath             ":CodeWarrior IDE Path.txt"
-sessionpath         ":Mozilla session path.txt"
-buildlogfilepath    ":Build Logs:Mozilla build log.txt"   # this is a path
-scriptlogfilepath   ":Build Logs:Mozilla script log.txt"

mozilla/build/mac/build_scripts/MozillaCheckoutList.txt

@@ -1,22 +0,0 @@
-# List of modules to check out. Format is
-#   module, (tag), (date)
-# where tag and date are optional (non-trailing commas are required)
-#
-# Examples:
-#   mozilla/nsprpub, NSPRPUB_CLIENT_TAG
-#   mozilla/gc, , 10/25/2000 12:00:00
-#
-
-mozilla/nsprpub,        	NETSCAPE_7_0_RTM
-mozilla/security/nss,   	NETSCAPE_7_0_RTM
-mozilla/security/manager,	NETSCAPE_7_0_RTM
-mozilla/accessible,			NETSCAPE_7_0_RTM
-mozilla/directory/c-sdk,	NETSCAPE_7_0_RTM
-mozilla/lib/mac/Instrumentation, 	NETSCAPE_7_0_RTM
-mozilla/gfx2, 				NETSCAPE_7_0_RTM
-mozilla/modules/libpr0n,	NETSCAPE_7_0_RTM
-SeaMonkeyAll, 				NETSCAPE_7_0_RTM
-
-## You need this if you want to be able to use SVG
-## Note that this library is under the LGPL, not the MPL
-#mozilla/other-licenses/libart_lgpl

mozilla/build/mac/build_scripts/PullMozilla.pl

@@ -1,79 +0,0 @@
-#!perl
-
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Simon Fraser <sfraser@netscape.com>
-#
-
-require 5.004;
-
-use strict;
-
-use Cwd;
-use Moz::BuildUtils;
-use Moz::BuildCore;
-
-#-------------------------------------------------------------
-# Where have the build options gone?
-# 
-# The various build flags have been centralized into one place. 
-# The master list of options is in MozBuildFlags.txt. However, 
-# you should never need to edit that file, or this one.
-# 
-# To customize what gets built, or where to start the build, 
-# edit the $prefs_file_name file in
-# System Folder:Preferences:Mozilla build prefs:
-# Documentation is provided in that file.
-#-------------------------------------------------------------
-
-my($prefs_file_name) = "Mozilla pull prefs";
-
-#-------------------------------------------------------------
-# hashes to hold build options
-#-------------------------------------------------------------
-my(%build);
-my(%options);
-my(%filepaths);
-my(%optiondefines);
-
-# Hash of input files for this build. Eventually, there will be
-# input files for manifests, and projects too.
-my(%inputfiles) = (
-  "buildflags",     "MozillaBuildFlags.txt",
-  "checkoutdata",   "MozillaCheckoutList.txt",
-  "buildprogress",  "",
-  "buildmodule",    "MozillaBuildList.pm",
-  "checkouttime",   "Mozilla last checkout"
-);
-#-------------------------------------------------------------
-# end build hashes
-#-------------------------------------------------------------
-
-# set the build root directory, which is the the dir above mozilla
-SetupBuildRootDir(":mozilla:build:mac:build_scripts");
-
-# Set up all the flags on $main::, like DEBUG, CARBON etc.
-# Override the defaults using the preferences files.
-SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:", "");
-
-my($do_checkout)    = 1;
-my($do_build)       = 0;
-
-RunBuild($do_checkout, $do_build, \%inputfiles, $prefs_file_name);

mozilla/client.mak

@@ -1,511 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=.
-
-!if !defined(MOZ_TOP)
-#enable builds from changed top level directories
-MOZ_TOP=mozilla
-!endif
-
-MOZ_SRC_FLIPPED = $(MOZ_SRC:\=/)
-MOZ_DIST_FLIPPED = $(MOZ_SRC_FLIPPED)/mozilla/dist
-!ifdef MOZ_DEBUG
-MOZ_OBJDIR = WIN32_D.OBJ
-!else
-MOZ_OBJDIR = WIN32_O.OBJ
-!endif
-
-#
-# Command macro defines
-#
-
-#//------------------------------------------------------------------------
-#// Figure out how to do the pull.
-#//------------------------------------------------------------------------
-# uncomment these, modify branch tag, and check in to branch for milestones
-MOZ_BRANCH=NETSCAPE_7_0_RTM
-NSPR_CO_TAG=NETSCAPE_7_0_RTM
-PSM_CO_TAG=NETSCAPE_7_0_RTM
-NSS_CO_TAG=NETSCAPE_7_0_RTM
-LDAPCSDK_CO_TAG=NETSCAPE_7_0_RTM
-ACCESSIBLE_CO_TAG=NETSCAPE_7_0_RTM
-IMGLIB2_CO_TAG=NETSCAPE_7_0_RTM
-GFX2_CO_TAG=NETSCAPE_7_0_RTM
-
-
-!ifdef MOZ_BRANCH
-CVS_BRANCH=-r $(MOZ_BRANCH)
-!endif
-
-!ifdef MOZ_DATE
-CVS_BRANCH=$(CVS_BRANCH) -D "$(MOZ_DATE)"
-!endif
-
-# default pull is "quiet" but it can be overridden with MOZ_CVS_VERBOSE
-!ifndef MOZ_CVS_VERBOSE
-CVS_FLAGS=-q
-!endif
-
-# honor any user-defined CVS flags
-!ifdef MOZ_CVS_FLAGS
-CVS_FLAGS=$(CVS_FLAGS) $(MOZ_CVS_FLAGS)
-!endif
-
-# let's be explicit about CVSROOT... some windows cvs clients
-# are too stupid to correctly work without the -d option 
-#
-#  if they are too stupid, they should fail.  I am
-#  commenting this out because this does not work
-#  under 4nt.  (%'s are evaluted differently)
-#
-#  If it breaks you, mail dougt@netscape.com
-#  and leaf@mozilla.org
-#
-!if 0
-!if defined(CVSROOT)
-CVS_FLAGS=$(CVS_FLAGS) -d "$(CVSROOT)"
-!endif
-!endif
-
-!ifndef MOZ_CO_FLAGS
-MOZ_CO_FLAGS = -P
-!endif
-
-CVSCO = cvs $(CVS_FLAGS) co $(MOZ_CO_FLAGS) $(CVS_BRANCH)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull NSPR.
-#// If no NSPR_CO_TAG is specified, use the default static tag
-#//------------------------------------------------------------------------
-
-!ifndef NSPR_CO_FLAGS
-NSPR_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) $(CVS_BRANCH)
-
-
-CVSCO_NSPR = cvs $(CVS_FLAGS) co $(NSPR_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull NSS and PSM libs.
-#// If no NSS_CO_TAG or PSM_CO_TAG is specified, use the default static tag
-#//------------------------------------------------------------------------
-
-!ifndef NSS_CO_FLAGS
-NSS_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-NSS_CO_FLAGS=$(NSS_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_NSS = cvs $(CVS_FLAGS) co $(NSS_CO_FLAGS)
-
-!ifndef PSM_CO_FLAGS
-PSM_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-PSM_CO_FLAGS=$(PSM_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_PSM = cvs $(CVS_FLAGS) co $(PSM_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull LDAP C SDK client libs.
-#// If no LDAPCSDK_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-
-!ifndef LDAPCSDK_CO_FLAGS
-LDAPCSDK_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-LDAPCSDK_CO_FLAGS=$(LDAPCSDK_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_LDAPCSDK = cvs $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull accessibility libs.
-#// If no ACCESSIBLE_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!ifndef ACCESSIBLE_CO_FLAGS
-ACCESSIBLE_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-ACCESSIBLE_CO_FLAGS=$(ACCESSIBLE_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_ACCESSIBLE = cvs $(CVS_FLAGS) co $(ACCESSIBLE_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull new image library.
-#// If no IMGLIB2_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!ifndef IMGLIB2_CO_FLAGS
-IMGLIB2_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-IMGLIB2_CO_FLAGS=$(IMGLIB2_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_IMGLIB2 = cvs $(CVS_FLAGS) co $(IMGLIB2_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull new image library.
-#// If no GFX2_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!ifndef GFX2_CO_FLAGS
-GFX2_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-GFX2_CO_FLAGS=$(GFX2_CO_FLAGS) $(CVS_BRANCH)
-
-CVSCO_GFX2 = cvs $(CVS_FLAGS) co $(GFX2_CO_FLAGS)
-
-#//------------------------------------------------------------------------
-#// Figure out how to pull the internal libart
-#// (only pulled and built if MOZ_INTERNAL_LIBART_LGPL is set)
-#// If no MOZ_INTERNAL_LIBART_CO_TAG is specified, use the default tag
-#//------------------------------------------------------------------------
-
-!if defined(MOZ_SVG) && !defined(MOZ_INTERNAL_LIBART_LGPL)
-ERR_MESSAGE = ^
-You are trying to build Mozilla with SVG support (MOZ_SVG=1), but you ^
-haven not specified that mozilla/other-licenses/libart_lgpl should be ^
-pulled and built. At the moment Mozilla SVG builds need this patched ^
-version of libart. You either need to disable SVG support (unset MOZ_SVG) ^
-or enable pulling and building by setting MOZ_INTERNAL_LIBART_LGPL=1.^
-^
-If you choose to pull and build libart, note that it is only licensed^
-under the terms of the LGPL, not the MPL. (Which is why you have to opt^
-in explicitly.)
-!endif
-
-!if defined(MOZ_INTERNAL_LIBART_LGPL)
-
-!ifndef MOZ_INTERNAL_LIBART_CO_FLAGS
-MOZ_INTERNAL_LIBART_CO_FLAGS=$(MOZ_CO_FLAGS)
-!endif
-
-!if "$(MOZ_INTERNAL_LIBART_CO_TAG)" != ""
-MOZ_INTERNAL_LIBART_CO_FLAGS=$(MOZ_INTERNAL_LIBART_CO_FLAGS) -r $(MOZ_INTERNAL_LIBART_CO_TAG)
-!else
-MOZ_INTERNAL_LIBART_CO_FLAGS=$(MOZ_INTERNAL_LIBART_CO_FLAGS) $(CVS_BRANCH)
-!endif
-
-CVSCO_MOZ_INTERNAL_LIBART = cvs $(CVS_FLAGS) co $(MOZ_INTERNAL_LIBART_CO_FLAGS)
-
-!endif
-
-## The master target
-############################################################
-
-pull_and_build_all: pull_all build_all_dep
-
-
-## Rules for pulling the source from the cvs repository
-############################################################
-
-pull_clobber_and_build_all: pull_all clobber_all build_all
-
-!if !defined(MOZ_INTERNAL_LIBART_LGPL)
-pull_all: pull_nspr pull_psm pull_ldapcsdk pull_accessible pull_gfx2 pull_imglib2 pull_seamonkey
-!else
-pull_all: pull_nspr pull_psm pull_ldapcsdk pull_accessible pull_gfx2 pull_imglib2 pull_moz_internal_libart pull_seamonkey
-!endif
-
-pull_nspr: pull_clientmak
-      cd $(MOZ_SRC)\.
-      $(CVSCO_NSPR) mozilla/nsprpub
-
-pull_nss:
-	cd $(MOZ_SRC)\.
-	$(CVSCO_NSS) mozilla/security/coreconf
-	$(CVSCO_NSS) mozilla/security/nss
-
-pull_psm: pull_nss
-	cd $(MOZ_SRC)\.
-	$(CVSCO_PSM) mozilla/security/manager
-	$(CVSCO_PSM) mozilla/security/makefile.win
-
-pull_ldapcsdk:
-	cd $(MOZ_SRC)\.
-	$(CVSCO_LDAPCSDK) mozilla/directory/c-sdk
-
-pull_accessible:
-	cd $(MOZ_SRC)\.
-	$(CVSCO_ACCESSIBLE) mozilla/accessible
-
-pull_gfx2:
-  cd $(MOZ_SRC)\.
-  $(CVSCO_GFX2) mozilla/gfx2
-
-pull_imglib2:
-  cd $(MOZ_SRC)\.
-  $(CVSCO_IMGLIB2) mozilla/modules/libpr0n
-
-!if defined(MOZ_INTERNAL_LIBART_LGPL)
-pull_moz_internal_libart:
-  cd $(MOZ_SRC)\.
-  $(CVSCO_MOZ_INTERNAL_LIBART) mozilla/other-licenses/libart_lgpl
-!endif
-
-pull_xpconnect: pull_nspr
-	cd $(MOZ_SRC)\.
-	$(CVSCO) mozilla/include
-	$(CVSCO) mozilla/config
-	$(CVSCO) -l mozilla/js
-	$(CVSCO) -l mozilla/js/src
-	$(CVSCO) mozilla/js/src/fdlibm
-	$(CVSCO) mozilla/js/src/xpconnect
-	$(CVSCO) mozilla/modules/libreg
-	$(CVSCO) mozilla/xpcom
-	$(CVSCO) mozilla/string
-
-# pull either layout only or seamonkey the browser
-pull_layout:
-	cd $(MOZ_SRC)\.
-	$(CVSCO) RaptorWin
-
-pull_seamonkey: pull_clientmak
-	cd $(MOZ_SRC)\.
-	$(CVSCO) SeaMonkeyAll
-
-pull_clientmak:
-    cd $(MOZ_SRC)\.
-    $(CVSCO) mozilla/client.mak
-
-############################################################
-
-# nmake has to be hardcoded, or we have to depend on mozilla/config
-# being pulled already to figure out what $(NMAKE) should be.
-
-clobber_all: clobber_nspr clobber_ldapcsdk clobber_psm clobber_seamonkey
-
-build_all: build_nspr build_ldapcsdk build_seamonkey
-
-build_all_dep: depend libs
-
-distclean: 
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\directory\c-sdk
-	gmake -f gmakefile.win distclean MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win distclean MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-	@cd $(MOZ_SRC)\$(MOZ_TOP)
-	nmake /f client.mak clobber_psm
-	nmake /f client.mak clobber_seamonkey
-
-clobber_ldapcsdk:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\directory\c-sdk
-	gmake -f gmakefile.win clobber_all MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED) \
-		SHELL=sh
-
-clobber_nspr: 
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win clobber_all MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-
-clobber_psm:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\security
-	nmake -f makefile.win clobber_all
-
-clobber_xpconnect:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	-rd /s /q dist
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win clobber_all  MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\include
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\modules\libreg
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\string
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js
-	nmake -f makefile.win clobber_all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src\xpconnect
-	nmake -f makefile.win clobber_all
-
-clobber_seamonkey:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	-rd /s /q dist
-	nmake -f makefile.win clobber_all 
-
-depend: export
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win depend 
-
-depend_xpconnect:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\include
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\modules\libreg
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\string
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src
-	nmake -f makefile.win depend
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src\xpconnect
-	nmake -f makefile.win depend
-
-build_nspr: 
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
-	gmake -f gmakefile.win MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED)
-
-build_ldapcsdk:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\directory\c-sdk
-	gmake -f gmakefile.win MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED) SHELL=sh
-
-build_psm:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\security
-	nmake -f makefile.win 
-
-build_xpconnect: build_nspr
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\include
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\modules\libreg
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win export
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\string
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom
-	nmake -f makefile.win libs
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src
-	nmake -f makefile.win all
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src\xpconnect
-	nmake -f makefile.win all
-
-build_seamonkey:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win all
-
-build_client:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win all
-
-build_layout:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win all
-
-build_dist:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win all
-
-libs:
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win libs
-
-export: build_nspr build_ldapcsdk
-	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
-	nmake -f makefile.win export
-
-clobber_dist:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win clobber_all
-
-clobber_client:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win clobber_all
-
-clobber_layout:
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake -f makefile.win clobber_all
-
-browse_info::
-	cd $(MOZ_SRC)\$(MOZ_TOP)
-	-dir /s /b *.sbr > sbrlist.tmp
-	-bscmake /Es /o mozilla.bsc @sbrlist.tmp
-	-rm sbrlist.tmp
-
-regchrome::
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake /f makefile.win regchrome
-
-deliver::
-	@cd $(MOZ_SRC)\mozilla\.
-	nmake /f makefile.win splitsymbols
-
-#//------------------------------------------------------------------------
-#// Utility stuff...
-#//------------------------------------------------------------------------
-
-#//------------------------------------------------------------------------
-# Verify that MOZ_SRC is set correctly
-#//------------------------------------------------------------------------
-
-# Check to see if it is set at all
-!if "$(MOZ_SRC)"==""
-MOZ_SRC = $(MAKEDIR)\..
-!endif
-
-#
-# create a temp file at the root and make sure it is visible from MOZ_SRC
-#
-!if [copy $(MAKEDIR)\client.mak $(MAKEDIR)\xyzzy.tmp > NUL] == 0
-!endif
-
-!if !EXIST( $(MOZ_SRC)\mozilla\xyzzy.tmp )
-ERR_MESSAGE=$(ERR_MESSAGE)^
-MOZ_SRC isn't set correctly: [$(MOZ_SRC)\mozilla]!=[$(MAKEDIR)]
-!endif
-
-!if [del $(MAKEDIR)\xyzzy.tmp]
-!endif
-
-#//------------------------------------------------------------------------
-# Verify that MOZ_BITS is set
-#//------------------------------------------------------------------------
-!if !defined(MOZ_BITS)
-ERR_MESSAGE=$(ERR_MESSAGE)^
-Environment variable MOZ_BITS isn't set.
-!endif
-
-!if !defined(MOZ_TOOLS)
-ERR_MESSAGE=$(ERR_MESSAGE)^
-Environment variable MOZ_TOOLS isn't set.
-!endif
-
-
-#//------------------------------------------------------------------------
-#// Display error 
-#//------------------------------------------------------------------------
-
-!if "$(ERR_MESSAGE)" != ""
-ERR_MESSAGE = ^
-client.mak:  ^
-$(ERR_MESSAGE) ^
-^
-client.mak: usage^
-^
-nmake -f client.mak [MOZ_BRANCH=<cvs_branch_name>] ^
-		    [MOZ_DATE=<cvs_date>]^
-		    [pull_and_build_all]^
-		    [pull_all]^
-		    [build_all]^
-^
-Environment variables:^
-^
-MOZ_BITS    set to 32^
-MOZ_TOOLS   set to the directory containing the needed tools ^
-
-!ERROR $(ERR_MESSAGE)
-
-!endif

mozilla/client.mk

@@ -1,650 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Stephen Lamm
-
-# Build the Mozilla client.
-#
-# This needs CVSROOT set to work, e.g.,
-#   setenv CVSROOT :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-# or
-#   setenv CVSROOT :pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
-# 
-# To checkout and build a tree,
-#    1. cvs co mozilla/client.mk
-#    2. cd mozilla
-#    3. gmake -f client.mk
-#
-# Other targets (gmake -f client.mk [targets...]),
-#    checkout
-#    build
-#    clean (realclean is now the same as clean)
-#    distclean
-#
-# See http://www.mozilla.org/build/unix.html for more information.
-#
-# Options:
-#   MOZ_OBJDIR           - Destination object directory
-#   MOZ_CO_DATE          - Date tag to use for checkout (default: none)
-#   MOZ_CO_MODULE        - Module to checkout (default: SeaMonkeyAll)
-#   MOZ_CVS_FLAGS        - Flags to pass cvs (default: -q -z3)
-#   MOZ_CO_FLAGS         - Flags to pass after 'cvs co' (default: -P)
-#   MOZ_MAKE_FLAGS       - Flags to pass to $(MAKE)
-#   MOZ_CO_BRANCH        - Branch tag (Deprecated. Use MOZ_CO_TAG below.)
-#
-
-#######################################################################
-# Checkout Tags
-#
-# For branches, uncomment the MOZ_CO_TAG line with the proper tag,
-# and commit this file on that tag.
-MOZ_CO_TAG = NETSCAPE_7_0_RTM
-NSPR_CO_TAG = NETSCAPE_7_0_RTM
-PSM_CO_TAG = NETSCAPE_7_0_RTM
-NSS_CO_TAG = NETSCAPE_7_0_RTM
-LDAPCSDK_CO_TAG = NETSCAPE_7_0_RTM
-ACCESSIBLE_CO_TAG = NETSCAPE_7_0_RTM
-GFX2_CO_TAG = NETSCAPE_7_0_RTM
-IMGLIB2_CO_TAG = NETSCAPE_7_0_RTM
-BUILD_MODULES = all
-
-#######################################################################
-# Defines
-#
-CVS = cvs
-
-CWD := $(shell pwd)
-
-ifeq "$(CWD)" "/"
-CWD   := /.
-endif
-
-ifneq (, $(wildcard client.mk))
-# Ran from mozilla directory
-ROOTDIR   := $(shell dirname $(CWD))
-TOPSRCDIR := $(CWD)
-else
-# Ran from mozilla/.. directory (?)
-ROOTDIR   := $(CWD)
-TOPSRCDIR := $(CWD)/mozilla
-endif
-
-# on os2, TOPSRCDIR may have two forward slashes in a row, which doesn't
-#  work;  replace first instance with one forward slash
-TOPSRCDIR := $(shell echo "$(TOPSRCDIR)" | sed -e 's%//%/%')
-
-ifndef TOPSRCDIR_MOZ
-TOPSRCDIR_MOZ=$(TOPSRCDIR)
-endif
-
-# if ROOTDIR equals only drive letter (i.e. "C:"), set to "/"
-DIRNAME := $(shell echo "$(ROOTDIR)" | sed -e 's/^.://')
-ifeq ($(DIRNAME),)
-ROOTDIR := /.
-endif
-
-AUTOCONF := autoconf
-MKDIR := mkdir
-SH := /bin/sh
-ifndef MAKE
-MAKE := gmake
-endif
-
-CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess)
-ifdef CONFIG_GUESS_SCRIPT
-  CONFIG_GUESS = $(shell $(CONFIG_GUESS_SCRIPT))
-else
-  _IS_FIRST_CHECKOUT := 1
-endif
-
-####################################
-# CVS
-
-# Add the CVS root to CVS_FLAGS if needed
-CVS_ROOT_IN_TREE := $(shell cat $(TOPSRCDIR)/CVS/Root 2>/dev/null)
-ifneq ($(CVS_ROOT_IN_TREE),)
-ifneq ($(CVS_ROOT_IN_TREE),$(CVSROOT))
-  CVS_FLAGS := -d $(CVS_ROOT_IN_TREE)
-endif
-endif
-
-CVSCO = $(strip $(CVS) $(CVS_FLAGS) co $(CVS_CO_FLAGS))
-CVSCO_LOGFILE := $(ROOTDIR)/cvsco.log
-CVSCO_LOGFILE := $(shell echo $(CVSCO_LOGFILE) | sed s%//%/%)
-
-ifdef MOZ_CO_TAG
-  CVS_CO_FLAGS := -r $(MOZ_CO_TAG)
-endif
-
-####################################
-# Load mozconfig Options
-
-# See build pages, http://www.mozilla.org/build/unix.html, 
-# for how to set up mozconfig.
-MOZCONFIG_LOADER := mozilla/build/autoconf/mozconfig2client-mk
-MOZCONFIG_FINDER := mozilla/build/autoconf/mozconfig-find 
-MOZCONFIG_MODULES := mozilla/build/unix/modules.mk
-run_for_side_effects := \
-  $(shell cd $(ROOTDIR); \
-     if test "$(_IS_FIRST_CHECKOUT)"; then \
-        $(CVSCO) $(MOZCONFIG_FINDER) $(MOZCONFIG_LOADER) $(MOZCONFIG_MODULES); \
-     else true; \
-     fi; \
-     $(MOZCONFIG_LOADER) $(TOPSRCDIR) mozilla/.mozconfig.mk > mozilla/.mozconfig.out)
-include $(TOPSRCDIR)/.mozconfig.mk
-include $(TOPSRCDIR)/build/unix/modules.mk
-
-####################################
-# Options that may come from mozconfig
-
-# Change CVS flags if anonymous root is requested
-ifdef MOZ_CO_USE_MIRROR
-  CVS_FLAGS := -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-endif
-
-# MOZ_CVS_FLAGS - Basic CVS flags
-ifeq "$(origin MOZ_CVS_FLAGS)" "undefined"
-  CVS_FLAGS := $(CVS_FLAGS) -q -z 3 
-else
-  CVS_FLAGS := $(MOZ_CVS_FLAGS)
-endif
-
-# This option is deprecated. The best way to have client.mk pull a tag
-# is to set MOZ_CO_TAG (see above) and commit that change on the tag.
-ifdef MOZ_CO_BRANCH
-  $(warning Use MOZ_CO_TAG instead of MOZ_CO_BRANCH)
-  CVS_CO_FLAGS := -r $(MOZ_CO_BRANCH)
-endif
-
-# MOZ_CO_FLAGS - Anything that we should use on all checkouts
-ifeq "$(origin MOZ_CO_FLAGS)" "undefined"
-  CVS_CO_FLAGS := $(CVS_CO_FLAGS) -P
-else
-  CVS_CO_FLAGS := $(CVS_CO_FLAGS) $(MOZ_CO_FLAGS)
-endif
-
-ifdef MOZ_CO_DATE
-  CVS_CO_DATE_FLAGS := -D "$(MOZ_CO_DATE)"
-endif
-
-ifdef MOZ_OBJDIR
-  OBJDIR := $(MOZ_OBJDIR)
-  MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
-else
-  OBJDIR := $(TOPSRCDIR)
-  MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS)
-endif
-
-####################################
-# CVS defines for PSM
-#
-PSM_CO_MODULE= mozilla/security/manager
-PSM_CO_FLAGS := -P -A
-ifdef MOZ_CO_FLAGS
-  PSM_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef PSM_CO_TAG
-  PSM_CO_FLAGS := $(PSM_CO_FLAGS) -r $(PSM_CO_TAG)
-endif
-CVSCO_PSM = $(CVS) $(CVS_FLAGS) co $(PSM_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(PSM_CO_MODULE)
-
-####################################
-# CVS defines for NSS
-#
-NSS_CO_MODULE = mozilla/security/nss \
-		mozilla/security/coreconf \
-		$(NULL)
-
-NSS_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  NSS_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef NSS_CO_TAG
-   NSS_CO_FLAGS := $(NSS_CO_FLAGS) -r $(NSS_CO_TAG)
-endif
-# Cannot pull static tags by date
-ifeq ($(NSS_CO_TAG),NSS_CLIENT_TAG)
-CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(NSS_CO_MODULE)
-else
-CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSS_CO_MODULE)
-endif
-
-####################################
-# CVS defines for NSPR
-#
-NSPR_CO_MODULE = mozilla/nsprpub
-NSPR_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  NSPR_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef NSPR_CO_TAG
-  NSPR_CO_FLAGS := $(NSPR_CO_FLAGS) -r $(NSPR_CO_TAG)
-endif
-# Cannot pull static tags by date
-ifeq ($(NSPR_CO_TAG),NSPRPUB_CLIENT_TAG)
-CVSCO_NSPR = $(CVS) $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(NSPR_CO_MODULE)
-else
-CVSCO_NSPR = $(CVS) $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSPR_CO_MODULE)
-endif
-
-####################################
-# CVS defines for the C LDAP SDK
-#
-LDAPCSDK_CO_MODULE = mozilla/directory/c-sdk
-LDAPCSDK_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  LDAPCSDK_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef LDAPCSDK_CO_TAG
-  LDAPCSDK_CO_FLAGS := $(LDAPCSDK_CO_FLAGS) -r $(LDAPCSDK_CO_TAG)
-endif
-CVSCO_LDAPCSDK = $(CVS) $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(LDAPCSDK_CO_MODULE)
-
-####################################
-# CVS defines for the C LDAP SDK
-#
-ACCESSIBLE_CO_MODULE = mozilla/accessible
-ACCESSIBLE_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  ACCESSIBLE_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef ACCESSIBLE_CO_TAG
-  ACCESSIBLE_CO_FLAGS := $(ACCESSIBLE_CO_FLAGS) -r $(ACCESSIBLE_CO_TAG)
-endif
-CVSCO_ACCESSIBLE = $(CVS) $(CVS_FLAGS) co $(ACCESSIBLE_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(ACCESSIBLE_CO_MODULE)
-
-####################################
-# CVS defines for gfx2
-#
-GFX2_CO_MODULE = mozilla/gfx2
-GFX2_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  GFX2_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef GFX2_CO_TAG
-  GFX2_CO_FLAGS := $(GFX2_CO_FLAGS) -r $(GFX2_CO_TAG)
-endif
-CVSCO_GFX2 = $(CVS) $(CVS_FLAGS) co $(GFX2_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(GFX2_CO_MODULE)
-
-####################################
-# CVS defines for new image library
-#
-IMGLIB2_CO_MODULE = mozilla/modules/libpr0n
-IMGLIB2_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  IMGLIB2_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-ifdef IMGLIB2_CO_TAG
-  IMGLIB2_CO_FLAGS := $(IMGLIB2_CO_FLAGS) -r $(IMGLIB2_CO_TAG)
-endif
-CVSCO_IMGLIB2 = $(CVS) $(CVS_FLAGS) co $(IMGLIB2_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(IMGLIB2_CO_MODULE)
-
-####################################
-# CVS defines for standalone modules
-#
-ifneq ($(BUILD_MODULES),all)
-  MOZ_CO_MODULE := $(filter-out $(NSPRPUB_DIR) security directory/c-sdk, $(BUILD_MODULE_CVS))
-  MOZ_CO_MODULE += allmakefiles.sh client.mk aclocal.m4 configure configure.in
-  MOZ_CO_MODULE += Makefile.in
-  MOZ_CO_MODULE := $(addprefix mozilla/, $(MOZ_CO_MODULE))
-
-  NOSUBDIRS_MODULE := $(addprefix mozilla/, $(BUILD_MODULE_CVS_NS))
-ifneq ($(NOSUBDIRS_MODULE),)
-  CVSCO_NOSUBDIRS := $(CVSCO) -l $(CVS_CO_DATE_FLAGS) $(NOSUBDIRS_MODULE)
-endif
-
-ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_CVS)))
-  CVSCO_NSPR :=
-endif
-ifeq (,$(filter security security/manager, $(BUILD_MODULE_CVS)))
-  CVSCO_PSM :=
-  CVSCO_NSS :=
-endif
-ifeq (,$(filter directory/c-sdk, $(BUILD_MODULE_CVS)))
-  CVSCO_LDAPCSDK :=
-endif
-ifeq (,$(filter accessible, $(BUILD_MODULE_CVS)))
-  CVSCO_ACCESSIBLE :=
-endif
-ifeq (,$(filter gfx2, $(BUILD_MODULE_CVS)))
-  CVSCO_GFX2 :=
-endif
-ifeq (,$(filter modules/libpr0n, $(BUILD_MODULE_CVS)))
-  CVSCO_IMGLIB2 :=
-endif
-endif
-
-####################################
-# CVS defines for SeaMonkey
-#
-ifeq ($(MOZ_CO_MODULE),)
-  MOZ_CO_MODULE := SeaMonkeyAll
-endif
-CVSCO_SEAMONKEY := $(CVSCO) $(CVS_CO_DATE_FLAGS) $(MOZ_CO_MODULE)
-
-####################################
-# CVS defined for libart (pulled and built if MOZ_INTERNAL_LIBART_LGPL is set)
-#
-CVSCO_LIBART := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/other-licenses/libart_lgpl
-
-ifdef MOZ_INTERNAL_LIBART_LGPL
-FASTUPDATE_LIBART := fast_update $(CVSCO_LIBART)
-CHECKOUT_LIBART := cvs_co $(CVSCO_LIBART)
-else
-CHECKOUT_LIBART := true
-FASTUPDATE_LIBART := true
-endif
-
-####################################
-# CVS defines for Calendar (pulled and built if MOZ_CALENDAR is set)
-#
-CVSCO_CALENDAR := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/calendar
-
-ifdef MOZ_CALENDAR
-FASTUPDATE_CALENDAR := fast_update $(CVSCO_CALENDAR)
-CHECKOUT_CALENDAR := cvs_co $(CVSCO_CALENDAR)
-else
-CHECKOUT_CALENDAR := true
-FASTUPDATE_CALENDAR := true
-endif
-
-
-# because some cygwin tools can't handle native dos-drive paths & vice-versa
-# force configure to use a relative path for --srcdir
-# need a better check for win32
-# and we need to get OBJDIR earlier
-ifdef MOZ_TOOLS
-_tmpobjdir := $(shell cygpath -u $(OBJDIR))
-_abs2rel := $(shell cygpath -w $(TOPSRCDIR)/build/unix/abs2rel.pl | sed -e 's|\\|/|g')
-_OBJ2SRCPATH := $(shell $(_abs2rel) $(TOPSRCDIR) $(_tmpobjdir))
-endif 
-
-#######################################################################
-# Rules
-# 
-
-# Print out any options loaded from mozconfig.
-all build checkout clean depend distclean export libs install realclean::
-	@if test -f .mozconfig.out; then \
-	  cat .mozconfig.out; \
-	  rm -f .mozconfig.out; \
-	else true; \
-	fi
-
-ifdef _IS_FIRST_CHECKOUT
-all:: checkout build
-else
-all:: checkout alldep
-endif
-
-# Windows equivalents
-pull_all: checkout
-build_all: build
-build_all_dep: alldep
-build_all_depend: alldep
-clobber clobber_all: clean
-pull_and_build_all: checkout alldep
-
-# Do everything from scratch
-everything: checkout clean build
-
-####################################
-# CVS checkout
-#
-checkout::
-#	@: Backup the last checkout log.
-	@if test -f $(CVSCO_LOGFILE) ; then \
-	  mv $(CVSCO_LOGFILE) $(CVSCO_LOGFILE).old; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo "Removing local configures" ; \
-	cd $(ROOTDIR) && \
-	$(RM) -f mozilla/configure mozilla/nsprpub/configure \
-		mozilla/directory/c-sdk/configure
-endif
-	@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
-	@echo '$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk'; \
-        cd $(ROOTDIR) && \
-	$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk
-	@cd $(ROOTDIR) && $(MAKE) -f mozilla/client.mk real_checkout
-
-real_checkout:
-#	@: Start the checkout. Split the output to the tty and a log file. \
-#	 : If it fails, touch an error file because "tee" hides the error.
-	@failed=.cvs-failed.tmp; rm -f $$failed*; \
-	cvs_co() { echo "$$@" ; \
-	  ("$$@" || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
-	  if test -f $$failed; then false; else true; fi; }; \
-	cvs_co $(CVSCO_NSPR) && \
-	cvs_co $(CVSCO_NSS) && \
-	cvs_co $(CVSCO_PSM) && \
-        cvs_co $(CVSCO_LDAPCSDK) && \
-        cvs_co $(CVSCO_ACCESSIBLE) && \
-        cvs_co $(CVSCO_GFX2) && \
-        cvs_co $(CVSCO_IMGLIB2) && \
-	$(CHECKOUT_CALENDAR) && \
-	$(CHECKOUT_LIBART) && \
-	cvs_co $(CVSCO_SEAMONKEY) && \
-	cvs_co $(CVSCO_NOSUBDIRS)
-	@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
-#	@: Check the log for conflicts. ;
-	@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
-	if test "$$conflicts" ; then \
-	  echo "$(MAKE): *** Conflicts during checkout." ;\
-	  echo "$$conflicts" ;\
-	  echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
-	  false; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo Generating configures using $(AUTOCONF) ; \
-	cd $(TOPSRCDIR) && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/nsprpub && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/directory/c-sdk && $(AUTOCONF)
-endif
-
-fast-update:
-#	@: Backup the last checkout log.
-	@if test -f $(CVSCO_LOGFILE) ; then \
-	  mv $(CVSCO_LOGFILE) $(CVSCO_LOGFILE).old; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo "Removing local configures" ; \
-	cd $(ROOTDIR) && \
-	$(RM) -f mozilla/configure mozilla/nsprpub/configure \
-		mozilla/directory/c-sdk/configure
-endif
-	@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
-	@echo '$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk'; \
-        cd $(ROOTDIR) && \
-	$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk
-	@cd $(TOPSRCDIR) && \
-	$(MAKE) -f client.mk real_fast-update
-
-real_fast-update:
-#	@: Start the update. Split the output to the tty and a log file. \
-#	 : If it fails, touch an error file because "tee" hides the error.
-	@failed=.fast_update-failed.tmp; rm -f $$failed*; \
-	fast_update() { (config/cvsco-fast-update.pl $$@ || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
-	  if test -f $$failed; then false; else true; fi; }; \
-	cvs_co() { echo "$$@" ; \
-	  ("$$@" || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
-	  if test -f $$failed; then false; else true; fi; }; \
-	fast_update $(CVSCO_NSPR) && \
-	cd $(ROOTDIR) && \
-	failed=mozilla/.fast_update-failed.tmp && \
-	cvs_co $(CVSCO_NSS) && \
-	failed=.fast_update-failed.tmp && \
-	cd mozilla && \
-	fast_update $(CVSCO_PSM) && \
-	fast_update $(CVSCO_LDAPCSDK) && \
-	fast_update $(CVSCO_ACCESSIBLE) && \
-	fast_update $(CVSCO_GFX2) && \
-	fast_update $(CVSCO_IMGLIB2) && \
-	$(FASTUPDATE_CALENDAR) && \
-	$(FASTUPDATE_LIBART) && \
-	fast_update $(CVSCO_SEAMONKEY) && \
-	fast_update $(CVSCO_NOSUBDIRS)
-	@echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE)
-#	@: Check the log for conflicts. ;
-	@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
-	if test "$$conflicts" ; then \
-	  echo "$(MAKE): *** Conflicts during fast-update." ;\
-	  echo "$$conflicts" ;\
-	  echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
-	  false; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo Generating configures using $(AUTOCONF) ; \
-	cd $(TOPSRCDIR) && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/nsprpub && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/directory/c-sdk && $(AUTOCONF)
-endif
-
-####################################
-# Web configure
-
-WEBCONFIG_FILE  := $(HOME)/.mozconfig
-
-MOZCONFIG2CONFIGURATOR := build/autoconf/mozconfig2configurator
-webconfig:
-	@cd $(TOPSRCDIR); \
-	url=`$(MOZCONFIG2CONFIGURATOR) $(TOPSRCDIR)`; \
-	echo Running mozilla with the following url: ;\
-	echo ;\
-	echo $$url ;\
-	mozilla -remote "openURL($$url)" || \
-	netscape -remote "openURL($$url)" || \
-	mozilla $$url || \
-	netscape $$url ;\
-	echo ;\
-	echo   1. Fill out the form on the browser. ;\
-	echo   2. Save the results to $(WEBCONFIG_FILE)
-
-#####################################################
-# First Checkout
-
-ifdef _IS_FIRST_CHECKOUT
-# First time, do build target in a new process to pick up new files.
-build::
-	$(MAKE) -f $(TOPSRCDIR)/client.mk build
-else
-
-#####################################################
-# After First Checkout
-
-
-####################################
-# Configure
-
-CONFIG_STATUS := $(wildcard $(OBJDIR)/config.status)
-CONFIG_CACHE  := $(wildcard $(OBJDIR)/config.cache)
-
-ifdef RUN_AUTOCONF_LOCALLY
-EXTRA_CONFIG_DEPS := \
-	$(TOPSRCDIR)/aclocal.m4 \
-	$(wildcard $(TOPSRCDIR)/build/autoconf/*.m4) \
-	$(NULL)
-
-$(TOPSRCDIR)/configure: $(TOPSRCDIR)/configure.in $(EXTRA_CONFIG_DEPS)
-	@echo Generating $@ using autoconf
-	cd $(TOPSRCDIR); $(AUTOCONF)
-endif
-
-CONFIG_STATUS_DEPS_L10N := $(wildcard $(TOPSRCDIR)/l10n/makefiles.all)
-
-CONFIG_STATUS_DEPS := \
-	$(TOPSRCDIR)/configure \
-	$(TOPSRCDIR)/allmakefiles.sh \
-	$(TOPSRCDIR)/.mozconfig.mk \
-	$(wildcard $(TOPSRCDIR)/nsprpub/configure) \
-	$(wildcard $(TOPSRCDIR)/directory/c-sdk/configure) \
-	$(wildcard $(TOPSRCDIR)/mailnews/makefiles) \
-	$(CONFIG_STATUS_DEPS_L10N) \
-	$(wildcard $(TOPSRCDIR)/themes/makefiles) \
-	$(NULL)
-
-# configure uses the program name to determine @srcdir@. Calling it without
-#   $(TOPSRCDIR) will set @srcdir@ to "."; otherwise, it is set to the full
-#   path of $(TOPSRCDIR).
-ifeq ($(TOPSRCDIR),$(OBJDIR))
-  CONFIGURE := ./configure
-else
-  CONFIGURE := $(TOPSRCDIR)/configure
-endif
-
-ifdef _OBJ2SRCPATH
-CONFIGURE_ARGS := --srcdir=$(_OBJ2SRCPATH) $(CONFIGURE_ARGS)
-endif
-
-$(OBJDIR)/Makefile $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS)
-	@if test ! -d $(OBJDIR); then $(MKDIR) $(OBJDIR); else true; fi
-	@echo cd $(OBJDIR);
-	@echo $(CONFIGURE) $(CONFIGURE_ARGS)
-	@cd $(OBJDIR) && $(CONFIGURE_ENV_ARGS) $(CONFIGURE) $(CONFIGURE_ARGS) \
-	  || ( echo "*** Fix above errors and then restart with\
-               \"$(MAKE) -f client.mk build\"" && exit 1 )
-	@touch $(OBJDIR)/Makefile
-
-ifdef CONFIG_STATUS
-$(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in
-	cd $(OBJDIR); \
-	  CONFIG_FILES=config/autoconf.mk ./config.status
-endif
-
-
-####################################
-# Depend
-
-depend:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE) export && $(MOZ_MAKE) depend
-
-####################################
-# Build it
-
-build::  $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE)
-
-####################################
-# Other targets
-
-# Pass these target onto the real build system
-install export libs clean realclean distclean alldep:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE) $@
-
-cleansrcdir:
-	@cd $(TOPSRCDIR); \
-        if [ -f webshell/embed/gtk/Makefile ]; then \
-          $(MAKE) -C webshell/embed/gtk distclean; \
-        fi; \
-	if [ -f Makefile ]; then \
-	  $(MAKE) distclean ; \
-	else \
-	  echo "Removing object files from srcdir..."; \
-	  rm -fr `find . -type d \( -name .deps -print -o -name CVS \
-	          -o -exec test ! -d {}/CVS \; \) -prune \
-	          -o \( -name '*.[ao]' -o -name '*.so' \) -type f -print`; \
-	   build/autoconf/clean-config.sh; \
-	fi;
-
-# (! IS_FIRST_CHECKOUT)
-endif
-
-.PHONY: checkout real_checkout depend build export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything

mozilla/security/makefile.win

@@ -0,0 +1,29 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..
+include <$(DEPTH)/config/config.mak>
+
+DIRS = nss \
+	manager \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/Makefile.in

@@ -0,0 +1,109 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#  Brian Ryner <bryner@netscape.com>
+# 
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
+LOADABLE_ROOT_MODULE = nssckbi$(DLL_SUFFIX)
+NSS3_LIB = nss3$(DLL_SUFFIX)
+SMIME3_LIB = smime3$(DLL_SUFFIX)
+SSL3_LIB =  ssl3$(DLL_SUFFIX)
+SOFTOKEN3_LIB = softokn3$(DLL_SUFFIX)
+else
+LOADABLE_ROOT_MODULE = libnssckbi$(DLL_SUFFIX)
+NSS3_LIB = libnss3$(DLL_SUFFIX)
+SMIME3_LIB = libsmime3$(DLL_SUFFIX)
+SSL3_LIB =  libssl3$(DLL_SUFFIX)
+SOFTOKEN3_LIB = libsoftokn3$(DLL_SUFFIX)
+endif
+FREEBL_PURE32_MODULE = libfreebl_pure32_3$(DLL_SUFFIX)
+FREEBL_HYBRID_MODULE = libfreebl_hybrid_3$(DLL_SUFFIX)
+
+# NSS makefiles are not safe for parallel execution.
+DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
+DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
+DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
+DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
+DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
+DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
+ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
+ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
+DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT)
+endif
+ifndef MOZ_DEBUG
+DEFAULT_GMAKE_FLAGS += BUILD_OPT=1
+endif
+ifdef GNU_CC
+DEFAULT_GMAKE_FLAGS += NS_USE_GCC=1 NS_USE_NATIVE=
+else
+DEFAULT_GMAKE_FLAGS += NS_USE_GCC= NS_USE_NATIVE=1
+endif
+ifdef USE_N32
+# It is not really necessary to specify USE_PTHREADS=1.  USE_PTHREADS
+# merely adds _PTH to coreconf's OBJDIR name.
+DEFAULT_GMAKE_FLAGS += USE_N32=1 USE_PTHREADS=1
+endif
+ifdef HAVE_64BIT_OS
+DEFAULT_GMAKE_FLAGS += USE_64=1
+endif
+
+SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile
+
+include $(topsrcdir)/config/rules.mk
+
+depend dependclean export::
+	$(MAKE) -C boot $@
+	$(MAKE) -C ssl $@
+	$(MAKE) -C pki $@
+
+libs::
+	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+	cd $(DIST)/lib; cp -f libmozdbm_s.$(LIB_SUFFIX) libdbm.$(LIB_SUFFIX)
+	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
+	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
+	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
+	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
+ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
+ifneq ($(OS_TEST),i86pc)
+ifndef HAVE_64BIT_OS
+	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
+	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
+endif
+endif
+endif
+	$(MAKE) -C boot $@
+	$(MAKE) -C ssl $@
+	$(MAKE) -C pki $@
+
+clean clobber clobber_all realclean distclean::
+	$(MAKE) -C boot $@
+	$(MAKE) -C ssl $@
+	$(MAKE) -C pki $@
+	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean

mozilla/security/manager/boot/Makefile.in

@@ -0,0 +1,45 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Kai Engert <kaie@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+DIRS		= public src
+
+include $(topsrcdir)/config/rules.mk

mozilla/security/manager/boot/makefile.win

@@ -0,0 +1,44 @@
+#!nmake
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Kai Engert <kaie@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH=..\..\..
+include <$(DEPTH)/config/config.mak>
+
+DIRS = public src
+
+include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/boot/public/Makefile.in

@@ -0,0 +1,53 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Kai Engert <kaie@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+MODULE = pipboot
+
+DEPTH           = ../../../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+XPIDLSRCS = \
+    nsISSLStatusProvider.idl \
+    nsISecurityWarningDialogs.idl \
+    nsIBufEntropyCollector.idl \
+    $(NULL)
+
+include $(topsrcdir)/config/rules.mk

mozilla/security/manager/boot/public/makefile.win

@@ -0,0 +1,55 @@
+#!nmake
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Kai Engert <kaie@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+MODULE = pipboot
+
+DEPTH=..\..\..\..
+IGNORE_MANIFEST=1
+
+include <$(DEPTH)/config/config.mak>
+
+XPIDL_INCLUDES=-I$(DEPTH)\dist\idl
+
+XPIDLSRCS= \
+    .\nsISSLStatusProvider.idl \
+    .\nsISecurityWarningDialogs.idl \
+    .\nsIBufEntropyCollector.idl \
+    $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/boot/public/nsIBufEntropyCollector.idl

@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   L. David Baron <dbaron@fas.harvard.edu> (original author)
+ *   Kai Engert <kaie@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+#include "nsIEntropyCollector.idl"
+
+[uuid(485b87a8-5dd7-4b8d-8ea8-dee53201f899)]
+interface nsIBufEntropyCollector : nsIEntropyCollector
+{
+  /**
+   * Forward the entropy collected so far to |collector| and then
+   * continue forwarding new entropy as it arrives.
+   */
+  void forwardTo(in nsIEntropyCollector collector);
+
+  /**
+   * No longer forward to a (possibly) previously remembered collector.
+   * Do buffering again.
+   */
+  void dontForward();
+};

mozilla/security/manager/boot/public/nsISSLStatusProvider.idl

@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Terry Hayes <thayes@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(8de811f0-1dd2-11b2-8bf1-e9aa324984b2)]
+interface nsISSLStatusProvider : nsISupports {
+  readonly attribute nsISupports SSLStatus;
+};

mozilla/security/manager/boot/public/nsISecurityWarningDialogs.idl

@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Terry Hayes <thayes@netscape.com>
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+interface nsIInterfaceRequestor;
+
+/**
+ * nsISecurityWarningDialogs - functions that
+ *   display warnings for transitions between secure
+ *   and insecure pages, posts to insecure servers etc.
+ */
+[scriptable, uuid(1c399d06-1dd2-11b2-bc58-c87cbcacdb78)]
+interface nsISecurityWarningDialogs : nsISupports
+{
+  /**
+   * alertEnteringSecure
+   */
+  void alertEnteringSecure(in nsIInterfaceRequestor ctx);
+
+  /**
+   * alertEnteringWeak
+   */
+  void alertEnteringWeak(in nsIInterfaceRequestor ctx);
+
+  /**
+   * alertLeavingSecure
+   */
+  void alertLeavingSecure(in nsIInterfaceRequestor ctx);
+
+  /**
+   * alertMixedMode
+   */
+  void alertMixedMode(in nsIInterfaceRequestor ctx);
+
+  /**
+   * confirmPostToInsecure
+   */
+  boolean confirmPostToInsecure(in nsIInterfaceRequestor ctx);
+
+  /**
+   * confirmPostToInsecureFromSecure
+   */
+  boolean confirmPostToInsecureFromSecure(in nsIInterfaceRequestor ctx);
+};
+

mozilla/security/manager/boot/src/Makefile.in

@@ -0,0 +1,99 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#     Javier Delgadillo <javi@netscape.com>
+#     Terry Hayes <thayes@netscape.com>
+#     Kai Engert <kaie@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= pipboot
+LIBRARY_NAME	= pipboot
+IS_COMPONENT	= 1
+MODULE_NAME	= BOOT
+EXPORT_LIBRARY	= 1
+META_COMPONENT	= crypto
+
+EXPORTS =  \
+	$(NULL)
+
+CPPSRCS = \
+	nsEntropyCollector.cpp \
+	nsSecureBrowserUIImpl.cpp \
+	nsBOOTModule.cpp \
+	$(NULL)
+
+REQUIRES	= nspr \
+		  xpcom \
+		  string \
+		  necko \
+		  uriloader \
+		  pref \
+		  caps \
+		  dom \
+		  intl \
+		  locale \
+		  profile \
+		  windowwatcher \
+		  js \
+		  docshell \
+		  widget \
+		  layout \
+		  content \
+		  pippki \
+		  xpconnect \
+		  jar \
+		  unicharutil \
+                  pipnss \
+		  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= \
+		-I$(DIST)/public/security \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS += \
+		$(MOZ_COMPONENT_LIBS) \
+		$(MOZ_JS_LIBS) \
+		$(NULL)
+
+EXTRA_LIBS	+= \
+        $(NULL)

mozilla/security/manager/boot/src/makefile.win

@@ -0,0 +1,86 @@
+#!nmake
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#     Terry Hayes <thayes@netscape.com>
+#     Kai Engert <kaie@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+MODULE = pipboot
+
+DEPTH=..\..\..\..
+IGNORE_MANIFEST=1
+
+LIBRARY_NAME   = pipboot
+PDBFILE        = $(LIBRARY_NAME).pdb
+MAPFILE        = $(LIBRARY_NAME).map
+MODULE_NAME = BOOT
+META_COMPONENT = crypto
+
+REQUIRES = \
+	xpcom \
+	string \
+	dom \
+	pref \
+	intl \
+	locale \
+	windowwatcher \
+	necko \
+	pipnss \
+	layout \
+	layout_xul \
+        uriloader \
+        docshell \
+        widget \
+        content \
+	$(NULL)
+
+include <$(DEPTH)/config/config.mak>
+
+LLIBS   = \
+    $(DIST)/lib/js3250.lib \
+    $(LIBNSPR) \
+    $(DIST)\lib\xpcom.lib \
+    $(NULL)
+
+EXPORTS = \
+    $(NULL)
+
+OBJS = \
+    .\$(OBJDIR)\nsEntropyCollector.obj \
+    .\$(OBJDIR)\nsSecureBrowserUIImpl.obj \
+    .\$(OBJDIR)\nsBOOTModule.obj \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/boot/src/nsBOOTModule.cpp

@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Terry Hayes <thayes@netscape.com>
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsIModule.h"
+#include "nsIGenericFactory.h"
+
+#include "nsEntropyCollector.h"
+#include "nsSecureBrowserUIImpl.h"
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsEntropyCollector)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsSecureBrowserUIImpl)
+
+static nsModuleComponentInfo components[] =
+{
+  {
+    "Entropy Collector",
+    NS_ENTROPYCOLLECTOR_CID,
+    NS_ENTROPYCOLLECTOR_CONTRACTID,
+    nsEntropyCollectorConstructor
+  },
+
+  {
+    NS_SECURE_BROWSER_UI_CLASSNAME,
+    NS_SECURE_BROWSER_UI_CID,
+    NS_SECURE_BROWSER_UI_CONTRACTID,
+    nsSecureBrowserUIImplConstructor
+  }
+};
+
+NS_IMPL_NSGETMODULE(BOOT, components)

mozilla/security/manager/boot/src/nsEntropyCollector.cpp

@@ -0,0 +1,131 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   L. David Baron <dbaron@fas.harvard.edu> (original author)
+ *   Kai Engert <kaie@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "prlog.h"
+#include "nsEntropyCollector.h"
+#include "nsMemory.h"
+
+nsEntropyCollector::nsEntropyCollector()
+:mBytesCollected(0), mWritePointer(mEntropyCache)
+{
+  NS_INIT_ISUPPORTS();
+}
+
+nsEntropyCollector::~nsEntropyCollector()
+{
+}
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsEntropyCollector,
+                              nsIEntropyCollector,
+                              nsIBufEntropyCollector)
+
+NS_IMETHODIMP
+nsEntropyCollector::RandomUpdate(void *new_entropy, PRInt32 bufLen)
+{
+  if (bufLen > 0) {
+    if (mForwardTarget) {
+      return mForwardTarget->RandomUpdate(new_entropy, bufLen);
+    }
+    else {
+      const unsigned char *InputPointer = (const unsigned char *)new_entropy;
+      const unsigned char *PastEndPointer = mEntropyCache + entropy_buffer_size;
+
+      // if the input is large, we only take as much as we can store
+      PRInt32 bytes_wanted = PR_MIN(bufLen, entropy_buffer_size);
+
+      // remember the number of bytes we will have after storing new_entropy
+      mBytesCollected = PR_MIN(entropy_buffer_size, mBytesCollected + bytes_wanted);
+
+      // as the above statements limit bytes_wanted to the entropy_buffer_size,
+      // this loop will iterate at most twice.
+      while (bytes_wanted > 0) {
+
+        // how many bytes to end of cyclic buffer?
+        const PRInt32 space_to_end = PastEndPointer - mWritePointer;
+
+        // how many bytes can we copy, not reaching the end of the buffer?
+        const PRInt32 this_time = PR_MIN(space_to_end, bytes_wanted);
+
+        // copy at most to the end of the cyclic buffer
+        for (PRInt32 i = 0; i < this_time; ++i) {
+
+          // accept the fact that we use our buffer's random uninitialized content
+          unsigned int old = *mWritePointer;
+
+          // combine new and old value already stored in buffer
+          // this logic comes from PSM 1
+          *mWritePointer++ = ((old << 1) | (old >> 7)) ^ *InputPointer++;
+        }
+
+        PR_ASSERT(mWritePointer <= PastEndPointer);
+        PR_ASSERT(mWritePointer >= mEntropyCache);
+
+        // have we arrived at the end of the buffer?
+        if (PastEndPointer == mWritePointer) {
+          // reset write pointer back to begining of our buffer
+          mWritePointer = mEntropyCache;
+        }
+
+        // subtract the number of bytes we have already copied
+        bytes_wanted -= this_time;
+      }
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsEntropyCollector::ForwardTo(nsIEntropyCollector *aCollector)
+{
+  NS_PRECONDITION(!mForwardTarget, "|ForwardTo| should only be called once.");
+
+  mForwardTarget = aCollector;
+  mForwardTarget->RandomUpdate(mEntropyCache, mBytesCollected);
+  mBytesCollected = 0;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsEntropyCollector::DontForward()
+{
+  mForwardTarget = nsnull;
+  return NS_OK;
+}

mozilla/security/manager/boot/src/nsEntropyCollector.h

@@ -0,0 +1,70 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   L. David Baron <dbaron@fas.harvard.edu> (original author)
+ *   Kai Engert <kaie@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef nsEntropyCollector_h___
+#define nsEntropyCollector_h___
+
+#include "nsIEntropyCollector.h"
+#include "nsIBufEntropyCollector.h"
+#include "nsCOMPtr.h"
+
+#define NS_ENTROPYCOLLECTOR_CID \
+ { /* 34587f4a-be18-43c0-9112-b782b08c0add */       \
+  0x34587f4a, 0xbe18, 0x43c0,                       \
+ {0x91, 0x12, 0xb7, 0x82, 0xb0, 0x8c, 0x0a, 0xdd} }
+
+class nsEntropyCollector : public nsIBufEntropyCollector
+{
+  public:
+    nsEntropyCollector();
+    virtual ~nsEntropyCollector();
+
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIENTROPYCOLLECTOR
+    NS_DECL_NSIBUFENTROPYCOLLECTOR
+
+    enum { entropy_buffer_size = 1024 };
+
+  protected:
+    unsigned char mEntropyCache[entropy_buffer_size];
+    PRInt32 mBytesCollected;
+    unsigned char *mWritePointer;
+    nsCOMPtr<nsIEntropyCollector> mForwardTarget;
+};
+
+#endif /* !defined nsEntropyCollector_h__ */

mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp

@@ -0,0 +1,834 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998-2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ *   Stuart Parmenter <pavlov@netscape.com>
+ *   Brian Ryner <bryner@netscape.com>
+ *   Terry Hayes <thayes@netscape.com>
+ *   Kai Engert <kaie@netscape.com>
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+
+#include "nspr.h"
+#include "prlog.h"
+#include "prmem.h"
+
+#include "nsISecureBrowserUI.h"
+#include "nsSecureBrowserUIImpl.h"
+#include "nsCOMPtr.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
+#include "nsIServiceManager.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIObserverService.h"
+#include "nsIDocumentLoader.h"
+#include "nsCURILoader.h"
+#include "nsIDocShell.h"
+#include "nsIDocumentViewer.h"
+#include "nsIDocument.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsIContent.h"
+#include "nsIWebProgress.h"
+#include "nsIChannel.h"
+#include "nsIHttpChannel.h"
+#include "nsIFileChannel.h"
+#include "nsITransportSecurityInfo.h"
+#include "nsIURI.h"
+#include "nsISecurityEventSink.h"
+#include "nsIPrompt.h"
+#include "nsIFormSubmitObserver.h"
+#include "nsISecurityWarningDialogs.h"
+#include "nsIProxyObjectManager.h"
+#include "nsINSSDialogs.h"
+
+#define SECURITY_STRING_BUNDLE_URL "chrome://communicator/locale/security.properties"
+
+static NS_DEFINE_CID(kCStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
+static const char *kNSSDialogsContractId = NS_NSSDIALOGS_CONTRACTID;
+
+#define IS_SECURE(state) ((state & 0xFFFF) == STATE_IS_SECURE)
+
+#if defined(PR_LOGGING)
+//
+// Log module for nsSecureBroswerUI logging...
+//
+// To enable logging (see prlog.h for full details):
+//
+//    set NSPR_LOG_MODULES=nsSecureBroswerUI:5
+//    set NSPR_LOG_FILE=nspr.log
+//
+// this enables PR_LOG_DEBUG level information and places all output in
+// the file nspr.log
+//
+PRLogModuleInfo* gSecureDocLog = nsnull;
+#endif /* PR_LOGGING */
+
+
+nsSecureBrowserUIImpl::nsSecureBrowserUIImpl()
+  : mMixContentAlertShown(PR_FALSE),
+    mSecurityState(STATE_IS_INSECURE)
+{
+  NS_INIT_ISUPPORTS();
+  
+#if defined(PR_LOGGING)
+  if (!gSecureDocLog)
+    gSecureDocLog = PR_NewLogModule("nsSecureBrowserUI");
+#endif /* PR_LOGGING */
+}
+
+nsSecureBrowserUIImpl::~nsSecureBrowserUIImpl()
+{
+  nsresult rv;
+  // remove self from form post notifications:
+  nsCOMPtr<nsIObserverService> svc(do_GetService("@mozilla.org/observer-service;1", &rv));
+  if (NS_SUCCEEDED(rv)) {
+    svc->RemoveObserver(this, NS_FORMSUBMIT_SUBJECT);
+  }
+}
+
+NS_IMPL_ISUPPORTS6(nsSecureBrowserUIImpl,
+                   nsISecureBrowserUI,
+                   nsIWebProgressListener,
+                   nsIFormSubmitObserver,
+                   nsIObserver,
+                   nsISupportsWeakReference,
+                   nsISSLStatusProvider);
+
+
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::Init(nsIDOMWindow *window,
+                            nsIDOMElement *button)
+{
+  nsresult rv = NS_OK;
+  mSecurityButton = button;  /* may be null */
+  mWindow = window;
+
+  nsCOMPtr<nsIStringBundleService> service(do_GetService(kCStringBundleServiceCID, &rv));
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL,
+                             getter_AddRefs(mStringBundle));
+  if (NS_FAILED(rv)) return rv;
+  
+  // hook up to the form post notifications:
+  nsCOMPtr<nsIObserverService> svc(do_GetService("@mozilla.org/observer-service;1", &rv));
+  if (NS_SUCCEEDED(rv)) {
+    rv = svc->AddObserver(this, NS_FORMSUBMIT_SUBJECT, PR_TRUE);
+  }
+  
+  /* GetWebProgress(mWindow) */
+  // hook up to the webprogress notifications.
+  nsCOMPtr<nsIScriptGlobalObject> sgo(do_QueryInterface(mWindow));
+  if (!sgo) return NS_ERROR_FAILURE;
+  
+  nsCOMPtr<nsIDocShell> docShell;
+  sgo->GetDocShell(getter_AddRefs(docShell));
+  if (!docShell) return NS_ERROR_FAILURE;
+  
+  nsCOMPtr<nsIWebProgress> wp(do_GetInterface(docShell));
+  if (!wp) return NS_ERROR_FAILURE;
+  /* end GetWebProgress */
+  
+  wp->AddProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this));
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::DisplayPageInfoUI()
+{
+#if 0
+  nsresult res = NS_OK;
+  nsCOMPtr<nsISecurityManagerComponent> psm(do_GetService(PSM_COMPONENT_CONTRACTID,
+                                                          &res));
+  if (NS_FAILED(res))
+    return res;
+  
+  nsXPIDLCString host;
+  if (mCurrentURI)
+    mCurrentURI->GetHost(getter_Copies(host));
+  
+  //    return psm->DisplayPSMAdvisor(mLastPSMStatus, host);
+#endif
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::Observe(nsISupports*, const char*,
+                               const PRUnichar*)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+static nsresult IsChildOfDomWindow(nsIDOMWindow *parent, nsIDOMWindow *child,
+                                   PRBool* value)
+{
+  *value = PR_FALSE;
+  
+  if (parent == child) {
+    *value = PR_TRUE;
+    return NS_OK;
+  }
+  
+  nsCOMPtr<nsIDOMWindow> childsParent;
+  child->GetParent(getter_AddRefs(childsParent));
+  
+  if (childsParent && childsParent.get() != child)
+    IsChildOfDomWindow(parent, childsParent, value);
+  
+  return NS_OK;
+}
+
+static PRInt32 GetSecurityStateFromChannel(nsIChannel* aChannel)
+{
+  nsresult res;
+  PRInt32 securityState;
+
+  // qi for the psm information about this channel load.
+  nsCOMPtr<nsISupports> info;
+  aChannel->GetSecurityInfo(getter_AddRefs(info));
+  nsCOMPtr<nsITransportSecurityInfo> psmInfo(do_QueryInterface(info));
+  if (!psmInfo) {
+    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - no nsITransportSecurityInfo for %p\n",
+                                         aChannel, (nsISupports *)info));
+    return nsIWebProgressListener::STATE_IS_INSECURE;
+  }
+  PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - info is %p\n", aChannel,
+                                       (nsISupports *)info));
+  
+  res = psmInfo->GetSecurityState(&securityState);
+  if (!NS_SUCCEEDED(res)) {
+    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - GetSecurityState failed: %d\n",
+                                         aChannel, res));
+    securityState = nsIWebProgressListener::STATE_IS_BROKEN;
+  }
+  
+  PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - Returning %d\n", aChannel,
+                                       securityState));
+  return securityState;
+}
+
+
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::Notify(nsIContent* formNode,
+                              nsIDOMWindowInternal* window, nsIURI* actionURL,
+                              PRBool* cancelSubmit)
+{
+  // Return NS_OK unless we want to prevent this form from submitting.
+  *cancelSubmit = PR_FALSE;
+  if (!window || !actionURL || !formNode)
+    return NS_OK;
+  
+  nsCOMPtr<nsIDocument> document;
+  formNode->GetDocument(*getter_AddRefs(document));
+  if (!document) return NS_OK;
+
+  nsCOMPtr<nsIURI> formURL;
+  document->GetBaseURL(*getter_AddRefs(formURL));
+  
+  nsCOMPtr<nsIScriptGlobalObject> globalObject;
+  document->GetScriptGlobalObject(getter_AddRefs(globalObject));
+  nsCOMPtr<nsIDOMWindow> postingWindow(do_QueryInterface(globalObject));
+  
+  PRBool isChild;
+  IsChildOfDomWindow(mWindow, postingWindow, &isChild);
+  
+  // This notify call is not for our window, ignore it.
+  if (!isChild)
+    return NS_OK;
+  
+  PRBool okayToPost;
+  nsresult res = CheckPost(formURL, actionURL, &okayToPost);
+  
+  if (NS_SUCCEEDED(res) && !okayToPost)
+    *cancelSubmit = PR_TRUE;
+  
+  return res;
+}
+
+//  nsIWebProgressListener
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::OnProgressChange(nsIWebProgress* aWebProgress,
+                                        nsIRequest* aRequest,
+                                        PRInt32 aCurSelfProgress,
+                                        PRInt32 aMaxSelfProgress,
+                                        PRInt32 aCurTotalProgress,
+                                        PRInt32 aMaxTotalProgress)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::OnStateChange(nsIWebProgress* aWebProgress,
+                                     nsIRequest* aRequest,
+                                     PRInt32 aProgressStateFlags,
+                                     nsresult aStatus)
+{
+  nsresult res = NS_OK;
+
+  if (!aRequest)
+    return NS_ERROR_NULL_POINTER;
+  
+  // Get the channel from the request...
+  // If the request is not network based, then ignore it.
+  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest, &res));
+  if (NS_FAILED(res))
+    return NS_OK;
+
+  // We are only interested in HTTP and file requests.
+  nsCOMPtr<nsIHttpChannel> httpRequest(do_QueryInterface(aRequest));
+  nsCOMPtr<nsIFileChannel> fileRequest(do_QueryInterface(aRequest));
+  if (!httpRequest && !fileRequest) {
+    return NS_OK;
+  }
+  
+  nsCOMPtr<nsIInterfaceRequestor> requestor;
+  nsCOMPtr<nsISecurityEventSink> eventSink;
+  channel->GetNotificationCallbacks(getter_AddRefs(requestor));
+  if (requestor)
+    eventSink = do_GetInterface(requestor);
+  
+#if defined(DEBUG)
+  nsCOMPtr<nsIURI> loadingURI;
+  res = channel->GetURI(getter_AddRefs(loadingURI));
+  NS_ASSERTION(NS_SUCCEEDED(res), "GetURI failed");
+  if (loadingURI) {
+    nsXPIDLCString temp;
+    loadingURI->GetSpec(getter_Copies(temp));
+    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
+           ("SecureUI:%p: OnStateChange: %x :%s\n", this,
+            aProgressStateFlags,(const char*)temp));
+  }
+#endif
+
+  // First event when loading doc
+  if (aProgressStateFlags & STATE_START) {
+    if (aProgressStateFlags & STATE_IS_NETWORK) {
+      // Reset state variables used per doc loading
+      mMixContentAlertShown = PR_FALSE;
+      mFirstRequest = PR_TRUE;
+      mSSLStatus = nsnull;
+    }
+  }
+  
+  // A Document is starting to load...
+  if ((aProgressStateFlags & (STATE_STOP)) &&
+      (aProgressStateFlags & STATE_IS_REQUEST)) {
+
+    // work-around for bug 48515.
+    nsCOMPtr<nsIURI> aURI;
+    channel->GetURI(getter_AddRefs(aURI));
+
+    // Sometimes URI is null, so ignore.
+    if (aURI == nsnull) {
+      return NS_OK;
+    }
+
+    // If this is the first request, then do a protocol check
+    if (mFirstRequest) {
+      mFirstRequest = PR_FALSE;
+      return CheckProtocolContextSwitch(eventSink, aRequest, channel);
+    }
+    // Check that the request does not have mixed content.
+    return CheckMixedContext(eventSink, aRequest, channel);
+  }
+
+  // A document has finished loading
+  if ((aProgressStateFlags & STATE_STOP) &&
+    (aProgressStateFlags & STATE_IS_NETWORK)) {
+
+    // Get SSL Status information if possible
+    nsCOMPtr<nsISupports> info;
+    channel->GetSecurityInfo(getter_AddRefs(info));
+    nsCOMPtr<nsISSLStatusProvider> sp = do_QueryInterface(info);
+    if (sp) {
+      // Ignore result
+      sp->GetSSLStatus(getter_AddRefs(mSSLStatus));
+    }
+
+    if (eventSink)
+      eventSink->OnSecurityChange(aRequest, mSecurityState);
+          
+    if (!mSecurityButton)
+      return res;
+          
+    /* TNH - need event for changing the tooltip */
+
+    // Do we really need to look at res here? What happens if there's an error?
+    // We should still set the certificate authority display.
+
+    nsXPIDLString tooltip;
+    if (info) {
+      nsCOMPtr<nsITransportSecurityInfo> secInfo(do_QueryInterface(info));
+      if (secInfo &&
+          NS_SUCCEEDED(secInfo->GetShortSecurityDescription(getter_Copies(tooltip))) &&
+          tooltip) {
+
+        res = mSecurityButton->SetAttribute(NS_LITERAL_STRING("tooltiptext"),
+                                                nsString(tooltip));
+              
+      }
+    }
+  }
+
+  return res;
+}
+
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::OnLocationChange(nsIWebProgress* aWebProgress,
+                                        nsIRequest* aRequest,
+                                        nsIURI* aLocation)
+{
+  mCurrentURI = aLocation;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::OnStatusChange(nsIWebProgress* aWebProgress,
+                                      nsIRequest* aRequest,
+                                      nsresult aStatus,
+                                      const PRUnichar* aMessage)
+{
+  return NS_OK;
+}
+
+nsresult
+nsSecureBrowserUIImpl::OnSecurityChange(nsIWebProgress *aWebProgress,
+                                        nsIRequest *aRequest,
+                                        PRInt32 state)
+{
+  nsresult res = NS_OK;
+
+#if defined(DEBUG_dougt)
+  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
+  if (!channel)
+    return NS_ERROR_FAILURE;
+  
+  nsCOMPtr<nsIURI> aURI;
+  channel->GetURI(getter_AddRefs(aURI));
+  
+  nsXPIDLCString temp;
+  aURI->GetSpec(getter_Copies(temp));
+  printf("OnSecurityChange: (%x) %s\n", state, (const char*)temp);
+#endif
+  /* Deprecated support for mSecurityButton */
+  if (mSecurityButton) {
+    NS_NAMED_LITERAL_STRING(level, "level");
+
+    if (state == (STATE_IS_SECURE|STATE_SECURE_HIGH)) {
+      res = mSecurityButton->SetAttribute(level, NS_LITERAL_STRING("high"));
+    } else if (state == (STATE_IS_SECURE|STATE_SECURE_LOW)) {
+      res = mSecurityButton->SetAttribute(level, NS_LITERAL_STRING("low"));
+    } else if (state == STATE_IS_BROKEN) {
+      res = mSecurityButton->SetAttribute(level, NS_LITERAL_STRING("broken"));
+    } else {
+      res = mSecurityButton->RemoveAttribute(level);
+    }
+  }
+
+  return res;
+}
+
+// nsISSLStatusProvider methods
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::GetSSLStatus(nsISupports** _result)
+{
+  NS_ASSERTION(_result, "non-NULL destination required");
+
+  *_result = mSSLStatus;
+  NS_IF_ADDREF(*_result);
+
+  return NS_OK;
+}
+
+nsresult
+nsSecureBrowserUIImpl::IsURLHTTPS(nsIURI* aURL, PRBool* value)
+{
+	*value = PR_FALSE;
+
+	if (!aURL)
+		return NS_OK;
+  
+  char* scheme;
+	aURL->GetScheme(&scheme);
+
+  // If no scheme, it's not an https url - not necessarily an error.
+  // See bugs 54845 and 54966  
+	if (!scheme)
+		return NS_OK;
+  
+  if (!PL_strncasecmp(scheme, "https",  5))
+		*value = PR_TRUE;
+	
+	nsMemory::Free(scheme);
+	return NS_OK;
+}
+
+void
+nsSecureBrowserUIImpl::GetBundleString(const PRUnichar* name,
+                                       nsString &outString)
+{
+  if (mStringBundle && name) {
+    PRUnichar *ptrv = nsnull;
+    if (NS_SUCCEEDED(mStringBundle->GetStringFromName(name,
+                                                      &ptrv)))
+      outString = ptrv;
+    else
+      outString.SetLength(0);
+    
+    nsMemory::Free(ptrv);
+    
+  } else {
+    outString.SetLength(0);
+  }
+}
+
+nsresult 
+nsSecureBrowserUIImpl::CheckProtocolContextSwitch(nsISecurityEventSink* eventSink,
+                                                  nsIRequest* aRequest,
+                                                  nsIChannel* aChannel)
+{
+  PRInt32 newSecurityState, oldSecurityState = mSecurityState;
+  
+  newSecurityState = GetSecurityStateFromChannel(aChannel);
+  mSecurityState = newSecurityState;
+
+  // Check to see if we are going from a secure page to an insecure page
+  if (newSecurityState == STATE_IS_INSECURE &&
+      (IS_SECURE(oldSecurityState) ||
+       oldSecurityState == STATE_IS_BROKEN)) {
+
+    SetBrokenLockIcon(eventSink, aRequest, PR_TRUE);
+
+    AlertLeavingSecure();
+
+  }
+  // check to see if we are going from an insecure page to a secure one.
+  else if ((newSecurityState == (STATE_IS_SECURE|STATE_SECURE_HIGH) ||
+            newSecurityState == STATE_IS_BROKEN) &&
+           oldSecurityState == STATE_IS_INSECURE) {
+    AlertEnteringSecure();
+  }
+  // check to see if we are going from a strong or insecure page to a
+  // weak one.
+  else if ((IS_SECURE(newSecurityState) &&
+            newSecurityState != (STATE_IS_SECURE|STATE_SECURE_HIGH)) &&
+           (oldSecurityState == STATE_IS_INSECURE ||
+            oldSecurityState == (STATE_IS_SECURE|STATE_SECURE_HIGH))) {
+
+    AlertEnteringWeak();
+  }
+  
+  mSecurityState = newSecurityState;
+  return NS_OK;
+}
+
+nsresult
+nsSecureBrowserUIImpl::CheckMixedContext(nsISecurityEventSink *eventSink,
+                                         nsIRequest* aRequest, nsIChannel* aChannel)
+{
+  PRInt32 newSecurityState;
+
+  newSecurityState = GetSecurityStateFromChannel(aChannel);
+
+  // Deal with http redirect to https //
+  if (mSecurityState == STATE_IS_INSECURE && newSecurityState != STATE_IS_INSECURE) {
+      return CheckProtocolContextSwitch(eventSink, aRequest, aChannel);
+  }
+
+  if ((newSecurityState == STATE_IS_INSECURE ||
+       newSecurityState == STATE_IS_BROKEN) &&
+      IS_SECURE(mSecurityState)) {
+    
+    // work-around for bug 48515
+    nsCOMPtr<nsIURI> aURI;
+    aChannel->GetURI(getter_AddRefs(aURI));
+
+    nsXPIDLCString temp;
+    aURI->GetSpec(getter_Copies(temp));
+
+    if (!nsCRT::strncmp((const char*) temp, "file:", 5) ||
+        !nsCRT::strcmp((const char*) temp, "about:layout-dummy-request")) {
+      return NS_OK;
+    }
+
+    mSecurityState = STATE_IS_BROKEN;
+    SetBrokenLockIcon(eventSink, aRequest);
+
+    // Show alert to user (first time only)
+    // NOTE: doesn't mSecurityState provide the correct
+    // one-time checking?? Why have mMixContentAlertShown
+    // as well?
+    if (!mMixContentAlertShown) {
+      AlertMixedMode();
+      mMixContentAlertShown = PR_TRUE;
+    }
+  }
+  
+  return NS_OK;
+}
+
+nsresult
+nsSecureBrowserUIImpl::CheckPost(nsIURI *formURL, nsIURI *actionURL, PRBool *okayToPost)
+{
+  PRBool formSecure,actionSecure;
+  *okayToPost = PR_TRUE;
+
+  nsresult rv = IsURLHTTPS(formURL, &formSecure);
+  if (NS_FAILED(rv))
+    return rv;
+
+  rv = IsURLHTTPS(actionURL, &actionSecure);
+  if (NS_FAILED(rv))
+    return rv;
+  
+  // if we are posting to a secure link from a secure page, all is okay.
+  if (actionSecure && formSecure) {
+    return NS_OK;
+  }
+    
+  // posting to insecure webpage from a secure webpage.
+  if (!actionSecure && formSecure) {
+    *okayToPost = ConfirmPostToInsecureFromSecure();
+  } else {
+    *okayToPost = ConfirmPostToInsecure();
+  }
+  
+  return NS_OK;
+}
+
+nsresult
+nsSecureBrowserUIImpl::SetBrokenLockIcon(nsISecurityEventSink *eventSink,
+                                         nsIRequest* aRequest,
+                                         PRBool removeValue)
+{
+  nsresult rv = NS_OK;
+  if (removeValue) {
+    if (eventSink)
+      (void) eventSink->OnSecurityChange(aRequest, STATE_IS_INSECURE);
+  } else {
+    if (eventSink)
+      (void) eventSink->OnSecurityChange(aRequest, (STATE_IS_BROKEN));
+  }
+  
+  nsAutoString tooltiptext;
+  GetBundleString(NS_LITERAL_STRING("SecurityButtonTooltipText").get(),
+                  tooltiptext);
+
+  /* TNH - need tooltip notification here */
+  if (mSecurityButton)
+    rv = mSecurityButton->SetAttribute(NS_LITERAL_STRING("tooltiptext"),
+                                       tooltiptext);
+  return rv;
+}
+
+//
+// Implementation of an nsIInterfaceRequestor for use
+// as context for NSS calls
+//
+class nsUIContext : public nsIInterfaceRequestor
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIINTERFACEREQUESTOR
+
+  nsUIContext(nsIDOMWindow *window);
+  virtual ~nsUIContext();
+
+private:
+  nsCOMPtr<nsIDOMWindow> mWindow;
+};
+
+NS_IMPL_ISUPPORTS1(nsUIContext, nsIInterfaceRequestor)
+
+nsUIContext::nsUIContext(nsIDOMWindow *aWindow)
+: mWindow(aWindow)
+{
+  NS_INIT_ISUPPORTS();
+}
+
+nsUIContext::~nsUIContext()
+{
+}
+
+/* void getInterface (in nsIIDRef uuid, [iid_is (uuid), retval] out nsQIResult result); */
+NS_IMETHODIMP nsUIContext::GetInterface(const nsIID & uuid, void * *result)
+{
+  nsresult rv;
+
+  if (uuid.Equals(NS_GET_IID(nsIPrompt))) {
+    nsCOMPtr<nsIDOMWindowInternal> internal = do_QueryInterface(mWindow, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    nsIPrompt *prompt;
+
+    rv = internal->GetPrompter(&prompt);
+    *result = prompt;
+  } else {
+    rv = NS_ERROR_NO_INTERFACE;
+  }
+
+  return rv;
+}
+
+nsresult nsSecureBrowserUIImpl::
+GetNSSDialogs(nsISecurityWarningDialogs **result)
+{
+  nsresult rv;
+  nsCOMPtr<nsISecurityWarningDialogs> my_result(do_GetService(kNSSDialogsContractId, &rv));
+
+  if (NS_FAILED(rv)) 
+    return rv;
+
+  nsCOMPtr<nsIProxyObjectManager> proxyman(do_GetService(NS_XPCOMPROXY_CONTRACTID));
+  if (!proxyman)
+    return NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsISupports> proxiedResult;
+  proxyman->GetProxyForObject(NS_UI_THREAD_EVENTQ,
+                              NS_GET_IID(nsISecurityWarningDialogs),
+                              my_result, PROXY_SYNC,
+                              getter_AddRefs(proxiedResult));
+
+  if (!proxiedResult) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return CallQueryInterface(proxiedResult, result);
+}
+
+void nsSecureBrowserUIImpl::
+AlertEnteringSecure()
+{
+  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
+
+  GetNSSDialogs(getter_AddRefs(dialogs));
+  if (!dialogs) return;
+
+  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
+
+  dialogs->AlertEnteringSecure(ctx);
+
+  return;
+}
+
+void nsSecureBrowserUIImpl::
+AlertEnteringWeak()
+{
+  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
+
+  GetNSSDialogs(getter_AddRefs(dialogs));
+  if (!dialogs) return;
+
+  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
+
+  dialogs->AlertEnteringWeak(ctx);
+
+  return;
+}
+
+void nsSecureBrowserUIImpl::
+AlertLeavingSecure()
+{
+  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
+
+  GetNSSDialogs(getter_AddRefs(dialogs));
+  if (!dialogs) return;
+
+  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
+
+  dialogs->AlertLeavingSecure(ctx);
+
+  return;
+}
+
+void nsSecureBrowserUIImpl::
+AlertMixedMode()
+{
+  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
+
+  GetNSSDialogs(getter_AddRefs(dialogs));
+  if (!dialogs) return;
+
+  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
+
+  dialogs->AlertMixedMode(ctx);
+
+  return;
+}
+
+/**
+ * ConfirmPostToInsecure - returns PR_TRUE if
+ *   the user approves the submit (or doesn't care).
+ *   returns PR_FALSE on errors.
+ */
+PRBool nsSecureBrowserUIImpl::
+ConfirmPostToInsecure()
+{
+  nsresult rv;
+
+  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
+
+  GetNSSDialogs(getter_AddRefs(dialogs));
+  if (!dialogs) return PR_FALSE;  // Should this allow PR_TRUE for unimplemented?
+
+  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
+
+  PRBool result;
+
+  rv = dialogs->ConfirmPostToInsecure(ctx, &result);
+  if (NS_FAILED(rv)) return PR_FALSE;
+
+  return result;
+}
+
+/**
+ * ConfirmPostToInsecureFromSecure - returns PR_TRUE if
+ *   the user approves the submit (or doesn't care).
+ *   returns PR_FALSE on errors.
+ */
+PRBool nsSecureBrowserUIImpl::
+ConfirmPostToInsecureFromSecure()
+{
+  nsresult rv;
+
+  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
+
+  GetNSSDialogs(getter_AddRefs(dialogs));
+  if (!dialogs) return PR_FALSE;  // Should this allow PR_TRUE for unimplemented?
+
+  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
+
+  PRBool result;
+
+  rv = dialogs->ConfirmPostToInsecureFromSecure(ctx, &result);
+  if (NS_FAILED(rv)) return PR_FALSE;
+
+  return result;
+}

mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.h

@@ -0,0 +1,117 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998-2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ *   Brian Ryner <bryner@netscape.com>
+ *   Kai Engert <kaie@netscape.com>
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsSecureBrowserUIImpl_h_
+#define nsSecureBrowserUIImpl_h_
+
+#include "nsCOMPtr.h"
+#include "nsXPIDLString.h"
+#include "nsString.h"
+#include "nsIObserver.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMWindow.h"
+#include "nsIStringBundle.h"
+#include "nsISecureBrowserUI.h"
+#include "nsIDocShell.h"
+#include "nsIWebProgressListener.h"
+#include "nsIFormSubmitObserver.h"
+#include "nsIURI.h"
+#include "nsISecurityEventSink.h"
+#include "nsWeakReference.h"
+#include "nsISSLStatusProvider.h"
+
+class nsITransportSecurityInfo;
+class nsISecurityWarningDialogs;
+
+#define NS_SECURE_BROWSER_UI_CID \
+{ 0xcc75499a, 0x1dd1, 0x11b2, {0x8a, 0x82, 0xca, 0x41, 0x0a, 0xc9, 0x07, 0xb8}}
+
+
+class nsSecureBrowserUIImpl : public nsISecureBrowserUI,
+                              public nsIWebProgressListener,
+                              public nsIFormSubmitObserver,
+                              public nsIObserver,
+                              public nsSupportsWeakReference,
+                              public nsISSLStatusProvider
+{
+public:
+  
+  nsSecureBrowserUIImpl();
+  virtual ~nsSecureBrowserUIImpl();
+  
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIWEBPROGRESSLISTENER
+  NS_DECL_NSISECUREBROWSERUI
+  
+  // nsIObserver
+  NS_DECL_NSIOBSERVER
+  NS_DECL_NSISSLSTATUSPROVIDER
+
+  NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindowInternal* window,
+                    nsIURI *actionURL, PRBool* cancelSubmit);
+  
+protected:
+  
+  nsCOMPtr<nsIDOMWindow> mWindow;
+  nsCOMPtr<nsIDOMElement> mSecurityButton;
+  nsCOMPtr<nsIStringBundle> mStringBundle;
+  nsCOMPtr<nsIURI> mCurrentURI;
+  
+  PRBool mMixContentAlertShown;
+  PRInt32 mSecurityState;
+  PRBool mFirstRequest;
+
+  nsCOMPtr<nsISupports> mSSLStatus;
+
+  void GetBundleString(const PRUnichar* name, nsString &outString);
+  
+  nsresult CheckProtocolContextSwitch(nsISecurityEventSink* sink,
+                                      nsIRequest* request, nsIChannel* aChannel);
+  nsresult CheckMixedContext(nsISecurityEventSink* sink, nsIRequest* request,
+                             nsIChannel* aChannel);
+  nsresult CheckPost(nsIURI *formURI, nsIURI *actionURL, PRBool *okayToPost);
+  nsresult IsURLHTTPS(nsIURI* aURL, PRBool *value);
+  nsresult SetBrokenLockIcon(nsISecurityEventSink* sink, nsIRequest* request,
+                             PRBool removeValue = PR_FALSE);
+
+  // Alerts for security transitions
+  void AlertEnteringSecure();
+  void AlertEnteringWeak();
+  void AlertLeavingSecure();
+  void AlertMixedMode();
+  PRBool ConfirmPostToInsecure();
+  PRBool ConfirmPostToInsecureFromSecure();
+
+  // Support functions
+  nsresult GetNSSDialogs(nsISecurityWarningDialogs **);
+
+};
+
+
+#endif /* nsSecureBrowserUIImpl_h_ */

mozilla/security/manager/makefile.win

@@ -0,0 +1,41 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#	Javier Delgadillo
+#
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable
+# instead of those above.  If you wish to allow use of your
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+DEPTH=..\..
+include <$(DEPTH)/config/config.mak>
+
+DIRS = boot ssl pki
+
+include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/pki/Makefile.in

@@ -0,0 +1,30 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#  Terry Hayes <thayes@netscape.com>
+# 
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+DIRS		= public resources src
+
+include $(topsrcdir)/config/rules.mk

mozilla/security/manager/pki/makefile.win

@@ -0,0 +1,41 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#	Terry Hayes <thayes@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable
+# instead of those above.  If you wish to allow use of your
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+DEPTH=..\..\..
+include <$(DEPTH)/config/config.mak>
+
+DIRS = public src resources
+
+include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/pki/public/Makefile.in

@@ -0,0 +1,49 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#  Javier Delgadillo <javi@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable
+# instead of those above.  If you wish to allow use of your
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+# 
+
+MODULE = pippki
+
+DEPTH           = ../../../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+XPIDLSRCS = \
+    nsIPKIParamBlock.idl \
+    nsIASN1Outliner.idl \
+    $(NULL)
+
+include $(topsrcdir)/config/rules.mk

mozilla/security/manager/pki/public/makefile.win

@@ -0,0 +1,51 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#	Javier Delgadillo
+#
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable
+# instead of those above.  If you wish to allow use of your
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+MODULE = pippki
+
+DEPTH=..\..\..\..
+IGNORE_MANIFEST=1
+
+include <$(DEPTH)/config/config.mak>
+
+XPIDL_INCLUDES=-I$(DEPTH)\dist\idl
+
+XPIDLSRCS= \
+    .\nsIPKIParamBlock.idl \
+    .\nsIASN1Outliner.idl \
+    $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/pki/public/nsIASN1Outliner.idl

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ian McGreer <mcgreer@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable
+ * instead of those above.  If you wish to allow use of your
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#include "nsISupports.idl"
+#include "nsIOutlinerView.idl"
+#include "nsIX509Cert.idl"
+
+[scriptable, uuid(c727b2f2-1dd1-11b2-95df-f63c15b4cd35)]
+interface nsIASN1Outliner : nsIOutlinerView {
+
+  void loadASN1Structure(in nsIASN1Object asn1Object);
+
+  wstring getDisplayData(in unsigned long index);
+
+};
+
+%{C++
+
+#define NS_ASN1OUTLINER_CONTRACTID "@mozilla.org/security/nsASN1Outliner;1"
+
+%}
+

mozilla/security/manager/pki/public/nsIASN1Tree.idl

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ian McGreer <mcgreer@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable
+ * instead of those above.  If you wish to allow use of your
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#include "nsISupports.idl"
+#include "nsIOutlinerView.idl"
+#include "nsIX509Cert.idl"
+
+[scriptable, uuid(c727b2f2-1dd1-11b2-95df-f63c15b4cd35)]
+interface nsIASN1Outliner : nsIOutlinerView {
+
+  void loadASN1Structure(in nsIASN1Object asn1Object);
+
+  wstring getDisplayData(in unsigned long index);
+
+};
+
+%{C++
+
+#define NS_ASN1OUTLINER_CONTRACTID "@mozilla.org/security/nsASN1Outliner;1"
+
+%}
+

mozilla/security/manager/pki/public/nsIPKIParamBlock.idl

@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Javier Delgadillo <javi@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable
+ * instead of those above.  If you wish to allow use of your
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(b6fe3d78-1dd1-11b2-9058-ced9016984c8)]
+interface nsIPKIParamBlock : nsISupports {
+
+  void setISupportAtIndex(in PRInt32 index, in nsISupports object);
+  nsISupports getISupportAtIndex(in PRInt32 index);
+};

mozilla/security/manager/pki/resources/Makefile.in

@@ -0,0 +1,33 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#  Terry Hayes <thayes@netscape.com>
+# 
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+libs::
+	$(REGCHROME) content pippki pippki.jar
+	$(REGCHROME) locale en-US/pippki en-US.jar

mozilla/security/manager/pki/resources/content/CAOverlay.xul

@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
+
+<overlay id="CAOverlay" 
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+         xmlns:cert="http://netscape.com/rdf-cert#" 
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <vbox id="CACerts">
+    <description>&certmgr.cas;</description>
+    <separator class="thin"/>
+    <outliner id="ca-outliner" multiple="true" enableColumnDrag="true"
+              onselect="ca_enableButtons()" flex="1">
+      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
+                   class="outlinercol-header outlinercell-inset-header" 
+                   persist="hidden width ordinal" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <outlinercol id="tokencol" label="&certmgr.tokenname;"
+                   class="outlinercol-header outlinercell-inset-header" 
+                   persist="hidden width ordinal" flex="1"/>
+<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
+      <outlinerbody flex="1" ondblclick="viewCerts();"/>
+    </outliner>
+    <hbox>
+      <button id="ca_viewButton"
+              label="&certmgr.view.label;"
+              disabled="true" oncommand="viewCerts();"/>
+      <button id="ca_editButton"
+              label="&certmgr.edit.label;"
+              disabled="true" oncommand="editCerts();"/>
+<!-- future - import a DER cert?
+      <button id="ca_addButton"
+              label="&certmgr.add.label;"
+              oncommand="addCerts();"/>
+-->
+      <button id="ca_deleteButton"
+              label="&certmgr.delete.label;"
+              disabled="true" oncommand="deleteCerts();"/>
+    </hbox>
+  </vbox>
+</overlay>

mozilla/security/manager/pki/resources/content/MineOverlay.xul

@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
+
+<overlay id="MineOverlay" 
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+         xmlns:cert="http://netscape.com/rdf-cert#" 
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <vbox id="myCerts">
+    <description>&certmgr.mine;</description>
+    <separator class="thin"/>
+    <outliner id="user-outliner" multiple="true" enableColumnDrag="true"
+              onselect="mine_enableButtons()" flex="1">
+      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
+                   class="outlinercol-header outlinercell-inset-header" 
+                   persist="hidden width ordinal" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <outlinercol id="tokencol" label="&certmgr.tokenname;"
+                   class="outlinercol-header outlinercell-inset-header" 
+                   persist="hidden width ordinal" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <outlinercol id="verifiedcol" 
+                   class="outlinercol-header outlinercell-inset-header" 
+                   persist="hidden width ordinal" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <outlinercol id="purposecol" label="&certmgr.purpose;"
+                   class="outlinercol-header outlinercell-inset-header" 
+                   persist="hidden width ordinal" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <outlinercol id="serialnumcol" label="&certmgr.serial;"
+                   class="outlinercol-header outlinercell-inset-header" 
+                   persist="hidden width ordinal" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <outlinercol id="issuedcol" label="&certmgr.issued;"
+                   class="outlinercol-header outlinercell-inset-header" 
+                   hidden="true" persist="hidden width ordinal" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <outlinercol id="expiredcol" label="&certmgr.expires;"
+                   class="outlinercol-header outlinercell-inset-header" 
+                   persist="hidden width ordinal" flex="1"/>
+<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
+      <outlinerbody flex="1" ondblclick="viewCerts();"/>
+    </outliner>
+    <hbox>
+       <button id="mine_viewButton" class="normal" 
+               label="&certmgr.view.label;"
+               disabled="true" oncommand="viewCerts();"/>
+       <button id="mine_backupButton" class="normal" 
+               label="&certmgr.backup.label;"
+               disabled="true" oncommand="backupCerts();"/>
+       <button id="mine_backupAllButton" class="normal" 
+               label="&certmgr.backupall.label;"
+               oncommand="backupAllCerts();"/>
+       <button id="mine_restoreButton" class="normal" 
+               label="&certmgr.restore.label;"
+               oncommand="restoreCerts();"/>
+       <button id="mine_deleteButton" class="normal" 
+               label="&certmgr.delete.label;"
+               disabled="true" oncommand="deleteCerts();"/>
+    </hbox>
+  </vbox>
+</overlay>

mozilla/security/manager/pki/resources/content/OthersOverlay.xul

@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Communicator
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corp..
+   - Portions created by the Initial Developer are Copyright (C) 2001
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s): Kai Engert <kaie@netscape.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
+
+<overlay id="WebSitesOverlay" 
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+         xmlns:cert="http://netscape.com/rdf-cert#" 
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <vbox id="othersCerts">
+    <description>&certmgr.others;</description>
+    <separator class="thin"/>
+    <outliner id="email-outliner" multiple="true"
+              onselect="email_enableButtons()" flex="1">
+      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
+                   class="outlinercol-header outlinercell-inset-header" 
+                   flex="1"/>
+      <splitter class="tree-splitter"/>
+      <outlinercol id="emailcol" label="&certmgr.email;"
+                   class="outlinercol-header outlinercell-inset-header" 
+                   flex="1"/>
+      <splitter class="tree-splitter"/>
+      <outlinercol id="tokencol" label="&certmgr.tokenname;"
+                   class="outlinercol-header outlinercell-inset-header" 
+                   flex="1"/>
+<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
+      <outlinerbody flex="1" ondblclick="viewCerts();"/>
+    </outliner>
+    <hbox>
+      <button id="email_viewButton"
+              label="&certmgr.view.label;"
+              disabled="true" oncommand="viewCerts();"/>
+      <button id="email_editButton"
+              label="&certmgr.edit.label;"
+              disabled="true" oncommand="editCerts();"/>
+<!-- future - import a DER cert?
+      <button id="email_addButton"
+              label="&certmgr.add.label;"
+              oncommand="addCerts();"/>
+-->
+      <button id="email_deleteButton"
+              label="&certmgr.delete.label;"
+              disabled="true" oncommand="deleteCerts();"/>
+    </hbox>
+  </vbox>
+</overlay>

mozilla/security/manager/pki/resources/content/PageInfoOverlay.xul

@@ -0,0 +1,210 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<!-- This file extends "chrome://navigator/content/pageInfo.xul" -->
+
+<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/PageInfoOverlay.dtd">
+
+<overlay id="pipPageInfoOverlayID"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/x-javascript">
+  <![CDATA[
+    var security = {
+      // Display the server certificate (static)
+      viewCert : function () {
+        var cert = security._cert;
+        if (cert) cert.view();
+      },
+
+      _getSecurityInfo : function() {
+        const nsIX509Cert = Components.interfaces.nsIX509Cert;
+        const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
+        const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
+        const nsISSLStatusProvider = Components.interfaces.nsISSLStatusProvider;
+        const nsISSLStatus = Components.interfaces.nsISSLStatus;
+
+        // Get the window for this information
+        var w;
+        if ("arguments" in window && window.arguments.length > 1 && window.arguments[0])
+          w = window.arguments[0];
+        else
+          w = window.opener.frames[0];
+
+        var hName = null;
+        try
+        {
+           hName = w.location.host;
+        } catch(exception){}
+
+        var ui = security._getSecurityUI();
+        var sp = ui.QueryInterface(nsISSLStatusProvider);
+        var status = sp.SSLStatus;
+        if (status) {
+          status = status.QueryInterface(nsISSLStatus);
+        }
+        if (status) {
+          var cert = status.serverCert;
+          var issuerName;
+
+          issuerName = this.mapIssuerOrganization(cert.issuerOrganization);
+          if (!issuerName) issuerName = cert.issuerName;
+        
+          return {
+            hostName : hName,
+            cAName : issuerName,
+            encryptionAlgorithm : status.cipherName,
+            encryptionStrength : status.secretKeyLength,
+            cert : cert
+          };
+        } else {
+          return {
+            hostName : hName,
+            cAName : "",
+            encryptionAlgorithm : "",
+            encryptionStrength : 0,
+            cert : null
+          };
+        } 
+      },
+
+      // Find the secureBrowserUI object (if present)
+      _getSecurityUI : function() {
+        return window.opener.gBrowser.boxObject.getPropertyAsSupports("secureBrowserUI");
+      },
+
+      // Interface for mapping a certificate issuer organization to
+      // the value to be displayed.
+      // Bug 82017 - this implementation should be moved to pipnss C++ code
+      mapIssuerOrganization: function(name) {
+        if (!name) return null;
+
+        if (name == "RSA Data Security, Inc.") return "Verisign, Inc.";
+
+        // No mapping required
+        return name;
+      },
+
+      _cert : null
+    };
+
+    function securityOnLoad() {
+      var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+
+      var info = security._getSecurityInfo();
+      var idHdr;
+      var message1;
+      var message2;
+
+      /* Set the identification messages */
+      if (info.cert)
+      {
+        idHdr = bundle.GetStringFromName("pageInfo_WebSiteVerified");
+        document.getElementById("security-identity").setAttribute("value", idHdr);
+
+        message1 = bundle.formatStringFromName("pageInfo_Identity_Verified", 
+                                [ info.hostName, info.cAName ],
+                                2);
+        setText("security-identity-text", message1);
+
+        var viewText = bundle.GetStringFromName("pageInfo_ViewCertificate");
+        setText("security-view-text", viewText);
+        security._cert = info.cert;
+      } else {
+        idHdr = bundle.GetStringFromName("pageInfo_SiteNotVerified");
+        document.getElementById("security-identity").setAttribute("value", idHdr);
+
+        document.getElementById("security-view-cert").setAttribute("disabled", "true");
+        document.getElementById("security-view-cert").setAttribute("hidden", "true");
+      }
+
+      var hdr;
+      var msg1;
+      var msg2;
+      
+      /* Set the encryption messages */
+      if (info.encryptionStrength >= 90) {
+        hdr = bundle.formatStringFromName("pageInfo_StrongEncryption",
+                             [ info.encryptionAlgorithm, info.encryptionStrength+"" ], 2);
+        document.getElementById("security-privacy").setAttribute("value", hdr);
+
+        msg1 = bundle.GetStringFromName("pageInfo_Privacy_Strong1");
+        setText("security-privacy-msg1", msg1);
+
+        msg2 = bundle.GetStringFromName("pageInfo_Privacy_Strong2");
+        setText("security-privacy-msg2", msg2);
+
+        security._cert = info.cert;
+      } else if (info.encryptionStrength > 0) {
+        hdr = bundle.formatStringFromName("pageInfo_WeakEncryption",
+                             [ info.encryptionAlgorithm, info.encryptionStrength+"" ], 2);
+        document.getElementById("security-privacy").setAttribute("value", hdr);
+
+        msg1 = bundle.formatStringFromName("pageInfo_Privacy_Weak1",
+                                               [ info.hostName ], 1);
+        setText("security-privacy-msg1", msg1);
+
+        msg2 = bundle.GetStringFromName("pageInfo_Privacy_Weak2");
+        setText("security-privacy-msg2", msg2);
+      } else {
+        hdr = bundle.GetStringFromName("pageInfo_NoEncryption");
+        document.getElementById("security-privacy").setAttribute("value", hdr);
+
+        if(info.hostName != null)
+          msg1 = bundle.formatStringFromName("pageInfo_Privacy_None1", [ info.hostName ], 1);
+        else
+          msg1 = bundle.GetStringFromName("pageInfo_Privacy_None3");
+
+        setText("security-privacy-msg1", msg1);
+
+        msg2 = bundle.GetStringFromName("pageInfo_Privacy_None2");
+        setText("security-privacy-msg2", msg2);
+      }
+    }
+
+    /* Register for pageInfo onload calls */
+    onLoadRegistry.push(securityOnLoad);
+  ]]>
+  </script>
+  <tabs id="tabs">
+    <tab id="securityTab" label="&pageInfo.securityTab;"/>
+  </tabs>
+  <tabpanels id="tabpanels">
+    <vbox id="securityPanel" flex="1">
+      <label id="security-identity" class="header"/>
+      <description id="security-identity-text" flex="1"/>
+      <hbox>
+        <button id="security-view-cert" label="&pageInfo.view.label;" 
+                oncommand="security.viewCert();"/>
+        <description id="security-view-text" flex="1"/>
+      </hbox>
+      <separator class="groove"/>
+      <label id="security-privacy" class="header"/>
+      <vbox flex="1">
+        <description id="security-privacy-msg1"/>
+        <description id="security-privacy-msg2"/>
+      </vbox>
+    </vbox>
+  </tabpanels>
+</overlay>

mozilla/security/manager/pki/resources/content/PrefOverlay.xul

@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<!-- This file overlays "chrome://communicator/content/pref/preftree.xul" -->
+
+<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/PrefOverlay.dtd">
+
+<overlay id="pipPrefOverlayID"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <treechildren id="securityChildren">
+    <treeitem id="masterpassItem">
+      <treerow>
+        <treecell class="treecell-indent" url="chrome://pippki/content/pref-masterpass.xul"
+                  label="&masterpass.label;"/>
+      </treerow>
+    </treeitem>
+    <treeitem id="sslItem">
+      <treerow>
+        <treecell class="treecell-indent" url="chrome://pippki/content/pref-ssl.xul"
+                  label="&ssl.label;"/>
+      </treerow>
+    </treeitem>
+    <treeitem id="certItem">
+      <treerow>
+        <treecell class="treecell-indent" url="chrome://pippki/content/pref-certs.xul"
+                  label="&certs.label;"/>
+      </treerow>
+    </treeitem>
+    <treeitem id="validationItem">
+      <treerow>
+        <treecell class="treecell-indent" url="chrome://pippki/content/pref-validation.xul"
+                 label="&validation.label;"/>
+      </treerow>
+    </treeitem>
+  </treechildren>
+</overlay>

mozilla/security/manager/pki/resources/content/WebSitesOverlay.xul

@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
+
+<overlay id="WebSitesOverlay" 
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+         xmlns:cert="http://netscape.com/rdf-cert#" 
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <vbox id="webCerts">
+    <description>&certmgr.websites;</description>
+    <separator class="thin"/>
+    <outliner id="server-outliner" multiple="true" enableColumnDrag="true"
+              onselect="websites_enableButtons()" flex="1">
+      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
+                   class="outlinercol-header outlinercell-inset-header" 
+                   persist="hidden width ordinal" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <outlinercol id="tokencol" label="&certmgr.tokenname;"
+                   class="outlinercol-header outlinercell-inset-header" 
+                   persist="hidden width ordinal" flex="1"/>
+<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
+      <outlinerbody flex="1" ondblclick="viewCerts();"/>
+    </outliner>
+    <hbox>
+      <button id="websites_viewButton"
+              label="&certmgr.view.label;"
+              disabled="true" oncommand="viewCerts();"/>
+      <button id="websites_editButton"
+              label="&certmgr.edit.label;"
+              disabled="true" oncommand="editCerts();"/>
+<!-- future - import a DER cert?
+      <button id="websites_addButton"
+              label="&certmgr.add.label;"
+              oncommand="addCerts();"/>
+-->
+      <button id="websites_deleteButton"
+              label="&certmgr.delete.label;"
+              disabled="true" oncommand="deleteCerts();"/>
+    </hbox>
+  </vbox>
+</overlay>

mozilla/security/manager/pki/resources/content/cacertexists.js

@@ -0,0 +1,26 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Rangan Sen <rangansen@netscape.com>
+ */
+
+function doOK()
+{
+  window.close();
+}

mozilla/security/manager/pki/resources/content/cacertexists.xul

@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Rangan Sen <rangansen@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
+
+<window id="cacertexists" 
+  title="&caCertExists.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  onload="setWindowName();">
+
+  <script type="application/x-javascript" src="chrome://pippki/content/cacertexists.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+
+  <vbox flex="1">
+    <description>&caCertExists.message;</description>
+    
+    <separator/>
+
+    <hbox align="center">
+      <button id="ok-button" label="&ok.label;"
+              oncommand="doOK();"/> 
+    </hbox>
+    
+    <separator/>
+
+  </vbox>
+
+</window>
+

mozilla/security/manager/pki/resources/content/certDump.xul

@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+   -   Javier Delgadillo <javi@netscape.com>
+  -->
+
+<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
+
+<overlay id="certDumpOverlay" 
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+         xmlns:cert="http://netscape.com/rdf-cert#" 
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<vbox class="box-padded" id="certPrettyPrint" flex="1">
+  <label class="header" value="&certmgr.hierarchy.label;"/>
+  <tree id="treesetDump" rows="4"
+        onselect="updateCertDump();">
+    <treecolgroup>
+      <treecol flex="1"/>
+    </treecolgroup>
+    <treechildren id="chainDump"/>
+  </tree>
+  <outliner class="inset" id="prettyDumpOutliner" style="height:150px">
+    <outlinercol flex ="1" id="certDataCol" label="&certmgr.details.label;"
+                 ignoreincolumnpicker="true" class="header outlinercol-header" primary="true"/>
+    <splitter/>
+    <outlinerbody flex="1" onselect="displaySelected();"/>
+  </outliner>
+  <label class="header" value="&certmgr.fields.label;"/>
+  <textbox class="inset" id="certDumpVal"  multiline="true" rows="8"
+           readonly="true" style="font-family: -moz-fixed;"/>
+</vbox>
+</overlay>

mozilla/security/manager/pki/resources/content/certManager.js

@@ -0,0 +1,371 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Lord <lord@netscape.com>
+ *  Ian McGreer <mcgreer@netscape.com>
+ */
+
+const nsIFilePicker = Components.interfaces.nsIFilePicker;
+const nsFilePicker = "@mozilla.org/filepicker;1";
+const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
+const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
+const nsIX509Cert = Components.interfaces.nsIX509Cert;
+const nsICertOutliner = Components.interfaces.nsICertOutliner;
+const nsCertOutliner = "@mozilla.org/security/nsCertOutliner;1";
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+const nsDialogParamBlock = "@mozilla.org/embedcomp/dialogparam;1";
+const nsIPKIParamBlock    = Components.interfaces.nsIPKIParamBlock;
+const nsPKIParamBlock    = "@mozilla.org/security/pkiparamblock;1";
+
+
+var helpURL = "chrome://help/content/help.xul";
+var key;
+
+var selected_certs = [];
+var certdb;
+
+var caOutlinerView;
+var serverOutlinerView;
+var emailOutlinerView;
+var userOutlinerView;
+
+function LoadCerts()
+{
+  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
+
+  caOutlinerView = Components.classes[nsCertOutliner]
+                    .createInstance(nsICertOutliner);
+  caOutlinerView.loadCerts(nsIX509Cert.CA_CERT);
+  document.getElementById('ca-outliner')
+   .outlinerBoxObject.view = caOutlinerView;
+
+  serverOutlinerView = Components.classes[nsCertOutliner]
+                        .createInstance(nsICertOutliner);
+  serverOutlinerView.loadCerts(nsIX509Cert.SERVER_CERT);
+  document.getElementById('server-outliner')
+   .outlinerBoxObject.view = serverOutlinerView;
+
+  emailOutlinerView = Components.classes[nsCertOutliner]
+                       .createInstance(nsICertOutliner);
+  emailOutlinerView.loadCerts(nsIX509Cert.EMAIL_CERT);
+  document.getElementById('email-outliner')
+   .outlinerBoxObject.view = emailOutlinerView; 
+
+  userOutlinerView = Components.classes[nsCertOutliner]
+                      .createInstance(nsICertOutliner);
+  userOutlinerView.loadCerts(nsIX509Cert.USER_CERT);
+  document.getElementById('user-outliner')
+   .outlinerBoxObject.view = userOutlinerView;
+
+  var rowCnt = userOutlinerView.rowCount;
+  var enableBackupAllButton=document.getElementById('mine_backupAllButton');
+  if(rowCnt < 1) {
+    enableBackupAllButton.setAttribute("disabled",true);
+  } else  {
+    enableBackupAllButton.setAttribute("enabled",true);
+  }
+
+
+  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+  var verifiedColText;
+  if (certdb.ocspOn) {
+    verifiedColText = bundle.GetStringFromName("certmgr.verifiedNoOCSP");
+  } else {
+    verifiedColText = bundle.GetStringFromName("certmgr.verified");
+  }
+  var verifiedCol = document.getElementById('verifiedcol');
+  verifiedCol.setAttribute('label', verifiedColText);
+}
+
+function ReloadCerts()
+{
+  caOutlinerView.loadCerts(nsIX509Cert.CA_CERT);
+  serverOutlinerView.loadCerts(nsIX509Cert.SERVER_CERT);
+  emailOutlinerView.loadCerts(nsIX509Cert.EMAIL_CERT);
+  userOutlinerView.loadCerts(nsIX509Cert.USER_CERT);
+}
+
+function getSelectedTab()
+{
+  var selTab = document.getElementById('certMgrTabbox').selectedItem;
+  var selTabID = selTab.getAttribute('id');
+  if (selTabID == 'mine_tab') {
+    key = "?my_certs";
+  } else if (selTabID == "others_tab") {
+    key = "?others_certs";
+  } else if (selTabID == "websites_tab") {
+    key = "?web_certs";
+  } else if (selTabID == "ca_tab") {
+    key = "?ca_certs";
+  }  
+  var context = helpURL + key;
+  return context;
+}
+
+
+function doHelpButton() {
+   var uri = getSelectedTab();
+   openHelp(uri);
+}
+
+
+function getSelectedCerts()
+{
+  var ca_tab = document.getElementById("ca_tab");
+  var mine_tab = document.getElementById("mine_tab");
+  var others_tab = document.getElementById("others_tab");
+  var websites_tab = document.getElementById("websites_tab");
+  var items = null;
+  if (ca_tab.selected) {
+    items = caOutlinerView.selection;
+  } else if (mine_tab.selected) {
+    items = userOutlinerView.selection;
+  } else if (others_tab.selected) {
+    items = emailOutlinerView.selection;
+  } else if (websites_tab.selected) {
+    items = serverOutlinerView.selection;
+  }
+  selected_certs = [];
+  var cert = null;
+  var nr = 0;
+  if (items != null) nr = items.getRangeCount();
+  if (nr > 0) {
+    for (var i=0; i<nr; i++) {
+      var o1 = {};
+      var o2 = {};
+      items.getRangeAt(i, o1, o2);
+      var min = o1.value;
+      var max = o2.value;
+      for (var j=min; j<=max; j++) {
+        if (ca_tab.selected) {
+          cert = caOutlinerView.getCert(j);
+        } else if (mine_tab.selected) {
+          cert = userOutlinerView.getCert(j);
+        } else if (others_tab.selected) {
+          cert = emailOutlinerView.getCert(j);
+        } else if (websites_tab.selected) {
+          cert = serverOutlinerView.getCert(j);
+        }
+        if (cert)
+          selected_certs[selected_certs.length] = cert;
+      }
+    }
+  }
+}
+
+function ca_enableButtons()
+{
+  var items = caOutlinerView.selection;
+  var nr = items.getRangeCount();
+  var toggle="false";
+  if (nr == 0) {
+    toggle="true";
+  }
+  var edit_toggle=toggle;
+/*
+  var edit_toggle="true";
+  if (nr > 0) {
+    for (var i=0; i<nr; i++) {
+      var o1 = {};
+      var o2 = {};
+      items.getRangeAt(i, o1, o2);
+      var min = o1.value;
+      var max = o2.value;
+      var stop = false;
+      for (var j=min; j<=max; j++) {
+        var tokenName = items.outliner.view.getCellText(j, "tokencol");
+	if (tokenName == "Builtin Object Token") { stop = true; } break;
+      }
+      if (stop) break;
+    }
+    if (i == nr) {
+      edit_toggle="false";
+    }
+  }
+*/
+  var enableViewButton=document.getElementById('ca_viewButton');
+  enableViewButton.setAttribute("disabled",toggle);
+  var enableEditButton=document.getElementById('ca_editButton');
+  enableEditButton.setAttribute("disabled",edit_toggle);
+  var enableDeleteButton=document.getElementById('ca_deleteButton');
+  enableDeleteButton.setAttribute("disabled",toggle);
+}
+
+function mine_enableButtons()
+{
+  var items = userOutlinerView.selection;
+  var toggle="false";
+  if (items.getRangeCount() == 0) {
+    toggle="true";
+  }
+  var enableViewButton=document.getElementById('mine_viewButton');
+  enableViewButton.setAttribute("disabled",toggle);
+  var enableBackupButton=document.getElementById('mine_backupButton');
+  enableBackupButton.setAttribute("disabled",toggle);
+  var enableDeleteButton=document.getElementById('mine_deleteButton');
+  enableDeleteButton.setAttribute("disabled",toggle);
+}
+
+function websites_enableButtons()
+{
+  var items = serverOutlinerView.selection;
+  var toggle="false";
+  if (items.getRangeCount() == 0) {
+    toggle="true";
+  }
+  var enableViewButton=document.getElementById('websites_viewButton');
+  enableViewButton.setAttribute("disabled",toggle);
+  var enableEditButton=document.getElementById('websites_editButton');
+  enableEditButton.setAttribute("disabled",toggle);
+  var enableDeleteButton=document.getElementById('websites_deleteButton');
+  enableDeleteButton.setAttribute("disabled",toggle);
+}
+
+function email_enableButtons()
+{
+  var items = emailOutlinerView.selection;
+  var toggle="false";
+  if (items.getRangeCount() == 0) {
+    toggle="true";
+  }
+  var enableViewButton=document.getElementById('email_viewButton');
+  enableViewButton.setAttribute("disabled",toggle);
+  var enableEditButton=document.getElementById('email_editButton');
+  enableEditButton.setAttribute("disabled",toggle);
+  var enableDeleteButton=document.getElementById('email_deleteButton');
+  enableDeleteButton.setAttribute("disabled",toggle);
+}
+
+function backupCerts()
+{
+  getSelectedCerts();
+  var numcerts = selected_certs.length;
+  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+  var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker);
+  fp.init(window,
+          bundle.GetStringFromName("chooseP12BackupFileDialog"),
+          nsIFilePicker.modeSave);
+  fp.appendFilter("PKCS12 Files", "*.p12");
+  fp.appendFilters(nsIFilePicker.filterAll);
+  var rv = fp.show();
+  if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) {
+    certdb.exportPKCS12File(null, fp.file, 
+                            selected_certs.length, selected_certs);
+  }
+}
+
+function backupAllCerts()
+{
+  // Select all rows, then call doBackup()
+  var items = userOutlinerView.selection.selectAll();
+  backupCerts();
+}
+
+function editCerts()
+{
+  getSelectedCerts();
+  var numcerts = selected_certs.length;
+  for (var t=0; t<numcerts; t++) {
+    var cert = selected_certs[t];
+    var certkey = cert.dbKey;
+    var ca_tab = document.getElementById("ca_tab");
+    if (ca_tab.selected) {
+      window.openDialog('chrome://pippki/content/editcacert.xul', certkey,
+                  'chrome,width=100,resizable=1,modal');
+    } else {
+      window.openDialog('chrome://pippki/content/editsslcert.xul', certkey,
+                  'chrome,width=100,resizable=1,modal');
+    }
+  }
+}
+
+function restoreCerts()
+{
+  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+  var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker);
+  fp.init(window,
+          bundle.GetStringFromName("chooseP12RestoreFileDialog"),
+          nsIFilePicker.modeOpen);
+  fp.appendFilter("PKCS12 Files", "*.p12;*.pfx");
+  fp.appendFilters(nsIFilePicker.filterAll);
+  if (fp.show() == nsIFilePicker.returnOK) {
+    var certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
+    certdb.importPKCS12File(null, fp.file);
+  }
+  userOutlinerView.loadCerts(nsIX509Cert.USER_CERT);
+}
+
+function deleteCerts()
+{
+  getSelectedCerts();
+  
+  var params = Components.classes[nsDialogParamBlock].createInstance(nsIDialogParamBlock);
+  
+  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+  var selTab = document.getElementById('certMgrTabbox').selectedItem;
+  var selTabID = selTab.getAttribute('id');
+  if (selTabID == 'mine_tab') 
+  {
+    params.SetString(1,bundle.GetStringFromName("deleteUserCertFlag"));
+  } 
+  else if (selTabID == "websites_tab") 
+  {
+    params.SetString(1,bundle.GetStringFromName("deleteSslCertFlag"));
+  } 
+  else if (selTabID == "ca_tab") 
+  {
+    params.SetString(1,bundle.GetStringFromName("deleteCaCertFlag"));
+  }
+  else if (selTabID == "others_tab") 
+  {
+    params.SetString(1,bundle.GetStringFromName("deleteEmailCertFlag"));
+  }
+  else
+  {
+    return;
+  }
+
+  var numcerts = selected_certs.length;
+  params.SetInt(2,numcerts);
+  for (var t=0; t<numcerts; t++) 
+  {
+    var cert = selected_certs[t];
+    params.SetString(t+3, cert.dbKey);  
+  }
+   
+  window.openDialog('chrome://pippki/content/deletecert.xul', "",
+                'chrome,resizable=1,modal',params);
+ 
+  ReloadCerts();
+}
+
+function viewCerts()
+{
+  getSelectedCerts();
+  var numcerts = selected_certs.length;
+  for (var t=0; t<numcerts; t++) {
+    selected_certs[t].view();
+  }
+}
+
+/* XXX future - import a DER cert from a file? */
+function addCerts()
+{
+  alert("Add cert chosen");
+}

mozilla/security/manager/pki/resources/content/certManager.xul

@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<?xul-overlay href="chrome://pippki/content/MineOverlay.xul"?>
+<?xul-overlay href="chrome://pippki/content/OthersOverlay.xul"?>
+<?xul-overlay href="chrome://pippki/content/WebSitesOverlay.xul"?>
+<?xul-overlay href="chrome://pippki/content/CAOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
+
+<window id="certmanager" 
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
+        title="&certmgr.title;"
+        onload="LoadCerts();">
+
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/certManager.js"/>
+
+  <vbox flex="1">
+    <tabbox flex="1">
+      <tabs id="certMgrTabbox">
+        <tab id="mine_tab" label="&certmgr.tab.mine;"/>
+        <tab id="others_tab" label="&certmgr.tab.others;"/>
+        <tab id="websites_tab" label="&certmgr.tab.websites;"/>
+        <tab id="ca_tab" label="&certmgr.tab.ca;" selected="true"/>
+      </tabs>
+      <tabpanels flex="1">
+        <vbox id="myCerts" flex="1"/>
+        <vbox id="othersCerts" flex="1"/>
+        <vbox id="webCerts" flex="1"/>
+        <vbox id="CACerts" flex="1"/>
+      </tabpanels>
+    </tabbox>
+
+    <hbox>
+      <button id="HelpButton"
+              label="&certmgr.help.label;" 
+              accesskey="&certmgr.helpButtonAccessKey;"
+              oncommand="doHelpButton();"/>
+    </hbox>
+  </vbox>
+
+</window>

mozilla/security/manager/pki/resources/content/certViewer.xul

@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+   -   Javier Delgadillo <javi@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
+
+<?xul-overlay href="chrome://pippki/content/viewCertDetails.xul"?>
+<?xul-overlay href="chrome://pippki/content/certDump.xul"?>
+
+
+<window id="certDetails" 
+  title="&certmgr.certdetail.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  onload="setWindowName();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/viewCertDetails.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+<keyset id="keys">
+  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close()"/>
+</keyset>
+
+  <grid flex="1">
+    <column flex="1"/>
+    <rows>
+      <row flex="1">
+        <tabbox flex="1">
+          <tabs>
+            <tab id="general_tab" label="&certmgr.detail.general_tab.title;"/>
+            <tab id="prettyprint_tab" label="&certmgr.detail.prettyprint_tab.title;"/>
+          </tabs>
+          <tabpanels flex="1">
+            <vbox id="general_info" flex="1"/>
+            <vbox id="certPrettyPrint" flex="1"/>
+          </tabpanels>
+        </tabbox>
+      </row>
+      <row>
+        <separator class="thin"/>
+      </row>
+      <row>
+        <hbox align="right" flex="1">
+          <button id="HelpButton"
+                  label="&certmgr.help.label;" 
+                  accesskey="&certmgr.helpButtonAccessKey;"
+                  oncommand="openHelp('chrome://help/content/help.xul?cert_details');"/>
+          <button id="closeButton"
+                  label="&certmgr.close.label;" 
+                  accesskey="&certmgr.closeWindowAccessKey;"
+                  oncommand="window.close();"/>
+        </hbox>
+      </row>
+    </rows>
+  </grid>
+</window>

mozilla/security/manager/pki/resources/content/certpicker.js

@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp..
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kai Engert <kaie@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+
+var dialogParams;
+var itemCount = 0;
+
+function onLoad()
+{
+  dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
+
+  var pickerTitle = dialogParams.GetString(1);
+  var mainwin = document.getElementById("certPicker");
+  mainwin.setAttribute("title", pickerTitle);
+
+  var pickerInfo = dialogParams.GetString(2);
+  setText("pickerInfo", pickerInfo);
+
+  var selectElement = document.getElementById("nicknames");
+  itemCount = dialogParams.GetInt(1);
+
+  for (var i=0; i < itemCount; i++) {
+      var menuItemNode = document.createElement("menuitem");
+      var nick = dialogParams.GetString(i+3);
+      menuItemNode.setAttribute("value", i);
+      menuItemNode.setAttribute("label", nick); // this is displayed
+      selectElement.firstChild.appendChild(menuItemNode);
+      if (i == 0) {
+          selectElement.selectedItem = menuItemNode;
+      }
+  }
+
+  dialogParams.SetInt(1,0); // set cancel return value
+  setDetails();
+}
+
+function setDetails()
+{
+  var index = parseInt(document.getElementById("nicknames").value);
+  details = dialogParams.GetString(index+itemCount+3);
+  document.getElementById("details").value = details;
+}
+
+function onCertSelected()
+{
+  setDetails();
+}
+
+function doOK()
+{
+  dialogParams.SetInt(1,1);
+  var index = parseInt(document.getElementById("nicknames").value);
+  dialogParams.SetInt(2, index);
+  window.close();
+}
+
+function doCancel()
+{
+  dialogParams.SetInt(1,0);
+  window.close();
+}

mozilla/security/manager/pki/resources/content/certpicker.xul

@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Communicator
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corp..
+   - Portions created by the Initial Developer are Copyright (C) 2001
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s): Kai Engert <kaie@netscape.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
+%pippkiDTD;
+]>
+
+
+<window id="certPicker" title="&certPicker.defaultTitle;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/certpicker.js"/>
+
+<keyset id="keys">
+  <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
+  <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
+  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
+</keyset>
+
+<vbox style="margin: 5px;">
+    <groupbox>
+    <description id="pickerInfo" style="font-weight: bold;">&certPicker.defaultInfo;</description>
+    <broadcaster id="certSelected" oncommand="onCertSelected();"/>
+    <!-- The items in this menulist must never be sorted,
+         but remain in the order filled by the application
+    -->
+    <menulist id="nicknames" observes="certSelected">
+        <menupopup/>
+    </menulist>
+    <label value="&certPicker.detailsLabel;"/>
+    <textbox readonly="true" id="details" multiline="true"
+      style="height: 11em; width=80em;"/>
+    </groupbox>
+  <separator class="thin"/>
+  <hbox>
+  <button id="ok-button" label="&ok.label;"
+          oncommand="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
+          oncommand="doCancel();"/> 
+  </hbox>
+</vbox>
+</window>

mozilla/security/manager/pki/resources/content/changepassword.xul

@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
+
+<window id="set_password" title="&setPassword.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+
+<vbox style="margin: 5px;" flex="1">
+
+<hbox align="center">
+  <label value="&setPassword.tokenName.label;: "/>
+  <label id="tokenName" />
+  <menulist id="tokenMenu" oncommand="onMenuChange()">
+     <menupopup/>
+  </menulist>
+</hbox>
+
+
+<!--
+    <menulist id="signerList" disabled="true">
+      <menupopup>
+        <menuitem id="token-menu" label="Built-in private key database"/>
+        <menuitem label="Bob Lord's iButton"/>
+      </menupopup>
+    </menulist>
+-->
+<separator/>
+
+<groupbox>
+<grid>
+ <columns>
+   <column/>
+   <column/> 
+ </columns>
+ <rows>
+   <row>
+     <label value="&setPassword.oldPassword.label;"/> 
+     <textbox id="oldpw" type="password"/>
+     <!-- This textbox is inserted as a workaround to the fact that making the 'type' 
+          & 'disabled' property of the 'oldpw' textbox toggle between ['password' & 
+          'false'] and ['text' & 'true'] - as would be necessary if the menu has more 
+          than one tokens, some initialized and some not - does not work properly. So, 
+          either the textbox 'oldpw' or the textbox 'message' would be displayed, 
+          depending on the state of the token selected 
+     -->
+     <textbox id="message" disabled="true" />
+   </row>
+   <row>
+     <label value="&setPassword.newPassword.label;"/> 
+     <textbox id="pw1" type="password" 
+       onkeypress="setPasswordStrength(); checkPasswords();"/> 
+   </row>
+   <row>
+     <label value="&setPassword.reenterPassword.label;"/> 
+     <textbox id="pw2" type="password" onkeypress="checkPasswords();"/>  
+   </row>
+ </rows>
+</grid>
+</groupbox>
+
+<groupbox>
+ <caption label="&setPassword.meter.label;"/>
+ <progressmeter id="pwmeter" mode="determined" 
+                  value="0"/>
+</groupbox>
+
+<separator/>
+
+<keyset id="keys">
+  <key id="enter-key"  keycode="VK_ENTER"  oncommand="if (!document.getElementById('ok-button').disabled) setPassword();"/>
+  <key id="return-key" keycode="VK_RETURN" oncommand="if (!document.getElementById('ok-button').disabled) setPassword();"/>
+  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
+</keyset>
+
+<hbox>
+<button id="ok-button" label="&ok.label;"
+        oncommand="setPassword();" disabled="true" default="true"/>
+<button id="cancel-button" label="&cancel.label;"
+        oncommand="window.close();"/> 
+<button id="help-button" label="&help.label;"
+        oncommand="openHelp('chrome://help/content/help.xul?change_pwd');"/> 
+</hbox>
+
+
+</vbox>
+
+</window>

mozilla/security/manager/pki/resources/content/choosetoken.js

@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ * David Drinan.
+ */
+
+
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+
+var dialogParams;
+
+function onLoad()
+{
+    dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
+    var selectElement = document.getElementById("tokens");
+    for (var i=1; i <= dialogParams.GetInt(1); i++) {
+        var menuItemNode = document.createElement("menuitem");
+        var token = dialogParams.GetString(i);
+        menuItemNode.setAttribute("value", token);
+        menuItemNode.setAttribute("label", token);
+        selectElement.firstChild.appendChild(menuItemNode);
+        if (i == 1) {
+            selectElement.selectedItem = menuItemNode;
+        }
+    }
+}
+
+function doOK()
+{
+  var tokenList = document.getElementById("tokens");
+  var token = tokenList.value;
+  dialogParams.SetInt(1,1);
+  dialogParams.SetString(1, token);
+  window.close();
+}
+
+function doCancel()
+{
+  dialogParams.SetInt(1,0);
+  window.close();
+}

mozilla/security/manager/pki/resources/content/choosetoken.xul

@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  - The contents of this file are subject to the Mozilla Public
+  - License Version 1.1 (the "License"); you may not use this file
+  - except in compliance with the License. You may obtain a copy of
+  - the License at http://www.mozilla.org/MPL/
+  -
+  - Software distributed under the License is distributed on an "AS
+  - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  - implied. See the License for the specific language governing
+  - rights and limitations under the License.
+  -
+  - The Original Code is mozilla.org code.
+  -
+  - The Initial Developer of the Original Code is Netscape
+  - Communications Corporation.  Portions created by Netscape are
+  - Copyright (C) 2001 Netscape Communications Corporation. All
+  - Rights Reserved.
+  -
+  - Contributor(s):
+  - David Drinan (ddrinan@netscape.com)
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
+%pippkiDTD;
+]>
+
+
+<window id="ssl_warning" title="&chooseToken.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  height="360"
+  width="400"
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/choosetoken.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+<keyset id="keys">
+  <key id="enter-key"  keycode="VK_ENTER"  oncommand="if (!document.getElementById('ok-button').disabled) doOK();"/>
+  <key id="return-key" keycode="VK_RETURN" oncommand="if (!document.getElementById('ok-button').disabled) doOK();"/>
+  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
+</keyset>
+
+<vbox style="margin: 5px;" flex="1">
+    <groupbox>
+    <description>&chooseToken.message1;</description>
+    <menulist id="tokens">
+        <menupopup/>
+    </menulist>
+    </groupbox>
+  <separator />
+  <hbox>
+  <button id="ok-button" label="&ok.label;"
+          oncommand="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
+          oncommand="doCancel();"/> 
+  <button id="help-button" label="&help.label;"
+          oncommand="openHelp('chrome://help/content/help.xul?which_token');"/> 
+  </hbox>
+</vbox>
+</window>

mozilla/security/manager/pki/resources/content/clientauthask.js

@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Javier Delgadillo <javi@netscape.com>
+ */
+
+
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+
+var dialogParams;
+var itemCount = 0;
+
+function onLoad()
+{
+    var cn;
+    var org;
+    var issuer;
+
+    dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
+    cn = dialogParams.GetString(1);
+    org = dialogParams.GetString(2);
+    issuer = dialogParams.GetString(3);
+
+    var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+    var message1 = bundle.formatStringFromName("clientAuthMessage1", 
+                                             [org],
+                                             1);
+    var message2 = bundle.formatStringFromName("clientAuthMessage2",
+                                             [issuer],
+                                             1);
+    setText("hostname", cn);
+    setText("organization", message1);
+    setText("issuer", message2);
+
+    var selectElement = document.getElementById("nicknames");
+    itemCount = dialogParams.GetInt(1);
+    for (var i=0; i < itemCount; i++) {
+        var menuItemNode = document.createElement("menuitem");
+        var nick = dialogParams.GetString(i+4);
+        menuItemNode.setAttribute("value", i);
+        menuItemNode.setAttribute("label", nick); // this is displayed
+        selectElement.firstChild.appendChild(menuItemNode);
+        if (i == 0) {
+            selectElement.selectedItem = menuItemNode;
+        }
+    }
+
+    setDetails();
+}
+
+function setDetails()
+{
+  var index = parseInt(document.getElementById("nicknames").value);
+  details = dialogParams.GetString(index+itemCount+4);
+  document.getElementById("details").value = details;
+}
+
+function onCertSelected()
+{
+  setDetails();
+}
+
+function doOK()
+{
+  dialogParams.SetInt(1,1);
+  var index = parseInt(document.getElementById("nicknames").value);
+  dialogParams.SetInt(2, index);
+  window.close();
+}
+
+function doCancel()
+{
+  dialogParams.SetInt(1,0);
+  window.close();
+}

mozilla/security/manager/pki/resources/content/clientauthask.xul

@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -
+   -
+   - Contributor(s):
+   - David Drinan (ddrinan@netscape.com)
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
+%pippkiDTD;
+]>
+
+
+<window id="ssl_warning" title="&clientAuthAsk.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/clientauthask.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js" />
+
+<keyset id="keys">
+  <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
+  <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
+  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
+</keyset>
+
+<vbox style="margin: 5px;">
+    <groupbox>
+    <description style="font-weight: bold;">&clientAuthAsk.message1;</description>
+    <description id="hostname"/>
+    <description id="organization"/>
+    <description id="issuer"/>
+    </groupbox>
+    <groupbox>
+    <description style="font-weight: bold;">&clientAuthAsk.message2;</description>
+    <broadcaster id="certSelected" oncommand="onCertSelected();"/>
+    <!-- The items in this menulist must never be sorted,
+         but remain in the order filled by the application
+    -->
+    <menulist id="nicknames" observes="certSelected">
+        <menupopup/>
+    </menulist>
+    <description>&clientAuthAsk.message3;</description>
+    <textbox readonly="true" id="details" multiline="true"
+      style="height: 11em; width=80em;"/>
+    </groupbox>
+  <separator/>
+  <hbox>
+  <button id="ok-button" label="&ok.label;"
+          oncommand="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
+          oncommand="doCancel();"/> 
+  <button id="help-button" label="&help.label;"
+     style="width: 10ex" oncommand="openHelp('chrome://help/content/help.xul?which_cert');" /> 
+  </hbox>
+</vbox>
+</window>

mozilla/security/manager/pki/resources/content/contents.rdf

@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:pippki"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:pippki"
+        chrome:displayName="pippki"
+        chrome:author="PSM Team"
+        chrome:name="pippki"
+ 	chrome:localeVersion="0.9.6">
+  </RDF:Description>
+
+  <!-- Declare overlay points used in this package -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
+    <RDF:li resource="chrome://navigator/content/pageInfo.xul"/>
+  </RDF:Seq>
+
+  <!-- Define the local overlay file(s) for each overlay point -->
+  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
+    <RDF:li>chrome://pippki/content/PrefOverlay.xul</RDF:li>
+  </RDF:Seq>
+  <RDF:Seq about="chrome://navigator/content/pageInfo.xul">
+    <RDF:li>chrome://pippki/content/PageInfoOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+</RDF:RDF>  
+

mozilla/security/manager/pki/resources/content/createCertInfo.js

@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ */
+
+var keygenThread;
+
+function onLoad()
+{
+  keygenThread = window.arguments[0].QueryInterface(Components.interfaces.nsIKeygenThread);
+  
+  if (!keygenThread) {
+    window.close();
+    return;
+  }
+  
+  setCursor("wait");
+  
+  keygenThread.startKeyGeneration(window);
+}
+
+function onClose()
+{
+  setCursor("default");
+
+  var alreadyClosed = new Object();
+  keygenThread.userCanceled(alreadyClosed);
+}

mozilla/security/manager/pki/resources/content/createCertInfo.xul

@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
+
+<window
+  id="domainMismatch" title="&createCertInfo.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  onload="onLoad();"
+  onclose="onClose();"
+>
+<script type="application/x-javascript" src="chrome://global/content/strres.js" />
+<script type="application/x-javascript" src="pippki.js" />
+<script type="application/x-javascript" src="createCertInfo.js" />
+<script type="application/x-javascript" src="chrome://help/content/help.js" />
+
+<vbox style="margin: 5px; max-width: 50em;">
+
+  <description>&createCertInfo.msg1;</description>
+  <separator/>
+  <description style="font-weight: bold; text-align: center; text-decoration: blink;">&createCertInfo.msg2;</description>
+  <separator/>
+
+</vbox>
+</window>

mozilla/security/manager/pki/resources/content/crlManager.js

@@ -0,0 +1,105 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  David Drinan <ddrinan@netscape.com>
+ */
+
+const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
+const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
+const nsICrlEntry = Components.interfaces.nsICrlEntry;
+const nsISupportsArray = Components.interfaces.nsISupportsArray;
+
+var certdb;
+var crls;
+
+function onLoad()
+{
+  var crlEntry;
+  var i;
+
+  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
+  crls = certdb.getCrls();
+
+  for (i=0; i<crls.Count(); i++) {
+    crlEntry = crls.GetElementAt(i).QueryInterface(nsICrlEntry);
+    var org = crlEntry.org;
+    var orgUnit = crlEntry.orgUnit;
+    var lastUpdate = crlEntry.lastUpdate;
+    var nextUpdate = crlEntry.nextUpdate;
+    AddItem("crlList", [org, orgUnit, lastUpdate, nextUpdate], "crltree_", i);
+  }
+}
+
+function AddItem(children,cells,prefix,idfier)
+{
+  var kids = document.getElementById(children);
+  var item  = document.createElement("treeitem");
+  var row   = document.createElement("treerow");
+  for(var i = 0; i < cells.length; i++)
+  {
+    var cell  = document.createElement("treecell");
+    cell.setAttribute("class", "propertylist");
+    cell.setAttribute("label", cells[i])
+    row.appendChild(cell);
+  }
+  item.appendChild(row);
+  item.setAttribute("id",prefix + idfier);
+  kids.appendChild(item);
+}
+
+function DeleteCrlSelected() {
+  var crlEntry;
+
+  // delete selected item
+  var crltree = document.getElementById("crltree");
+  var i = crltree.selectedIndex;
+
+  // Delete it
+  certdb.deleteCrl(i);
+  DeleteItemSelected("crltree", "crltree_", "crlList");
+  if( !crltree.selectedItems.length ) {
+    if( !document.getElementById("deleteCrl").disabled ) {
+      document.getElementById("deleteCrl").setAttribute("disabled", "true")
+    }
+  }
+}
+
+function EnableCrlActions() {
+  document.getElementById("deleteCrl").removeAttribute("disabled", "true");
+  // document.getElementById("updateCrl").removeAttribute("disabled", "true");
+}
+
+function DeleteItemSelected(tree, prefix, kids) {
+  var i;
+  var delnarray = [];
+  var rv = "";
+  var cookietree = document.getElementById(tree);
+  var selitems = cookietree.selectedItems;
+  for(i = 0; i < selitems.length; i++) 
+  { 
+    delnarray[i] = document.getElementById(selitems[i].getAttribute("id"));
+    var itemid = parseInt(selitems[i].getAttribute("id").substring(prefix.length,selitems[i].getAttribute("id").length));
+    rv += (itemid + ",");
+  }
+  for(i = 0; i < delnarray.length; i++) 
+  { 
+    document.getElementById(kids).removeChild(delnarray[i]);
+  }
+  return rv;
+}

mozilla/security/manager/pki/resources/content/crlManager.xul

@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!-- 
+  The contents of this file are subject to the Netscape Public
+  License Version 1.1 (the "License"); you may not use this file
+  except in compliance with the License. You may obtain a copy of
+  the License at http://www.mozilla.org/NPL/
+  
+  Software distributed under the License is distributed on an "AS
+  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  implied. See the License for the specific language governing
+  rights and limitations under the License.
+  
+  The Original Code is Mozilla Communicator client code, released
+  March 31, 1998.
+  
+  The Initial Developer of the Original Code is Netscape
+  Communications Corporation. Portions created by Netscape are
+  Copyright (C) 1998-1999 Netscape Communications Corporation. All
+  Rights Reserved.
+  
+  Contributor(s):
+    David Drinan (ddrinan@netscape.com)
+-->
+
+<!-- CHANGE THIS WHEN MOVING FILES -->
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!-- CHANGE THIS WHEN MOVING FILES -->
+<!DOCTYPE window [
+    <!ENTITY % prefValDTD SYSTEM "chrome://pippki/locale/pref-validation.dtd">
+    %prefValDTD;
+    <!ENTITY % prefCertMgrDTD SYSTEM "chrome://pippki/locale/certManager.dtd">
+    %prefCertMgrDTD;
+]>
+
+<window id="crlviewer"
+        class="dialog"
+        title="&validation.crlmanager.label;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        style="width: 30em;"
+        onload="onLoad();">
+
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/crlManager.js"/>
+
+  <description value="&validation.crlmanager.label;"/>
+  <separator class="thin"/>
+  <tree id="crltree" style="height: 10em;"
+   multiple="false" onclick="EnableCrlActions()" flex="1">
+    <treecolgroup>
+      <treecol flex="3" width="0"/>
+      <splitter class="tree-splitter"/>
+      <treecol flex="5" width="0"/>
+      <splitter class="tree-splitter"/>
+      <treecol flex="2" width="0"/>
+      <splitter class="tree-splitter"/>
+      <treecol flex="2" width="0"/>
+    </treecolgroup>
+    <treehead>
+      <treerow>
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&certmgr.certdetail.o;"/>
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&certmgr.certdetail.ou;"/>
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&validation.crllastupdate.label;"/>
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&validation.crlnextupdate.label;"/>
+      </treerow>          
+    </treehead>
+    <treechildren id="crlList" flex="1"/>
+  </tree>
+  <hbox>
+    <button id="deleteCrl" disabled="true"
+            label="&validation.deletecrl.label;"
+            oncommand="DeleteCrlSelected();"/>
+  </hbox>
+  <separator class="thin"/>
+</window>

mozilla/security/manager/pki/resources/content/deletecert.js

@@ -0,0 +1,126 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ian McGreer <mcgreer@netscape.com>
+ */
+
+const nsIX509Cert = Components.interfaces.nsIX509Cert;
+const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
+const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
+const nsIPKIParamBlock = Components.interfaces.nsIPKIParamBlock;
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+
+var certdb;
+var certs = [];
+var helpUrl;
+
+function setWindowName()
+{
+  var params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
+  
+  //  Get the cert from the cert database
+  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
+  
+  var typeFlag = params.GetString(1);
+  var numberOfCerts = params.GetInt(2);
+  var dbkey;
+  for(var x=0; x<numberOfCerts;x++)
+  {
+     dbkey = params.GetString(x+3);
+     certs[x] = certdb.getCertByDBKey(dbkey , null);
+  }
+  
+  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+  var title;
+  var confirm;
+  var impact;
+  
+  if(typeFlag == bundle.GetStringFromName("deleteUserCertFlag"))
+  {
+     title = bundle.GetStringFromName("deleteUserCertTitle");
+     confirm = bundle.GetStringFromName("deleteUserCertConfirm");
+     impact = bundle.GetStringFromName("deleteUserCertImpact");
+     helpUrl = "chrome://help/content/help.xul?delete_my_certs"
+  }
+  else if(typeFlag == bundle.GetStringFromName("deleteSslCertFlag"))
+  {
+     title = bundle.GetStringFromName("deleteSslCertTitle");
+     confirm = bundle.GetStringFromName("deleteSslCertConfirm");
+     impact = bundle.GetStringFromName("deleteSslCertImpact");
+     helpUrl = "chrome://help/content/help.xul?delete_web_certs"
+  }
+  else if(typeFlag == bundle.GetStringFromName("deleteCaCertFlag"))
+  {
+     title = bundle.GetStringFromName("deleteCaCertTitle");
+     confirm = bundle.GetStringFromName("deleteCaCertConfirm");
+     impact = bundle.GetStringFromName("deleteCaCertImpact");
+     helpUrl = "chrome://help/content/help.xul?delete_ca_certs"   
+  }
+  else if(typeFlag == bundle.GetStringFromName("deleteEmailCertFlag"))
+  {
+     title = bundle.GetStringFromName("deleteEmailCertTitle");
+     confirm = bundle.GetStringFromName("deleteEmailCertConfirm");
+     impact = bundle.GetStringFromName("deleteEmailCertImpact");
+     helpUrl = "chrome://help/content/help.xul?delete_email_certs"
+  }
+  else
+  {
+     return;
+  }
+  var windowReference = document.getElementById('deleteCertificate');
+  var confirReference = document.getElementById('confirm');
+  var impactReference = document.getElementById('impact');
+  windowReference.setAttribute("title", title);
+  
+  setText("confirm",confirm);
+
+  var box=document.getElementById("certlist");
+  var text;
+  for(var x=0;x<certs.length;x++)
+  {
+    text = document.createElement("text");
+    text.setAttribute("value",certs[x].commonName);
+    box.appendChild(text);
+  }
+
+  setText("impact",impact);
+
+  var wdth = window.innerWidth; // THIS IS NEEDED,
+  window.sizeToContent();
+  windowReference.setAttribute("width",window.innerWidth + 30);
+  var hght = window.innerHeight; // THIS IS NEEDED,
+  window.sizeToContent();
+  windowReference.setAttribute("height",window.innerHeight + 40);
+
+  
+}
+
+function doOK()
+{
+  for(var i=0;i<certs.length;i++)
+  {
+    certdb.deleteCertificate(certs[i]);
+  }
+  window.close();
+}
+
+function doHelp()
+{
+   openHelp(helpUrl);
+}

mozilla/security/manager/pki/resources/content/deletecert.xul

@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
+
+<window id="deleteCertificate" 
+  title="&certmgr.deletecert.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  onload="setWindowName();"
+  style="width:8ex">
+
+  <script type="application/x-javascript" src="chrome://pippki/content/deletecert.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="pippki.js" />
+
+  <keyset id="keys">
+    <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
+    <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
+    <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
+  </keyset>
+
+  <vbox flex="1">
+     <description id="confirm"/>
+     <separator />
+     <vbox id="certlist" flex="100%"/>
+     <description id="impact"/>
+     <separator />
+
+    <hbox align="center">
+      <button id="ok-button" label="&certmgr.ok.label;"
+              oncommand="doOK();"/> 
+      <button id="cancel-button" label="&certmgr.cancel.label;"
+              oncommand="window.close();"/> 
+      <button id="help-button" label="&certmgr.help.label;"
+              oncommand="doHelp();"/> 
+    </hbox>
+  </vbox>
+
+</window>

mozilla/security/manager/pki/resources/content/device_manager.js

@@ -0,0 +1,420 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Lord <lord@netscape.com>
+ *  Ian McGreer <mcgreer@netscape.com>
+ */
+
+const nsIFilePicker = Components.interfaces.nsIFilePicker;
+const nsFilePicker = "@mozilla.org/filepicker;1";
+const nsIPKCS11Slot = Components.interfaces.nsIPKCS11Slot;
+const nsIPKCS11Module = Components.interfaces.nsIPKCS11Module;
+const nsPKCS11ModuleDB = "@mozilla.org/security/pkcs11moduledb;1";
+const nsIPKCS11ModuleDB = Components.interfaces.nsIPKCS11ModuleDB;
+const nsIPK11Token = Components.interfaces.nsIPK11Token;
+const nsPK11TokenDB = "@mozilla.org/security/pk11tokendb;1";
+const nsIPK11TokenDB = Components.interfaces.nsIPK11TokenDB;
+
+var bundle;
+var secmoddb;
+
+/* Do the initial load of all PKCS# modules and list them. */
+function LoadModules()
+{
+  bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+  secmoddb = Components.classes[nsPKCS11ModuleDB].getService(nsIPKCS11ModuleDB);
+  var modules = secmoddb.listModules();
+  var done = false;
+  try {
+    modules.isDone();
+  } catch (e) { done = true; }
+  while (!done) {
+    var module = modules.currentItem().QueryInterface(nsIPKCS11Module);
+    if (module) {
+      var slotnames = [];
+      var slots = module.listSlots();
+      var slots_done = false;
+      try {
+        slots.isDone();
+      } catch (e) { slots_done = true; }
+      while (!slots_done) {
+        var slot = null;
+ 	try {
+          slot = slots.currentItem().QueryInterface(nsIPKCS11Slot);
+        } catch (e) { slot = null; }
+        // in the ongoing discussion of whether slot names or token names
+        // are to be shown, I've gone with token names because NSS will
+        // prefer lookup by token name.  However, the token may not be
+        // present, so maybe slot names should be listed, while token names
+        // are "remembered" for lookup?
+	if (slot != null) {
+          if (slot.tokenName)
+            slotnames[slotnames.length] = slot.tokenName;
+          else
+            slotnames[slotnames.length] = slot.name;
+	}
+        try {
+          slots.next();
+        } catch (e) { slots_done = true; }
+      }
+      AddModule(module.name, slotnames);
+    }
+    try {
+      modules.next();
+    } catch (e) { done = true; }
+  }
+  /* Set the text on the fips button */
+  SetFIPSButtonText();
+}
+
+function SetFIPSButtonText()
+{
+  var fipsButton = document.getElementById("fipsbutton");
+  var label;
+  if (secmoddb.isFIPSEnabled) {
+   label = bundle.GetStringFromName("disable_fips"); 
+  } else {
+   label = bundle.GetStringFromName("enable_fips"); 
+  }
+  fipsButton.setAttribute("label", label);
+}
+
+/* Add a module to the tree.  slots is the array of slots in the module,
+ * to be represented as children.
+ */
+function AddModule(module, slots)
+{
+  var tree = document.getElementById("device_list");
+  var item  = document.createElement("treeitem");
+  var row  = document.createElement("treerow");
+  var cell = document.createElement("treecell");
+  cell.setAttribute("class", "propertylist");
+  cell.setAttribute("label", module);
+  cell.setAttribute("style", "font-weight: bold");
+  cell.setAttribute("crop", "never");
+  row.appendChild(cell);
+  item.appendChild(row);
+  var parent = document.createElement("treechildren");
+  for (var i = 0; i<slots.length; i++) {
+    var child_item = document.createElement("treeitem");
+    var child_row = document.createElement("treerow");
+    var child_cell = document.createElement("treecell");
+    child_cell.setAttribute("label", slots[i]);
+    child_cell.setAttribute("class", "treecell-indent");
+    child_row.appendChild(child_cell);
+    child_item.appendChild(child_row);
+    child_item.setAttribute("pk11kind", "slot");
+    parent.appendChild(child_item);
+  }
+  item.appendChild(parent);
+  item.setAttribute("pk11kind", "module");
+  item.setAttribute("open", "true");
+  item.setAttribute("container", "true");
+  tree.appendChild(item);
+}
+
+var selected_slot;
+var selected_module;
+
+/* get the slot selected by the user (can only be one-at-a-time) */
+function getSelectedItem()
+{
+  var tree = document.getElementById('device_tree');
+  var items = tree.selectedItems;
+  selected_slot = null;
+  selected_module = null;
+  if (items.length > 0) {
+    var kind = items[0].getAttribute("pk11kind");
+    var module_name;
+    if (kind == "slot") {
+      // get the module cell for this slot cell
+      var cell = items[0].parentNode.parentNode.firstChild.firstChild;
+      module_name = cell.getAttribute("label");
+      var module = secmoddb.findModuleByName(module_name);
+      // get the cell for the selected row (the slot to display)
+      cell = items[0].firstChild.firstChild;
+      var slot_name = cell.getAttribute("label");
+      selected_slot = module.findSlotByName(slot_name);
+    } else { // (kind == "module")
+      // get the cell for the selected row (the module to display)
+      cell = items[0].firstChild.firstChild;
+      module_name = cell.getAttribute("label");
+      selected_module = secmoddb.findModuleByName(module_name);
+    }
+  }
+}
+
+function enableButtons()
+{
+  var login_toggle = "true";
+  var logout_toggle = "true";
+  var pw_toggle = "true";
+  var unload_toggle = "true";
+  getSelectedItem();
+  if (selected_module) {
+    unload_toggle = "false";
+    showModuleInfo();
+  } else if (selected_slot) {
+    // here's the workaround - login functions are all with token,
+    // so grab the token type
+    var selected_token = selected_slot.getToken();
+    if (selected_token != null) {
+      if (selected_token.needsLogin() || !(selected_token.needsUserInit)) {
+        pw_toggle = "false";
+        if(selected_token.needsLogin()) {
+          if (selected_token.isLoggedIn()) {
+            logout_toggle = "false";
+          } else {
+            login_toggle = "false";
+          }
+        }
+      }
+    }
+    showSlotInfo();
+  }
+  var thebutton = document.getElementById('login_button');
+  thebutton.setAttribute("disabled", login_toggle);
+  thebutton = document.getElementById('logout_button');
+  thebutton.setAttribute("disabled", logout_toggle);
+  thebutton = document.getElementById('change_pw_button');
+  thebutton.setAttribute("disabled", pw_toggle);
+  thebutton = document.getElementById('unload_button');
+  thebutton.setAttribute("disabled", unload_toggle);
+  // not implemented
+  //thebutton = document.getElementById('change_slotname_button');
+  //thebutton.setAttribute("disabled", toggle);
+}
+
+// clear the display of information for the slot
+function ClearInfoList()
+{
+  var info_list = document.getElementById("info_list");
+  while (info_list.firstChild)
+      info_list.removeChild(info_list.firstChild);
+}
+
+// show a list of info about a slot
+function showSlotInfo()
+{
+  ClearInfoList();
+  switch (selected_slot.status) {
+   case nsIPKCS11Slot.SLOT_DISABLED:
+     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
+                bundle.GetStringFromName("devinfo_stat_disabled"), 
+                "tok_status");
+     break;
+   case nsIPKCS11Slot.SLOT_NOT_PRESENT:
+     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
+                bundle.GetStringFromName("devinfo_stat_notpresent"), 
+                "tok_status");
+     break;
+   case nsIPKCS11Slot.SLOT_UNINITIALIZED:
+     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
+                bundle.GetStringFromName("devinfo_stat_uninitialized"), 
+                "tok_status");
+     break;
+   case nsIPKCS11Slot.SLOT_NOT_LOGGED_IN:
+     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
+                bundle.GetStringFromName("devinfo_stat_notloggedin"), 
+                "tok_status");
+     break;
+   case nsIPKCS11Slot.SLOT_LOGGED_IN:
+     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
+                bundle.GetStringFromName("devinfo_stat_loggedin"), 
+                "tok_status");
+     break;
+   case nsIPKCS11Slot.SLOT_READY:
+     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
+                bundle.GetStringFromName("devinfo_stat_ready"), 
+                "tok_status");
+     break;
+  }
+  AddInfoRow(bundle.GetStringFromName("devinfo_desc"), 
+             selected_slot.desc, "slot_desc");
+  AddInfoRow(bundle.GetStringFromName("devinfo_manID"), 
+             selected_slot.manID, "slot_manID");
+  AddInfoRow(bundle.GetStringFromName("devinfo_hwversion"),
+             selected_slot.HWVersion, "slot_hwv");
+  AddInfoRow(bundle.GetStringFromName("devinfo_fwversion"),
+             selected_slot.FWVersion, "slot_fwv");
+}
+
+function showModuleInfo()
+{
+  ClearInfoList();
+  AddInfoRow(bundle.GetStringFromName("devinfo_modname"),
+             selected_module.name, "module_name");
+  AddInfoRow(bundle.GetStringFromName("devinfo_modpath"),
+             selected_module.libName, "module_path");
+}
+
+// add a row to the info list, as [col1 col2] (ex.: ["status" "logged in"])
+function AddInfoRow(col1, col2, cell_id)
+{
+  var tree = document.getElementById("info_list");
+  var item  = document.createElement("treeitem");
+  var row  = document.createElement("treerow");
+  var cell1 = document.createElement("treecell");
+  cell1.setAttribute("label", col1);
+  cell1.setAttribute("crop", "never");
+  row.appendChild(cell1);
+  var cell2 = document.createElement("treecell");
+  cell2.setAttribute("label", col2);
+  cell2.setAttribute("crop", "never");
+  cell2.setAttribute("id", cell_id);
+  row.appendChild(cell2);
+  item.appendChild(row);
+  tree.appendChild(item);
+}
+
+// log in to a slot
+function doLogin()
+{
+  getSelectedItem();
+  // here's the workaround - login functions are with token
+  var selected_token = selected_slot.getToken();
+  try {
+    selected_token.login(false);
+    var tok_status = document.getElementById("tok_status");
+    if (selected_token.isLoggedIn()) {
+      tok_status.setAttribute("label", 
+                          bundle.GetStringFromName("devinfo_stat_loggedin"));
+    } else {
+      tok_status.setAttribute("label",
+                       bundle.GetStringFromName("devinfo_stat_notloggedin"));
+    }
+  } catch (e) {
+    var alertStr = bundle.GetStringFromName("login_failed"); 
+    alert(alertStr);
+  }
+  enableButtons();
+}
+
+// log out of a slot
+function doLogout()
+{
+  getSelectedItem();
+  // here's the workaround - login functions are with token
+  var selected_token = selected_slot.getToken();
+  try {
+    selected_token.logout(false);
+    var tok_status = document.getElementById("tok_status");
+    if (selected_token.isLoggedIn()) {
+      tok_status.setAttribute("label", 
+                          bundle.GetStringFromName("devinfo_stat_loggedin"));
+    } else {
+      tok_status.setAttribute("label",
+                       bundle.GetStringFromName("devinfo_stat_notloggedin"));
+    }
+  } catch (e) {
+  }
+  enableButtons();
+}
+
+// load a new device
+function doLoad()
+{
+  //device.loaddlg.width=300
+  //device.loaddlg.height=200
+  var dlgWidth = bundle.GetStringFromName("device.loaddlg.width");
+  var dlgHeight = bundle.GetStringFromName("device.loaddlg.height");
+  //
+  window.open("load_device.xul", "loaddevice", 
+              "chrome,width=" + dlgWidth + ",height="+ dlgHeight+ ",resizable=1,dialog=1,modal=1");
+  var device_list = document.getElementById("device_list");
+  while (device_list.firstChild)
+    device_list.removeChild(device_list.firstChild);
+  LoadModules();
+}
+
+function doUnload()
+{
+  getSelectedItem();
+  if (selected_module) {
+    pkcs11.deletemodule(selected_module.name);
+    var device_list = document.getElementById("device_list");
+    while (device_list.firstChild)
+      device_list.removeChild(device_list.firstChild);
+    LoadModules();
+  }
+}
+
+function changePassword()
+{
+  getSelectedItem();
+  token = selected_slot.getToken();
+  window.open("changepassword.xul",
+              selected_slot.tokenName, 
+              "chrome,resizable=1,modal=1,dialog=1");
+  showSlotInfo();
+  enableButtons();
+}
+
+// browse fs for PKCS#11 device
+function doBrowseFiles()
+{
+  var srbundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+  var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker);
+  fp.init(window,
+          srbundle.GetStringFromName("loadPK11TokenDialog"),
+          nsIFilePicker.modeOpen);
+  fp.appendFilters(nsIFilePicker.filterAll);
+  if (fp.show() == nsIFilePicker.returnOK) {
+    var pathbox = document.getElementById("device_path");
+    pathbox.setAttribute("value", fp.file.persistentDescriptor);
+  }
+}
+
+function doLoadDevice()
+{
+  var name_box = document.getElementById("device_name");
+  var path_box = document.getElementById("device_path");
+  pkcs11.addmodule(name_box.value, path_box.value, 0,0);
+  window.close();
+}
+
+// -------------------------------------   Old code
+
+function showTokenInfo()
+{
+  ClearInfoList();
+  getSelectedToken();
+  AddInfoRow(bundle.GetStringFromName("devinfo_label"), 
+             selected_token.tokenLabel, "tok_label");
+  AddInfoRow(bundle.GetStringFromName("devinfo_manID"),
+             selected_token.tokenManID, "tok_manID");
+  AddInfoRow(bundle.GetStringFromName("devinfo_serialnum"), 
+             selected_token.tokenSerialNumber, "tok_sNum");
+  AddInfoRow(bundle.GetStringFromName("devinfo_hwversion"),
+             selected_token.tokenHWVersion, "tok_hwv");
+  AddInfoRow(bundle.GetStringFromName("devinfo_fwversion"),
+             selected_token.tokenFWVersion, "tok_fwv");
+}
+
+function toggleFIPS()
+{
+  secmoddb.toggleFIPSMode();
+  //Remove the existing listed modules so that re-fresh doesn't 
+  //display the module that just changed.
+  var device_list = document.getElementById("device_list");
+  while (device_list.firstChild)
+    device_list.removeChild(device_list.firstChild);
+
+  LoadModules();
+}

mozilla/security/manager/pki/resources/content/device_manager.xul

@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % deviceManangerDTD SYSTEM "chrome://pippki/locale/deviceManager.dtd">
+%deviceManangerDTD;
+<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
+%pippkiDTD;
+]>
+
+<window id="devicemanager" 
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
+        title="&devmgr.title;"
+        persist="screenX screenY width height"
+        onload="LoadModules();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+<grid flex="1">
+  <columns>
+    <column flex="1"/> 
+    <column flex="1"/> 
+    <column flex="1"/> 
+  </columns>
+  <rows>
+    <row>
+      <hbox flex="1"> <!-- List of devices -->
+        <tree id="device_tree" rows="12" multiple="false"
+              onselect="enableButtons();"
+              flex="1" style="min-width:15em">
+          <treecolgroup> 
+            <treecol flex="1"/> 
+          </treecolgroup>
+          <treehead>
+            <treerow>
+              <treecell class="treecell-header" 
+                        label="&devmgr.devlist.label;"
+                        flex="1"/>
+            </treerow>
+          </treehead>
+          <treechildren id="device_list"/>
+        </tree>
+      </hbox> <!-- / List of devices -->
+      <hbox flex="1"> <!-- Device status -->
+        <tree id="info_tree" rows="12" multiple="false" 
+              class="list" flex="1" style="min-width:10em">
+          <treecolgroup> 
+            <treecol flex="5"/> 
+            <treecol flex="7"/> 
+          </treecolgroup>
+          <treehead>
+            <treerow>
+              <treecell class="treecell-header"
+                        label="&devmgr.details.title;" flex="2"/>
+              <treecell class="treecell-header"
+                        label="&devmgr.details.title2;" flex="7"/>
+            </treerow>
+          </treehead>
+          <treechildren id="info_list"/>
+        </tree>
+      </hbox> <!-- / Device status -->
+      <vbox> <!-- Buttons for manipulating devices -->
+        <button id="login_button" 
+                label="&devmgr.button.login.label;"
+                oncommand="doLogin();" disabled="true"/> 
+        <button id="logout_button" 
+                label="&devmgr.button.logout.label;"
+                oncommand="doLogout();" disabled="true"/> 
+        <button id="change_pw_button" 
+                label="&devmgr.button.changepw.label;"
+                oncommand="changePassword();" disabled="true"/> 
+        <button id="load_button" 
+                label="&devmgr.button.load.label;"
+                oncommand="doLoad();"/> 
+        <button id="unload_button" 
+                label="&devmgr.button.unload.label;"
+                oncommand="doUnload();" disabled="true"/> 
+        <button id="fipsbutton" 
+                label=""
+                oncommand="toggleFIPS();"/>
+      </vbox> <!-- / Buttons for manipulating devices -->
+    </row>
+    <row>
+      <hbox>
+        <button id="help_button" 
+                label="&help.label;" 
+                oncommand="openHelp('chrome://help/content/help.xul?sec_devices');"/> 
+        <button id="ok_button" 
+                label="&ok.label;" 
+                oncommand="window.close();"/> 
+      </hbox>
+    </row>
+  </rows>
+</grid>
+</window>

mozilla/security/manager/pki/resources/content/domainMismatch.js

@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Javier Delgadillo <javi@netscape.com>
+ */
+
+
+const nsIPKIParamBlock    = Components.interfaces.nsIPKIParamBlock;
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+const nsIX509Cert         = Components.interfaces.nsIX509Cert;
+
+var pkiParams;
+var dialogParams;
+var cert;
+
+function onLoad()
+{
+  pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock);  
+  var isupport = pkiParams.getISupportAtIndex(1);
+  cert     = isupport.QueryInterface(nsIX509Cert);
+  dialogParams = pkiParams.QueryInterface(nsIDialogParamBlock);
+  var connectURL = dialogParams.GetString(1); 
+
+  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+
+  var message1 = bundle.formatStringFromName("mismatchDomainMsg1", 
+                                             [ connectURL, cert.commonName ],
+                                             2);
+  var message2 = bundle.formatStringFromName("mismatchDomainMsg2", 
+                                             [ connectURL ],
+                                              1);
+  setText("message1", message1);
+  setText("message2", message2);
+  //Set the focus so key press events work
+  document.getElementById('ok-button').focus();
+
+  var xulWindow = document.getElementById("domainMismatch");
+  var wdth = window.innerWidth; // THIS IS NEEDED,
+  window.sizeToContent();
+  xulWindow.setAttribute("width",window.innerWidth + 30);
+
+  var hght = window.innerHeight; // THIS IS NEEDED,
+  window.sizeToContent();
+  xulWindow.setAttribute("height",window.innerHeight + 40);
+   
+}
+
+function viewCert()
+{
+  cert.view();
+}
+
+function doOK()
+{
+  dialogParams.SetInt(1,1);
+  window.close();
+}
+
+function doCancel()
+{
+  dialogParams.SetInt(1,0);
+  window.close();
+}

mozilla/security/manager/pki/resources/content/domainMismatch.xul

@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!--
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -
+   -
+   - Contributor(s):
+   -  Javier Delgadillo <javi@netscape.com>
+   -  Bob Lord <lord@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
+
+<window id="domainMismatch" title="&domainMismatch.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  width="320"
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/domainMismatch.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+
+<keyset id="keys">
+  <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK()"    />
+  <key id="return-key" keycode="VK_RETURN" oncommand="doOK()"    />
+  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel()"/>
+</keyset>
+
+<vbox style="margin: 5px;" flex="1">
+
+  <description id="message1"/>
+  <separator/>
+  <description id="message2" flex="100%"/>
+
+  <hbox>
+  <button id="examineCert-button" label="&examineCert.label;"
+     oncommand="viewCert();"/> 
+  </hbox>
+  <separator/>
+ 
+  <keyset id="keys">
+    <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
+    <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
+    <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
+  </keyset>
+ 
+  <hbox>
+  <button id="ok-button" label="&ok.label;"
+          oncommand="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
+          oncommand="doCancel();"/> 
+  <button id="help-button" label="&help.label;"
+          oncommand="openHelp('chrome://help/content/help.xul?bad_name_web_cert');"/> 
+  </hbox>
+</vbox>
+</window>

mozilla/security/manager/pki/resources/content/downloadcert.js

@@ -0,0 +1,92 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Lord <lord@netscape.com>
+ *  Terry Hayes <thayes@netscape.com>
+ */
+
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+const nsIPKIParamBlock = Components.interfaces.nsIPKIParamBlock;
+const nsIX509Cert = Components.interfaces.nsIX509Cert;
+
+var pkiParams;
+var params;
+var caName;
+var cert;
+
+function onLoad()
+{
+  pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock);
+  params = pkiParams.QueryInterface(nsIDialogParamBlock);
+  var isupport = pkiParams.getISupportAtIndex(1);
+  cert = isupport.QueryInterface(nsIX509Cert);
+
+  caName = cert.commonName; 
+
+  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+
+  if (!caName.length)
+    caName = bundle.GetStringFromName("unnamedCA");
+
+  var message2 = bundle.formatStringFromName("newCAMessage1",
+                                             [ caName ],
+                                              1);
+  setText("message2", message2);
+
+  var xulWindow = document.getElementById("download_cert");
+  var wdth = window.innerWidth; // THIS IS NEEDED,
+  window.sizeToContent();
+  xulWindow.setAttribute("width",window.innerWidth + 30);
+
+  var hght = window.innerHeight; // THIS IS NEEDED,
+  window.sizeToContent();
+  xulWindow.setAttribute("height",window.innerHeight + 40);
+}
+
+function viewCert()
+{
+  cert.view();
+}
+
+function doOK()
+{
+  var checkSSL = document.getElementById("trustSSL");
+  var checkEmail = document.getElementById("trustEmail");
+  var checkObjSign = document.getElementById("trustObjSign");
+  if (checkSSL.checked)
+    params.SetInt(2,1);
+  else
+    params.SetInt(2,0);
+  if (checkEmail.checked)
+    params.SetInt(3,1);
+  else
+    params.SetInt(3,0);
+  if (checkObjSign.checked)
+    params.SetInt(4,1);
+  else
+    params.SetInt(4,0);
+  params.SetInt(1,1);
+  window.close();
+}
+
+function doCancel()
+{
+  params.SetInt(1,0);
+  window.close();
+}

mozilla/security/manager/pki/resources/content/downloadcert.xul

@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
+
+<window id="download_cert" title="&downloadCert.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  height="320"
+  width="460"
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/downloadcert.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+
+<vbox style="margin: 5px;" flex="1">
+
+  <!--  Let 'em know what they're doing -->
+  <vbox>
+    <description>&downloadCert.message1;</description>
+  </vbox>
+
+  <separator/>
+
+  <!--  checkboxes for trust bits
+     -  "do you want to?"
+     -  * trust for SSL
+     -  * trust for email
+     -  * trust for object signing
+    -->
+  <vbox>
+    <description id="message2"/>
+    <checkbox label="&downloadCert.trustSSL;"
+              id="trustSSL"/>
+    <checkbox label="&downloadCert.trustEmail;"
+              id="trustEmail"/>
+    <checkbox label="&downloadCert.trustObjSign;"
+              id="trustObjSign"/>
+  </vbox>
+
+  <separator/>
+
+  <!--  buttons for viewing cert and policies
+     -  "suggested you view the following:"
+     -  <>  view cert
+     -  <>  view policy
+    -->
+  <vbox>
+    <description>&downloadCert.message3;</description>
+    <separator/>
+    <grid>
+      <columns>
+        <column/>
+        <column/>
+      </columns>
+      <rows>
+        <row>
+          <button id="viewC-button"
+                  label="&downloadCert.viewCert.label;"
+                  oncommand="viewCert();"/> 
+          <description style="margin: 4px;">&downloadCert.viewCert.text;</description>
+        </row>
+      </rows>
+    </grid>
+  </vbox>
+
+  <separator/>
+
+  <!--  usual runaround
+     -  <ok>  <cancel> <help>
+    -->
+  <hbox align="center">
+    <button id="ok-button" label="&ok.label;"
+            oncommand="doOK();"/> 
+    <button id="cancel-button" label="&cancel.label;"
+            oncommand="doCancel();"/> 
+    <button id="help-button" label="&help.label;"
+            oncommand="openHelp('chrome://help/content/help.xul?new_ca');"/> 
+  </hbox>
+
+</vbox>
+
+</window>

mozilla/security/manager/pki/resources/content/editcacert.xul

@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
+
+<window id="editCaCert" 
+        title="&certmgr.editcacert.title;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="setWindowName();"
+>
+
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+
+  <vbox flex="1">
+    <description id="certmsg"/>
+    <separator />
+    <description flex="100%">&certmgr.editcert.edittrust;</description>
+    <vbox flex="100%">
+      <checkbox label="&certmgr.editcert.trustssl;"
+                id="trustSSL"/>
+      <checkbox label="&certmgr.editcert.trustemail;"
+                id="trustEmail"/>
+      <checkbox label="&certmgr.editcert.trustobjsign;"
+                id="trustObjSign"/>
+    </vbox>
+
+    <keyset id="keys">
+      <key id="enter-key"  keycode="VK_ENTER"  oncommand="doSSLOK();"/>
+      <key id="return-key" keycode="VK_RETURN" oncommand="doSSLOK();"/>
+      <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
+    </keyset>
+
+    <hbox>
+      <button id="ok-button" label="&certmgr.ok.label;"
+              oncommand="doOK();"/> 
+      <button id="cancel-button" label="&certmgr.cancel.label;"
+              oncommand="window.close();"/> 
+      <button id="help-button" label="&certmgr.help.label;"
+              oncommand="openHelp('chrome://help/content/help.xul?edit_ca_certs');"/>
+    </hbox>
+  </vbox>
+
+</window>

mozilla/security/manager/pki/resources/content/editcerts.js

@@ -0,0 +1,209 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Lord <lord@netscape.com>
+ *  Ian McGreer <mcgreer@netscape.com>
+ */
+
+const nsIX509Cert = Components.interfaces.nsIX509Cert;
+const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
+const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
+const nsIPKIParamBlock = Components.interfaces.nsIPKIParamBlock;
+
+var certdb;
+var cert;
+
+function setWindowName()
+{
+  var dbkey = self.name;
+
+  //  Get the cert from the cert database
+  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
+  //var pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock);
+  //var isupport = pkiParams.getISupportAtIndex(1);
+  //cert = isupport.QueryInterface(nsIX509Cert);
+  cert = certdb.getCertByDBKey(dbkey, null);
+
+  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+  var windowReference = document.getElementById('editCaCert');
+
+  var message1 = bundle.formatStringFromName("editTrustCA",
+                                             [ cert.commonName ],
+                                             1);
+  setText("certmsg", message1);
+
+  var ssl = document.getElementById("trustSSL");
+  if (certdb.getCertTrust(cert, nsIX509Cert.CA_CERT, 
+                          nsIX509CertDB.TRUSTED_SSL)) {
+    ssl.setAttribute("checked", "true");
+  } else {
+    ssl.setAttribute("checked", "false");
+  }
+  var email = document.getElementById("trustEmail");
+  if (certdb.getCertTrust(cert, nsIX509Cert.CA_CERT, 
+                          nsIX509CertDB.TRUSTED_EMAIL)) {
+    email.setAttribute("checked", "true");
+  } else {
+    email.setAttribute("checked", "false");
+  }
+  var objsign = document.getElementById("trustObjSign");
+  if (certdb.getCertTrust(cert, nsIX509Cert.CA_CERT,  
+                          nsIX509CertDB.TRUSTED_OBJSIGN)) {
+    objsign.setAttribute("checked", "true");
+  } else {
+    objsign.setAttribute("checked", "false");
+  }
+
+  var xulWindow = document.getElementById("editCaCert");
+  var wdth = window.innerWidth; // THIS IS NEEDED,
+  window.sizeToContent();
+  xulWindow.setAttribute("width",window.innerWidth + 30);
+  var hght = window.innerHeight; // THIS IS NEEDED,
+  window.sizeToContent();
+  xulWindow.setAttribute("height",window.innerHeight + 70);
+  
+
+}
+
+function doOK()
+{
+  var ssl = document.getElementById("trustSSL");
+  var email = document.getElementById("trustEmail");
+  var objsign = document.getElementById("trustObjSign");
+  var trustssl = (ssl.checked) ? nsIX509CertDB.TRUSTED_SSL : 0;
+  var trustemail = (email.checked) ? nsIX509CertDB.TRUSTED_EMAIL : 0;
+  var trustobjsign = (objsign.checked) ? nsIX509CertDB.TRUSTED_OBJSIGN : 0;
+  //
+  //  Set the cert trust
+  //
+  certdb.setCertTrust(cert, nsIX509Cert.CA_CERT, 
+                      trustssl | trustemail | trustobjsign);
+  window.close();
+}
+
+function doLoadForSSLCert()
+{
+  var dbkey = self.name;
+
+  //  Get the cert from the cert database
+  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
+  cert = certdb.getCertByDBKey(dbkey, null);
+
+  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+  var windowReference = document.getElementById('editWebsiteCert');
+
+  var message1 = bundle.formatStringFromName("editTrustSSL",
+                                             [ cert.commonName ],
+                                             1);
+  setText("certmsg", message1);
+
+  setText("issuer", cert.issuerName);
+
+  var cacert = getCaCertForServerCert(cert);
+  if(cacert == null)
+  {
+     setText("explainations",bundle.GetStringFromName("issuerNotKnown"));
+  }
+  else if(certdb.getCertTrust(cacert, nsIX509Cert.CA_CERT,
+                                                nsIX509CertDB.TRUSTED_SSL))
+  {
+     setText("explainations",bundle.GetStringFromName("issuerTrusted"));
+  }
+  else
+  {
+     setText("explainations",bundle.GetStringFromName("issuerNotTrusted"));
+  }
+/*
+  if(cacert == null)
+  {
+     var editButton = document.getElementById('editca-button');
+	 editButton.setAttribute("disabled","true");
+  }
+*/  
+  var trustssl = document.getElementById("trustSSLCert");
+  var notrustssl = document.getElementById("dontTrustSSLCert");
+  if (certdb.getCertTrust(cert, nsIX509Cert.SERVER_CERT, 
+                          nsIX509CertDB.TRUSTED_SSL)) {
+    trustssl.radioGroup.selectedItem = trustssl;
+  } else {
+    trustssl.radioGroup.selectedItem = notrustssl;
+  }
+
+  var xulWindow = document.getElementById("editWebsiteCert");
+  var wdth = window.innerWidth; // THIS IS NEEDED,
+  window.sizeToContent();
+  xulWindow.setAttribute("width",window.innerWidth + 30);
+  var hght = window.innerHeight; // THIS IS NEEDED,
+  window.sizeToContent();
+  xulWindow.setAttribute("height",window.innerHeight + 70);
+
+}
+
+function doSSLOK()
+{
+  var ssl = document.getElementById("trustSSLCert");
+  //var checked = ssl.getAttribute("value");
+  var trustssl = ssl.selected ? nsIX509CertDB.TRUSTED_SSL : 0;
+  //
+  //  Set the cert trust
+  //
+  certdb.setCertTrust(cert, nsIX509Cert.SERVER_CERT, trustssl);
+  window.close();
+}
+
+function editCaTrust()
+{
+   var cacert = getCaCertForServerCert(cert);
+   if(cacert != null)
+   {
+      window.openDialog('chrome://pippki/content/editcacert.xul', cacert.dbKey,
+                               'chrome,resizable=1,modal');
+   }
+   else
+   {
+      var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+      alert(bundle.GetStringFromName("issuerCertNotFound"));
+   }
+}
+
+function getCaCertForServerCert(cert)
+{
+   var i=1;
+   var nextCertInChain;
+   nextCertInChain = cert;
+   var lastSubjectName="";
+   while(true)
+   {
+     if(nextCertInChain == null)
+     {
+        return null;
+     }
+     if((nextCertInChain.type == nsIX509Cert.CA_CERT) || 
+                                 (nextCertInChain.subjectName = lastSubjectName))
+     {
+        break;
+     }
+
+     lastSubjectName = nextCertInChain.subjectName;
+     nextCertInChain = nextCertInChain.issuer;
+   }
+
+   return nextCertInChain;
+}
+

mozilla/security/manager/pki/resources/content/editsslcert.xul

@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
+
+<window id="editWebsiteCert" 
+        title="&certmgr.editsslcert.title;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="doLoadForSSLCert();"
+>
+
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+
+  <vbox flex="1">
+    <description id="certmsg"/>
+    <description id="issuer"/>
+    <separator/>
+    <description id="explainations"/>
+    <separator />
+    <description>&certmgr.editsslcert.edittrust;</description>
+    <vbox>
+      <radiogroup id="sslTrustGroup" flex="1">
+        <radio label="&certmgr.editsslcert.dotrust;"
+               id="trustSSLCert"/>
+        <radio label="&certmgr.editsslcert.donttrust;"
+               id="dontTrustSSLCert"/>
+      </radiogroup>
+    </vbox>
+    <hbox>
+      <button id="editca-button" label="&certmgr.editca.label;"
+            oncommand="editCaTrust();"/> 
+    </hbox>
+
+    <hbox> 
+      <button id="ok-button" label="&certmgr.ok.label;"
+              oncommand="doSSLOK();"/> 
+      <button id="cancel-button" label="&certmgr.cancel.label;"
+              oncommand="window.close();"/> 
+      <button id="help-button" label="&certmgr.help.label;"
+              oncommand="openHelp('chrome://help/content/help.xul?edit_web_certs');"/>
+    </hbox>
+  </vbox>
+
+</window>

mozilla/security/manager/pki/resources/content/escrowWarn.js

@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Javier Delgadillo <javi@netscape.com>
+ */
+
+
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+const nsIPKIParamBlock    = Components.interfaces.nsIPKIParamBlock;
+const nsIX509Cert         = Components.interfaces.nsIX509Cert;
+
+var dialogParams;
+var pkiParams;
+var cert=null;
+
+function onLoad()
+{
+  pkiParams    = window.arguments[0].QueryInterface(nsIPKIParamBlock);
+  dialogParams = pkiParams.QueryInterface(nsIDialogParamBlock);
+ 
+  var isupports = pkiParams.getISupportAtIndex(1);
+  cert = isupports.QueryInterface(nsIX509Cert); 
+  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+  var dispName = cert.commonName;
+  if (dispName == null)
+    dispName = cert.windowTitle;
+
+  var msg = bundle.formatStringFromName("escrowFinalMessage",
+                                        [dispName], 1);
+  setText("message1",msg);
+
+  var wdth = window.innerWidth; // THIS IS NEEDED,
+  window.sizeToContent();
+  windowReference.setAttribute("width",window.innerWidth + 30);
+  var hght = window.innerHeight; // THIS IS NEEDED,
+  window.sizeToContent();
+  windowReference.setAttribute("height",window.innerHeight + 30);
+
+}
+
+function doOK()
+{
+  dialogParams.SetInt(1,1);
+  window.close();
+}
+
+function doCancel()
+{
+  dialogParams.SetInt(1,0);
+  window.close();
+}
+
+function viewCert()
+{
+  cert.view();
+}

mozilla/security/manager/pki/resources/content/escrowWarn.xul

@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!--
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -
+   -
+   - Contributor(s):
+   -  Javier Delgadillo <javi@netscape.com>
+   -  Bob Lord <lord@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
+
+<window id="escrowWarnDialog" title="&escrowWarn.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  width="400"
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/escrowWarn.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+<keyset id="keys">
+  <key id="enter-key"  keycode="VK_ENTER"  oncommand="getPassword();"/>
+  <key id="return-key" keycode="VK_RETURN" oncommand="getPassword();"/>
+  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
+</keyset>
+
+<vbox style="margin: 5px;" flex="1">
+
+  <description>&escrowWarn.message1;</description>
+  <separator/>
+  <description>&escrowWarn.benefit1;</description>
+  <separator/>
+  <description>&escrowWarn.message2;</description>
+  <separator/>
+  <description id="message1"/>
+  <hbox>
+  <button id="examineCert-button" label="&examineCert.label;"
+          oncommand="viewCert();"/> 
+  </hbox>
+  <separator/>
+  <hbox>
+  <button id="ok-button" label="&ok.label;"
+          oncommand="doOK();"/> 
+  <button id="cancel-button" label="&cancel.label;"
+          oncommand="doCancel();"/> 
+  <button id="help-button" label="&help.label;"
+          oncommand="openHelp('chrome://help/content/help.xul?priv_key_copy');"/> 
+  </hbox>
+</vbox>
+</window>

mozilla/security/manager/pki/resources/content/getp12password.xul

@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Terry Hayes <thayes@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
+
+<window id="getp12password" title="&pkcs12.getpassword.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  height="200"
+  width="300"
+  onload="onP12Load();">
+
+  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+  <keyset id="keys">
+    <key id="enter-key"  keycode="VK_ENTER"  oncommand="getPassword();"/>
+    <key id="return-key" keycode="VK_RETURN" oncommand="getPassword();"/>
+    <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
+  </keyset>
+
+  <vbox style="margin: 5px;" flex="1">
+    <description>&pkcs12.getpassword.message;</description>
+    <separator />
+    <grid>
+      <columns> <column/> <column/> </columns>
+      <rows>
+        <row>
+          <label value="&getPassword.password.label;"/> 
+          <textbox id="pw1" type="password"/> 
+        </row>
+      </rows>
+    </grid>
+    <hbox>
+      <button id="ok-button" label="&ok.label;"
+              oncommand="getPassword();" 
+              default="true" accesskey="&createCertInfo.okButtonAccessKey;"/> 
+      <button id="cancel-button" label="&cancel.label;"
+              oncommand="window.close();"/> 
+      <button id="help-button" label="&help.label;"
+              oncommand="openHelp('chrome://help/content/help.xul?my_certs');"/> 
+    </hbox>
+  </vbox>
+</window>

mozilla/security/manager/pki/resources/content/getpassword.xul

@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Terry Hayes <thayes@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
+
+<window id="getpassword" title="&getPassword.title;"
+  xmlns:html="http://www.w3.org/1999/xhtml"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  height="320"
+  width="300"
+  onload="onLoad();">
+
+  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+
+  <vbox style="margin: 5px;" flex="1">
+    <hbox>
+      <text value="&getPassword.tokenName.label;:"/>
+      <text id="tokenName"/>
+    </hbox>
+    <separator/>
+    <grid>
+      <columns> <column/> <column/> </columns>
+      <rows>
+        <row>
+          <text value="&getPassword.password.label;"/> 
+          <textbox id="pw1" type="password"/> 
+        </row>
+      </rows>
+    </grid>
+
+    <keyset id="keys">
+      <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
+      <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
+      <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
+    </keyset>
+
+    <hbox>
+      <button id="ok-button" class="dialog" label="&ok.label;"
+              oncommand="getPassword();" 
+              default="true" accesskey="&createCertInfo.okButtonAccessKey;"/> 
+      <button id="cancel-button" class="dialog" label="&cancel.label;"
+              oncommand="window.close();"/> 
+      <button id="help-button" class="dialog" label="&help.label;"
+              oncommand="alert('help goes here');"/> 
+    </hbox>
+  </vbox>
+</window>

mozilla/security/manager/pki/resources/content/load_device.xul

@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % deviceManangerDTD SYSTEM "chrome://pippki/locale/deviceManager.dtd">
+%deviceManangerDTD;
+<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
+%pippkiDTD;
+]>
+
+<window id="loaddevice" 
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
+        title="&loaddevice.title;">
+
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
+
+  <vbox>
+    <description>&loaddevice.info;</description>
+    <hbox>
+      <label value="&loaddevice.modname;"/>
+      <textbox id="device_name" flex="1" value="&loaddevice.modname.default;"/>
+    </hbox>
+    <hbox>
+      <label value="&loaddevice.filename;"/>
+      <textbox id="device_path" flex="1"/>
+      <button label="&loaddevice.browse;" flex="1" oncommand="doBrowseFiles();"/>
+    </hbox>
+    <hbox>
+      <button id="ok_button"
+              label="&ok.label;" 
+              oncommand="doLoadDevice();"/> 
+      <button id="cancel_button" 
+              label="&cancel.label;" 
+              oncommand="window.close();"/> 
+    </hbox>
+  </vbox>
+
+</window>

mozilla/security/manager/pki/resources/content/newserver.js

@@ -0,0 +1,103 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Javier Delgadillo <javi@netscape.com>
+ *  Håkan Waara <hwaara@chello.se>
+ */
+
+
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+const nsIPKIParamBlock    = Components.interfaces.nsIPKIParamBlock;
+const nsIX509Cert         = Components.interfaces.nsIX509Cert;
+
+var dialogParams;
+var pkiParams;
+var cert;
+
+
+function onLoad()
+{
+
+  doSetOKCancel(doOK, doCancel, doHelpButton);
+
+  pkiParams    = window.arguments[0].QueryInterface(nsIPKIParamBlock);
+  dialogParams = pkiParams.QueryInterface(nsIDialogParamBlock);
+
+  var isupport = pkiParams.getISupportAtIndex(1);
+  cert = isupport.QueryInterface(nsIX509Cert);
+
+  var bundle = srGetStrBundle("chrome://pippki/locale/newserver.properties");
+  var gBundleBrand = srGetStrBundle("chrome://global/locale/brand.properties");
+
+  var brandName = gBundleBrand.GetStringFromName("brandShortName");
+  var continueButton = bundle.GetStringFromName("continueButton");
+
+  document.getElementById("ok").label = continueButton;
+
+  var message = 
+    bundle.formatStringFromName("newServerMessage",
+                                 [cert.commonName],
+                                 1);
+  var notRecognized = 
+    bundle.formatStringFromName("certNotRecognized", 
+                                 [brandName], 
+                                 1);
+
+  setText("message", message);
+  setText("notRecognized", notRecognized);
+
+  var windowReference = document.getElementById('ssl_warning');
+  var wdth = window.innerWidth; // THIS IS NEEDED,
+  window.sizeToContent();
+  windowReference.setAttribute("width",window.innerWidth + 30);
+  var hght = window.innerHeight; // THIS IS NEEDED,
+  window.sizeToContent();
+  windowReference.setAttribute("height",window.innerHeight + 40);
+
+}
+
+function doHelpButton()
+{
+  openHelp('chrome://help/content/help.xul?new_web_cert');
+}
+
+function doOK()
+{
+  // the user pressed OK
+  dialogParams.SetInt(1,1);
+  var checkbox = document.getElementById("alwaysAccept");
+
+  // 0 = accept perm, 1 = accept for this session - just the opposite
+  // of the checkbox value.
+  dialogParams.SetInt(2, !checkbox.checked);
+  window.close();
+}
+
+function doCancel()
+{
+  // the user pressed cancel
+  dialogParams.SetInt(1,0);
+  window.close();
+}
+
+function viewCert()
+{
+  cert.view();
+}

mozilla/security/manager/pki/resources/content/newserver.xul

@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!--
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -
+   -
+   - Contributor(s):
+   -  Javier Delgadillo <javi@netscape.com>
+   -  Bob Lord <lord@netscape.com>
+   -  Håkan Waara <hwaara@chello.se>
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % newserverDTD SYSTEM "chrome://pippki/locale/newserver.dtd" >
+%newserverDTD;
+<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
+%pippkiDTD;
+]>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<window id="ssl_warning" title="&newserver.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  style="width: 30em; height: 16em"
+  class="dialog"
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/newserver.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
+
+<keyset id="dialogKeys"/>
+
+<vbox flex="1">
+  <hbox valign="top" align="center">
+
+    <image class="alert-icon" style="margin: 5px"/>
+    <vbox flex="1" valign="middle">
+
+      <description id="message"/>
+      <separator class="thin"/>
+      <description id="notRecognized"/>
+      <separator/>
+
+      <vbox flex="1" align="start">
+        <button id="examineCert-button" label="&examineCert.label;"
+                oncommand="viewCert();"/> 
+      </vbox>
+
+      <checkbox id="alwaysAccept" label="&alwaysAccept.label;"/>
+
+    </vbox>
+  </hbox>
+
+  <hbox id="okCancelHelpButtonsRight" flex="1"/>
+</vbox>
+
+</window>

mozilla/security/manager/pki/resources/content/password.js

@@ -0,0 +1,311 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Bob Lord <lord@netscape.com>
+ *  Terry Hayes <thayes@netscape.com>
+ */
+const nsPK11TokenDB = "@mozilla.org/security/pk11tokendb;1";
+const nsIPK11TokenDB = Components.interfaces.nsIPK11TokenDB;
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+const nsPKCS11ModuleDB = "@mozilla.org/security/pkcs11moduledb;1";
+const nsIPKCS11ModuleDB = Components.interfaces.nsIPKCS11ModuleDB;
+const nsIPKCS11Slot = Components.interfaces.nsIPKCS11Slot;
+const nsIPK11Token = Components.interfaces.nsIPK11Token;
+
+
+var params;
+var tokenName="";
+var pw1;
+
+function onLoad()
+{
+
+  pw1 = document.getElementById("pw1");
+  try {
+     params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
+     tokenName = params.GetString(1);
+  }catch(exception)
+	 {tokenName = self.name;}
+
+  if(tokenName=="" || tokenName=="_blank") {
+     var sectokdb = Components.classes[nsPK11TokenDB].getService(nsIPK11TokenDB);
+     var tokenList = sectokdb.listTokens();
+     var enumElement;
+     i=0;
+     var menu = document.getElementById("tokenMenu");
+     try {
+        for ( ; !tokenList.isDone(); tokenList.next()) {
+           enumElement = tokenList.currentItem();
+           var token = enumElement.QueryInterface(nsIPK11Token);
+           if(token.needsLogin() || !(token.needsUserInit)) {
+              var menuItemNode = document.createElement("menuitem");
+              menuItemNode.setAttribute("value", token.tokenName);
+              menuItemNode.setAttribute("label", token.tokenName);
+              menu.firstChild.appendChild(menuItemNode);
+              if (i == 0) {
+                 menu.selectedItem = menuItemNode;
+                 tokenName = token.tokenName;
+              }
+              i++;
+           }
+        }
+     }catch(exception){}
+  } else {
+    var sel = document.getElementById("tokenMenu");
+    sel.setAttribute("hidden", "true");
+    var tag = document.getElementById("tokenName");
+    tag.setAttribute("value",tokenName);
+  }
+	 	 
+  process();
+}
+
+function onMenuChange()
+{
+   //get the selected token
+   var list = document.getElementById("tokenMenu");
+   tokenName = list.value;
+
+   process();
+}
+
+
+function process()
+{
+   var secmoddb = Components.classes[nsPKCS11ModuleDB].getService(nsIPKCS11ModuleDB);
+   var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+
+   // If the token is unitialized, don't use the old password box.
+   // Otherwise, do.
+
+   var slot = secmoddb.findSlotByName(tokenName);
+   if (slot) {
+     var oldpwbox = document.getElementById("oldpw");
+     var msgBox = document.getElementById("message");
+     var status = slot.status;
+     if (status == nsIPKCS11Slot.SLOT_UNINITIALIZED
+         || status == nsIPKCS11Slot.SLOT_READY) {
+      
+       oldpwbox.setAttribute("hidden", "true");
+       msgBox.setAttribute("value", bundle.GetStringFromName("password_not_set")); 
+       msgBox.setAttribute("hidden", "false");
+
+       if (status == nsIPKCS11Slot.SLOT_READY) {
+         oldpwbox.setAttribute("inited", "empty");
+       } else {
+         oldpwbox.setAttribute("inited", "true");
+       }
+      
+       // Select first password field
+       document.getElementById('pw1').focus();
+    
+     } else {
+       // Select old password field
+       oldpwbox.setAttribute("hidden", "false");
+       msgBox.setAttribute("hidden", "true");
+       oldpwbox.setAttribute("inited", "false");
+       oldpwbox.focus();
+     }
+   }
+
+  if (params) {
+    // Return value 0 means "canceled"
+    params.SetInt(1, 0);
+  }
+  
+  checkPasswords();
+}
+
+function onP12Load()
+{
+  pw1 = document.getElementById("pw1");
+  params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
+  // Select first password field
+  document.getElementById('pw1').focus();
+}
+
+function setPassword()
+{
+  var pk11db = Components.classes[nsPK11TokenDB].getService(nsIPK11TokenDB);
+  var token = pk11db.findTokenByName(tokenName);
+
+  var oldpwbox = document.getElementById("oldpw");
+  var initpw = oldpwbox.getAttribute("inited");
+  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+  
+  var success = false;
+  
+  if (initpw == "false" || initpw == "empty") {
+    try {
+      var oldpw = "";
+      var passok = 0;
+      
+      if (initpw == "empty") {
+        passok = 1;
+      } else {
+        oldpw = oldpwbox.value;
+        passok = token.checkPassword(oldpw);
+      }
+      
+      if (passok) {
+        if (initpw == "empty" && pw1.value == "") {
+          // This makes no sense that we arrive here, 
+          // we reached a case that should have been prevented by checkPasswords.
+        } else {
+          token.changePassword(oldpw, pw1.value);
+          if (pw1.value == "") {
+            alert(bundle.GetStringFromName("pw_erased_ok")
+                  + " "
+                  + bundle.GetStringFromName("pw_empty_warning"));
+          } else {
+            alert(bundle.GetStringFromName("pw_change_ok")); 
+          }
+        }
+        success = true;
+      } else {
+        oldpwbox.focus();
+        oldpwbox.setAttribute("value", "");
+        alert(bundle.GetStringFromName("incorrect_pw")); 
+      }
+    } catch (e) {
+      alert(bundle.GetStringFromName("failed_pw_change")); 
+    }
+  } else {
+    token.initPassword(pw1.value);
+    if (pw1.value == "") {
+      alert(bundle.GetStringFromName("pw_not_wanted")
+            + " " 
+            + bundle.GetStringFromName("pw_empty_warning"));
+    }
+    success = true;
+  }
+
+  // Terminate dialog
+  if (success) {
+    if (params) {
+      // Return value 1 means "successfully executed ok"
+      params.SetInt(1, 1);
+    }
+
+    window.close();
+  }
+}
+
+function getPassword()
+{
+  // grab what was entered
+  params.SetString(2, pw1.value);
+  // Return value
+  params.SetInt(1, 1);
+  // Terminate dialog
+  window.close();
+}
+
+function setP12Password()
+{
+  // grab what was entered
+  params.SetString(2, pw1.value);
+  // Return value
+  params.SetInt(1, 1);
+  // Terminate dialog
+  window.close();
+}
+
+function setPasswordStrength()
+{
+// Here is how we weigh the quality of the password
+// number of characters
+// numbers
+// non-alpha-numeric chars
+// upper and lower case characters
+
+  var pw=document.getElementById('pw1').value;
+//  alert("password='" + pw +"'");
+
+//length of the password
+  var pwlength=(pw.length);
+  if (pwlength>5)
+    pwlength=5;
+
+
+//use of numbers in the password
+  var numnumeric = pw.replace (/[0-9]/g, "");
+  var numeric=(pw.length - numnumeric.length);
+  if (numeric>3)
+    numeric=3;
+
+//use of symbols in the password
+  var symbols = pw.replace (/\W/g, "");
+  var numsymbols=(pw.length - symbols.length);
+  if (numsymbols>3)
+    numsymbols=3;
+
+//use of uppercase in the password
+  var numupper = pw.replace (/[A-Z]/g, "");
+  var upper=(pw.length - numupper.length);
+  if (upper>3)
+    upper=3;
+
+
+  var pwstrength=((pwlength*10)-20) + (numeric*10) + (numsymbols*15) + (upper*10);
+
+  // make sure we're give a value between 0 and 100
+  if ( pwstrength < 0 ) {
+    pwstrength = 0;
+  }
+  
+  if ( pwstrength > 100 ) {
+    pwstrength = 100;
+  }
+
+  var mymeter=document.getElementById('pwmeter');
+  mymeter.setAttribute("value",pwstrength);
+
+  return;
+}
+
+function checkPasswords()
+{
+  var pw1=document.getElementById('pw1').value;
+  var pw2=document.getElementById('pw2').value;
+
+  var ok=document.getElementById('ok-button');
+
+  var oldpwbox = document.getElementById("oldpw");
+  if (oldpwbox) {
+    var initpw = oldpwbox.getAttribute("inited");
+
+    if (initpw == "empty" && pw1 == "") {
+      // The token has already been initialized, therefore this dialog
+      // was called with the intention to change the password.
+      // The token currently uses an empty password.
+      // We will not allow changing the password from empty to empty.
+      ok.setAttribute("disabled","true");
+      return;
+    }
+  }
+
+  if (pw1 == pw2){
+    ok.setAttribute("disabled","false");
+  } else
+  {
+    ok.setAttribute("disabled","true");
+  }
+
+}

mozilla/security/manager/pki/resources/content/pippki.js

@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Javier Delgadillo <javi@netscape.com>
+ */
+
+/*
+ * These are helper functions to be included
+ * pippki UI js files.
+ */
+
+function setText(id, value) {
+  var element = document.getElementById(id);
+  if (!element) return;
+     if (element.hasChildNodes())
+       element.removeChild(element.firstChild);
+  var textNode = document.createTextNode(value);
+  element.appendChild(textNode);
+}
+

mozilla/security/manager/pki/resources/content/pref-certs.xul

@@ -0,0 +1,86 @@
+<?xml version="1.0"?> 
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
+
+<!DOCTYPE window [
+  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
+  <!ENTITY % prefSec SYSTEM "chrome://pippki/locale/pref-security.dtd">
+  <!ENTITY % prefSslDTD SYSTEM "chrome://pippki/locale/pref-ssl.dtd">
+  %brandDTD;
+  %prefSec;
+  %prefSslDTD;
+]>
+
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://pippki/content/pref-certs.xul');">
+
+  <!-- List elements to manage for prefs -->
+  <script type="application/x-javascript" src="chrome://pippki/content/pref-security.js"/>
+  <script type="application/x-javascript">
+  <![CDATA[
+    var _elementIDs = [ "certSelection" ];
+  ]]>
+  </script>
+            
+  <!-- Fancy panel header -->
+  <hbox class="box-smallheader" title="&certs.label;"/>
+
+  <groupbox align="start">
+    <caption label="&SSLClientAuthMethod;"/>
+    <description> &certselect.description; </description>
+    <!-- Prefs -->
+    <radiogroup id="certSelection" orient="horizontal" preftype="string" 
+	        prefstring="security.default_personal_cert">
+    <radio label="&certselect.auto;" value="Select Automatically"/>
+    <radio label="&certselect.ask;" value="Ask Every Time"/>
+    </radiogroup>
+  </groupbox>
+
+  <!-- Certificate manager -->
+  <groupbox>
+    <caption label="&managecerts.label;"/>
+    <description>&managecerts.text;</description>
+    <hbox align="center">
+      <button label="&managecerts.button;"
+              oncommand="openCertManager();" 
+              id="openCertManagerButton"
+              prefstring="security.disable_button.openCertManager"/>
+    </hbox>
+  </groupbox>
+
+  <!-- Device manager -->
+  <groupbox>
+    <caption label="&managedevices.label;"/>
+    <description>&managedevices.text;</description>
+    <hbox align="center">
+      <button label="&managedevices.button;"
+              oncommand="openDeviceManager();"
+              id="openDeviceManagerButton"
+              prefstring="security.disable_button.openDeviceManager"/>
+    </hbox>
+  </groupbox>
+
+</page>

mozilla/security/manager/pki/resources/content/pref-ciphers.xul

@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/pref-ssl.dtd">
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<window id="pref-ciphers" title="&cipher.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  onload="onLoad();">
+
+  <script type="application/x-javascript"><![CDATA[
+    var prefs = null;
+
+    function onLoad() {
+      doSetOKCancel(doOK, doCancel);
+
+      // Set checkboxes from prefs
+      const nsIPref = Components.interfaces.nsIPref;
+
+      prefs = Components.classes["@mozilla.org/preferences;1"].getService(nsIPref);
+
+      // Enumerate each checkbox on this page and set value
+      var prefElements = document.getElementsByAttribute("prefstring", "*");
+      for (var i = 0; i < prefElements.length; i++) {
+        var element = prefElements[i];
+        var prefString = element.getAttribute("prefstring");
+        var prefValue = false;
+
+        try {
+          prefValue = prefs.GetBoolPref(prefString);
+        } catch(e) { /* Put debug output here */ }
+
+        element.setAttribute("checked", prefValue);
+        // disable xul element if the pref is locked.
+        if (prefs.PrefIsLocked(prefString)) {
+          element.disabled=true;
+        }
+      }
+    }
+
+    function doOK() {
+     // Save the prefs
+     try {
+      // Enumerate each checkbox on this page and save the value
+      var prefElements = document.getElementsByAttribute("prefstring", "true");
+      for (var i = 0; i < prefElements.length; i++) {
+        var element = prefElements[i];
+        var prefString = element.getAttribute("prefstring");
+        var prefValue = element.getAttribute("checked");
+
+        
+        if (typeof(prefValue) == "string") prefValue = (prefValue == "true");
+
+        prefs.SetBoolPref(prefString, prefValue);
+      }
+
+      prefs.savePrefFile(null);
+     } catch(e) { }
+
+     window.close();
+    }
+
+    function doCancel() {
+      window.close();
+    }
+  ]]></script>
+
+  <vbox style="overflow: hidden;" flex="1">
+
+  <groupbox align="start">
+    <caption label="&cipher.ssl2.label;"/>
+
+    <checkbox label="&cipher.ssl2.rc4_128;"
+              prefstring="security.ssl2.rc4_128"/>
+    <checkbox label="&cipher.ssl2.rc2_128;"
+              prefstring="security.ssl2.rc2_128"/>
+    <checkbox label="&cipher.ssl2.des_ede3_192;"
+              prefstring="security.ssl2.des_ede3_192"/>
+    <checkbox label="&cipher.ssl2.des_64;"
+              prefstring="security.ssl2.des_64"/>
+    <checkbox label="&cipher.ssl2.rc4_40;"
+              prefstring="security.ssl2.rc4_40"/>
+    <checkbox label="&cipher.ssl2.rc2_40;"
+              prefstring="security.ssl2.rc2_40"/>
+
+  </groupbox>
+
+  <groupbox align="start">
+    <caption label="&cipher.ssl3.label;"/>
+
+    <checkbox label="&cipher.ssl3.rsa_rc4_128_md5;"
+              prefstring="security.ssl3.rsa_rc4_128_md5"/>
+    <checkbox label="&cipher.ssl3.rsa_fips_des_ede3_sha;"
+              prefstring="security.ssl3.rsa_fips_des_ede3_sha"/>
+    <checkbox label="&cipher.ssl3.rsa_des_ede3_sha;"
+              prefstring="security.ssl3.rsa_des_ede3_sha"/>
+    <checkbox label="&cipher.ssl3.rsa_fips_des_sha;"
+              prefstring="security.ssl3.rsa_fips_des_sha"/>
+    <checkbox label="&cipher.ssl3.rsa_des_sha;"
+              prefstring="security.ssl3.rsa_des_sha"/>
+    <checkbox label="&cipher.ssl3.rsa_1024_rc4_56_sha;"
+              prefstring="security.ssl3.rsa_1024_rc4_56_sha"/>
+    <checkbox label="&cipher.ssl3.rsa_1024_des_cbc_sha;"
+              prefstring="security.ssl3.rsa_1024_des_cbc_sha"/>
+    <checkbox label="&cipher.ssl3.rsa_rc4_40_md5;"
+              prefstring="security.ssl3.rsa_rc4_40_md5"/>
+    <checkbox label="&cipher.ssl3.rsa_rc2_40_md5;"
+              prefstring="security.ssl3.rsa_rc2_40_md5"/>
+    <checkbox label="&cipher.ssl3.rsa_null_md5;"
+              prefstring="security.ssl3.rsa_null_md5"/>
+  </groupbox>
+
+  <separator/>
+
+  <keyset id="dialogKeys"/>
+  <hbox id="okCancelButtonsRight"/>
+
+  </vbox>
+
+</window>

mozilla/security/manager/pki/resources/content/pref-masterpass.js

@@ -0,0 +1,114 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Javier Delgadillo <javi@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+const nsIPK11Token = Components.interfaces.nsIPK11Token;
+const nsPK11TokenDB = "@mozilla.org/security/pk11tokendb;1";
+const nsIPK11TokenDB = Components.interfaces.nsIPK11TokenDB;
+const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
+const nsDialogParamBlock = "@mozilla.org/embedcomp/dialogparam;1";
+
+var internal_token;
+
+function onMasterPasswordLoad()
+{
+  var tokendb = Components.classes[nsPK11TokenDB].getService(nsIPK11TokenDB);
+  internal_token = tokendb.getInternalKeyToken();
+  var askTimes = internal_token.getAskPasswordTimes();
+  switch (askTimes) {
+  case nsIPK11Token.ASK_FIRST_TIME:  askTimes = 0; break;
+  case nsIPK11Token.ASK_EVERY_TIME:  askTimes = 1; break;
+  case nsIPK11Token.ASK_EXPIRE_TIME: askTimes = 2; break;
+  }
+  var radiogroup = document.getElementById("passwordAskTimes");
+  var radioitem;
+  switch (askTimes) {
+  case 0: radioitem = document.getElementById("askFirstTime"); break;
+  case 1: radioitem = document.getElementById("askEveryTime"); break;
+  case 2: radioitem = document.getElementById("askTimeout"); break;
+  }
+  radiogroup.selectedItem = radioitem;
+  var timeout = internal_token.getAskPasswordTimeout();
+  var timeoutField = document.getElementById("passwordTimeout");
+  timeoutField.setAttribute("value", timeout);
+  
+  changePasswordSettings();
+}
+
+function changePasswordSettings()
+{
+  var askTimes = 0;
+  var timeout = internal_token.getAskPasswordTimeout();
+  var timeoutField = document.getElementById("passwordTimeout");
+  var radiogroup = document.getElementById("passwordAskTimes");
+  switch ( radiogroup.value ) {
+  case "0": 
+    timeoutField.setAttribute("disabled", true);
+    askTimes = nsIPK11Token.ASK_FIRST_TIME;
+    break;
+  case "1": 
+    timeoutField.setAttribute("disabled", true);
+    askTimes = nsIPK11Token.ASK_EVERY_TIME;
+    break;
+  case "2":
+    timeoutField.removeAttribute("disabled");
+    timeoutField.focus();
+    timeout = timeoutField.value;
+    var re = new RegExp("^[0-9]+$");
+    if (!re.test(timeout)) {
+      timeout = "1";
+    }
+    askTimes = nsIPK11Token.ASK_EXPIRE_TIME;
+    break;
+  }
+  internal_token.setAskPasswordDefaults(askTimes, timeout);
+
+  var askEveryTimeHidden = document.getElementById("askEveryTimeHidden");
+  askEveryTimeHidden.setAttribute("checked",(radiogroup.value == 1)?"true":"false");
+}
+
+function ChangePW()
+{
+  var params = Components.classes[nsDialogParamBlock].createInstance(nsIDialogParamBlock);
+  params.SetString(1,"_blank");
+  window.openDialog("chrome://pippki/content/changepassword.xul","",
+              "chrome,resizable=1,modal=1,dialog=1",params);
+}
+
+function ResetPW()
+{
+  window.open("chrome://pippki/content/resetpassword.xul",
+              internal_token.tokenName,
+              "centerscreen,chrome,resizable=1,modal=1,dialog=1");
+}

mozilla/security/manager/pki/resources/content/pref-masterpass.xul

@@ -0,0 +1,109 @@
+<?xml version="1.0"?> 
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Ian McGreer <mcgreer@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
+
+<!DOCTYPE window [
+  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
+  <!ENTITY % prefPass SYSTEM "chrome://pippki/locale/pref-masterpass.dtd">
+  %brandDTD;
+  %prefPass;
+]>
+
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://pippki/content/pref-masterpass.xul'); onMasterPasswordLoad();">
+
+  <script type="application/x-javascript" src="chrome://pippki/content/pref-masterpass.js"/>
+
+  <!-- List elements to manage for prefs -->
+  <script type="application/x-javascript">
+  <![CDATA[
+    var _elementIDs = ["askEveryTimeHidden",
+                       "changePasswordButton",
+                       "resetPasswordButton",
+                       "passwordAskTimes",
+                       "passwordTimeout"];
+  ]]>
+  </script>
+            
+  <!-- Fancy panel header -->
+  <hbox class="box-smallheader" title="&lheader;"/>
+
+  <!-- Change Password -->
+  <groupbox>
+    <caption label="&changepassword.label;"/>
+    <description>&changepassword.text;</description>
+    <hbox align="center">
+      <button label="&changepassword.button;"
+              oncommand="ChangePW();"
+              id="changePasswordButton"
+              prefstring="security.disable_button.changePassword"/>
+    </hbox>
+  </groupbox>
+
+  <!-- Password Prefs -->
+  <groupbox>
+
+    <checkbox id="askEveryTimeHidden"
+              prefstring="signon.expireMasterPassword"
+              hidden="true"/>
+
+    <caption label="&managepassword.label;"/>
+    <description>&managepassword.text;</description>
+    <hbox align="center">
+      <radiogroup id="passwordAskTimes"
+                  prefstring="security.ask_for_password"
+                  flex="1">
+        <!-- note that these values are different than what NSS uses, which
+             are (0, -1, 1) respectively -->
+        <radio value="0" label="&managepassword.askfirsttime;" id="askFirstTime"
+               style="margin: 0px;" oncommand="changePasswordSettings();"/>
+        <radio value="1" label="&managepassword.askeverytime;" id="askEveryTime"
+               style="margin: 0px;" oncommand="changePasswordSettings();"/>
+        <hbox align="center">
+          <radio value="2" label="&managepassword.asktimeout;" id="askTimeout"
+                 style="margin: 0px;" oncommand="changePasswordSettings();"/>
+          <textbox id="passwordTimeout" size="4"
+                   preftype="int"
+                   prefstring="security.password_lifetime"
+                   oninput="changePasswordSettings();"/>
+          <label value="&managepassword.timeout.unit;" style="margin: 4px;"/>
+        </hbox>
+      </radiogroup>
+    </hbox>
+  </groupbox>
+
+  <!-- Reset Password -->
+  <groupbox>
+    <caption label="&resetpassword.label;"/>
+    <description>&resetpassword.text;</description>
+    <hbox align="center">
+      <button label="&resetpassword.button;"
+              oncommand="ResetPW();"
+              id="resetPasswordButton"
+              prefstring="security.disable_button.resetPassword"/>
+    </hbox>
+  </groupbox>
+
+</page>

mozilla/security/manager/pki/resources/content/pref-security.js

@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Javier Delgadillo <javi@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+
+function openCertManager()
+{
+    window.open('chrome://pippki/content/certManager.xul',  "",
+                'chrome,width=500,height=400,resizable=yes,dialog=no');
+}
+
+function openDeviceManager()
+{
+    window.open('chrome://pippki/content/device_manager.xul',  "devmgr",
+                'chrome,width=540,height=360,resizable=yes');
+}

mozilla/security/manager/pki/resources/content/pref-ssl.xul

@@ -0,0 +1,91 @@
+<?xml version="1.0"?> 
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Bob Lord <lord@netscape.com>
+   -   Terry Hayes <thayes@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
+
+<!DOCTYPE window [
+  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
+  <!ENTITY % prefSslDTD SYSTEM "chrome://pippki/locale/pref-ssl.dtd">
+  %brandDTD;
+  %prefSslDTD;
+]>
+
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://pippki/content/pref-ssl.xul');">
+
+  <!-- List elements to manage for prefs -->
+  <script type="application/x-javascript">
+  <![CDATA[
+    var _elementIDs = ["enableSSL2", "enableSSL3", "enableTLS", 
+        "warnEnteringSecure", "warnEnteringWeak", 
+        "warnLeavingSecure", "warnInsecurePost",
+        "warnViewMixed" ];
+  ]]>
+  </script>
+            
+  <!-- Fancy panel header -->
+  <hbox class="box-smallheader" title="SSL"/>
+
+  <groupbox orient="horizontal">
+    <caption label="&SSLProtocolVersions;"/>
+
+    <!-- Prefs -->
+    <vbox flex="1" align="start">
+      <checkbox id="enableSSL2" label="&enable.ssl2;"
+                prefstring="security.enable_ssl2"/>
+      <checkbox id="enableSSL3" label="&enable.ssl3;"
+                prefstring="security.enable_ssl3"/>
+      <checkbox id="enableTLS" label="&enable.tls;"
+                prefstring="security.enable_tls"/>
+    </vbox>
+
+    <vbox halign="right">
+      <button label="&edit.sslciphers;"
+              oncommand="window.openDialog('chrome://pippki/content/pref-ciphers.xul', '',
+                             'modal=yes,resizable,chrome');"
+              id="editSSLCiphersButton"
+              prefstring="security.disable_button.editSSLCiphers"/>
+    </vbox>
+
+  </groupbox>
+
+  <groupbox align="start">
+    <caption label="&SSLWarnings;"/>
+    <description>&warn.description;</description>
+    <!-- Prefs -->
+    <checkbox id="warnEnteringSecure" label="&warn.enteringsecure;"
+              prefstring="security.warn_entering_secure"/>
+    <checkbox id="warnEnteringWeak" label="&warn.enteringweak;"
+              prefstring="security.warn_entering_weak"/>
+    <checkbox id="warnLeavingSecure" label="&warn.leavingsecure;"
+              prefstring="security.warn_leaving_secure"/>
+    <checkbox id="warnInsecurePost" label="&warn.insecurepost;"
+              prefstring="security.warn_submit_insecure"/>
+    <checkbox id="warnViewMixed" label="&warn.viewmixed;"
+              prefstring="security.warn_viewing_mixed"
+              checked="true"/>
+  </groupbox>
+
+</page>

mozilla/security/manager/pki/resources/content/pref-validation.js

@@ -0,0 +1,95 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  David Drinan <ddrinan@netscape.com>
+ */
+
+const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
+const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
+const nsIOCSPResponder = Components.interfaces.nsIOCSPResponder;
+const nsISupportsArray = Components.interfaces.nsISupportsArray;
+
+var certdb;
+var ocspResponders;
+
+function onLoad()
+{
+  var ocspEntry;
+  var i;
+
+  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
+  ocspResponders = certdb.getOCSPResponders();
+
+  var signersMenu = document.getElementById("signingCA");
+  var signersURL = document.getElementById("serviceURL");
+  for (i=0; i<ocspResponders.Count(); i++) {
+    ocspEntry = ocspResponders.GetElementAt(i).QueryInterface(nsIOCSPResponder);
+    var menuItemNode = document.createElement("menuitem");
+    menuItemNode.setAttribute("value", ocspEntry.responseSigner);
+    menuItemNode.setAttribute("label", ocspEntry.responseSigner);
+    signersMenu.firstChild.appendChild(menuItemNode);
+  }
+
+  parent.initPanel('chrome://pippki/content/pref-validation.xul');
+
+  doEnabling();
+}
+
+function doEnabling()
+{
+  var signersMenu = document.getElementById("signingCA");
+  var signersURL = document.getElementById("serviceURL");
+  var radiogroup = document.getElementById("securityOCSPEnabled");
+  
+  switch ( radiogroup.value ) {
+   case "0":
+   case "1":
+    signersMenu.setAttribute("disabled", true);
+    signersURL.setAttribute("disabled", true);
+    break;
+   case "2":
+   default:
+    signersMenu.removeAttribute("disabled");
+    signersURL.removeAttribute("disabled");
+  }
+}
+
+function changeURL()
+{
+  var signersMenu = document.getElementById("signingCA");
+  var signersURL = document.getElementById("serviceURL");
+  var CA = signersMenu.getAttribute("value");
+  var i;
+  var ocspEntry;
+
+  for (i=0; i < ocspResponders.Count(); i++) {
+    ocspEntry = ocspResponders.GetElementAt(i).QueryInterface(nsIOCSPResponder);
+    if (CA == ocspEntry.responseSigner) {
+      signersURL.setAttribute("value", ocspEntry.serviceURL);
+      break;
+    }
+  }
+}
+
+function openCrlManager()
+{
+    window.open('chrome://pippki/content/crlManager.xul',  "",
+                'chrome,width=500,height=400,resizable=1');
+}
+

mozilla/security/manager/pki/resources/content/pref-validation.xul

@@ -0,0 +1,92 @@
+<?xml version="1.0"?> 
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   David Drinan <ddrinan@netscape.com>
+  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
+
+<!DOCTYPE window [
+  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
+  <!ENTITY % prefValidationDTD SYSTEM "chrome://pippki/locale/pref-validation.dtd">
+  %brandDTD;
+  %prefValidationDTD;
+]>
+
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="onLoad();">
+
+  <!-- List elements to manage for prefs -->
+  <script type="application/x-javascript">
+  <![CDATA[
+    var _elementIDs = ["securityOCSPEnabled", "serviceURL", "signingCA"];
+  ]]>
+  </script>
+            
+  <script type="application/x-javascript" src="chrome://pippki/content/pref-validation.js"/>
+
+  <!-- Fancy panel header -->
+  <hbox class="box-smallheader" title="&validation.title;"/>
+
+  <groupbox>
+    <caption label="&validation.crl.label;"/>
+    <description>&validation.crl.description;</description>
+    <hbox align="center">
+      <button label="&validation.managecrls.button;"
+              oncommand="openCrlManager();"
+              id="managecrlbutton"
+              prefstring="security.OCSP.disable_button.managecrl"/>
+    </hbox>
+  </groupbox>
+
+  <groupbox align="start">
+    <caption label="&validation.ocsp.label;"/>
+    <description>&validation.ocsp.description;</description>
+    <!-- Prefs -->
+    <radiogroup id="securityOCSPEnabled"
+                prefstring="security.OCSP.enabled">
+        <radio value="0" label="&disableOCSP.label;" oncommand="doEnabling();"/>
+        <radio value="1" label="&certOCSP.label;" oncommand="doEnabling();"/>
+        <radio value="2" label="&proxyOCSP.label;" oncommand="doEnabling();"/>
+
+        <grid class="indent" flex="1">
+          <columns>
+          <column/>
+          <column flex="1"/>
+          </columns>
+          
+          <rows>
+            <row align="center">
+              <label value="&signingCA.label;" control="signingCA"/>
+              <menulist id="signingCA" preftype="string" prefstring="security.OCSP.signingCA"
+                        flex="1" oncommand="changeURL()">
+                <menupopup/>
+              </menulist>
+            </row>
+            <row align="center">
+              <label value="&serviceURL.label;" control="serviceURL"/>
+              <textbox id="serviceURL" prefstring="security.OCSP.URL"/>
+            </row>
+         </rows>
+       </grid>
+    </radiogroup>
+  </groupbox>
+</page>

mozilla/security/manager/pki/resources/content/resetpassword.js

@@ -0,0 +1,89 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ */
+
+const nsPK11TokenDB = "@mozilla.org/security/pk11tokendb;1";
+const nsIPK11TokenDB = Components.interfaces.nsIPK11TokenDB;
+
+var tokenName;
+
+function onLoad()
+{
+  if ("arguments" in window) {
+    var params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
+    tokenName = params.GetString(1);
+  } else {
+    tokenName = self.name;
+  }
+
+  var okButton = document.getElementById("ok");
+  var cancelButton = document.getElementById("cancel");
+  var helpButton = document.getElementById("help");
+  
+  var bundle = document.getElementById("pippki_bundle");
+
+  doSetOKCancel(resetPassword, null, null, null);
+
+  if (okButton && cancelButton && bundle) {
+    okButton.setAttribute("label", bundle.getString("resetPasswordButtonLabel"));
+    okButton.removeAttribute("default");
+    cancelButton.setAttribute("default", "true");
+    cancelButton.focus();
+  }
+}
+
+function resetPassword()
+{
+  var pk11db = Components.classes[nsPK11TokenDB].getService(nsIPK11TokenDB);
+  var token = pk11db.findTokenByName(tokenName);
+  token.reset();
+
+  var pref = Components.classes['@mozilla.org/preferences;1'];
+  if (pref) {
+    pref = pref.getService(Components.interfaces.nsIPrefBranch);
+    try {
+      if (pref.getBoolPref("wallet.crypto")) {
+        // data in wallet is encrypted, clear it
+        var wallet = Components.classes['@mozilla.org/wallet/wallet-service;1'];
+        if (wallet) {
+          wallet = wallet.getService(Components.interfaces.nsIWalletService);
+          wallet.WALLET_DeleteAll();
+        }
+      }
+    }
+    catch(e) {
+      // wallet.crypto pref is missing
+    }
+  }
+
+  var bundle = document.getElementById("pippki_bundle");
+  var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
+  promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
+  if (promptService && bundle) {
+    promptService.alert(window,
+      bundle.getString("resetPasswordConfirmationTitle"), 
+      bundle.getString("resetPasswordConfirmationMessage"));
+  }
+
+  window.close();
+}
+
+function doHelpButton()
+{
+  openHelp('chrome://help/content/help.xul?reset_pwd');
+}

mozilla/security/manager/pki/resources/content/resetpassword.xul

@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is mozilla.org code.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+  -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<window id="reset_password" title="&resetPassword.title;"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
+  style="width: 40em;" onload="onLoad();">
+
+  <keyset id="keys">
+    <key id="enter-key"  keycode="VK_ENTER"  oncommand="window.close();"/>
+    <key id="return-key" keycode="VK_RETURN" oncommand="window.close();"/>
+    <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
+  </keyset>
+
+  <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
+
+  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/resetpassword.js"/>
+
+  <hbox flex="1">
+    <image class="alert-icon" style="margin: 5px;"/>
+    <vbox style="margin: 5px;" flex="1">
+      <hbox flex="1">
+        <vbox flex="1">
+          <description>&resetPassword.text;</description>
+        </vbox>
+      </hbox>
+      <separator class="thin"/>
+      <hbox id="okCancelHelpButtonsRight"/>
+    </vbox>
+  </hbox>
+</window>