Added the memstream file.

git-svn-id: svn://10.0.0.236/branches/NuCache_BRANCH@9000 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/config/config.mak

@@ -0,0 +1,408 @@
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+!if !defined(CONFIG_CONFIG_MAK)
+CONFIG_CONFIG_MAK=1
+
+#//------------------------------------------------------------------------
+#//
+#// Define public make variables:
+#//
+#//    OBJDIR  - Specifies the location of intermediate files (ie. objs...)
+#//              Currently, the names are WINxx_O.OBJ or WINxx_D.OBJ for
+#//              optimized and debug builds respectively.
+#//
+#//    DIST    - Specifies the location of the distribution directory where
+#//              all targets are delivered.
+#//
+#//    CFGFILE - Specifies the name of the temporary configuration file 
+#//              containing the arguments to the current command.
+#//
+#//    INCS    - Default include paths.
+#//
+#//    CFLAGS  - Default compiler options.
+#//
+#//    LFLAGS  - Default linker options.
+#//
+#//------------------------------------------------------------------------
+
+!if [$(MOZ_TOOLS)\bin\uname > osuname.inc]
+!endif
+WINOS=\
+!include "osuname.inc"
+WINOS=$(WINOS: =)^
+
+!if [del osuname.inc]
+!endif
+
+## Include support for MOZ_LITE/MOZ_MEDIUM
+include <$(DEPTH)/config/liteness.mak>
+
+!if "$(MOZ_BITS)" == "16"
+
+!if "$(MAKE_OBJ_TYPE)" == "DLL"
+OBJTYPE=D
+!else
+OBJTYPE=E
+!endif
+
+!else
+OBJTYPE=
+!endif
+
+XPDIST=$(DEPTH)\dist
+PUBLIC=$(XPDIST)\public
+
+#//-----------------------------------------------------------------------
+#// OBJDIR is NOT the same as DIST for Win16. The Win16 dist stuff can
+#// be built with EXE or DLL compiler flags, but the DIST directory
+#// has the same name no matter what
+#//-----------------------------------------------------------------------
+
+
+!ifdef NGLAYOUT_BUILD_PREFIX
+DIST_PREFIX=NGL
+!else
+!ifdef MOZ_NAV_BUILD_PREFIX
+DIST_PREFIX=NAV
+!else
+DIST_PREFIX=WIN
+!endif
+!endif
+
+!ifndef MOZ_DEBUG
+OBJDIR=$(DIST_PREFIX)$(MOZ_BITS)$(OBJTYPE)_O.OBJ
+JAVA_OPTIMIZER = -O
+!ifdef NO_CAFE
+JAVAC_OPTIMIZER =
+!else
+#JAVAC_OPTIMIZER= -O -noinline
+JAVAC_OPTIMIZER =
+!endif
+!else
+OBJDIR=$(DIST_PREFIX)$(MOZ_BITS)$(OBJTYPE)_D.OBJ
+JAVA_OPTIMIZER = -g
+JAVAC_OPTIMIZER = -g
+!endif
+
+#//
+#// DIST DEFINES SHOULD NEVER BE COMPONENT SPECIFIC.
+#//
+!ifndef MOZ_DEBUG
+DIST=$(XPDIST)\$(DIST_PREFIX)$(MOZ_BITS)_O.OBJ
+!else
+DIST=$(XPDIST)\$(DIST_PREFIX)$(MOZ_BITS)_D.OBJ
+!endif
+
+# This will always give the location of NGLayout's dist, even if "NGLAYOUT_BUILD_PREFIX" is not defined.
+!if defined(MOZ_NGLAYOUT)
+!ifndef MOZ_DEBUG
+NGLAYOUT_DIST=$(XPDIST)\NGL$(MOZ_BITS)_O.OBJ
+!else
+NGLAYOUT_DIST=$(XPDIST)\NGL$(MOZ_BITS)_D.OBJ
+!endif
+!endif
+
+
+CFGFILE=$(OBJDIR)\cmd.cfg
+
+!if "$(MOZ_BITS)" == "16"
+INCS=-I$(XPDIST)\public\win16 $(INCS) -I$(DEPTH)\include -I$(DIST)\include -I..\include
+!else
+INCS=$(INCS) -I$(DEPTH)\include -I$(DIST)\include \
+             -I$(XPDIST)\public\img -I$(XPDIST)\public\util \
+             -I$(XPDIST)\public\coreincl
+!endif # 16
+
+!ifndef NO_LAYERS
+INCS=$(INCS) -I$(DEPTH)\lib\liblayer\include
+!endif 
+
+!if "$(STAND_ALONE_JAVA)" == "1"
+LCFLAGS=$(LCFLAGS) -DSTAND_ALONE_JAVA
+!endif
+
+!if defined(MOZ_JAVA)
+MOZ_JAVA_FLAG=-DJAVA
+!if defined(MOZ_OJI)
+!error You can't define both MOZ_JAVA and MOZ_OJI anymore. 
+!endif
+JAVA_OR_OJI=1
+!endif
+
+!if defined(MOZ_OJI)
+LCFLAGS=$(LCFLAGS) -DOJI
+JAVA_OR_OJI=1
+!endif
+
+# Perhaps we should add MOZ_LITENESS_FLAGS to 16 bit build
+!if "$(MOZ_BITS)" == "16"
+CFLAGS=$(MOZ_JAVA_FLAG) -DMOCHA -DLAYERS -DEDITOR $(OS_CFLAGS) $(MOZ_CFLAGS)
+!else
+CFLAGS=$(MOZ_JAVA_FLAG) -DMOCHA -DLAYERS $(OS_CFLAGS) $(MOZ_CFLAGS) $(MOZ_LITENESS_FLAGS)
+!endif
+LFLAGS=$(OS_LFLAGS) $(LLFLAGS) $(MOZ_LFLAGS)
+
+!ifdef NO_SECURITY
+CFLAGS = $(CFLAGS) -DNO_SECURITY
+!endif
+
+# This compiles in heap dumping utilities and other good stuff 
+# for developers -- maybe we only want it in for a special SDK 
+# nspr/java runtime(?):
+!if "$(MOZ_BITS)"=="32" || defined(MOZ_DEBUG)
+CFLAGS = $(CFLAGS) -DDEVELOPER_DEBUG
+!endif
+
+!ifdef STANDALONE_IMAGE_LIB
+CFLAGS=$(CFLAGS) -DSTANDALONE_IMAGE_LIB
+!endif
+
+!ifdef MODULAR_NETLIB
+CFLAGS=$(CFLAGS) -DMODULAR_NETLIB
+!else
+# Defines for new cookie management...
+CFLAGS=$(CFLAGS) -DCookieManagement -DSingleSignon
+
+!endif
+
+# TODO Remove later - Gagan
+!ifdef NU_CACHE 
+CFLAGS=$(CFLAGS) -DNU_CACHE
+!endif
+
+# always need these:
+CFLAGS = $(CFLAGS) -DNETSCAPE
+
+# Specify that we are building a client.
+# This will instruct the cross platform libraries to
+# include all the client specific cruft.
+!if defined(SERVER_BUILD)
+CFLAGS = $(CFLAGS) -DSERVER_BUILD
+!elseif defined(LIVEWIRE)
+CFLAGS = $(CFLAGS) -DLIVEWIRE
+!else
+CFLAGS = $(CFLAGS) -DMOZILLA_CLIENT
+!endif
+
+PERL= $(MOZ_TOOLS)\perl5\perl.exe
+MASM = $(MOZ_TOOLS)\bin\ml.exe
+
+!if "$(WINOS)" == "WIN95"
+MKDIR = $(DEPTH)\config\w95mkdir
+QUIET =
+!else
+MKDIR = mkdir
+QUIET=@
+!endif
+
+
+#//------------------------------------------------------------------------
+#//
+#// Include the OS dependent configuration information
+#//
+#//------------------------------------------------------------------------
+include <$(DEPTH)/config/WIN$(MOZ_BITS)>
+
+!ifdef MOZ_DEBUG
+!ifdef USERNAME
+CFLAGS = $(CFLAGS) -DDEBUG_$(USERNAME)
+!endif
+!if defined(GLOWCODE) && defined(GLOWPROF) && "$(MOZ_BITS)"=="32"
+CFLAGS = $(CFLAGS) -Gh
+!endif
+!endif
+
+#//------------------------------------------------------------------------
+#//
+#// Define the global make commands.
+#//
+#//    MAKE_INSTALL  - Copy a target to the distribution directory.
+#//
+#//    MAKE_OBJDIRS  - Create an object directory (if necessary).
+#//
+#//     MAKE_MANGLE   - Convert all long filenames into 8.3 names
+#//
+#//     MAKE_UNMANGLE - Restore all long filenames
+#//
+#//------------------------------------------------------------------------
+!if !defined(MOZ_SRC)
+#enable builds on any drive if defined.
+MOZ_SRC=y:
+!endif
+MAKE_INSTALL=$(QUIET)$(DEPTH)\config\makecopy.exe
+MAKE_MANGLE=$(DEPTH)\config\mangle.exe
+MAKE_UNMANGLE=if exist unmangle.bat call unmangle.bat
+
+#//------------------------------------------------------------------------
+#//
+#// Common Libraries
+#//
+#//------------------------------------------------------------------------
+!ifdef NSPR20
+!if "$(MOZ_BITS)" == "16"
+LIBNSPR=$(DIST)\lib\nspr21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\msgc21.lib
+!else
+LIBNSPR=$(DIST)\lib\libnspr21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\libplds21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\libmsgc21.lib
+!endif
+!else
+LIBNSPR=$(DIST)\lib\pr$(MOZ_BITS)$(VERSION_NUMBER).lib
+!endif
+
+!ifdef NSPR20
+NSPRDIR = nsprpub
+CFLAGS = $(CFLAGS) -DNSPR20
+!else
+NSPRDIR = nspr
+!endif
+
+LIBJPEG=$(DIST)\lib\jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib
+
+######################################################################
+### Windows-Specific Java Stuff
+
+PATH_SEPARATOR = ;
+
+# where the bytecode will go
+!if "$(AWT_11)" == "1"
+JAVA_DESTPATH = $(DEPTH)\dist\classes11
+!else
+JAVA_DESTPATH = $(DEPTH)\dist\classes
+!endif
+
+# where the source are
+DEFAULT_JAVA_SOURCEPATH = $(DEPTH)\sun-java\classsrc
+!ifndef JAVA_SOURCEPATH
+!if "$(AWT_11)" == "1"
+JAVA_SOURCEPATH = $(DEPTH)\sun-java\classsrc11;$(DEFAULT_JAVA_SOURCEPATH)
+!else
+JAVA_SOURCEPATH = $(DEFAULT_JAVA_SOURCEPATH)
+!endif
+!endif
+
+JAVA_PROG=$(MOZ_TOOLS)\bin\java.exe
+#JAVA_PROG=$(DIST)\bin\java
+
+JAVAC_ZIP=$(MOZ_TOOLS)/lib/javac.zip
+
+ZIP_PROG = $(MOZ_TOOLS)\bin\zip
+UNZIP_PROG = $(MOZ_TOOLS)\bin\unzip
+ZIP_FLAGS = -0 -r -q
+
+CFLAGS = $(CFLAGS) -DOS_HAS_DLL
+
+DLL_SUFFIX	= dll
+LIB_SUFFIX	= lib
+
+!if "$(STAND_ALONE_JAVA)" == "1"
+STAND_ALONE_JAVA_DLL_SUFFIX=s
+!else
+STAND_ALONE_JAVA_DLL_SUFFIX=
+!endif
+
+MOD_JRT=jrt$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_MM =mm$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_AWT=awt$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_AWTS=awt$(MOZ_BITS)$(VERSION_NUMBER)$(STAND_ALONE_JAVA_DLL_SUFFIX)
+MOD_JIT=jit$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JSJ=jsj$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_NET=net$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JBN=jbn$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_NSC=nsc$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JPW=jpw$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JDB=jdb$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_ZIP=zip$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_ZPW=zpw$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_CON=con$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_NPJ=npj$(MOZ_BITS)$(VERSION_NUMBER)
+
+JRTDLL=$(MOD_JRT).$(DLL_SUFFIX)
+MMDLL =$(MOD_MM).$(DLL_SUFFIX)
+AWTDLL=$(MOD_AWT).$(DLL_SUFFIX)
+AWTSDLL=$(MOD_AWT)$(STAND_ALONE_JAVA_DLL_SUFFIX).$(DLL_SUFFIX)
+JITDLL=$(MOD_JIT).$(DLL_SUFFIX)
+JSJDLL=$(MOD_JSJ).$(DLL_SUFFIX)
+NETDLL=$(MOD_NET).$(DLL_SUFFIX)
+JBNDLL=$(MOD_JBN).$(DLL_SUFFIX)
+NSCDLL=$(MOD_NSC).$(DLL_SUFFIX)
+JPWDLL=$(MOD_JPW).$(DLL_SUFFIX)
+JDBDLL=$(MOD_JDB).$(DLL_SUFFIX)
+ZIPDLL=$(MOD_ZIP).$(DLL_SUFFIX)
+ZPWDLL=$(MOD_ZPW).$(DLL_SUFFIX)
+CONDLL=$(MOD_CON).$(DLL_SUFFIX)
+NPJDLL=$(MOD_NPJ).$(DLL_SUFFIX)
+
+ZIPLIB=$(DIST)\lib\$(MOD_ZIP).$(LIB_SUFFIX)
+AWTLIB=$(DIST)\lib\$(MOD_AWT).$(LIB_SUFFIX)
+
+######################################################################
+
+include <$(DEPTH)/config/common.mk>
+
+JAVA_DEFINES =			   \
+	-DJAR_NAME=\"$(JAR_NAME)\" \
+	-DJRTDLL=\"$(JRTDLL)\"	   \
+	-DMMDLL=\"$(MMDLL)\"	   \
+	-DAWTDLL=\"$(AWTDLL)\"	   \
+	-DAWTSDLL=\"$(AWTSDLL)\"   \
+	-DJSJDLL=\"$(JSJDLL)\"	   \
+	-DJITDLL=\"$(JITDLL)\"     \
+	-DNETDLL=\"$(NETDLL)\"     \
+	-DJBNDLL=\"$(JBNDLL)\"     \
+	-DNSCDLL=\"$(NSCDLL)\"     \
+	-DJDBDLL=\"$(JDBDLL)\"	   \
+	-DJPWDLL=\"$(JPWDLL)\"     \
+	-DZPWDLL=\"$(ZPWDLL)\"     \
+	-DCONDLL=\"$(CONDLL)\"
+!if "$(MOZ_BITS)" == "16"
+
+# Override JAVA_DEFINES to make command line short for win16.
+# Put any new defines into javadefs.h in ns/sun-java/include.
+# This is to shorten the command line in order not to break Win16.
+
+JAVA_DEFINES = -DJAR_NAME=\"$(JAR_NAME)\" -DMOZ_BITS=\"$(MOZ_BITS)\" -DVERSION_NUMBER=\"$(VERSION_NUMBER)\" -DDLL_SUFFIX=\".$(DLL_SUFFIX)\"   
+
+!endif
+
+!if "$(AWT_11)" == "1"
+JAVA_DEFINES = $(JAVA_DEFINES) -DAWT_11
+!else
+JAVA_DEFINES = $(JAVA_DEFINES) -DAWT_102
+!endif
+
+
+#JAVA_CLASSPATH = $(JAVA_CLASSPATH:/=\)
+JMCSRCDIR = $(JMCSRCDIR:/=\)
+JAVA_BOOT_CLASSPATH = $(JAVA_BOOT_CLASSPATH:/=\)
+
+NMAKE=nmake -nologo -$(MAKEFLAGS)
+
+########
+#   Get the cwd to prepend to all compiled source
+#       files.  Will allow debugger to automatically find sources
+#       instead of asking for the path info.
+#   Win16 will break if enabled, guess we continue to live in pain
+#       therein.
+########
+!if "$(MOZ_BITS)" == "32"
+CURDIR=$(MAKEDIR)^\
+!endif
+
+!endif # CONFIG_CONFIG_MAK
+

mozilla/config/config.mk

@@ -0,0 +1,632 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# config.mk
+#
+# Determines the platform and builds the macros needed to load the
+# appropriate platform-specific .mk file, then defines all (most?)
+# of the generic macros.
+#
+
+# This wastes time.
+include $(DEPTH)/config/common.mk
+
+#
+# Important internal static macros
+#
+OS_ARCH		:= $(subst /,_,$(shell uname -s))
+OS_RELEASE	:= $(shell uname -r)
+OS_TEST		:= $(shell uname -m)
+
+#
+# Tweak the default OS_ARCH and OS_RELEASE macros as needed.
+#
+ifeq ($(OS_ARCH),AIX)
+OS_RELEASE	:= $(shell uname -v).$(shell uname -r)
+endif
+ifeq ($(OS_ARCH),BSD_386)
+OS_ARCH		:= BSD_OS
+endif
+ifeq ($(OS_ARCH),IRIX64)
+OS_ARCH		:= IRIX
+endif
+ifeq ($(OS_ARCH),UNIX_SV)
+ifneq ($(findstring NCR,$(shell grep NCR /etc/bcheckrc | head -1 )),)
+OS_ARCH		:= NCR
+else
+OS_ARCH		:= UNIXWARE
+OS_RELEASE	:= $(shell uname -v)
+endif
+endif
+ifeq ($(OS_ARCH),ncr)
+OS_ARCH		:= NCR
+endif
+# This is the only way to correctly determine the actual OS version on NCR boxes.
+ifeq ($(OS_ARCH),NCR)
+OS_RELEASE	:= $(shell awk '{print $$3}' /etc/.relid | sed 's/^\([0-9]\)\(.\)\(..\)\(.*\)$$/\2.\3/')
+endif
+ifeq ($(OS_ARCH),UNIX_System_V)
+OS_ARCH		:= NEC
+endif
+ifeq ($(OS_ARCH),QNX)
+OS_RELEASE	:= $(shell uname -v | sed 's/^\([0-9]\)\([0-9]*\)$$/\1.\2/')
+endif
+ifeq ($(OS_ARCH),SCO_SV)
+OS_ARCH		:= SCOOS
+OS_RELEASE	:= 5.0
+endif
+ifneq (,$(filter SINIX-N SINIX-Y SINIX-Z ReliantUNIX-M,$(OS_ARCH)))
+OS_ARCH		:= SINIX
+OS_TEST		:= $(shell uname -p)
+endif
+ifeq ($(OS_ARCH),UnixWare)
+OS_ARCH		:= UNIXWARE
+endif
+
+#
+# Strip off the excessively long version numbers on these platforms,
+# but save the version to allow multiple versions of the same base
+# platform to be built in the same tree.
+#
+ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OSF1 SunOS,$(OS_ARCH)))
+OS_VERS		:= $(suffix $(OS_RELEASE))
+OS_RELEASE	:= $(basename $(OS_RELEASE))
+OS_VERSION	:= $(shell echo $(OS_VERS) | sed 's/-.*//')
+endif
+
+OS_CONFIG	:= $(OS_ARCH)$(OS_RELEASE)
+
+#
+# Personal makefile customizations go in these optional make include files.
+#
+MY_CONFIG	:= $(DEPTH)/config/myconfig.mk
+MY_RULES	:= $(DEPTH)/config/myrules.mk
+
+#
+# Relative pathname from top-of-tree to current source directory
+#
+ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
+REVDEPTH	:= $(DEPTH)/config/revdepth
+SRCDIR		= $(shell $(PERL) $(REVDEPTH).pl $(DEPTH))
+endif
+
+#
+# Define an include-at-most-once flag
+#
+NS_CONFIG_MK	= 1
+
+#
+# Provide the means to easily override our tool directory locations.
+#
+ifdef NETSCAPE_HIERARCHY
+NETSCAPE_BUILD = 1   # Defines XFEPRIVDIR, below.
+CONTRIB_BIN	:= /tools/contrib/bin/
+JAVA_BIN	:= /usr/local/java/bin/
+LOCAL_BIN	:= /usr/local/bin/
+LOCAL_SUN4	:= /usr/local/sun4/bin/
+NS_BIN		:= /tools/ns/bin/
+NS_LIB		:= /tools/ns/lib
+JAVA_LIB	:= /usr/local/netscape/java/lib
+else
+NS_LIB		:= .
+JAVA_LIB	:= .
+endif
+
+# Allow NETSCAPE_BUILD to include XFEPRIVDIR w/o NETSCAPE_HIERARCHY
+ifdef NETSCAPE_BUILD
+XFEPRIVDIR		:= $(DEPTH)/../ns/cmd/xfe/
+endif
+
+#
+# Default command macros; can be overridden in <arch>.mk.
+#
+AS		= $(CC)
+ASFLAGS		= $(CFLAGS)
+BSDECHO		= echo
+CC		= gcc
+CCC		= g++
+CCF		= $(CC) $(CFLAGS)
+LINK_EXE	= $(LINK) $(OS_LFLAGS) $(LFLAGS)
+LINK_DLL	= $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
+NFSPWD		= $(DEPTH)/config/nfspwd
+PURIFY		= purify $(PURIFYOPTIONS)
+QUANTIFY	= quantify $(QUANTIFYOPTIONS)
+RANLIB		= /bin/true
+SDKINSTALL	= $(NSINSTALL) -t
+UNZIP_PROG	= $(LOCAL_BIN)/unzip
+ZIP_PROG	= $(LOCAL_BIN)/zip
+ZIP_FLAGS	= -0rq
+
+ifeq ($(OS_ARCH),OS2)
+EMPTY		:=
+SLASH		:= /$(EMPTY)
+BSLASH		:= \$(EMPTY)
+SEMICOLON	:= ;$(EMPTY)
+SPACE		:= $(EMPTY) $(EMPTY)
+PATH_SEPARATOR	:= \;
+RC		= flipper rc$(BIN_SUFFIX)
+XP_DEFINE	= -DXP_PC
+LIB_SUFFIX	= lib
+DLL_SUFFIX	= dll
+MAP_SUFFIX	= map
+BIN_SUFFIX	= .exe
+AR		= flipper ILibo //noignorecase //nologo $@
+IMPLIB		= flipper ILibo //noignorecase //nologo $@
+DLLFLAGS	= -DLL -OUT:$@ $(XLFLAGS) -MAP:$(@:.dll=.map)
+LFLAGS		= $(OBJS) -OUT:$@ $(XLFLAGS) $(DEPLIBS) $(EXTRA_LIBS) -MAP:$(@:.dll=.map) $(DEF_FILE)
+NSINSTALL	= nsinstall
+INSTALL		= $(NSINSTALL)
+JAVA_PROG	= flipper java -norestart
+JAVAC_ZIP	= $(subst $(BSLASH),$(SLASH),$(JAVA_HOME))/lib/classes.zip
+else
+ifeq ($(OS_ARCH),WINNT)
+PATH_SEPARATOR	:= :
+RC		= rc$(BIN_SUFFIX)
+XP_DEFINE	= -DXP_PC
+LIB_SUFFIX	= lib
+DLL_SUFFIX	= dll
+BIN_SUFFIX	= .exe
+AR		= lib -NOLOGO -OUT:"$@"
+DLLFLAGS	= $(XLFLAGS) -OUT:"$@"
+LFLAGS		= $(OBJS) $(DEPLIBS) $(EXTRA_LIBS) -OUT:"$@"
+NSINSTALL	= nsinstall
+INSTALL		= $(NSINSTALL)
+JAVA_PROG	= java
+else
+PATH_SEPARATOR	:= :
+XP_DEFINE	= -DXP_UNIX
+AR		= ar cr $@
+DLL_SUFFIX	= so
+LIB_SUFFIX	= a
+ifeq ($(AWT_11),1)
+JAVA_PROG	= $(NS_BIN)java
+JAVAC_ZIP	= $(NS_LIB)/classes.zip
+else
+JAVA_PROG	= $(LOCAL_BIN)java
+JAVAC_ZIP	= $(JAVA_LIB)/javac.zip
+endif
+PERL		= $(NS_BIN)perl
+TAR		= tar
+EMACS		= xemacs
+WHOAMI		= /usr/bin/whoami
+endif
+endif
+
+#
+# Debug by default.
+#
+OBJDIR_TAG	= _DBG
+OPTIMIZER	= -g
+JAVA_OPTIMIZER	= -g
+XBCFLAGS	= -FR$*
+XCFLAGS		= $(LCFLAGS)
+XLFLAGS		= $(LLFLAGS)
+
+ifeq ($(OS_ARCH),OS2)
+OPTIMIZER	= -Ti+
+XLFLAGS		+= -DEBUG
+ifdef BUILD_PROFILE
+OPTIMIZER	+= -Gh+ 
+OBJDIR_TAG	= _PRF
+else
+OPTIMIZER	+= -DDEBUG
+ifdef BUILD_MEMDBG
+OPTIMIZER	+= -Tm+ -DXP_OS2_MEMDEBUG=1
+OBJDIR_TAG	= _MEM
+endif
+endif
+else
+ifeq ($(OS_ARCH),WINNT)
+OPTIMIZER	= -Od -Z7
+JAVA_OPTIMIZER	= $(OPTIMIZER)
+XLFLAGS		+= -DEBUG
+else
+DEFINES		= -DDEBUG -UNDEBUG -DDEBUG_$(shell $(WHOAMI)) -DTRACING
+endif
+endif
+
+ifdef BUILD_OPT
+OBJDIR_TAG	= _OPT
+XBCFLAGS	=
+ifeq ($(OS_ARCH),OS2)
+OPTIMIZER	= -O+ -Oi -DNDEBUG
+else
+ifeq ($(OS_ARCH),WINNT)
+OPTIMIZER	= -O2
+else
+OPTIMIZER	= -O
+DEFINES		= -UDEBUG -DNDEBUG -DTRIMMED
+endif
+endif
+endif
+
+#
+# XXX For now, we're including $(DEPTH)/include directly instead of
+# getting this stuff from dist. This stuff is old and will eventually
+# be put in the library directories where it belongs so that it can
+# get exported to dist properly.
+#
+INCLUDES	= $(LOCAL_PREINCLUDES) $(MODULE_PREINCLUDES) -I$(DEPTH)/include $(LOCAL_INCLUDES) $(OS_INCLUDES)
+
+LIBNT		= $(DIST)/lib/libnt.$(LIB_SUFFIX)
+LIBAWT		= $(DIST)/lib/libawt.$(LIB_SUFFIX)
+LIBMMEDIA	= $(DIST)/lib/libmmedia.$(LIB_SUFFIX)
+
+#
+# NSPR 2.0 is now the default, "setenv NSPR10 1" to go back to 1.0
+#
+ifndef NSPR10
+NSPR20		= 1
+NSPRDIR		= nsprpub
+DEFINES		+= -DNSPR20
+INCLUDES	+= -I$(DIST)/include
+LIBNSPR		= $(DIST)/lib/libplds21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/libmsgc21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/libnspr21.$(LIB_SUFFIX)
+PURELIBNSPR	= $(DIST)/lib/purelibplds21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/purelibmsgc21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/purelibnspr21.$(LIB_SUFFIX)
+else
+NSPRDIR		= nspr
+LIBNSPR		= $(DIST)/lib/libnspr.$(LIB_SUFFIX)
+PURELIBNSPR	= $(DIST)/lib/libpurenspr.$(LIB_SUFFIX)
+endif
+
+ifdef DBMALLOC
+LIBNSPR		+= $(DIST)/lib/libdbmalloc.$(LIB_SUFFIX)
+endif
+
+ifeq ($(OS_ARCH),OS2)
+LIBNSJAVA	= $(DIST)/lib/jrt$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
+LIBMD		= $(DIST)/lib/libjmd.$(LIB_SUFFIX)
+LIBJAVA		= $(DIST)/lib/libjrt.$(LIB_SUFFIX)
+LIBNSPR		= $(DIST)/lib/pr$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
+LIBXP		= $(DIST)/lib/libxp.$(LIB_SUFFIX)
+else
+ifeq ($(OS_ARCH),WINNT)
+LIBNSJAVA	= $(DIST)/lib/jrt3221.$(LIB_SUFFIX)
+else
+LIBNSJAVA	= $(DIST)/lib/nsjava32.$(LIB_SUFFIX)
+endif
+endif
+
+CFLAGS		= $(XP_DEFINE) $(OPTIMIZER) $(OS_CFLAGS) $(MDUPDATE_FLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROF_FLAGS)
+NOMD_CFLAGS	= $(XP_DEFINE) $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
+
+#
+# Include the binary distrib stuff, if necessary.
+#
+ifdef NS_BUILD_CORE
+include $(DEPTH)/config/coreconf.mk
+endif
+
+#
+# Now include the platform-specific stuff.
+#
+include $(DEPTH)/config/$(OS_ARCH).mk
+
+#
+# Some platforms (Solaris) might require builds using either
+# (or both) compiler(s).
+#
+ifdef SHOW_CC_TYPE
+COMPILER	= _$(notdir $(CC))
+endif
+
+#
+# Name of the binary code directories
+#
+ifeq ($(OS_ARCH)_$(PROCESSOR_ARCHITECTURE),WINNT_x86)
+OBJDIR_NAME	= $(OS_CONFIG)$(OS_VERSION)$(OBJDIR_TAG).OBJ
+else
+OBJDIR_NAME	= $(OS_CONFIG)$(OS_VERSION)$(PROCESSOR_ARCHITECTURE)$(COMPILER)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
+endif
+
+# Figure out where the binary code lives. It either lives in the src
+# tree (NSBUILDROOT is undefined) or somewhere else.
+ifdef NSBUILDROOT
+BUILD		= $(NSBUILDROOT)/$(OBJDIR_NAME)/build
+OBJDIR		= $(BUILD)/$(SRCDIR)
+XPDIST		= $(NSBUILDROOT)
+DIST		= $(NSBUILDROOT)/$(OBJDIR_NAME)/dist
+else
+BUILD		= $(OBJDIR_NAME)
+OBJDIR		= $(OBJDIR_NAME)
+XPDIST		= $(DEPTH)/dist
+DIST		= $(DEPTH)/dist/$(OBJDIR_NAME)
+endif
+
+# all public include files go in subdirectories of PUBLIC:
+PUBLIC		= $(XPDIST)/public
+
+VPATH		= $(OBJDIR)
+DEPENDENCIES	= $(OBJDIR)/.md
+
+ifneq ($(OS_ARCH),WINNT)
+MKDEPEND_DIR	= $(DEPTH)/config/mkdepend
+MKDEPEND	= $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend
+MKDEPENDENCIES	= $(OBJDIR)/depend.mk
+endif
+
+#
+# Include any personal overrides the user might think are needed.
+#
+-include $(MY_CONFIG)
+
+######################################################################
+# Now test variables that might have been set or overridden by $(MY_CONFIG).
+
+DEFINES		+= -DNETSCAPE -DOSTYPE=\"$(OS_CONFIG)\"
+
+# Specify that we are building a client.
+# This will instruct the cross platform libraries to
+# include all the client specific cruft.
+ifdef SERVER_BUILD
+DEFINES		+= -DSERVER_BUILD
+ifdef LIVEWIRE
+DEFINES		+= -DLIVEWIRE
+endif
+STATIC_JAVA	= yes
+else
+MOZILLA_CLIENT	= 1
+DEFINES		+= -DMOZILLA_CLIENT
+endif
+
+ifdef MOZ_SINGLESIGNON
+DEFINES		+= -DSingleSignon
+endif
+
+ifdef MOZ_COOKIEMANAGE
+DEFINES		+= -DCookieManagement
+endif
+
+ifdef MOZ_LITE
+NO_EDITOR	= 1
+NO_UNIX_LDAP	= 1
+MOZ_JSD		= 1
+MOZ_NAV_BUILD_PREFIX = 1
+endif
+ifdef MOZ_MEDIUM
+DEFINES		+= -DEDITOR -DMOZ_COMMUNICATOR_IIDS
+EDITOR		= 1
+MOZ_JSD		= 1
+MOZ_COMMUNICATOR_IIDS	= 1
+MOZ_COMMUNICATOR_CONFIG_JS	= 1
+MOZ_COPY_ALL_JARS	= 1
+ifndef MOZ_SECURITY
+NO_SECURITY	= 1
+endif
+endif
+ifdef MOZ_DARK
+DEFINES += -DEDITOR -DMOZ_COMMUNICATOR_IIDS -DMOZ_MAIL_NEWS -DMOZ_OFFLINE \
+                   -DMOZ_TASKBAR -DMOZ_LDAP -DMOZ_NEO 
+#-DMOZ_CALENDAR
+EDITOR		= 1
+MOZ_JSD		= 1
+MOZ_COMMUNICATOR_IIDS	= 1
+MOZ_COMMUNICATOR_CONFIG_JS	= 1
+MOZ_COPY_ALL_JARS	= 1
+MOZ_OFFLINE=1
+MOZ_TASKBAR=1
+MOZ_LDAP=1
+MOZ_MAIL_NEWS=1
+#MOZ_CALENDAR=1
+MOZ_NEO=1
+endif
+ifdef MOZ_GOLD
+DEFINES		+= -DGOLD
+BUILD_GOLD	= 1
+endif
+
+ifdef NO_SECURITY
+DEFINES		+= -DNO_SECURITY
+endif
+
+# Crash-reporting system
+ifdef MOZ_FULLCIRCLE
+DEFINES		+= -DMOZ_FULLCIRCLE
+endif
+
+ifdef EDITOR
+DEFINES		+= -DEDITOR -DEDITOR_UI
+BUILD_EDITOR	= 1
+BUILD_EDITOR_UI	= 1
+BUILD_EDT	= 1
+endif
+
+# Build layers by default
+ifndef NO_LAYERS
+DEFINES		+= -DLAYERS
+endif
+
+ifdef BUILD_DEBUG_GC
+DEFINES		+= -DDEBUG_GC
+endif
+
+ifdef BUILD_UNIX_PLUGINS
+# UNIX_EMBED Should not be needed. For now these two defines go
+# together until I talk with jg.  --dp
+DEFINES		+= -DUNIX_EMBED -DX_PLUGINS
+endif
+
+ifndef NO_UNIX_LDAP
+DEFINES		+= -DUNIX_LDAP
+endif
+
+#
+# Platform dependent switching off of NSPR, JAVA and MOCHA
+#
+ifndef NO_NSPR
+DEFINES		+= -DNSPR
+endif
+
+ifdef MOZ_JAVA
+DEFINES		+= -DJAVA
+ifdef MOZ_OJI
+error You can't define both MOZ_JAVA and MOZ_OJI anymore. 
+endif
+JAVA_OR_OJI	= 1
+endif
+
+ifdef MOZ_OJI
+DEFINES		+= -DOJI
+JAVA_OR_OJI	= 1
+endif
+
+ifdef JAVA_OR_OJI
+MOZ_SMARTUPDATE = 1
+endif
+
+ifndef NO_MOCHA
+DEFINES		+= -DMOCHA
+endif
+
+ifdef FORTEZZA
+DEFINES		+= -DFORTEZZA
+endif
+
+ifdef UNIX_SKIP_ASSERTS
+DEFINES		+= -DUNIX_SKIP_ASSERTS
+endif
+
+ifdef SHACK
+DEFINES		+= -DSHACK
+endif
+
+ifndef NO_UNIX_ASYNC_DNS
+DEFINES		+= -DUNIX_ASYNC_DNS
+endif
+
+# For profiling
+ifdef MOZILLA_GPROF
+# Don't want profiling on build tools..
+ifneq ($(SRCDIR),config)
+PROF_FLAGS	= $(OS_GPROF_FLAGS) -DMOZILLA_GPROF
+endif
+endif
+
+# This compiles in heap dumping utilities and other good stuff 
+# for developers -- maybe we only want it in for a special SDK 
+# nspr/java runtime(?):
+DEFINES		+= -DDEVELOPER_DEBUG
+
+#
+# For the standalone image lib
+#
+ifdef STANDALONE_IMAGE_LIB
+DEFINES		+= -DSTANDALONE_IMAGE_LIB
+endif
+
+ifdef MODULAR_NETLIB
+DEFINES 	+= -DMODULAR_NETLIB
+endif
+
+######################################################################
+
+GARBAGE		= $(DEPENDENCIES) core $(wildcard core.[0-9]*)
+
+ifndef SDK
+SDK		= $(DEPTH)/dist/sdk
+endif
+
+ifneq ($(OS_ARCH),WINNT)
+NSINSTALL	= $(DEPTH)/config/$(OBJDIR_NAME)/nsinstall
+
+ifeq ($(NSDISTMODE),copy)
+# copy files, but preserve source mtime
+INSTALL		= $(NSINSTALL) -t
+else
+ifeq ($(NSDISTMODE),absolute_symlink)
+# install using absolute symbolic links
+INSTALL		= $(NSINSTALL) -L `$(NFSPWD)`
+else
+# install using relative symbolic links
+INSTALL		= $(NSINSTALL) -R
+endif
+endif
+endif
+
+######################################################################
+### Java Stuff - see common.mk
+######################################################################
+
+# where the bytecode will go
+JAVA_DESTPATH	= $(XPDIST)/classes
+
+# where the sources for the module you are compiling are
+# default is sun-java/classsrc, override for other modules
+ifndef JAVA_SOURCEPATH
+JAVA_SOURCEPATH	= $(DEPTH)/sun-java/classsrc
+endif
+
+ifndef JAVAH_IN_JAVA
+ifeq ($(OS_ARCH),OS2)
+JAVAH_PROG	= flipper $(DIST)/bin/javah
+else
+JAVAH_PROG	= $(DIST)/bin/javah
+endif
+else
+JAVAH_PROG	= $(JAVA) netscape.tools.jric.Main
+endif
+
+ifeq ($(STAND_ALONE_JAVA),1)
+STAND_ALONE_JAVA_DLL_SUFFIX	= s
+endif
+
+ifeq ($(OS_ARCH),OS2)
+AWTDLL		= awt$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
+AWTSDLL		= awt$(MOZ_BITS)$(VERSION_NUMBER)$(STAND_ALONE_JAVA_DLL_SUFFIX).$(DLL_SUFFIX)
+CONDLL		= con.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JBNDLL		= jbn.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JDBCDLL		= jdb.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JITDLL		= jit.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JPWDLL		= jpw.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JRTDLL		= jrt$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
+JSJDLL		= jsj.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+MMDLL		= mm$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
+NETDLL		= net.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+NSCDLL		= nsc.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+ZIPDLL		= zip.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+ZPWDLL		= zpw.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+else
+AWTDLL		= libawt.$(DLL_SUFFIX)
+AWTSDLL		= libawt$(STAND_ALONE_JAVA_DLL_SUFFIX).$(DLL_SUFFIX)
+CONDLL		= libcon.$(DLL_SUFFIX)
+JBNDLL		= libjbn.$(DLL_SUFFIX)
+JDBCDLL		= libjdb.$(DLL_SUFFIX)
+JITDLL		= libjit.$(DLL_SUFFIX)
+JPWDLL		= libjpw.$(DLL_SUFFIX)
+JRTDLL		= libjrt.$(DLL_SUFFIX)
+JSJDLL		= libjsj.$(DLL_SUFFIX)
+MMDLL		= libmm.$(DLL_SUFFIX)
+NETDLL		= libnet.$(DLL_SUFFIX)
+NSCDLL		= libnsc.$(DLL_SUFFIX)
+ZIPDLL		= libzip.$(DLL_SUFFIX)
+ZPWDLL		= libzpw.$(DLL_SUFFIX)
+endif
+
+JAVA_DEFINES	+= -DAWTSDLL=\"$(AWTSDLL)\" -DCONDLL=\"$(CONDLL)\" -DJBNDLL=\"$(JBNDLL)\" -DJDBDLL=\"$(JDBDLL)\" \
+		   -DJSJDLL=\"$(JSJDLL)\" -DNETDLL=\"$(NETDLL)\" -DNSCDLL=\"$(NSCDLL)\" -DZPWDLL=\"$(ZPWDLL)\" \
+                   -DJAR_NAME=\"$(JAR_NAME)\"
+
+ifeq ($(AWT_11),1)
+JAVA_DEFINES    += -DAWT_11
+else
+JAVA_DEFINES    += -DAWT_102
+endif
+

mozilla/network/Makefile

@@ -0,0 +1,39 @@
+#! gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+#  
+#
+
+DEPTH	= ..
+
+DIRS	= \
+	cache		\
+	client		\
+	cnvts		\
+	mimetype	\
+	main		\
+	protocol	\
+	util
+
+ifdef MODULAR_NETLIB
+DIRS	+= module
+endif
+
+include $(DEPTH)/config/rules.mk
+
+INCLUDE += $(PUBLIC)\ldap $(PUBLIC)\security
+

mozilla/network/cache/MANIFEST

@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+extcache.h
+netcache.h

mozilla/network/cache/Makefile

@@ -0,0 +1,42 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../..
+
+MODULE		= netcache
+LIBRARY_NAME	= netcache
+
+CSRCS		= \
+	cachedump.c	\
+	extcache.c	\
+	mkcache.c	\
+	mkextcac.c	\
+	mkmemcac.c	\
+	$(NULL)
+
+ifdef NU_CACHE
+CSRCS += \
+	nucacheproto.c	\
+	$(NULL)
+endif
+
+EXPORTS= netcache.h mkcache.h mkmemcac.h extcache.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl security layer img jtools cachelib
+
+include $(DEPTH)/config/rules.mk
+

mozilla/network/cache/cachedump.c

@@ -0,0 +1,139 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* this little program will sequentially dump out
+ * every record in the database
+ */
+#include "mkcache.h"
+#include "extcache.h"
+#include "plstr.h"
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <assert.h>
+
+#ifdef _sgi
+#include <sys/endian.h> 
+#endif /* _sgi */
+
+/* URL methods
+ */
+#define URL_GET_METHOD  0
+#define URL_POST_METHOD 1
+#define URL_HEAD_METHOD 2
+
+static DB *
+net_OpenExtCacheFatDB(char *filename)
+{
+	DB *rv;
+    HASHINFO hash_info = {
+        16*1024,  /* bucket size */
+        0,        /* fill factor */
+        0,        /* number of elements */
+        0,        /* bytes to cache */
+        0,        /* hash function */
+        0};       /* byte order */
+
+
+	rv = dbopen(filename,
+									O_RDWR | O_CREAT,
+									0644,
+									DB_HASH,
+				&hash_info);
+
+	if(!rv)
+	  {
+		printf("Could not open cache database: %s\n", filename);
+		exit(1);
+	  }
+	
+	return(rv);
+}
+
+int main(int argc, char **argv)
+{
+    char url[4028];
+    struct stat stat_s;
+    net_CacheObject * cache_obj;
+	DB * ext_cache_database=0;
+	DBT key;
+	DBT data;
+    int len;
+    char *end;
+
+    memset(&cache_obj, 0, sizeof(net_CacheObject));
+
+    if(argc != 2)
+      {
+        printf("Usage:\n"
+                "%s database\n"
+                "\n"
+                "database: path and name of the database\n", argv[0]);
+        exit(1);
+      }
+
+    /* open the cache database */
+    ext_cache_database = net_OpenExtCacheFatDB(argv[1]);
+
+	if(!ext_cache_database)
+	  {
+		perror("Could not open cache database");
+		exit(1);
+	  }
+
+	while(!(ext_cache_database->seq)(ext_cache_database, &key, &data, 0))
+	  {
+
+        if(key.size == PL_strlen(EXT_CACHE_NAME_STRING)
+            && !PL_strcmp(key.data, EXT_CACHE_NAME_STRING))
+          {
+            /* make sure it's a terminated string */
+            if(((char *)data.data)[data.size-1] == '\0')
+                printf("\n\nDatabase Name: %s\n", (char*)data.data);
+            else
+                 printf("\n\nDatabase Name is corrupted!\n");
+			printf("\n--------------------------------------\n");
+			continue;
+		  }
+
+		/* try and convert the db struct to a cache struct */
+	    cache_obj = net_DBDataToCacheStruct(&data);
+
+		if(!cache_obj)
+		  {
+			printf("Malformed database entry:\n");
+			printf("key: ");
+			fwrite(key.data, 1, key.size, stdout);
+			printf("\ndata: ");
+			fwrite(data.data, 1, data.size, stdout);
+			printf("\n");
+			printf("--------------------------------------\n");
+			continue;
+		  }
+
+	    /* the URL is 8 bytes into the key struct
+	     */
+	    printf("URL: %s\n",(char*)key.data+8);
+	    printf("file: %s\n", cache_obj->filename);
+	    printf("is_relative_path: %s\n", cache_obj->is_relative_path ? "TRUE" : "FALSE");
+	    printf("content_type: %s\n", cache_obj->content_type);
+	    printf("content_length: %d\n", cache_obj->content_length);
+	    printf("last_modified: %s\n", ctime(&cache_obj->last_modified));
+		printf("--------------------------------------\n");
+	  }
+}
+

mozilla/network/cache/cacheutils.h

@@ -0,0 +1,21 @@
+
+#ifndef CACHEUTILS_H
+#define CACHEUTILS_H
+
+/* Find an actively-loading cache file for URL_s in context, and copy the first
+ * nbytes of it to a new cache file.  Return a cache converter stream by which
+ * the caller can append to the cloned cache file.
+ */
+extern NET_VoidStreamClass *
+NET_CloneWysiwygCacheFile(MWContext *context, URL_Struct *URL_s,
+                          uint32 nbytes, const char * wysiwyg_url,
+                          const char * base_href);
+
+/* Create a wysiwyg cache converter to a copy of the current entry for URL_s.
+ */
+extern NET_VoidStreamClass *
+net_CloneWysiwygMemCacheEntry(MWContext *window_id, URL_Struct *URL_s,
+                              uint32 nbytes, const char * wysiwyg_url,
+                              const char * base_href);
+
+#endif /* CACHEUTILS_H */

mozilla/network/cache/export.mac

@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+extcache.h
+netcache.h

mozilla/network/cache/extcache.c

@@ -0,0 +1,857 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* Please leave outside of ifdef for window precompiled headers */
+#include "mkcache.h"
+
+#ifdef MOZILLA_CLIENT
+#include "mktrace.h"
+#include "prmem.h"
+#include "plstr.h"
+
+/* Publicly released Netscape cache access routines.
+ *
+ * These routines are shared between the netscape executable
+ * and the programs released as a cache developers kit.
+ *
+ * Created: Lou Montulli <montulli@netscape.com>, July-95.
+ * Modifications/Addition: Gagan Saksena, 97
+ */
+
+#include "rosetta.h"
+
+#ifndef EXT_DB_ROUTINES
+#include "secnav.h"
+#include "sechash.h"
+#endif
+
+#include "extcache.h"  /* include this for everything */
+
+#ifdef EXT_DB_ROUTINES
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <assert.h>
+
+typedef struct {
+	int32 len;
+	char *data;
+} SECItem;
+
+#ifdef _sgi
+#include <sys/endian.h>
+#endif /* _sgi */
+
+
+/* URL methods
+ */
+ #define URL_GET_METHOD  0
+ #define URL_POST_METHOD 1
+ #define URL_HEAD_METHOD 2
+
+#endif /* DB_STORE */
+
+
+MODULE_PRIVATE DBT *
+net_CacheDBTDup(DBT *obj)
+{
+	DBT * rv = PR_NEW(DBT);
+
+	if(!rv)
+		return(NULL);
+
+	rv->size = obj->size;
+	rv->data = PR_Malloc(rv->size);
+
+	if(!rv->data)
+	  {
+		PR_Free(rv);
+		return(NULL);
+	  }
+
+	memcpy(rv->data, obj->data, rv->size);
+
+	return(rv);
+
+}
+
+/* free the cache object
+ */
+MODULE_PRIVATE void net_freeCacheObj (net_CacheObject * cache_obj)
+{
+
+    PR_FREEIF(cache_obj->address);
+    PR_FREEIF(cache_obj->post_data);
+    PR_FREEIF(cache_obj->post_headers);
+    PR_FREEIF(cache_obj->content_type);
+    PR_FREEIF(cache_obj->charset);
+    PR_FREEIF(cache_obj->content_encoding);
+    PR_FREEIF(cache_obj->page_services_url);
+    PR_FREEIF(cache_obj->filename);
+	
+#ifndef EXT_DB_ROUTINES
+    PR_FREEIF(cache_obj->sec_info);
+#endif
+	
+    PR_Free(cache_obj);
+}
+
+/* returns true if this DBT looks like a valid
+ * entry.  It looks at the checksum and the
+ * version number to see if it's valid
+ */
+#define MAX_VALID_DBT_SIZE 10000
+
+MODULE_PRIVATE PRBool
+net_IsValidCacheDBT(DBT *obj)
+{
+    char *cur_ptr, *max_ptr;
+    uint32 len;
+
+	if(!obj || obj->size < 9 || obj->size > MAX_VALID_DBT_SIZE)
+		return(FALSE);
+
+    cur_ptr = (char *)obj->data;
+    max_ptr = cur_ptr+obj->size;
+
+    /* get the total size of the struct out of
+     * the first field to check it
+     */
+    COPY_INT32(&len, cur_ptr);
+    cur_ptr += sizeof(int32);
+
+    if(len != obj->size)
+      {
+        TRACEMSG(("Size going in is not the same as size coming out"));
+        return(FALSE);
+      }
+
+    /* get the version number of the written structure
+     */
+    if(cur_ptr > max_ptr)
+        return(FALSE);
+    COPY_INT32(&len, cur_ptr);
+    cur_ptr += sizeof(int32);
+
+    if(len != CACHE_FORMAT_VERSION)
+      {
+        TRACEMSG(("Version of cache structure is wrong!: %d", len));
+        return(FALSE);
+      }
+
+	/* looks good to me... */
+	return(TRUE);
+}
+
+
+/* takes a cache object and returns a malloc'd 
+ * (void *) suitible for passing in as a database
+ * data storage object
+ */
+MODULE_PRIVATE DBT *
+net_CacheStructToDBData(net_CacheObject * old_obj)
+{
+    int32 len;
+	char *cur_ptr;
+	void *new_obj;
+	int32 total_size;
+	DBT *rv;
+
+	rv = PR_NEW(DBT);
+
+	if(!rv)
+		return(NULL);
+
+	total_size = sizeof(net_CacheObject);
+
+#define ADD_STRING_SIZE(string) \
+total_size += old_obj->string ? PL_strlen(old_obj->string)+1 : 0
+
+	ADD_STRING_SIZE(address);
+	total_size += old_obj->post_data_size+1;
+	ADD_STRING_SIZE(post_headers);
+	ADD_STRING_SIZE(content_type);
+	ADD_STRING_SIZE(content_encoding);
+	ADD_STRING_SIZE(charset);
+	ADD_STRING_SIZE(filename);
+    total_size += sizeof(uint32); /* size of secinfo */
+	total_size += HG73653(old_obj->sec_info);
+	ADD_STRING_SIZE(page_services_url);
+
+#undef ADD_STRING_SIZE
+	
+	new_obj = PR_Malloc(total_size * sizeof(char));
+
+	if(!new_obj)
+	  {
+		PR_Free(rv);
+		return NULL;
+	  }
+
+	memset(new_obj, 0, total_size * sizeof(char));
+
+	/*
+	 * order is:
+	 * int32	size of the entire structure;
+	 *
+	 * int32    version of the structure format (CACHE_FORMAT_VERSION)
+	 *
+     * time_t                  last_modified;
+     * time_t                  last_accessed;
+     * time_t                  expires;
+     * uint32                  content_length;
+     * XP_Bool                    is_netsite;
+	 *
+ 	 * time_t                  lock_date;
+	 *
+     * char                  * filename;
+     * int32                   filename_len;
+	 *
+     * int32                   HG52242;
+     * unsigned char         * HG42320;
+	 *
+     * int32                   method;
+	 *
+	 * # don't store address, or post_data stuff
+	 * # char                  * address;
+     * # uint32                  post_data_size;
+     * # char                  * post_data;
+	 *
+     * char                  * post_headers;
+     * char                  * content_type;
+     * char                  * content_encoding;
+     * char                  * charset;
+	 *
+	 * XP_Bool                    incomplete_file;
+	 * uint32                  total_content_length;
+	 *
+	 * char                  * page_services_url;
+ 	 * 
+	 * string lengths all include null terminators
+	 * all integer constants are stored as 4 bytes
+	 * all booleans are stored as one byte
+	 */
+
+	/* VERY VERY IMPORTANT.  Whenever the
+	 * format of the record structure changes
+ 	 * you must verify that the byte positions	
+	 * in extcache.h are updated
+	 */
+
+#define STUFF_STRING(string) 									\
+{	 															\
+  len = (old_obj->string ? PL_strlen(old_obj->string)+1 : 0);	\
+  COPY_INT32((void *)cur_ptr, &len);							\
+  cur_ptr = cur_ptr + sizeof(int32);							\
+  if(len)														\
+      memcpy((void *)cur_ptr, old_obj->string, len);			\
+  cur_ptr += len;												\
+}
+
+#define STUFF_NUMBER(number) 									\
+{ 																\
+  COPY_INT32((void *)cur_ptr, &old_obj->number);				\
+  cur_ptr = cur_ptr + sizeof(int32);							\
+}
+
+#define STUFF_TIMET(number) 									\
+{ 																\
+  COPY_INT32((void *)cur_ptr, &old_obj->number);				\
+  cur_ptr = cur_ptr + sizeof(time_t);							\
+}
+
+#define STUFF_BOOL(bool_val)	 									\
+{ 																	\
+  if(old_obj->bool_val)												\
+    ((char *)(cur_ptr))[0] = 1;										\
+  else																\
+    ((char *)(cur_ptr))[0] = 0;										\
+  cur_ptr = cur_ptr + sizeof(char);									\
+}
+
+	cur_ptr = (char *)new_obj;
+
+	/* put the total size of the struct into
+	 * the first field so that we have
+	 * a cross check against corruption
+	 */
+  	COPY_INT32((void *)cur_ptr, &total_size);
+  	cur_ptr = cur_ptr + sizeof(int32);
+
+	HG73209
+	/* put the version number of the structure
+	 * format that we are using
+	 * By using a version string when writting
+	 * we can support backwards compatibility
+	 * in our reading code
+	 * (use "len" as a temp variable)
+	 */
+	len = CACHE_FORMAT_VERSION;
+  	COPY_INT32((void *)cur_ptr, &len);
+  	cur_ptr = cur_ptr + sizeof(int32);
+
+	STUFF_TIMET(last_modified);
+	STUFF_TIMET(last_accessed);
+	STUFF_TIMET(expires);
+	STUFF_NUMBER(content_length);
+	STUFF_BOOL(is_netsite);
+
+	STUFF_TIMET(lock_date);
+
+	STUFF_STRING(filename);
+	STUFF_NUMBER(filename_len);
+
+	STUFF_BOOL(is_relative_path);
+
+	STUFF_NUMBER(security_on);
+
+#ifndef EXT_DB_ROUTINES
+    HG42539
+    /* save the security info */
+    if ( old_obj->sec_info ) {
+		len = HG65293(old_obj->sec_info);
+		COPY_INT32((void *)cur_ptr, &len);
+		cur_ptr = cur_ptr + sizeof(int32);
+
+		memcpy((void *)cur_ptr, old_obj->sec_info, len);
+		cur_ptr += len;
+	} else
+#endif
+    {
+		len = 0;
+		COPY_INT32((void *)cur_ptr, &len);
+		cur_ptr = cur_ptr + sizeof(int32);
+	}
+
+    STUFF_NUMBER(method);
+
+#ifdef STORE_ADDRESS_AND_POST_DATA
+
+	STUFF_STRING(address);
+	STUFF_NUMBER(post_data_size);
+	
+	/* post_data 
+	 * this is special since it not necessarily a string
+	 */
+	if(old_obj->post_data_size)
+	  {
+	    memcpy(cur_ptr, old_obj->post_data, old_obj->post_data_size+1);
+	    cur_ptr += old_obj->post_data_size+1;
+	  }
+
+#endif /* STORE_ADDRESS_AND_POST_DATA */
+
+	STUFF_STRING(post_headers);
+
+	STUFF_STRING(content_type);
+	STUFF_STRING(content_encoding);
+	STUFF_STRING(charset);
+
+	STUFF_BOOL(incomplete_file);
+	STUFF_NUMBER(real_content_length);
+
+	STUFF_STRING(page_services_url);
+
+#undef STUFF_STRING
+#undef STUFF_NUMBER
+#undef STUFF_BOOL
+
+	rv->data = new_obj;
+	rv->size = total_size;
+
+	return(rv);
+
+}
+
+/* takes a database storage object and returns a malloc'd
+ * cache data object.  The cache object needs all of
+ * it's parts free'd.
+ *
+ * returns NULL on parse error 
+ */
+MODULE_PRIVATE net_CacheObject *
+net_DBDataToCacheStruct(DBT * db_obj)
+{
+	net_CacheObject * rv = PR_NEW(net_CacheObject);
+	char * cur_ptr;
+	char * max_ptr;
+	uint32 len;
+	int32 version;
+
+	if(!rv)
+		return NULL;
+
+	memset(rv, 0, sizeof(net_CacheObject));
+
+/* if any strings are larger than this then
+ * there was a serious database error
+ */
+#define MAX_HUGE_STRING_SIZE 10000
+
+#define RETRIEVE_STRING(string)					\
+{												\
+    if(cur_ptr > max_ptr)                       \
+	  {					 						\
+		net_freeCacheObj(rv);				 	\
+        return(NULL);                           \
+	  }											\
+	COPY_INT32(&len, cur_ptr);					\
+	cur_ptr += sizeof(int32);					\
+	if(len)										\
+	  {											\
+		if(len > MAX_HUGE_STRING_SIZE)			\
+	      {				 						\
+		    net_freeCacheObj(rv);				\
+			return(NULL);						\
+	      }										\
+	    rv->string = (char*)PR_Malloc(len);		\
+		if(!rv->string)							\
+	      {				 						\
+		    net_freeCacheObj(rv);				\
+			return(NULL);						\
+	      }										\
+	    memcpy(rv->string, cur_ptr, len);	\
+	    cur_ptr += len;							\
+	  }											\
+}											
+
+#define RETRIEVE_NUMBER(number)					\
+{												\
+    if(cur_ptr > max_ptr)                       \
+        return(rv);                             \
+	COPY_INT32(&rv->number, cur_ptr);			\
+	cur_ptr += sizeof(int32);					\
+}
+
+#define RETRIEVE_TIMET(number)					\
+{												\
+    if(cur_ptr > max_ptr)                       \
+        return(rv);                             \
+    COPY_INT32(&rv->number, cur_ptr);			\
+	cur_ptr += sizeof(time_t);					\
+}
+
+#define RETRIEVE_BOOL(bool)				\
+{										\
+  if(cur_ptr > max_ptr)                 \
+    return(rv);                         \
+  if(((char *)(cur_ptr))[0])			\
+	rv->bool = TRUE;					\
+  else 									\
+	rv->bool = FALSE;					\
+  cur_ptr += sizeof(char);				\
+}
+
+	cur_ptr = (char *)db_obj->data;
+
+	max_ptr = cur_ptr+db_obj->size;
+
+	/* get the total size of the struct out of
+	 * the first field to check it
+	 */
+	COPY_INT32(&len, cur_ptr);
+	cur_ptr += sizeof(int32);
+
+	if(len != db_obj->size)
+	  {
+		TRACEMSG(("Size going in is not the same as size coming out"));
+		PR_Free(rv);
+		return(NULL);
+	  }
+
+	/* get the version number of the written structure
+	 */
+    if(cur_ptr > max_ptr)
+        return(rv);
+	COPY_INT32(&version, cur_ptr);
+	cur_ptr += sizeof(int32);
+
+	if(version != CACHE_FORMAT_VERSION)
+	  {
+		TRACEMSG(("Version of cache structure is wrong!: %d", version));
+		PR_Free(rv);
+		return(NULL);
+	  }
+
+	HG32839
+	RETRIEVE_TIMET(last_modified);
+	RETRIEVE_TIMET(last_accessed);
+	RETRIEVE_TIMET(expires);
+	RETRIEVE_NUMBER(content_length);
+	RETRIEVE_BOOL(is_netsite);
+
+	RETRIEVE_TIMET(lock_date);
+
+	RETRIEVE_STRING(filename);
+	RETRIEVE_NUMBER(filename_len);
+
+	RETRIEVE_BOOL(is_relative_path);
+
+	HG72761 
+
+	RETRIEVE_NUMBER(method);
+
+#ifdef STORE_ADDRESS_AND_POST_DATA
+
+	RETRIEVE_STRING(address);
+	RETRIEVE_NUMBER(post_data_size);
+	
+	/* post_data 
+	 * this is special since it not necessarily a string
+	 */
+	if(rv->post_data_size)
+	  {
+		rv->post_data = PR_Malloc(rv->post_data_size+1);
+		if(rv->post_data)
+			memcpy(rv->post_data, cur_ptr, rv->post_data_size+1);
+		cur_ptr += rv->post_data_size+1;
+	  }
+
+#endif /* STORE_ADDRESS_AND_POST_DATA */
+
+	RETRIEVE_STRING(post_headers);
+
+	RETRIEVE_STRING(content_type);
+	RETRIEVE_STRING(content_encoding);
+	RETRIEVE_STRING(charset);
+
+	RETRIEVE_BOOL(incomplete_file);
+	RETRIEVE_NUMBER(real_content_length);
+
+	RETRIEVE_STRING(page_services_url);
+#undef RETRIEVE_STRING
+#undef RETRIEVE_NUMBER
+#undef RETRIEVE_BOOL
+
+	return(rv);
+}
+
+#if defined(DEBUG) && defined(UNIX)
+int
+cache_test_me()
+{
+
+	net_CacheObject test;
+	net_CacheObject *rv;
+	int32 total_size;
+	DBT *db_obj;
+
+	memset(&test, 0, sizeof(net_CacheObject));
+	StrAllocCopy(test.address, "test1");
+	db_obj = net_CacheStructToDBData(&test);
+	rv = net_DBDataToCacheStruct(db_obj);
+	printf("test1: %s\n", rv->address);
+
+	memset(&test, 0, sizeof(net_CacheObject));
+	StrAllocCopy(test.address, "test2");
+	StrAllocCopy(test.charset, "test2");
+	db_obj = net_CacheStructToDBData(&test);
+	rv = net_DBDataToCacheStruct(db_obj);
+	printf("test2: %s	%s\n", rv->address, rv->charset);
+
+	memset(&test, 0, sizeof(net_CacheObject));
+	StrAllocCopy(test.address, "test3");
+	StrAllocCopy(test.charset, "test3");
+	test.content_length = 3 ;
+	test.method = 3 ;
+	test.is_netsite = 3 ;
+	db_obj = net_CacheStructToDBData(&test);
+	rv = net_DBDataToCacheStruct(db_obj);
+	printf("test3: %s	%s	%d	%d	%s\n", 
+			rv->address, rv->charset,
+			rv->content_length, rv->method, 
+			(rv->is_netsite == 3 ? "TRUE" : "FALSE"));
+
+}
+#endif
+
+/* generates a key for use in the cache database
+ * from a CacheObject struct
+ * 
+ * Key is based on the address and the post_data
+ *
+ * looks like:
+ *  size checksum | size of address | ADDRESS | size of post data | POST DATA
+ */
+MODULE_PRIVATE DBT *
+net_GenCacheDBKey(char *address, char *post_data, int32 post_data_size)
+{
+	DBT *rv = PR_NEW(DBT);
+	char *hash;
+	char *data_ptr;
+	int32 str_len;
+	int32 size;
+
+#define MD5_HASH_SIZE 16 /* always 16 due to md5 hash type */
+	
+	if(!rv)
+		return(NULL);
+	
+	if(!address)
+	  {
+		PR_ASSERT(0);
+		rv->size = 0;
+		return(rv);
+	  } 
+
+	hash = PL_strchr(address, '#');
+
+	/* don't include '#' in a key */
+	if(hash)
+		*hash = '\0';
+
+	str_len = PL_strlen(address)+1;
+
+	size  = sizeof(int32);  /* for check sum */
+	size += sizeof(int32);  /* for size of address */
+	size += str_len;        /* for address string */
+	size += sizeof(int32);  /* for size of post_data */
+
+	HG42490
+
+	rv->size = size;
+	rv->data = PR_Malloc(size);
+
+	if(!rv->data)
+	  {
+		PR_Free(rv);
+		return NULL;
+	  }
+
+	data_ptr = (char *) rv->data;
+
+	/* put in the checksum size */
+	COPY_INT32(data_ptr, &size);
+	data_ptr = data_ptr + sizeof(int32);
+	HG83777
+	
+	/* put in the size of the address string */
+	COPY_INT32(data_ptr, &str_len);
+	data_ptr = data_ptr + sizeof(int32);
+
+	/* put in the address string data */
+	memcpy(data_ptr, address, str_len);
+	data_ptr = data_ptr + str_len;
+
+	/* set the address back to it's original form */
+	if(hash)
+		*hash = '#';
+
+	/* put in the size of the post data */
+	HG73699
+	  {
+		COPY_INT32(data_ptr, &post_data_size);
+		data_ptr = data_ptr + sizeof(int32);
+	  }
+
+	return(rv);
+}
+
+/* returns a static string that contains the
+ * URL->address of the key
+ * 
+ * returns NULL on error
+ */
+MODULE_PRIVATE char *
+net_GetAddressFromCacheKey(DBT *key)
+{
+	uint32 size;
+	char *data;
+
+	/* check for minimum size */
+	if(key->size < 10)
+		return(NULL);
+	HG72873
+
+	/* validate size checksum */
+	data = (char *)key->data;
+	COPY_INT32(&size, data);
+	data += sizeof(int32);
+
+	if(size != key->size)
+		return(NULL);
+
+	/* get size of address string */
+	COPY_INT32(&size, data);
+	data += sizeof(int32);
+
+	/* make sure it's a valid c string */
+	if(data[size] != '\0')
+		return(NULL);
+		
+	/* it's valid return it */
+	return(data);
+}
+
+
+/* checks a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ * 
+ * returns 0 on error
+ */
+MODULE_PRIVATE time_t 
+net_GetTimeInCacheDBT(DBT *data, int byte_position)
+{
+	time_t date;
+	char *ptr = (char *)data->data;
+
+	if(data->size < byte_position+sizeof(time_t))
+		return(0);
+
+	if(!net_IsValidCacheDBT(data))
+		return(0);
+
+	COPY_INT32(&date, ptr+byte_position);
+
+	/* TRACEMSG(("Got date from cache DBT: %d", date)); */
+	
+	return(date);
+
+}
+
+/* Sets a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ * 
+ * returns 0 on error
+ */
+MODULE_PRIVATE void
+net_SetTimeInCacheDBT(DBT *data, int byte_position, time_t date)
+{
+	char *ptr = (char *)data->data;
+
+    if(data->size < byte_position+sizeof(time_t))
+        return;
+
+	if(!net_IsValidCacheDBT(data))
+		return;
+
+    COPY_INT32(ptr+byte_position, &date);
+
+    return;
+
+}
+
+/* Gets the filename within a cache DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns NULL on error
+ */
+#define MAX_FILE_SIZE 2048
+MODULE_PRIVATE char *
+net_GetFilenameInCacheDBT(DBT *data)
+{
+	int32 size;
+	char *rv;
+	char *ptr = (char*)data->data;
+
+    if(data->size < FILENAME_BYTE_POSITION)
+        return(NULL);
+
+	if(!net_IsValidCacheDBT(data))
+		return(0);
+
+    COPY_INT32(&size, ptr+FILENAME_SIZE_BYTE_POSITION);
+
+    if(data->size < FILENAME_BYTE_POSITION+size 
+		|| size > MAX_FILE_SIZE)
+        return(NULL);
+
+	rv = (char *)PR_Malloc(size);
+	if(!rv)
+		return(NULL);
+    memcpy(rv, ptr+FILENAME_BYTE_POSITION, size);
+
+	TRACEMSG(("Got filename: %s from DBT", rv));
+
+    return(rv);
+}
+
+/* Gets a int32 within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+MODULE_PRIVATE time_t
+net_GetInt32InCacheDBT(DBT *data, int byte_position)
+{
+    int32 num;
+	char *ptr = (char *)data->data;
+
+	if(!net_IsValidCacheDBT(data))
+		return(0);
+
+    if(data->size < byte_position+sizeof(time_t))
+        return(0);
+
+    COPY_INT32(&num, ptr+byte_position);
+
+    /* TRACEMSG(("Got int32 from cache DBT: %d", num)); */
+   
+    return(num);
+
+}
+
+MODULE_PRIVATE void
+net_FreeCacheDBTdata(DBT *stuff)
+{
+	if(stuff)
+	  {
+		PR_Free(stuff->data);
+		PR_Free(stuff);
+	  }
+}
+
+/* takes a database storage object and returns an un-malloc'd
+ * cache data object. The structure returned has pointers
+ * directly into the database memory and are only valid
+ * until the next call to any database function
+ *
+ * do not free anything returned by this structure
+ */
+MODULE_PRIVATE net_CacheObject *
+net_Fast_DBDataToCacheStruct(DBT *obj)
+{
+	static net_CacheObject *rv=0;
+
+	/* free any previous one */
+	if(rv)
+		net_freeCacheObj(rv);
+
+	rv = net_DBDataToCacheStruct(obj);
+
+	return(rv);
+
+}
+
+#endif /* MOZILLA_CLIENT */

mozilla/network/cache/extcache.h

@@ -0,0 +1,272 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef EXT_CACHE_H
+#define EXT_CACHE_H
+
+#ifndef EXT_DB_ROUTINES
+#include "mcom_db.h"
+#endif
+
+#ifdef EXT_DB_ROUTINES
+#define PRBool char
+#define uint32 unsigned int
+#define int32  int
+#define PR_NEW(structure)  ((structure *) malloc(sizeof(structure)))
+#define PR_Malloc   (void *) malloc
+#define memcpy  memcpy
+#define memset  memset
+#define TRACEMSG(x) printf x
+#define FREEIF(x)  do { if(x) free(x); } while(0)
+#define FREE free
+#define PL_strlen  strlen
+#define PL_strchr  strchr
+#define PL_strcmp  strcmp
+#define PR_ASSERT  assert
+#define MODULE_PRIVATE
+#define PRIVATE static
+#define TRUE  !0
+#define FALSE 0
+
+#include <stdio.h>
+#include <string.h>
+#include <db.h>
+#endif 
+
+#ifndef EXT_DB_ROUTINES
+
+#ifndef NSPR20
+#include "prosdep.h"  /* for IS_LITTLE_ENDIAN / IS_BIG_ENDIAN */
+#else
+#include "prtypes.h"
+#endif
+
+#endif /* EXT_DB_ROUTINES */
+
+#if !defined(IS_LITTLE_ENDIAN) && !defined(IS_BIG_ENDIAN)
+ERROR! Must have a byte order
+#endif
+
+#ifdef IS_LITTLE_ENDIAN
+#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32));
+#else
+#define COPY_INT32(_a,_b)  /* swap */                   \
+    do {                                                \
+    ((char *)(_a))[0] = ((char *)(_b))[3];              \
+    ((char *)(_a))[1] = ((char *)(_b))[2];              \
+    ((char *)(_a))[2] = ((char *)(_b))[1];              \
+    ((char *)(_a))[3] = ((char *)(_b))[0];              \
+    } while(0)
+#endif
+
+#define EXT_CACHE_NAME_STRING "INT_ExternalCacheNameString"
+
+/* Internal WARNING!!  Some slots of this structure 
+ * are shared with URL_Struct and
+ * History_entry.  If you add a slot, decide whether it needs to be shared
+ * as well.
+ */
+typedef struct _net_CacheObject {
+    time_t  last_modified;
+    time_t  last_accessed;
+    time_t  expires;
+    PRBool    is_netsite;
+    uint32  content_length;
+
+    char    * filename;                 /* cache file name */
+    int32     filename_len;             /* optimization */
+    PRBool      is_relative_path;         /* is the path relative? */
+
+    /* Security information */
+    int32   security_on;                /* is security on? */
+    unsigned char *sec_info;
+
+    time_t  lock_date;                  /* the file is locked if this
+                                         * is non-zero.  The date
+                                         * represents the time the
+                                         * lock was put in place.
+                                         * Locks are only valid for
+                                         * one session
+                                         */
+
+    int32       method;
+    char    * address;
+    uint32    post_data_size;
+    char    * post_data;
+    char    * post_headers;
+    char    * content_type;
+    char    * content_encoding;
+    char    * charset;
+
+    PRBool      incomplete_file;          /* means that the whole
+                                         * file is not there.
+                                         * This can only be true
+                                         * if the server supports byteranges
+                                         */
+    uint32    real_content_length;      /* the whole content length
+                                         * i.e. the server size of a truncated 
+                                         * client file
+                                         */
+    char    * page_services_url;
+    char    * etag;			/* HTTP/1.1 Etag */
+
+} net_CacheObject;
+
+/* this is the version number of the cache database entry.
+ * It should be incremented in integer ingrements up
+ * to MAXINT32
+ */
+#define CACHE_FORMAT_VERSION 5
+
+/* these defines specify the exact byte position
+ * of the first 4 elements in the DBT data struct
+ * Change these if you change the order of entry into
+ * the DBT
+ */
+#define LAST_MODIFIED_BYTE_POSITION   \
+                sizeof(int32)+sizeof(int32)
+#define LAST_ACCESSED_BYTE_POSITION   \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)
+#define EXPIRES_BYTE_POSITION         \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t)
+#define CONTENT_LENGTH_BYTE_POSITION  \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)
+#define IS_NETSITE_BYTE_POSITION  \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(int32)
+
+#define LOCK_DATE_BYTE_POSITION  \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(int32)+sizeof(char)
+
+#define FILENAME_SIZE_BYTE_POSITION   \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(uint32)+sizeof(char)+sizeof(time_t)
+#define FILENAME_BYTE_POSITION        \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(uint32)+sizeof(char)+sizeof(time_t) \
+                +sizeof(int32)
+
+/* generates a key for use in the cache database
+ * from a CacheObject struct
+ *
+ * Key is based on the address and the post_data
+ */
+extern DBT *
+net_GenCacheDBKey(char *address, char *post_data, int32 post_data_size);
+
+/* returns a static string that contains the
+ * URL->address of the key
+ *
+ * returns NULL on error
+ */
+extern char *
+net_GetAddressFromCacheKey(DBT *key);
+
+
+/* allocs and copies a new DBT from an existing DBT
+ */
+extern DBT * net_CacheDBTDup(DBT *obj);
+
+/* free the cache object
+ */
+extern void net_freeCacheObj (net_CacheObject * cache_obj);
+
+/* takes a cache object and returns a malloc'd
+ * (void *) suitible for passing in as a database
+ * data storage object
+ */
+extern DBT * net_CacheStructToDBData(net_CacheObject * old_obj);
+
+/* takes a database storage object and returns a malloc'd
+ * cache data object.  The cache object needs all of
+ * it's parts free'd.
+ *
+ * returns NULL on parse error
+ */
+extern net_CacheObject * net_DBDataToCacheStruct(DBT * db_obj);
+
+/* checks a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+extern time_t net_GetTimeInCacheDBT(DBT *data, int byte_position);
+
+/* Sets a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+extern void net_SetTimeInCacheDBT(DBT *data, int byte_position, time_t date);
+
+/* Gets the filename within a cache DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns NULL on error
+ */
+extern char * net_GetFilenameInCacheDBT(DBT *data);
+
+/* Gets a int32 within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+extern time_t net_GetInt32InCacheDBT(DBT *data, int byte_position);
+
+/* free's a DBT struct
+ */
+extern void net_FreeCacheDBTdata(DBT *stuff);
+
+/* stores a cache object in the DBM database
+ */
+extern void net_ExtCacheStore(DB *database, net_CacheObject * obj);
+
+/* takes a database storage object and returns an un-malloc'd
+ * cache data object. The structure returned has pointers
+ * directly into the database memory and are only valid
+ * until the next call to any database function
+ *
+ * do not free anything returned by this structure
+ */
+extern net_CacheObject * net_Fast_DBDataToCacheStruct(DBT *obj);
+
+/* returns true if this DBT looks like a valid
+ * entry.  It looks at the checksum and the
+ * version number to see if it's valid
+ */
+extern PRBool net_IsValidCacheDBT(DBT *obj);
+
+#endif /* EXT_CACHE_H */

mozilla/network/cache/makefile.win

@@ -0,0 +1,105 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+IGNORE_MANIFEST=1
+#
+
+#------------------------------------------------------------------------
+#
+# Makefile to build the cache LIB
+#
+#------------------------------------------------------------------------
+
+#!ifdef MOZ_JAVA
+#LOCAL_JMC_SUBDIR = .
+#!endif
+
+#
+# Make sure we have MOZILLA_CLIENT defined so we get the
+#   proper JS includes
+#
+LCFLAGS		= $(LCFLAGS)  -DMOZILLA_CLIENT
+
+!ifdef BUILD_DEBUG_GC
+LCFLAGS		= $(LCFLAGS) -DDEBUG_GC
+!endif
+
+LLIBS=  \
+	$(NULL)
+MISCDEP=$(LLIBS)
+OBJS=   \
+	.\$(OBJDIR)\extcache.obj		\
+	.\$(OBJDIR)\mkcache.obj		\
+	.\$(OBJDIR)\mkextcac.obj		\
+	.\$(OBJDIR)\mkmemcac.obj		\
+!ifdef NU_CACHE
+	.\$(OBJDIR)\nucacheproto.obj		\
+!endif
+	$(NULL)
+	
+
+CSRCS =	\
+	cachedump.c	\
+	extcache.c	\
+	mkcache.c	\
+	mkextcac.c	\
+	mkmemcac.c	\
+!ifdef NU_CACHE
+	nucacheproto.c	\
+!endif
+	$(NULL)
+
+
+LIBRARY_NAME=netcache
+
+MODULE=netcache 
+DEPTH=..\..
+
+EXTRA_LIBS=
+
+REQUIRES= network nspr2 cachelib
+EXPORTS= netcache.h
+
+C_OBJS = \
+	$(NULL)
+	
+
+# use LINCS on win32 for now since REQUIRES seems to be broken
+#!if "$(MOZ_BITS)" != "16"
+LINCS= \
+    -I$(XPDIST)\public\nspr2 	\
+    -I$(XPDIST)\public\dbm 	\
+    -I$(XPDIST)\public\util	\
+    -I$(XPDIST)\public\pref 	\
+    -I$(XPDIST)\public\network 	\
+    -I$(XPDIST)\public\js 	\
+    -I$(XPDIST)\public\java 	\
+    -I$(XPDIST)\public\fileurl 	\
+    -I$(XPDIST)\public\security \
+    -I$(XPDIST)\public\cache 	\
+    -I$(XPDIST)\public\jtools
+#!endif
+
+include <$(DEPTH)\config\rules.mak> 
+
+libs:: $(LIBRARY)
+    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+
+symbols::
+	@echo "LIBRARY_NAME     is $(LIBRARY_NAME)"
+	@echo "LIBRARY          is $(LIBRARY)"

mozilla/network/cache/mkcache.h

@@ -0,0 +1,40 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef MKCACHE_H
+#define MKCACHE_H
+
+#include "xp.h"
+
+#ifndef EXT_CACHE_H
+#include "extcache.h"
+#endif
+
+#ifndef NU_CACHE
+/* trace variable for cache testing */
+extern PRBool NET_CacheTraceOn;
+#endif /* This is handled by CacheTrace_Enable() and CacheTrace_IsEnabled() in the NU world */
+
+PR_BEGIN_EXTERN_C
+#ifndef NU_CACHE
+/* public accessor function for netcaster */
+extern PRBool NET_CacheStore(net_CacheObject *cacheObject, URL_Struct *url_s, PRBool accept_partial_files);
+#endif
+PR_END_EXTERN_C
+
+#endif /* MKCACHE_H */

mozilla/network/cache/mkextcac.h

@@ -0,0 +1,22 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef MKEXTCACHE_H
+#define MKEXTCACHE_H
+
+#endif /* MKEXTCACHE_H */

mozilla/network/cache/mkmemcac.h

@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef MK_MEMORY_CACHE_H
+
+#include "mkgeturl.h"
+
+/* A pointer to this struct is passed as the converter_obj argument to
+ * NET_MemCacheConverter.
+ */
+typedef struct net_MemCacheConverterObject {
+    NET_StreamClass *next_stream;
+	PRBool         dont_hold_URL_s;
+} net_MemCacheConverterObject;
+
+extern NET_StreamClass * 
+NET_MemCacheConverter (FO_Present_Types format_out,
+                    void       *converter_obj,
+                    URL_Struct *URL_s,
+                    MWContext  *window_id);
+
+/* remove a URL from the memory cache
+ */
+extern void
+NET_RemoveURLFromMemCache(URL_Struct *URL_s);
+
+/* set or unset a lock on a memory cache object
+ */
+extern void
+NET_ChangeMemCacheLock(URL_Struct *URL_s, PRBool set);
+
+/* Create a wysiwyg cache converter to a copy of the current entry for URL_s.
+ */
+extern NET_StreamClass *
+net_CloneWysiwygMemCacheEntry(MWContext *window_id, URL_Struct *URL_s,
+			      uint32 nbytes, const char * wysiwyg_url,
+			      const char * base_href);
+/* return the first cache object in memory */
+extern net_CacheObject * 
+NET_FirstMemCacheObject(XP_List* list_ptr);
+
+/* return the next cache object in memory */
+extern net_CacheObject * 
+NET_NextMemCacheObject(XP_List* list_ptr);
+
+#endif /* MK_MEMORY_CACHE_H */

mozilla/network/cache/netcache.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef NETCACHE_H
+#define NETCACHE_H
+
+#include "mkgeturl.h"
+
+PR_BEGIN_EXTERN_C
+
+/* Initialization */
+extern void     NET_CacheInit(void);
+/* Shutdown */
+extern void     NET_CleanupCache(void); 
+
+/* create an HTML stream and push a bunch of HTML about
+ * the cache
+ */
+extern void     NET_DisplayCacheInfoAsHTML(ActiveEntry * cur_entry);
+
+/* create an HTML stream and push a bunch of HTML about
+ * the memory cache - TODO consolidate these two into one function! - Gagan
+ */
+extern void     NET_DisplayMemCacheInfoAsHTML(ActiveEntry * cur_entry);
+
+extern int      NET_FindURLInCache(URL_Struct * URL_s, MWContext *ctxt);
+
+#ifdef NU_CACHE
+extern void     NET_InitNuCacheProtocol(void);
+#else
+extern void     NET_InitMemCacProtocol(void);
+#endif
+
+/* Will go away later */
+extern PRBool   NET_IsCacheTraceOn(void);
+
+/* return TRUE if the URL is in the cache and
+ * is a partial cache file - TODO- only used in HTTP- cleanup - Gagan 
+ */ 
+extern PRBool   NET_IsPartialCacheFile(URL_Struct *URL_s);
+
+/* Update cache entry on a 304 return*/
+extern void     NET_RefreshCacheFileExpiration(URL_Struct * URL_s);
+
+/* remove a URL from the cache */
+extern void     NET_RemoveURLFromCache(URL_Struct *URL_s);
+
+/* Removed in NU_Cache, SAR should go through new api. - Gagan */
+#ifndef NU_CACHE
+extern void     NET_OpenExtCacheFAT(MWContext *ctxt, char * cache_name, char * instructions);
+extern void     CACHE_CloseAllOpenSARCache();
+extern void     CACHE_OpenAllSARCache();
+extern int      NET_FindURLInMemCache(URL_Struct * URL_s, MWContext *ctxt);
+/* lookup routine
+ *
+ * builds a key and looks for it in the database.  Returns an access
+ * method and sets a filename in the URL struct if found
+ */
+extern int      NET_FindURLInExtCache(URL_Struct * URL_s, MWContext *ctxt);
+#endif
+
+PR_END_EXTERN_C
+
+#endif /* NETCACHE_H */

mozilla/network/cache/nu/Makefile

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

mozilla/network/cache/nu/include/Makefile

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

mozilla/network/cache/nu/include/makefile.win

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

mozilla/network/cache/nu/include/nsCacheTrace.h

@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef _nsCacheTrace_H_
+#define _nsCacheTrace_H_
+/* 
+* nsCacheTrace
+*
+* Gagan Saksena
+* 02/02/98
+* 
+*/
+#ifndef CRLF
+#	define CRLF "\r\n"
+#endif
+
+#include "prtypes.h"
+#include "prlog.h"
+
+class nsCacheTrace 
+{
+
+public:
+		nsCacheTrace(void);
+    static void Enable(PRBool bEnable);
+    static PRBool IsEnabled(void);
+    static void	Trace(const char* msg);
+    static void	Traceln(const char* msg);
+    static void Use(char* buffer);
+    static char* m_TraceBuffer;
+private:
+    PRBool m_bEnabled;
+};
+
+inline void nsCacheTrace::Trace(const char* msg) 
+{
+	PR_ASSERT(msg);
+    //Do log stuff here TODO
+}
+
+inline void nsCacheTrace::Traceln(const char* msg)
+{
+	Trace(msg);
+	Trace(CRLF);
+}
+
+inline void nsCacheTrace::Use(char* buffer) 
+{
+	m_TraceBuffer = buffer;
+}
+#endif

mozilla/network/cache/nu/include/nsFFEntry.h

@@ -0,0 +1,132 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsFFEntry_h__
+#define nsFFEntry_h__
+
+#include "nsFFObject.h"
+//#include "nsISupports.h"
+/** An FFEntry consists of several objects, all io takes place 
+  * through the FFEntry's read and write functions */
+
+class nsFFEntry//: public nsISupports
+{
+
+public:
+            nsFFEntry();
+            nsFFEntry(const PRUint32 i_ID);
+            //Single block entries can use this constructor
+            nsFFEntry(const PRUint32 i_ID, const PRUint32 i_offset, const PRUint32 i_size);
+    virtual ~nsFFEntry();
+
+    /*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+    */
+
+    PRBool      AddObject(const nsFFObject* i_object);
+
+    //Appends an entry to the list
+    PRBool      AddEntry(const nsFFEntry* i_pEntry);
+
+    nsFFObject* FirstObject(void) const;
+    void        FirstObject(const nsFFObject* i_object);
+
+    PRUint32    ID(void) const;
+    void        ID(const PRUint32 i_ID);
+
+    nsFFEntry*  NextEntry(void) const;
+    void        NextEntry(const nsFFEntry* i_pEntry);
+
+    //Returns the number of objects in this entry. 
+    PRUint32    Objects(void) const;
+
+    PRBool      Remove(void);
+
+    PRUint32    Size(void) const;
+
+protected:
+
+private:
+    nsFFEntry(const nsFFEntry& o);
+    nsFFEntry& operator=(const nsFFEntry& o);
+
+    nsFFObject* m_pFirstObject;
+    nsFFEntry* m_pNextEntry;
+
+    PRUint32 m_ID;
+    PRUint32 m_Objects;
+};
+
+inline
+PRBool nsFFEntry::AddEntry(const nsFFEntry* i_Entry)
+{
+    if (!i_Entry)
+        return PR_FALSE;
+    if (m_pNextEntry)
+        return m_pNextEntry->AddEntry(i_Entry);
+    m_pNextEntry = (nsFFEntry*) i_Entry;
+    return PR_TRUE;
+}
+
+inline
+nsFFObject* nsFFEntry::FirstObject(void) const
+{
+    return m_pFirstObject;
+}
+
+inline
+PRUint32 nsFFEntry::ID(void) const
+{
+    return m_ID;
+}
+
+inline
+void nsFFEntry::ID(const PRUint32 i_id)
+{
+    m_ID = i_id;
+}
+
+inline
+nsFFEntry* nsFFEntry::NextEntry(void) const
+{
+    return m_pNextEntry;
+}
+
+inline
+void nsFFEntry::NextEntry(const nsFFEntry* i_pEntry)
+{
+    m_pNextEntry = (nsFFEntry*) i_pEntry;
+}
+
+inline
+PRUint32 nsFFEntry::Objects(void) const
+{
+    return m_Objects;
+}
+
+inline
+PRUint32 nsFFEntry::Size(void) const
+{
+    return m_pFirstObject ? m_pFirstObject->TotalSize() : 0; // Assumption that there is no zero length files //TODO
+}
+
+#endif // nsFFEntry_h__
+

mozilla/network/cache/nu/include/nsFFObject.h

@@ -0,0 +1,125 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsFFObject_h__
+#define nsFFObject_h__
+
+#include "prtypes.h"
+
+class nsFFObject
+{
+
+public:
+            nsFFObject(
+                PRUint32 i_ID, 
+                PRUint32 i_Offset, 
+                PRUint32 i_Size = 0);
+
+    virtual ~nsFFObject();
+
+    PRBool      Add(const nsFFObject* i_object);
+
+    PRUint32    ID(void) const;
+    void        ID(const PRUint32 i_ID);
+
+    nsFFObject* Next(void) const;
+    void        Next(nsFFObject* io_pNext);
+
+    PRUint32    Offset(void) const;
+    void        Offset(const PRUint32 i_offset);
+
+    PRUint32    Size(void) const;
+    void        Size(const PRUint32 i_Size);
+
+    PRUint32    TotalSize(void) const;
+
+protected:
+
+private:
+    nsFFObject(const nsFFObject& o);
+    nsFFObject& operator=(const nsFFObject& o);
+    
+    PRUint32 m_ID;
+    PRUint32 m_Offset;
+    PRUint32 m_Size;
+
+    nsFFObject* m_pNext;
+};
+
+inline
+PRUint32 nsFFObject::ID(void) const
+{
+    return m_ID;
+}
+
+inline
+void nsFFObject::ID(const PRUint32 i_ID)
+{
+    m_ID = i_ID;
+}
+
+inline
+nsFFObject* nsFFObject::Next(void) const
+{
+    return m_pNext;
+}
+
+inline 
+void nsFFObject::Next(nsFFObject* io_pNext)
+{
+    if (io_pNext)
+        io_pNext->ID(m_ID);
+    m_pNext = io_pNext;
+    // Overlap check! //TODO
+    //PR_ASSERT(io_pNext->Offset() > m_Offset + m_Size) ||
+        // (io_pNext->Offset() + io_pNext->Size() < m_Offset)
+}
+
+inline
+PRUint32 nsFFObject::Offset(void) const
+{
+    return m_Offset;
+}
+
+inline
+void nsFFObject::Offset(const PRUint32 i_Offset)
+{
+    m_Offset = i_Offset;
+    //TODO - overlap check. 
+}
+
+inline
+PRUint32 nsFFObject::Size(void) const
+{
+    return m_Size;
+}
+
+inline
+void nsFFObject::Size(const PRUint32 i_Size)
+{
+    m_Size = i_Size;
+    //TODO - Overlap check. 
+}
+
+inline 
+PRUint32 nsFFObject::TotalSize(void) const
+{
+    return m_Size + (m_pNext ? m_pNext->TotalSize() : 0);
+}
+#endif // nsFFObject_h__
+

mozilla/network/cache/nu/include/nsFlatFile.h

@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsFlatFile_h__
+#define nsFlatFile_h__
+
+#include "prtypes.h"
+#include "prio.h"
+
+//#include "nsISupports.h"
+
+#ifdef IS_LITTLE_ENDIAN
+#ifndef COPY_INT32
+#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32))
+#else
+#define COPY_INT32(_a,_b)  /* swap */                   \
+    do {                                                \
+    ((char *)(_a))[0] = ((char *)(_b))[3];              \
+    ((char *)(_a))[1] = ((char *)(_b))[2];              \
+    ((char *)(_a))[2] = ((char *)(_b))[1];              \
+    ((char *)(_a))[3] = ((char *)(_b))[0];              \
+    } while(0)
+#endif
+#endif
+
+/** A class to handle flat file storage mechanism */
+static const PRUint32 kPAGE_SIZE =4096; 
+
+class nsFlatFile //: public nsISupports
+{
+public:
+
+            nsFlatFile(const char* i_pFilename, 
+                const PRUint32 i_FileSize= 5242880); // 5 meg
+            // TODO think if we want to substract the toc size from this?
+
+    virtual ~nsFlatFile();
+
+    const char*     Filename(void) const;
+
+    PRUint32        HeaderSize(void) const;
+
+    void            Init(void);
+
+    PRBool          IsValid(void) const;
+    
+    PRUint32        Size(void) const;
+    /*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+    */
+protected:
+
+private:
+    nsFlatFile(const nsFlatFile& o);
+    nsFlatFile& operator=(const nsFlatFile& o);
+
+    PRBool      m_bIsValid;
+    char*       m_pFilename;
+    PRUint32    m_Size;
+
+    PRFileDesc* m_pFD;
+    PRUint32    m_HeaderSize;
+};
+
+inline
+const char* nsFlatFile::Filename(void) const
+{
+    return m_pFilename;
+}
+
+inline
+PRUint32 nsFlatFile::HeaderSize(void) const
+{
+    return m_HeaderSize;
+}
+
+inline
+PRBool nsFlatFile::IsValid(void) const
+{
+    return m_bIsValid;
+}
+
+inline
+PRUint32 nsFlatFile::Size(void) const
+{
+    return m_Size;
+}
+#endif // nsFlatFile_h__
+

mozilla/network/cache/nu/include/nsTOC.h

@@ -0,0 +1,108 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsTOC_h__
+#define nsTOC_h__
+
+//#include "nsISupports.h"
+
+#include "nsFlatFile.h"
+#include "nsFFEntry.h"
+
+class nsTOC//: public nsISupports
+{
+
+public:
+            nsTOC(const char* i_pFilename, nsFlatFile* i_pFlatFile);
+    virtual ~nsTOC();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+
+    nsFFEntry*  AddEntry(PRUint32 i_size = kPAGE_SIZE);
+
+    PRUint32    Entries(void) const;
+
+    const char* Filename(void) const;
+    
+    nsFFEntry*  FirstDataEntry(void) const;
+    
+    nsFFEntry*  FreeEntry(void) const;
+
+    void        Init(void);
+
+    PRBool      IsValid(void) const;
+    
+protected:
+    PRUint32    NextID(void) const;
+    
+    PRBool      Serialize(nsFFEntry* io_Entry, PRBool bRead = PR_FALSE);
+    
+
+private:
+    nsTOC(const nsTOC& o);
+    nsTOC& operator=(const nsTOC& o);
+
+    nsFFEntry*      m_pContents; // The first entry is reserved for free space list
+    PRUint32        m_Entries;
+    char*           m_pFilename;
+    nsFlatFile*     m_pFlatFile;
+    PRFileDesc*     m_pFD;
+    PRBool          m_bIsValid;
+};
+
+inline
+PRUint32 nsTOC::Entries(void) const
+{
+    return m_Entries;
+}
+
+inline
+const char* nsTOC::Filename(void) const
+{
+    return m_pFilename;
+}
+
+inline
+nsFFEntry*  nsTOC::FirstDataEntry(void) const
+{
+    return m_pContents ? m_pContents->NextEntry() : 0;
+}
+    
+inline
+nsFFEntry* nsTOC::FreeEntry(void) const
+{
+    return m_pContents;
+}
+
+inline
+PRBool nsTOC::IsValid(void) const
+{
+    return m_bIsValid;
+}
+
+inline
+PRUint32 nsTOC::NextID(void) const
+{
+    return m_Entries + 1;
+}
+#endif // nsTOC_h__
+

mozilla/network/cache/nu/include/nsTimeIt.h

@@ -0,0 +1,25 @@
+/* A class to time excursion events */
+/* declare an object of this class within the scope to be timed. */
+#include "prtypes.h"
+#include "prinrval.h"
+
+class nsTimeIt
+{
+public:
+    nsTimeIt(PRUint32& tmp);
+    ~nsTimeIt();
+private:
+    PRIntervalTime t;
+    PRUint32& dest;
+};
+
+inline
+nsTimeIt::nsTimeIt(PRUint32& tmp):t(PR_IntervalNow()), dest(tmp)
+{
+}
+
+inline
+nsTimeIt::~nsTimeIt()
+{
+    dest = PR_IntervalToMicroseconds(PR_IntervalNow()-t);
+}

mozilla/network/cache/nu/macbuild/nuCache.Prefix

@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+ 
+//
+//	nuCache.Prefix
+//
+// Global prefix file for the nuCache project.
+//
+//
+
+#include "MacPrefix_debug.h"
+#include "nuCacheConfig.h"

mozilla/network/cache/nu/macbuild/nuCacheConfig.h

@@ -0,0 +1,18 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#define CGLUESUPPORTED 0 // turn off C glue support to avoid conflict on create() in RDF

mozilla/network/cache/nu/macbuild/nuCacheDebug.Prefix

@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+//
+//	RDFDebug.Prefix
+//
+// Global prefix file for the nuCache project.
+//
+//
+
+#include "MacPrefix_debug.h"
+#include "nuCacheConfig.h"

mozilla/network/cache/nu/makefile.win

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

mozilla/network/cache/nu/nsGeneric.cpp

@@ -0,0 +1,50 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+#include "nsGeneric.h"
+
+nsGeneric::nsGeneric()
+{
+}
+
+nsGeneric::~nsGeneric()
+{
+}
+
+nsrefcnt nsGeneric::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsGeneric::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsGeneric::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+
+nsGeneric::

mozilla/network/cache/nu/nsGeneric.h

@@ -0,0 +1,45 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+#ifndef nsGeneric_h__
+#define nsGeneric_h__
+
+#include "nsISupports.h"
+
+class nsGeneric: public nsISupports
+{
+
+public:
+            nsGeneric();
+    virtual ~nsGeneric();
+
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+
+protected:
+
+private:
+    nsGeneric(const nsGeneric& o);
+    nsGeneric& operator=(const nsGeneric& o);
+};
+
+#endif // nsGeneric_h__
+

mozilla/network/cache/nu/public/CacheStubs.h

@@ -0,0 +1,130 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+/* Design and original implementation by Gagan Saksena '98 */
+
+/* Ideally we should be using the C++ api directly, but since the core of
+   Netlib is still in C, this file uses the stub functions that call the C++
+   API internally, allowing C programs to use the new cache architecture.
+   If you are accessing the cache, see if you can directly use the C++ api. */
+
+#ifndef CacheStubs_h__
+#define CacheStubs_h__
+
+#include "prtypes.h"
+#include "prinrval.h"
+
+#define MEM_MODULE_ID 0
+#define DISK_MODULE_ID 1
+
+PR_BEGIN_EXTERN_C
+ 
+    /* General mapped functions which resolve to a bunch of internal calls. */
+    extern void             Cache_Init(void);
+    extern void             Cache_Shutdown(void);
+
+    /* Cache Manager stub functions
+       Does not include some functions not required in the current 
+       design like AddModule etc... If you need to these functions, try
+       accessing them directly thru the C++ api or let me know. 
+       Check nsCacheManager.h for details on these functions.*/
+    extern PRBool           CacheManager_Contains(const char* i_url);
+    extern PRInt16          CacheManager_Entries(void);
+    extern void*            CacheManager_GetObject(const char* i_url);
+    extern PRBool           CacheManager_IsOffline(void);
+    extern void             CacheManager_Offline(PRBool bSet);
+    extern PRBool           CacheManager_Remove(const char* i_url);
+    extern PRUint32         CacheManager_WorstCaseTime(void);
+
+    /* Cache Object- check nsCacheObject.h for details on these functions */
+    extern void*            CacheObject_Create(const char* i_url);
+    extern void             CacheObject_Destroy(void* pThis);
+    extern const char*      CacheObject_GetAddress(const void* pThis);
+    extern const char*      CacheObject_GetCharset(void* pThis);
+    extern const char*      CacheObject_GetContentEncoding(void* pThis);
+    extern PRUint32         CacheObject_GetContentLength(void* pThis);
+    extern const char*      CacheObject_GetContentType(void* pThis);
+    extern const char*      CacheObject_GetEtag(const void* pThis);
+    extern PRIntervalTime   CacheObject_GetExpires(const void* pThis);
+    extern const char*      CacheObject_GetFilename(const void* pThis);
+    extern PRIntervalTime   CacheObject_GetLastAccessed(const void* pThis);
+    extern PRIntervalTime   CacheObject_GetLastModified(const void* pThis);
+    extern PRInt16          CacheObject_GetModule(const void* pThis);
+    extern const char*      CacheObject_GetPageServicesURL(void* pThis);
+    extern const char*      CacheObject_GetPostData(const void* pThis);
+    extern PRUint32         CacheObject_GetPostDataLen(const void* pThis);
+    extern PRUint32         CacheObject_GetSize(const void* pThis);
+    extern PRUint32         CacheObject_Hits(const void* pThis);
+    extern PRBool           CacheObject_IsExpired(const void* pThis);
+    extern PRBool           CacheObject_IsPartial(const void* pThis);
+    extern PRUint32         CacheObject_Read(const void* pThis, char* o_Destination, PRUint32 i_Len);
+    extern void             CacheObject_SetAddress(void* pThis, const char* i_Address);
+    extern void             CacheObject_SetCharset(void* pThis, const char* i_CharSet);
+    extern void             CacheObject_SetContentEncoding(void* pThis, const char* i_Encoding);
+    extern void             CacheObject_SetContentLength(void* pThis, PRUint32 i_Len);
+    extern void             CacheObject_SetContentType(void* pThis, const char* i_Type);
+    extern void             CacheObject_SetEtag(void* pThis, const char* i_Etag);
+    extern void             CacheObject_SetExpires(void *pThis, const PRIntervalTime i_Time);
+    extern void             CacheObject_SetFilename(void *pThis, const char* i_Filename);
+    extern void             CacheObject_SetLastModified(void* pThis, const PRIntervalTime i_Time);
+    extern void             CacheObject_SetModule(void* pThis, const PRInt16 i_Module);
+    extern void             CacheObject_SetPageServicesURL(void* pThis, const char* i_Url);
+    extern void             CacheObject_SetPostData(void* pThis, const char* i_PostData, const PRUint32 i_Len);
+    extern void             CacheObject_SetSize(void* pThis, const PRUint32 i_Size);
+    extern PRBool           CacheObject_Synch(void* pThis);
+    extern PRUint32         CacheObject_Write(void* pThis, const char* i_buffer, const PRUint32 i_length);
+
+    /* Cache Prefs- check nsCachePref.h for details on these functions */
+    extern PRUint32         CachePref_GetDiskCacheSize(void);
+    extern PRBool           CachePref_GetDiskCacheSSL(void);
+    extern PRUint32         CachePref_GetMemCacheSize(void);
+    extern void             CachePref_SetDiskCacheSize(const PRUint32 i_Size);
+    extern void             CachePref_SetDiskCacheSSL(PRBool bSet);
+    extern void             CachePref_SetMemCacheSize(const PRUint32 i_Size);
+    
+    /* Cache Trace- Check nsCacheTrace.h for details on these functions */
+    extern void             CacheTrace_Enable(PRBool bEnable);
+    extern PRBool           CacheTrace_IsEnabled(void);
+    
+    /* Disk Module- Check nsDiskModule.h for details on these functions */
+    extern PRBool           DiskModule_AddObject(void* pCacheObject);
+    extern PRBool           DiskModule_Contains(const char* i_url);
+    extern PRUint32         DiskModule_Entries(void);
+    extern PRUint32         DiskModule_GetSize(void); /* Should be the same as CachePref_DiskCacheSize */
+    extern PRUint32         DiskModule_GetSizeInUse(void);
+    extern PRBool           DiskModule_IsEnabled(void);
+    extern PRBool           DiskModule_Remove(const char* i_url);
+    extern PRBool           DiskModule_RemoveAll(void);
+    extern void             DiskModule_SetSize(PRUint32 i_Size);
+
+    /* Mem Module- Check nsMemModule.h for details on these functions */
+    extern PRBool           MemModule_AddObject(void* pCacheObject); 
+    extern PRBool           MemModule_Contains(const char* i_url);
+    extern PRUint32         MemModule_Entries(void);
+    extern PRUint32         MemModule_GetSize(void); /* Should be the same as CachePref_MemCacheSize */
+    extern PRUint32         MemModule_GetSizeInUse(void);
+    extern PRBool           MemModule_IsEnabled(void);
+    extern PRBool           MemModule_Remove(const char* i_url);
+    extern PRBool           MemModule_RemoveAll(void);
+    extern void             MemModule_SetSize(PRUint32 i_Size);
+
+PR_END_EXTERN_C     
+
+#endif // CacheStubs_h__
+

mozilla/network/cache/nu/public/Makefile

@@ -0,0 +1,35 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../../../..
+
+EXPORTS =               \
+	nsMonitorable.h		\
+	nsMemModule.h 		\
+	nsCacheManager.h 	\
+    nsDiskModule.h 		\
+	nsCacheModule.h 	\
+	nsMemCacheObject.h  \
+	nsCacheObject.h	    \
+	nsCachePref.h		\
+        $(NULL)
+
+MODULE = cache
+
+include $(DEPTH)/config/config.mk
+
+include $(DEPTH)/config/rules.mk

mozilla/network/cache/nu/public/makefile.win

@@ -0,0 +1,32 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..\..
+IGNORE_MANIFEST=1
+
+MODULE=cache 
+
+EXPORTS=nsCacheObject.h nsMemModule.h nsCacheManager.h  \
+    nsDiskModule.h nsCacheModule.h nsMemCacheObject.h   \
+    nsCachePref.h nsCacheBkgThd.h nsBkgThread.h         \
+    CacheStubs.h nsCacheIterator.h nsIterator.h         \
+    nsMonitorable.h nsStream.h nsFileStream.h           \
+    nsMemStream.h                                       \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/network/cache/nu/public/nsBkgThread.h

@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsBkgThread_h__
+#define nsBkgThread_h__
+
+//#include "nsISupports.h"
+#include "prthread.h"
+#include "prinrval.h"
+
+/*
+    Creates a background thread that maintains odd 
+    tasks like updating, expiration, validation and 
+    garbage collection. 
+    
+    Note that this is a noop active when the cache 
+    manager is offline. 
+
+    In PRThread terms, this is a PR_USER_THREAD with 
+    local scope.
+*/
+class nsBkgThread//: public nsISupports
+{
+
+public:
+            nsBkgThread(PRIntervalTime iSleepTime, PRBool bStart=PR_TRUE);
+    virtual ~nsBkgThread();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    void            Process(void);
+    virtual void    Run(void) = 0;
+    void            Stop(void);
+protected:
+    PRThread*       m_pThread;
+    PRBool          m_bContinue;
+    PRIntervalTime  m_SleepTime;
+
+private:
+    nsBkgThread(const nsBkgThread& o);
+    nsBkgThread& operator=(const nsBkgThread& o);
+
+};
+
+#endif // nsBkgThread_h__
+

mozilla/network/cache/nu/public/nsCacheBkgThd.h

@@ -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 Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsCacheBkgThd_h__
+#define nsCacheBkgThd_h__
+
+#include "nsBkgThread.h"
+
+class nsCacheBkgThd: public nsBkgThread
+{
+
+public:
+            nsCacheBkgThd(PRIntervalTime iSleepTime);
+    virtual ~nsCacheBkgThd();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    void        Run(void);
+
+protected:
+
+private:
+    nsCacheBkgThd(const nsCacheBkgThd& o);
+    nsCacheBkgThd& operator=(const nsCacheBkgThd& o);
+};
+
+#endif // nsCacheBkgThd_h__
+

mozilla/network/cache/nu/public/nsCacheIterator.h

@@ -0,0 +1,74 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+#ifndef nsCacheIterator_h__
+#define nsCacheIterator_h__
+
+#include "nsIterator.h"
+#include "prtypes.h"
+#include "nsCacheModule.h"
+
+class nsCacheIterator: public nsIterator
+{
+
+public:
+            nsCacheIterator(nsCacheModule* i_pModule);
+    virtual ~nsCacheIterator();
+
+    virtual PRBool          IsDone(void) const;
+    virtual nsCacheObject*  Current(void) const;
+
+private:
+    nsCacheIterator(const nsCacheIterator& o);
+    nsCacheIterator& operator=(const nsCacheIterator& o);
+    nsCacheModule*    m_pModule;
+};
+
+inline
+nsCacheIterator::nsCacheIterator(nsCacheModule* i_pModule): m_pModule(i_pModule)
+{
+}
+
+inline
+nsCacheIterator::~nsCacheIterator()
+{
+}
+
+inline
+PRBool nsCacheIterator::IsDone(void) const
+{
+    if (m_pModule)
+    {
+        return m_pModule->Entries() <= m_Index;
+    }
+    else
+        return PR_FALSE;
+}
+
+inline
+nsCacheObject* nsCacheIterator::Current(void) const
+{
+    if (m_pModule)
+    {
+        return m_pModule->GetObject(m_Index);
+    }
+    return 0;
+}
+#endif // nsCacheIterator_h__
+

mozilla/network/cache/nu/public/nsCacheManager.h

@@ -0,0 +1,168 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _CacheManager_H_
+#define _CacheManager_H_
+/* 
+ * nsCacheManager
+ * Design and original implementation 
+ * by Gagan Saksena 02/02/98
+ * 
+ */
+
+#if 0
+#   include "nsISupports.h"
+#endif
+
+#include "prlog.h"
+
+#include "nsMonitorable.h"
+#include "nsCacheModule.h"
+#include "nsCacheObject.h"
+
+class nsMemModule;
+class nsDiskModule;
+class nsCachePref;
+class nsCacheBkgThd;
+
+class nsCacheManager : public nsMonitorable //: public nsISupports
+{
+
+public:
+
+    //Reserved modules
+    enum modules
+    {
+       MEM =0,
+       DISK=1
+    };
+
+    nsCacheManager();
+    ~nsCacheManager();
+
+    PRInt32                 AddModule(nsCacheModule* i_cacheModule);
+                            // InsertModule
+    PRBool                  Contains(const char* i_url) const;
+    
+    /* Number of modules in the cache manager */
+    PRInt16                 Entries() const;
+    
+    /* Singleton */
+    static nsCacheManager*  GetInstance();
+    
+    nsCacheObject*          GetObj(const char* i_url) const;
+
+    nsCacheModule*          GetModule(PRInt16 i_index) const;
+
+    nsMemModule*            GetMemModule() const;
+    nsDiskModule*           GetDiskModule() const;
+
+    PRBool                  IsOffline(void) const;
+
+    void                    Offline(PRBool bSet);
+
+    PRBool                  Remove(const char* i_url);
+
+    const char*             Trace() const;
+
+    /* Performance measure- microseconds */
+    PRUint32                WorstCaseTime(void) const;
+
+protected:
+    
+    PRBool                  ContainsExactly(const char* i_url) const;
+
+    void                    Init();
+  
+    nsCacheModule*          LastModule() const;
+    //PRBool                  Lock(void);
+    //void                    Unlock(void);
+
+/*
+    class MgrMonitor
+    {
+    public:
+        MgrMonitor() { nsCacheManager::GetInstance()->Lock();}
+        ~MgrMonitor() { nsCacheManager::GetInstance()->Unlock();}
+    };
+
+    friend MgrMonitor;
+*/
+
+private:
+    nsCacheModule*      m_pFirstModule;
+    PRMonitor*          m_pMonitor;
+
+    nsCacheManager(const nsCacheManager& cm);
+    nsCacheManager& operator=(const nsCacheManager& cm);
+    nsCacheBkgThd*  m_pBkgThd;
+    PRBool          m_bOffline;
+};
+
+inline
+nsDiskModule* nsCacheManager::GetDiskModule() const
+{
+    PR_ASSERT(m_pFirstModule && m_pFirstModule->NextModule());
+    return (m_pFirstModule) ? (nsDiskModule*) m_pFirstModule->NextModule() : NULL;
+}
+
+inline
+nsMemModule* nsCacheManager::GetMemModule() const
+{
+    PR_ASSERT(m_pFirstModule);
+    return (nsMemModule*) m_pFirstModule;
+}
+
+inline
+PRBool nsCacheManager::IsOffline(void) const
+{
+    return m_bOffline;
+}
+
+/*
+inline
+PRBool nsCacheManager::Lock(void)
+{
+    if (!m_pMonitor)
+    {
+        m_pMonitor = PR_NewMonitor();
+        if (!m_pMonitor)
+            return PR_FALSE;
+    }
+    PR_EnterMonitor(m_pMonitor);
+    return PR_TRUE;
+}
+*/
+
+inline
+void  nsCacheManager::Offline(PRBool i_bSet) 
+{
+    m_bOffline = i_bSet;
+}
+
+/*
+inline
+void nsCacheManager::Unlock(void)
+{
+    PR_ASSERT(m_pMonitor);
+    if (m_pMonitor)
+        PR_ExitMonitor(m_pMonitor);
+}
+*/
+
+#endif

mozilla/network/cache/nu/public/nsCacheModule.h

@@ -0,0 +1,194 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsCacheModule_h__
+#define nsCacheModule_h__
+
+/* 
+ * nsCacheModule
+ *
+ * Gagan Saksena 02/03/98
+ * 
+ */
+//#include <nsISupports.h>
+#include "nsCacheObject.h"
+#include "nsEnumeration.h"
+#include "nsMonitorable.h"
+
+/* Why in the world is forward decl. not working? */
+//class nsCacheObject;
+
+/*
+// {5D51B24F-E6C2-11d1-AFE5-006097BFC036}
+static const NS_CACHEMODULE_ID = 
+{ 0x5d51b24f, 0xe6c2, 0x11d1, { 0xaf, 0xe5, 0x0, 0x60, 0x97, 0xbf, 0xc0, 0x36 } };
+*/
+
+class nsCacheIterator;
+class nsCacheModule : public nsMonitorable /*: public nsISupports */
+{
+
+public:
+    nsCacheModule(const PRUint32 i_size /*= DEFAULT_SIZE */);
+
+    virtual
+        ~nsCacheModule();
+
+    virtual 
+        PRBool          AddObject(nsCacheObject* i_pObject)=0;
+    
+    virtual
+        PRBool          Contains(const char* i_url) const=0;
+    virtual 
+        PRBool          Contains(nsCacheObject* i_pObject) const=0;
+    
+    void                Enable(PRBool i_Enable);
+    
+    const PRUint32      Entries(void) const;
+
+    nsEnumeration*      Enumeration(void) const;
+    /* Enumerations wiht a function pointer - TODO */
+
+    //TODO move to own interface for both Garbage Collection and Revalidation
+    virtual
+        void            GarbageCollect(void);
+
+    virtual
+        nsCacheObject*  GetObject(const char* i_url) const=0;
+
+    virtual
+        nsCacheObject*  GetObject(const PRUint32 i_index) const =0;
+
+    virtual
+        nsStream*       GetStreamFor(const nsCacheObject* i_pObject)=0;
+
+    PRBool              IsEnabled(void) const;
+
+    /* Cant do additions, deletions, validations, expirations */
+    PRBool              IsReadOnly(void) const; 
+
+    nsCacheModule*      NextModule(void) const;
+    void                NextModule(nsCacheModule*);
+
+    virtual
+        PRBool          Remove(const char* i_url) = 0;
+
+    virtual
+        PRBool          Remove(const PRUint32 i_index) = 0;
+
+    virtual
+        PRBool          RemoveAll(void);
+
+    virtual
+        PRBool          Revalidate(void) = 0;
+
+    const PRUint32      Size(void) const;
+
+    virtual
+        void            SetSize(const PRUint32 i_size);
+
+    PRUint32            SizeInUse(void) const;
+
+    const char*         Trace(void) const;
+
+protected:
+
+    virtual
+        PRBool          ReduceSizeTo(const PRUint32 i_NewSize);
+
+    PRUint32            m_Entries;
+    PRUint32            m_Size;
+    PRUint32            m_SizeInUse;
+    PRBool              m_Enabled;
+    nsEnumeration*      m_pEnumeration;
+    nsCacheIterator*    m_pIterator;
+    nsCacheModule*      m_pNext;
+
+private:
+    nsCacheModule(const nsCacheModule& cm);
+    nsCacheModule& operator=(const nsCacheModule& cm);
+};
+
+inline void nsCacheModule::Enable(PRBool i_Enable)
+{
+    m_Enabled = i_Enable;
+}
+
+inline const PRUint32 nsCacheModule::Entries() const 
+{
+    return m_Entries;
+}
+
+inline 
+nsEnumeration* nsCacheModule::Enumeration(void) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    if (!m_pEnumeration)
+    {
+        PR_ASSERT(m_pIterator);
+        ((nsCacheModule*)this)->m_pEnumeration = new nsEnumeration((nsIterator*)m_pIterator); 
+    }
+    else
+        ((nsCacheModule*)this)->m_pEnumeration->Reset();
+    return m_pEnumeration;
+}
+
+inline PRBool nsCacheModule::IsEnabled(void) const
+{
+    return m_Enabled;
+}
+
+inline PRBool nsCacheModule::IsReadOnly(void) const
+{
+    return PR_FALSE;
+}
+
+inline nsCacheModule* nsCacheModule::NextModule(void) const 
+{
+    return m_pNext;
+}
+
+inline void nsCacheModule::NextModule(nsCacheModule* pNext) 
+{
+    /* No overwriting */
+    PR_ASSERT(m_pNext == 0);
+    if (m_pNext)
+    {
+        /* ERROR */
+        delete m_pNext; //Worst case. 
+
+    }
+    m_pNext = pNext;
+}
+
+inline const PRUint32 nsCacheModule::Size() const
+{
+    return m_Size;
+}
+
+inline void nsCacheModule::SetSize(const PRUint32 size)
+{
+    m_Size = size;
+}
+
+inline PRUint32 nsCacheModule::SizeInUse(void) const
+{
+    return m_SizeInUse;
+}
+
+#endif // nsCacheModule_h__

mozilla/network/cache/nu/public/nsCacheObject.h

@@ -0,0 +1,288 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsCacheObject_h__
+#define nsCacheObject_h__
+
+#if 0
+#include "nsISupports.h"
+#endif
+
+#include "prtypes.h"
+#include "prinrval.h"
+
+static const PRUint32 kCACHE_VERSION = 5;
+
+class nsStream;
+
+class nsCacheObject //: public nsISupports
+{
+
+public:
+
+    enum state_flags 
+    {
+        INIT=0x000000,
+        PARTIAL=0x000001
+    };
+
+    nsCacheObject();
+    nsCacheObject(const nsCacheObject& another);
+    nsCacheObject(const char* i_url);
+
+    virtual ~nsCacheObject();
+
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+
+*/
+
+    void            Address(const char* i_url);
+    const char*     Address(void) const;
+
+    void            Charset(const char* i_Charset);
+    const char*     Charset(void) const;
+
+    void            ContentEncoding(const char* i_Encoding);
+    const char*     ContentEncoding(void) const;
+
+    void            ContentLength(PRUint32 i_len);
+    PRUint32        ContentLength(void) const;
+    
+    void            ContentType(const char* i_Type);
+    const char*     ContentType(void) const;
+
+    void            Etag(const char* i_etag);
+    const char*     Etag(void) const;
+
+    void            Expires(PRIntervalTime i_Expires);
+    PRIntervalTime  Expires(void) const;
+
+    void            Filename(const char* i_Filename);
+    const char*     Filename(void) const;
+
+    PRUint16        Hits(void) const;
+
+    /* Read and write info about this cache object */
+    void*           Info(void) const;
+    PRBool          Info(void* /*, PRUint32 len */);
+
+    PRUint32        InfoSize(void) const;
+
+    PRBool          IsExpired(void) const;
+
+    PRBool          IsPartial(void) const;
+
+    PRIntervalTime  LastAccessed(void) const;
+
+    PRIntervalTime  LastModified(void) const;
+    void            LastModified(const PRIntervalTime i_lastModified);
+
+    PRInt16         Module(void) const;
+    void            Module(PRUint16 i_m);
+
+    void            PageServicesURL(const char* i_Url);
+    const char*     PageServicesURL(void) const;
+
+    const char*     PostData(void) const;
+    void            PostData(const char* i_data, const PRUint32 i_Len);
+
+    PRUint32        PostDataLen(void) const;
+
+    PRUint32        Read(char* o_Buffer, PRUint32 len);
+
+    PRUint32        Size(void) const;
+    void            Size(PRUint32 i_Size);
+
+    const char*     Trace() const;
+
+    PRUint32        Write(const char* i_Buffer, const PRUint32 len);
+
+protected:
+
+    void            Init();
+
+    char*           m_Charset;
+    char*           m_ContentEncoding;
+    PRUint32        m_ContentLength;
+    char*           m_ContentType;
+    char*           m_Etag;
+    PRIntervalTime  m_Expires;
+    int             m_Flags;
+    char*           m_Filename;
+    PRUint16        m_Hits;
+    PRUint32        m_info_size;
+    PRIntervalTime  m_LastAccessed, m_LastModified;
+    void*           m_pInfo;
+    char*           m_PageServicesURL;
+    char*           m_PostData;
+    PRUint32        m_PostDataLen;
+    PRInt16         m_Module;
+    PRUint32        m_Size;
+    nsStream*       m_pStream;
+    char*           m_URL;
+    
+
+private:
+    nsCacheObject& operator=(const nsCacheObject& x);
+};
+
+inline 
+const char* nsCacheObject::Address(void) const
+{
+	return m_URL;
+};
+
+inline
+const char* nsCacheObject::Charset(void) const
+{
+    return m_Charset;
+}
+
+inline
+const char* nsCacheObject::ContentEncoding(void) const
+{
+    return m_ContentEncoding;
+}
+
+inline 
+PRUint32 nsCacheObject::ContentLength(void) const
+{
+	return m_ContentLength;
+};
+
+inline 
+void nsCacheObject::ContentLength(PRUint32 i_Size)
+{
+	m_ContentLength = i_Size;
+};
+
+inline 
+const char* nsCacheObject::ContentType(void) const
+{
+	return m_ContentType;
+};
+
+inline 
+const char* nsCacheObject::Etag(void) const 
+{
+	return m_Etag;
+};
+
+inline 
+PRIntervalTime nsCacheObject::Expires(void) const
+{
+	return m_Expires;
+};
+
+inline 
+void nsCacheObject::Expires(PRIntervalTime i_Expires)
+{
+	m_Expires = i_Expires;
+};
+
+inline
+const char* nsCacheObject::Filename(void) const
+{
+    return m_Filename;
+}
+
+inline 
+PRUint16 nsCacheObject::Hits(void) const
+{
+	return m_Hits;
+};
+
+inline 
+PRBool nsCacheObject::IsExpired(void) const
+{
+	PRIntervalTime now = PR_IntervalNow();
+	return (m_Expires <= now);
+};
+
+inline 
+PRBool nsCacheObject::IsPartial(void) const
+{
+	return (m_Flags & nsCacheObject::PARTIAL);
+};
+
+inline 
+PRIntervalTime nsCacheObject::LastAccessed(void) const
+{
+	return m_LastAccessed;
+};
+
+inline 
+PRIntervalTime nsCacheObject::LastModified(void) const
+{
+	return m_LastModified;
+};
+
+inline 
+void nsCacheObject::LastModified(const PRIntervalTime i_LastModified)
+{
+	m_LastModified = i_LastModified;
+};
+
+inline 
+PRInt16 nsCacheObject::Module(void) const
+{
+    return m_Module;
+};
+
+inline 
+void nsCacheObject::Module(PRUint16 i_Module) 
+{
+    m_Module = i_Module;
+};
+
+inline
+const char* nsCacheObject::PageServicesURL(void) const
+{
+    return m_PageServicesURL;
+}
+
+inline
+const char* nsCacheObject::PostData(void) const
+{
+    return m_PostData;
+}
+
+inline
+PRUint32 nsCacheObject::PostDataLen(void) const
+{
+    return m_PostDataLen;
+}
+
+inline 
+PRUint32 nsCacheObject::Size(void) const
+{
+	return m_Size;
+};
+
+inline 
+void nsCacheObject::Size(PRUint32 i_Size)
+{
+	m_Size = i_Size;
+};
+
+#endif // nsCacheObject_h__
+

mozilla/network/cache/nu/public/nsCachePref.h

@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsCachePref_h__
+#define nsCachePref_h__
+
+//#include "nsISupports.h"
+#include "prtypes.h"
+
+class nsCachePref //: public nsISupports
+{
+
+public:
+    static nsCachePref* GetInstance(void);
+    
+    nsCachePref(void);
+    ~nsCachePref();
+
+    enum Refresh 
+    {
+        NEVER,
+        ONCE,
+        ALWAYS
+    } r;
+
+    const PRUint32   BkgSleepTime(void);
+    
+    const char*      DiskCacheDBFilename(void); /* like Fat.db */
+    const char*      DiskCacheFolder(void);   /* Cache dir */
+
+    PRBool           DiskCacheSSL(void);
+    void             DiskCacheSSL(PRBool bSet);
+
+    PRUint32         DiskCacheSize(void);
+    void             DiskCacheSize(const PRUint32 i_Size);
+
+    PRUint32         MemCacheSize(void);
+    void             MemCacheSize(const PRUint32 i_Size);
+
+    nsCachePref::Refresh
+                            Frequency(void);
+
+    /* Revalidating in background, makes IMS calls in the bkg thread to 
+       update cache entries. TODO, this should be at a bigger time period
+       than the cache cleanup routine */
+    PRBool           RevalidateInBkg(void);
+
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+private:
+    nsCachePref(const nsCachePref& o);
+    nsCachePref& operator=(const nsCachePref& o);
+
+    PRBool                  m_bRevalidateInBkg;
+    PRBool                  m_bDiskCacheSSL;
+    nsCachePref::Refresh    m_RefreshFreq;
+    PRUint32                m_MemCacheSize;
+    PRUint32                m_DiskCacheSize;
+    char*                   m_DiskCacheDBFilename;
+    char*                   m_DiskCacheFolder;
+    PRUint32                m_BkgSleepTime;
+};
+
+#endif // nsCachePref_h__
+

mozilla/network/cache/nu/public/nsDiskModule.h

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _nsDiskModule_H_
+#define _nsDiskModule_H_
+/* 
+* nsDiskModule
+*
+* Gagan Saksena 02/03/98
+* 
+*/
+#include "nsCacheModule.h"
+#include "nsCachePref.h"
+#include "mcom_db.h"
+
+class nsDiskModule : public nsCacheModule
+{
+
+public:
+    nsDiskModule(const PRUint32 size = nsCachePref::GetInstance()->DiskCacheSize());
+    ~nsDiskModule();
+
+    // Cache module interface
+    PRBool          AddObject(nsCacheObject* io_pObject);
+    
+    PRBool          Contains(nsCacheObject* io_pObject) const;
+    PRBool          Contains(const char* i_url) const;
+    
+    void            GarbageCollect(void);
+
+    nsCacheObject*  GetObject(const PRUint32 i_index) const;
+    nsCacheObject*  GetObject(const char* i_url) const;
+
+    nsStream*       GetStreamFor(const nsCacheObject* i_pObject)=0;
+
+    PRBool          ReduceSizeTo(const PRUint32 i_NewSize);
+
+    PRBool          Remove(const char* i_url);
+    PRBool          Remove(const PRUint32 i_index);
+
+    // To do cleanup set size to zero. Else initialize disk cache
+    void            SetSize(const PRUint32 i_size);
+
+    PRBool          Revalidate(void);
+
+private:
+    enum sync_frequency
+    {
+        EVERYTIME,
+        IDLE,
+        NEVER
+    } m_Sync;
+
+    PRBool          InitDB(void);
+
+    nsDiskModule(const nsDiskModule& dm);
+    nsDiskModule& operator=(const nsDiskModule& dm);
+
+    DB* m_pDB;
+};
+
+#endif

mozilla/network/cache/nu/public/nsEnumeration.h

@@ -0,0 +1,93 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+#ifndef nsEnumeration_h__
+#define nsEnumeration_h__
+
+//#include "nsISupports.h"
+#include "nsIterator.h"
+#include "prlog.h"
+
+class nsEnumeration //: public nsISupports
+{
+
+public:
+            nsEnumeration(nsIterator* iter);
+    virtual ~nsEnumeration();
+
+    PRBool  HasMoreElements(void);
+    void*   NextElement(void);
+    void    Reset(void);
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+protected:
+    nsIterator* m_pIter;
+private:
+    nsEnumeration(const nsEnumeration& o);
+    nsEnumeration& operator=(const nsEnumeration& o);
+};
+
+inline 
+nsEnumeration::nsEnumeration(nsIterator* iter):m_pIter(iter)
+{
+    PR_ASSERT(iter);
+    if (m_pIter)
+        m_pIter->First();
+}
+
+inline
+nsEnumeration::~nsEnumeration()
+{
+}
+
+inline
+PRBool nsEnumeration::HasMoreElements(void)
+{
+    if (m_pIter) //remove this check for optimization?
+        return m_pIter->IsDone() ? PR_FALSE : PR_TRUE;
+    return PR_FALSE;
+}
+
+inline
+void* nsEnumeration::NextElement(void)
+{
+    if (m_pIter)
+    {
+        void* pTemp = m_pIter->CurrentItem();
+        m_pIter->Next();
+        return pTemp;
+    }
+    return 0;
+}
+
+inline
+void nsEnumeration::Reset(void)
+{
+    if (m_pIter)
+    {
+        m_pIter->First();
+    }
+}
+
+#endif // nsEnumeration_h__
+

mozilla/network/cache/nu/public/nsFileStream.h

@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+#ifndef nsFileStream_h__
+#define nsFileStream_h__
+
+//#include "nsISupports.h"
+#include "nsStream.h"
+#include "xp.h" // Reqd. for xp_file.h
+#include "xp_file.h" // Cuz we don't have a better choice, as yet
+
+class nsFileStream: public nsStream
+{
+
+public:
+            nsFileStream(XP_File* i_pFile);
+    virtual ~nsFileStream();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    PRInt32     Read(void* o_Buffer, PRUint32 i_Len);
+    PRInt32     Write(const void* i_Buffer, PRUint32 i_Len);
+
+protected:
+
+private:
+    nsFileStream(const nsFileStream& o);
+    nsFileStream& operator=(const nsFileStream& o);
+    XP_File* m_pFile;
+};
+
+#endif // nsFileStream_h__
+

mozilla/network/cache/nu/public/nsHash.h

@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsHash_h__
+#define nsHash_h__
+
+#include "plhash.h"
+
+class nsHashKey {
+protected:
+  nsHashKey(void);
+public:
+  virtual ~nsHashKey(void);
+  virtual PRUint32 HashValue(void) const = 0;
+  virtual PRBool Equals(const nsHashKey *aKey) const = 0;
+  virtual nsHashKey *Clone(void) const = 0;
+};
+
+// Enumerator callback function. Use
+
+typedef PRBool (*nsHashEnumFunc)(nsHashKey *aKey, void *aData);
+
+class nsHash {
+private:
+  // members  
+  PLHashTable *hashtable;
+
+public:
+  nsHash(PRUint32 aSize = 256);
+  ~nsHash();
+
+  void *Put(nsHashKey *aKey, void *aData);
+  void *Get(nsHashKey *aKey);
+  void *Remove(nsHashKey *aKey);
+  void Enumerate(nsHashEnumFunc aEnumFunc);
+};
+
+#endif

mozilla/network/cache/nu/public/nsIterator.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+#ifndef nsIterator_h__
+#define nsIterator_h__
+
+//#include "nsISupports.h"
+#include "prtypes.h"
+
+class nsIterator //:public nsISupports
+{
+
+public:
+
+    virtual void    First(void);
+    virtual PRBool  IsDone(void) const = 0;
+    virtual void    Next(void);
+    virtual void*   CurrentItem(void) const;
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+
+protected:
+    nsIterator() {m_Index = 0;};
+
+    PRUint32    m_Index;
+
+};
+
+inline 
+void nsIterator::First(void)
+{
+    m_Index = 0;
+}
+
+inline
+void nsIterator::Next(void)
+{
+    ++m_Index;
+}
+
+inline
+void* nsIterator::CurrentItem(void) const
+{
+    return 0;
+}
+#endif // nsIterator_h__
+

mozilla/network/cache/nu/public/nsMemCacheObject.h

@@ -0,0 +1,101 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _nsMemCacheObject_h_
+#define _nsMemCacheObject_h_
+
+#include "prtypes.h"
+
+#include "nsCacheObject.h"
+
+class nsMemCacheObject
+{
+public:
+
+    nsMemCacheObject(void);
+    nsMemCacheObject(nsCacheObject* io_pObject);
+    nsMemCacheObject(const char* i_url); 
+    ~nsMemCacheObject();
+
+    void*               Data(void) const;
+    
+    void                Next(nsMemCacheObject* pObject);
+    void                Next(nsCacheObject* io_pObject);
+    
+    nsMemCacheObject*   Next(void) const;
+    
+    nsCacheObject*      ThisObject(void) const;
+    
+private:
+    nsMemCacheObject* m_pNextObject;
+    nsCacheObject*  m_pObject;
+    void* m_pData;
+
+    nsMemCacheObject& operator=(const nsMemCacheObject& mco);
+    nsMemCacheObject(const nsMemCacheObject&);
+
+};
+
+inline nsMemCacheObject::nsMemCacheObject(void):
+    m_pObject(new nsCacheObject()), 
+    m_pNextObject(0),
+    m_pData(0)
+{
+}
+
+inline nsMemCacheObject::nsMemCacheObject(nsCacheObject* io_pObject):
+    m_pObject(io_pObject),
+    m_pNextObject(0),
+    m_pData(0)
+{
+}
+
+inline nsMemCacheObject::nsMemCacheObject(const char* i_url):
+    m_pObject(new nsCacheObject(i_url)), 
+    m_pNextObject(0),
+    m_pData(0)
+{
+}
+
+inline void* nsMemCacheObject::Data(void) const
+{
+//    PR_ASSERT(m_pData);
+    return m_pData;
+}
+
+inline nsMemCacheObject* nsMemCacheObject::Next(void) const
+{
+    return m_pNextObject;
+}
+
+inline void nsMemCacheObject::Next(nsMemCacheObject* pObject)
+{
+    m_pNextObject = pObject;
+}
+
+inline void nsMemCacheObject::Next(nsCacheObject* pObject)
+{
+    m_pNextObject = new nsMemCacheObject(pObject);
+}
+
+inline nsCacheObject* nsMemCacheObject::ThisObject(void) const
+{
+   return m_pObject;
+}
+
+#endif //_nsMemCacheObject_h_

mozilla/network/cache/nu/public/nsMemModule.h

@@ -0,0 +1,112 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef _nsMemModule_H_
+#define _nsMemModule_H_
+/* 
+* nsMemModule
+*
+* Gagan Saksena
+* 02/03/98
+* 
+*/
+
+#include "nsCacheModule.h"
+#include "nsMemCacheObject.h"
+#include "nsCachePref.h"
+
+//#include "nsHash.h" // TODO - replace with nsHashtable when the XPCOM_BRANCH merges
+
+//#include "nsHashtable.h"
+/*
+// {5D51B250-E6C2-11d1-AFE5-006097BFC036}
+static const NS_MEMMODULE_IID = 
+{ 0x5d51b250, 0xe6c2, 0x11d1, { 0xaf, 0xe5, 0x0, 0x60, 0x97, 0xbf, 0xc0, 0x36 } };
+*/
+
+class nsMemModule : public nsCacheModule
+{
+
+public:
+    nsMemModule(const PRUint32 size=nsCachePref::GetInstance()->MemCacheSize());
+    ~nsMemModule();
+
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+
+*/
+    PRBool          AddObject(nsCacheObject* io_pObject);
+    
+    PRBool          Contains(nsCacheObject* io_pObject) const;
+    PRBool          Contains(const char* i_url) const;
+    
+    void            GarbageCollect(void);
+
+    nsCacheObject*  GetObject(const PRUint32 i_index) const;
+    nsCacheObject*  GetObject(const char* i_url) const;
+
+    nsStream*       GetStreamFor(const nsCacheObject* i_pObject);
+
+    PRBool          ReduceSizeTo(const PRUint32 i_NewSize);
+
+    PRBool          Remove(const char* i_url);
+    PRBool          Remove(const PRUint32 i_index);
+
+//    PRBool          RemoveAll(void);
+    
+    PRBool          Revalidate(void);
+
+
+    // Start of nsMemModule specific stuff...
+    // Here is a sample implementation using linked list
+protected:
+    nsMemCacheObject* LastObject(void) const;
+
+private:
+    nsMemCacheObject* m_pFirstObject;
+
+    //nsHash m_ht; //TODO replace with nsHashtable
+    //Optimization
+    nsMemCacheObject* m_pLastObject;
+
+    nsMemModule(const nsMemModule& mm);
+    nsMemModule& operator=(const nsMemModule& mm);
+
+/*    
+    class nsMemKey : public nsHashKey
+    {
+    public:
+                    nsMemKey();
+                    ~nsMemKey();
+      PRUint32      HashValue();
+      PRBool        Equals(nsHashKey *aKey);
+      nsHashKey*    Clone();
+    };
+*/    
+};
+
+inline
+PRBool nsMemModule::Revalidate(void)
+{
+    /* Mem module elements are never revalidated */
+    return PR_FALSE; 
+}
+
+#endif

mozilla/network/cache/nu/public/nsMemStream.h

@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this Mem are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you may not use this Mem 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.
+ *
+ * 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.
+ */
+
+#ifndef nsMemStream_h__
+#define nsMemStream_h__
+
+//#include "nsISupports.h"
+#include "nsStream.h"
+
+class nsMemStream: public nsStream
+{
+
+public:
+            nsMemStream();
+    virtual ~nsMemStream();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    PRInt32     Read(void* o_Buffer, PRUint32 i_Len);
+    PRInt32     Write(const void* i_Buffer, PRUint32 i_Len);
+
+protected:
+
+private:
+    nsMemStream(const nsMemStream& o);
+    nsMemStream& operator=(const nsMemStream& o);
+    void*       m_pCurrent;
+    void*       m_pStart;
+    PRUint32    m_Size;
+};
+
+#endif // nsMemStream_h__
+

mozilla/network/cache/nu/public/nsMonitorable.h

@@ -0,0 +1,106 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+#ifndef nsMonitorable_h__
+#define nsMonitorable_h__
+
+//#include "nsISupports.h"
+
+#include "prmon.h"
+
+class nsMonitorable//: public nsISupports
+{
+
+public:
+            nsMonitorable();
+    virtual ~nsMonitorable();
+
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    PRBool      Lock(void);
+    void        Unlock(void);
+
+protected:
+
+    class MonitorLocker
+    {
+    public:
+        MonitorLocker(nsMonitorable* i_pThis): 
+            m_pMonitorable(i_pThis) 
+        { 
+            if (m_pMonitorable) m_pMonitorable->Lock();
+        }
+        ~MonitorLocker() 
+        { 
+            if (m_pMonitorable) m_pMonitorable->Unlock();
+        }
+    private:
+        nsMonitorable* m_pMonitorable;
+    };
+
+    PRMonitor*          m_pMonitor;
+
+private:
+    nsMonitorable(const nsMonitorable& o);
+    nsMonitorable& operator=(const nsMonitorable& o);
+};
+
+inline
+nsMonitorable::nsMonitorable(void):m_pMonitor(PR_NewMonitor())
+{
+}
+
+inline
+nsMonitorable::~nsMonitorable()
+{
+    if (m_pMonitor)
+    {
+    PR_DestroyMonitor(m_pMonitor);
+    m_pMonitor = 0;
+    }
+}
+
+inline
+PRBool nsMonitorable::Lock(void)
+{
+    if (!m_pMonitor)
+    {
+        m_pMonitor = PR_NewMonitor();
+        if (!m_pMonitor)
+            return PR_FALSE;
+    }
+    PR_EnterMonitor(m_pMonitor);
+    return PR_TRUE;
+}
+
+
+inline
+void nsMonitorable::Unlock(void)
+{
+    PR_ASSERT(m_pMonitor);
+    if (m_pMonitor)
+        PR_ExitMonitor(m_pMonitor);
+}
+
+#endif // nsMonitorable_h__
+

mozilla/network/cache/nu/public/nsStream.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+#ifndef nsStream_h__
+#define nsStream_h__
+
+//#include "nsISupports.h"
+
+#include "prtypes.h"
+
+class nsStream//: public nsISupports
+{
+
+public:
+            nsStream();
+    virtual ~nsStream();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+    virtual
+        PRInt32     Read(void* o_Buffer, PRUint32 i_Len) = 0;
+    virtual
+        PRInt32     Write(const void* i_Buffer, PRUint32 i_Len) = 0;
+protected:
+
+private:
+    nsStream(const nsStream& o);
+    nsStream& operator=(const nsStream& o);
+};
+
+#endif // nsStream_h__
+

mozilla/network/cache/nu/src/CacheStubs.cpp

@@ -0,0 +1,493 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+/* Design and original implementation by Gagan Saksena '98 */
+
+#include "CacheStubs.h"
+#include "nsCacheManager.h"
+#include "nsDiskModule.h"
+#include "nsMemModule.h"
+#include "nsCacheTrace.h"
+#include "prlog.h"
+
+#define CACHEMGR nsCacheManager::GetInstance()
+
+void
+Cache_Init(void)
+{
+    /* Most of the initilization gets done in the constructor for the 
+     * nsCacheManager class. */ 
+}
+
+void 
+Cache_Shutdown(void)
+{
+    /* todo- Should the destructor for nsCacheManager object be forced here?*/
+}
+
+/* CacheManager functions */
+PRBool
+CacheManager_Contains(const char* i_url)
+{
+    return CACHEMGR->Contains(i_url);
+}
+
+PRInt16 
+CacheManager_Entries()
+{
+    return CACHEMGR->Entries();
+}
+
+void*
+CacheManager_GetObject(const char* i_url)
+{
+    return CACHEMGR->GetObj(i_url);
+}
+
+PRBool
+CacheManager_IsOffline(void)
+{
+    return CACHEMGR->IsOffline();
+}
+
+void
+CacheManager_Offline(PRBool bSet)
+{
+    CACHEMGR->Offline(bSet);
+}
+
+PRBool
+CacheManager_Remove(const char* i_url)
+{
+    return CACHEMGR->Remove(i_url);
+}
+
+PRUint32
+CacheManager_WorstCaseTime(void)
+{
+    return CACHEMGR->WorstCaseTime();
+}
+
+/* CacheObject functions */
+void*
+CacheObject_Create(const char* i_url)
+{
+    return new nsCacheObject(i_url);
+}
+
+const char*
+CacheObject_GetAddress(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Address() : 0;
+}
+
+const char*
+CacheObject_GetCharset(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Charset() : 0;
+}
+
+const char*
+CacheObject_GetContentEncoding(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->ContentEncoding() : 0;
+}
+
+PRUint32
+CacheObject_GetContentLength(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->ContentLength() : 0;
+}
+
+const char*
+CacheObject_GetContentType(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->ContentType() : 0;
+}
+
+const char*
+CacheObject_GetEtag(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Etag() : 0;
+}
+
+PRIntervalTime
+CacheObject_GetExpires(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Expires() : 0;
+}
+
+const char*      
+CacheObject_GetFilename(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Filename() : 0;
+}
+    
+PRIntervalTime
+CacheObject_GetLastAccessed(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->LastAccessed() : 0;
+}
+
+PRIntervalTime
+CacheObject_GetLastModified(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->LastModified() : 0;
+}
+
+PRInt16 
+CacheObject_GetModule(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Module() : -1;
+}
+
+const char*
+CacheObject_GetPageServicesURL(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->PageServicesURL() : 0;
+}
+
+const char*
+CacheObject_GetPostData(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->PostData() : 0;
+}
+
+PRUint32
+CacheObject_GetPostDataLen(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->PostDataLen() : 0;
+}
+
+PRUint32
+CacheObject_GetSize(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Size() : 0;
+}
+
+PRUint32
+CacheObject_Hits(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Hits() : 0;
+}
+
+PRBool
+CacheObject_IsExpired(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->IsExpired() : PR_FALSE;
+}
+
+PRBool
+CacheObject_IsPartial(const void* pThis)
+{
+    return pThis ? ((nsCacheObject*)pThis)->IsPartial() : PR_FALSE;
+}
+
+PRUint32
+CacheObject_Read(const void* pThis, char* o_Buffer, PRUint32 i_Len)
+{
+    return pThis ? ((nsCacheObject*)pThis)->Read(o_Buffer, i_Len) : 0;
+}
+
+void
+CacheObject_SetAddress(void* pThis, const char* i_Address)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Address(i_Address);
+}
+
+void
+CacheObject_SetCharset(void* pThis, const char* i_Charset)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Charset(i_Charset);
+}
+
+void
+CacheObject_SetContentEncoding(void* pThis, const char* i_Encoding)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->ContentEncoding(i_Encoding);
+}
+
+void
+CacheObject_SetContentLength(void* pThis, PRUint32 i_ContentLen)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->ContentLength(i_ContentLen);
+}
+
+void
+CacheObject_SetContentType(void* pThis, const char* i_ContentType)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->ContentType(i_ContentType);
+}
+
+void
+CacheObject_SetEtag(void* pThis, const char* i_Etag)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Etag(i_Etag);
+}
+
+void
+CacheObject_SetExpires(void *pThis, const PRIntervalTime i_Time)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Expires(i_Time);
+}
+
+void
+CacheObject_SetFilename(void* pThis, const char* i_Filename)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Filename(i_Filename);
+}
+
+void
+CacheObject_SetLastModified(void* pThis, const PRIntervalTime i_Time)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->LastModified(i_Time);   
+}
+
+void
+CacheObject_SetModule(void* pThis, const PRInt16 i_Module)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Module(i_Module);
+}
+
+void
+CacheObject_SetPageServicesURL(void* pThis, const char* i_Url)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->PageServicesURL(i_Url);
+}
+
+void
+CacheObject_SetPostData(void* pThis, const char* i_PostData, const PRUint32 i_Len)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->PostData(i_PostData, i_Len);
+}
+
+void
+CacheObject_SetSize(void* pThis, const PRUint32 i_Size)
+{
+    if (pThis)
+        ((nsCacheObject*)pThis)->Size(i_Size);
+}
+
+PRBool
+CacheObject_Synch(void* pThis)
+{
+    if (pThis)
+    {
+        nsCacheObject* pObj = (nsCacheObject*) pThis;
+        PRBool bStatus = CACHEMGR->GetModule(pObj->Module())->AddObject(pObj);
+        return bStatus;
+    }
+    return PR_FALSE;
+}
+
+PRUint32
+CacheObject_Write(void* pThis, const char* i_buffer, const PRUint32 i_length)
+{
+    return i_length;
+}
+
+void
+CacheObject_Destroy(void* pThis)
+{
+    if (pThis)
+    {
+        ((nsCacheObject*)pThis)->~nsCacheObject();
+        pThis = 0;
+    }
+}
+
+/* CachePref functions */
+PRUint32
+CachePref_GetDiskCacheSize(void)
+{
+    return nsCachePref::GetInstance()->DiskCacheSize();
+}
+
+PRBool
+CachePref_GetDiskCacheSSL(void)
+{
+    return nsCachePref::GetInstance()->DiskCacheSSL();
+}
+
+PRUint32
+CachePref_GetMemCacheSize(void)
+{
+    return nsCachePref::GetInstance()->MemCacheSize();
+}
+
+void
+CachePref_SetDiskCacheSize(const PRUint32 i_Size)
+{
+    nsCachePref::GetInstance()->DiskCacheSize(i_Size);
+}
+
+void
+CachePref_SetDiskCacheSSL(PRBool bSet)
+{
+    nsCachePref::GetInstance()->DiskCacheSSL(bSet);
+}
+
+void
+CachePref_SetMemCacheSize(const PRUint32 i_Size)
+{
+    nsCachePref::GetInstance()->MemCacheSize(i_Size);
+}
+
+/* CacheTrace functions */
+void
+CacheTrace_Enable(PRBool bEnable)
+{
+    nsCacheTrace::Enable(bEnable);
+}
+
+PRBool
+CacheTrace_IsEnabled(void)
+{
+    return nsCacheTrace::IsEnabled();
+}
+
+/* DiskModule functions */
+#define DISKMOD nsCacheManager::GetInstance()->GetDiskModule()
+
+PRBool
+DiskModule_AddObject(void* pObject)
+{
+    return DISKMOD->AddObject((nsCacheObject*)pObject);
+}
+
+PRBool
+DiskModule_Contains(const char* i_url)
+{
+    return DISKMOD->Contains(i_url);
+}
+
+PRUint32
+DiskModule_Entries(void)
+{
+    return DISKMOD->Entries();
+}
+
+PRUint32
+DiskModule_GetSize(void)
+{
+    return DISKMOD->Size();
+}
+
+PRUint32
+DiskModule_GetSizeInUse(void)
+{
+    return DISKMOD->SizeInUse(); 
+}
+
+PRBool
+DiskModule_IsEnabled(void)
+{
+    return DISKMOD->IsEnabled();
+}
+
+PRBool
+DiskModule_Remove(const char* i_url)
+{
+    return DISKMOD->Remove(i_url);
+}
+
+PRBool
+DiskModule_RemoveAll(void)
+{
+    return DISKMOD->RemoveAll();
+}
+
+void
+DiskModule_SetSize(PRUint32 i_Size)
+{
+    DISKMOD->SetSize(i_Size);
+}
+
+/* MemModule functions */
+#define MEMMOD nsCacheManager::GetInstance()->GetMemModule()
+
+PRBool
+MemModule_AddObject(void* pObject)
+{
+    return MEMMOD->AddObject((nsCacheObject*)pObject);
+}
+
+PRBool
+MemModule_Contains(const char* i_url)
+{
+    return MEMMOD->Contains(i_url);
+}
+
+PRUint32
+MemModule_Entries(void)
+{
+    return MEMMOD->Entries();
+}
+
+PRUint32
+MemModule_GetSize(void)
+{
+    return MEMMOD->Size();
+}
+
+PRUint32
+MemModule_GetSizeInUse(void)
+{
+    return MEMMOD->SizeInUse() ;
+}
+
+PRBool
+MemModule_IsEnabled(void)
+{
+    return MEMMOD->IsEnabled();
+}
+
+PRBool
+MemModule_Remove(const char* i_url)
+{
+    return MEMMOD->Remove(i_url);
+}
+
+PRBool
+MemModule_RemoveAll(void)
+{
+    return MEMMOD->RemoveAll();
+}
+
+void
+MemModule_SetSize(PRUint32 i_Size)
+{
+    MEMMOD->SetSize(i_Size);
+}
+
+#undef MEMMOD
+#undef DISKMOD
+#undef CACHEMGR

mozilla/network/cache/nu/src/Makefile

@@ -0,0 +1,62 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../../../..
+
+TARGET = $(LIBRARY)
+
+LIBRARY_NAME=cachelib
+
+MISCDEP = 		    \
+    $(LIBNSPR)  	    \
+    $(DIST)/lib/dbm32.lib \
+    $(DIST)/lib/libplc21.lib \
+    $(DIST)/lib/xpcom32.lib \
+    $(NULL)
+
+MODULE = cache
+
+CPPSRCS	= nsCacheObject.cpp 	\
+		  nsCacheModule.cpp 	\
+		  nsCacheManager.cpp 	\
+		  nsMemModule.cpp 		\
+		  nsDiskModule.cpp 		\
+		  nsCacheTrace.cpp 		\
+		  nsCachePref.cpp 		\
+		  nsMemCacheObject.cpp	\
+		  nsBkgThread.cpp		\
+		  nsCacheBkgThd.cpp		\
+		  CacheStubs.cpp		\
+		  nsFileStream.cpp		\
+		  nsMemStream.cpp		\
+	 	  $(NULL)
+
+REQUIRES = dbm nspr pref xpcom 
+
+LLIBS =				 \
+    $(DIST)/lib/dbm32.lib 		\
+    $(DIST)/lib/libplc21.lib 	\
+ 	$(DIST)/lib/xpcom32.lib  	\
+	$(LIBNSPR)		 			\
+	$(NULL)
+
+include $(DEPTH)/config/rules.mk
+
+INCLUDES += -I../include	\
+			-I../public		\
+			$(NULL)
+

mozilla/network/cache/nu/src/makefile.win

@@ -0,0 +1,81 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+IGNORE_MANIFEST = 1
+
+DEPTH=..\..\..\..
+
+MAKE_OBJ_TYPE = EXE
+DLLNAME = cachelib
+#DLL = .\$(OBJDIR)\$(DLLNAME).dll
+
+LIBRARY_NAME=cachelib
+
+#
+# Remember to change libplc21 to $whatever it is...
+#
+LLIBS =				 \
+	$(LIBNSPR)		 \
+	$(DIST)\lib\libplc21.lib \
+	$(DIST)\lib\dbm32.lib    \
+ 	$(DIST)\lib\xpcom32.lib  \
+	$(NULL)
+
+MISCDEP = $(LLIBS)
+
+MODULE = cache
+
+OBJS =						\
+	.\$(OBJDIR)\nsCacheObject.obj 		\
+	.\$(OBJDIR)\nsCacheModule.obj 		\
+	.\$(OBJDIR)\nsMemModule.obj 		\
+	.\$(OBJDIR)\nsDiskModule.obj 		\
+	.\$(OBJDIR)\nsCacheTrace.obj 		\
+	.\$(OBJDIR)\nsCacheManager.obj 		\
+	.\$(OBJDIR)\nsCachePref.obj 		\
+	.\$(OBJDIR)\nsMemCacheObject.obj 	\
+	.\$(OBJDIR)\nsBkgThread.obj	 	\
+	.\$(OBJDIR)\nsCacheBkgThd.obj	 	\
+	.\$(OBJDIR)\CacheStubs.obj	 	\
+	.\$(OBJDIR)\nsFileStream.obj	 	\
+	.\$(OBJDIR)\nsMemStream.obj	 	\
+	$(NULL)
+
+#	.\$(OBJDIR)\nsHash.obj 			\
+
+LINCS = 			\
+	-I$(PUBLIC)\xpcom	\
+	-I$(PUBLIC)\dbm		\
+	-I$(PUBLIC)\pref	\
+	-I..\public		\
+	-I..\include		\
+	$(NULL)
+
+LCFLAGS =				\
+	$(LCFLAGS)			\
+	$(NULL)
+	#-DNS_DLLNAME=$(DLLNAME).dll	\
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(EXE)
+        $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).$(LIB_SUFFIX) $(DIST)\lib
+# $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).$(DLL_SUFFIX) $(DIST)\bin
+
+clobber::
+	rm -f $(DIST)\lib\$(DLLNAME).$(LIB_SUFFIX)
+

mozilla/network/cache/nu/src/nsBkgThread.cpp

@@ -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 Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsBkgThread.h"
+#include "prlog.h"
+
+static void PR_CALLBACK RunFunction(void* arg);
+
+static void PR_CALLBACK RunFunction(void* arg)
+{
+    nsBkgThread* pBT = (nsBkgThread*) arg;
+    if (pBT)
+    {
+        pBT->Process();
+    }
+}
+
+nsBkgThread::nsBkgThread(PRIntervalTime iSleepTime, PRBool bStart /* =PR_TRUE */)
+{
+    m_SleepTime = iSleepTime;
+    m_bContinue = bStart;
+    m_pThread = PR_CreateThread(
+        PR_USER_THREAD,
+        RunFunction,
+        this,
+        PR_PRIORITY_NORMAL,
+        PR_LOCAL_THREAD,
+        PR_JOINABLE_THREAD,
+        0);
+    PR_ASSERT(NULL != m_pThread);
+}
+
+nsBkgThread::~nsBkgThread()
+{
+    m_bContinue = PR_FALSE;
+    if (m_pThread != NULL)
+    {
+        Stop();
+    }
+}
+/*
+nsrefcnt nsBkgThread::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsBkgThread::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsBkgThread::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+
+*/
+void nsBkgThread::Process(void)
+{
+    while (m_bContinue)
+    {
+        PR_Sleep(m_SleepTime);
+        Run();
+    }
+}
+
+void nsBkgThread::Stop(void)
+{
+    m_bContinue = PR_FALSE;
+    PRStatus status = PR_Interrupt(m_pThread);
+    PR_ASSERT(PR_SUCCESS == status);
+}

mozilla/network/cache/nu/src/nsCacheBkgThd.cpp

@@ -0,0 +1,78 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "prlog.h"
+#include "nsCacheBkgThd.h"
+#include "nsCacheManager.h"
+#include "nsCacheModule.h"
+#include "nsCachePref.h"
+
+nsCacheBkgThd::nsCacheBkgThd(PRIntervalTime iSleepTime):
+    nsBkgThread(iSleepTime)
+{
+}
+
+nsCacheBkgThd::~nsCacheBkgThd()
+{
+}
+
+/*
+nsrefcnt nsCacheBkgThd::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsCacheBkgThd::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsCacheBkgThd::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+*/
+
+void nsCacheBkgThd::Run(void)
+{
+    /* Step thru all the modules and call cleanup on each */
+    nsCacheManager* pCM = nsCacheManager::GetInstance();
+    PR_ASSERT(pCM);
+    if (pCM->IsOffline())
+        return; /* Dont update entries if offline */
+    PRInt16 i = pCM->Entries();
+    while (i>0)
+    {
+        nsCacheModule* pModule = pCM->GetModule(--i);
+        PR_ASSERT(pModule);
+        /* TODO change this based on if it supports garbage cleaning */
+        if (!pModule->IsReadOnly())
+        {
+            pModule->GarbageCollect();
+            if (nsCachePref::GetInstance()->RevalidateInBkg())
+            {
+                pModule->Revalidate();
+            }
+        }
+    }
+}

mozilla/network/cache/nu/src/nsCacheManager.cpp

@@ -0,0 +1,249 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * Gagan Saksena  02/02/98
+ * 
+ */
+
+#include "prtypes.h"
+#include "prinrval.h"
+
+#include "nsCacheManager.h"
+#include "nsCacheTrace.h"
+#include "nsCachePref.h"
+#include "nsCacheModule.h"
+#include "nsMemModule.h"
+#include "nsDiskModule.h"
+#include "nsCacheBkgThd.h"
+
+/* TODO move this to InitNetLib */
+static nsCacheManager TheManager;
+
+nsCacheManager::nsCacheManager(): m_pFirstModule(0), m_bOffline(PR_FALSE)
+{
+    Init();
+}
+
+nsCacheManager::~nsCacheManager()
+{
+    if (m_pBkgThd)
+    {
+        m_pBkgThd->Stop();
+        delete m_pBkgThd;
+        m_pBkgThd = 0;
+    }
+    if (m_pFirstModule)
+    {
+        delete m_pFirstModule;
+        m_pFirstModule = 0;
+    }
+}
+
+nsCacheManager* 
+nsCacheManager::GetInstance()
+{
+    return &TheManager;
+}
+
+#if 0
+/* Caller must free returned char* */
+const char* 
+nsCacheManager::Trace() const
+{
+
+    char linebuffer[128];
+    char* total;
+
+    sprintf(linebuffer, "nsCacheManager: Modules = %d\n", Entries());
+
+    total = new char[strlen(linebuffer) + 1];
+    strcpy(total, linebuffer);
+    return total;
+}
+#endif
+
+PRInt32 
+nsCacheManager::AddModule(nsCacheModule* pModule)
+{
+    MonitorLocker ml(this);
+    if (pModule) 
+    {
+        if (m_pFirstModule)
+            LastModule()->NextModule(pModule);
+        else
+            m_pFirstModule = pModule;
+
+        return Entries()-1;
+    }
+    else
+        return -1;
+}
+
+PRBool 
+nsCacheManager::Contains(const char* i_url) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    // Add logic to check for IMAP type URLs, byteranges, and search with / appended as well...
+    // TODO 
+    PRBool bStatus = ContainsExactly(i_url);
+    if (!bStatus)
+    {
+        // try alternate stuff
+        /*
+        char* extraBytes;
+        char extraBytesSeparator;
+        */
+    }
+    return bStatus;
+}
+
+PRBool
+nsCacheManager::ContainsExactly(const char* i_url) const
+{
+    if (m_pFirstModule)
+    {
+        nsCacheModule* pModule = m_pFirstModule;
+        while (pModule)
+        {
+            if (pModule->Contains(i_url))
+            {
+                return PR_TRUE;
+            }
+            pModule = pModule->NextModule();
+        }
+    }
+    return PR_FALSE;
+}
+
+nsCacheObject* 
+nsCacheManager::GetObj(const char* i_url) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    if (m_pFirstModule) 
+    {
+        nsCacheModule* pModule = m_pFirstModule;
+        nsCacheObject* obj = 0;
+        while (pModule)
+        {
+            obj = pModule->GetObject(i_url);
+            if (obj)
+                return obj;
+            pModule = pModule->NextModule();
+        }
+    }
+    return 0;
+}
+
+PRInt16 
+nsCacheManager::Entries() const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    if (m_pFirstModule) 
+    {
+        PRInt16 count=1;
+        nsCacheModule* pModule = m_pFirstModule;
+        while (pModule = pModule->NextModule()) 
+        {
+            count++;
+        }
+        return count;
+    }
+    return 0;
+}
+
+nsCacheModule* 
+nsCacheManager::GetModule(PRInt16 i_index) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    if ((i_index < 0) || (i_index >= Entries()))
+        return 0;
+    nsCacheModule* pModule = m_pFirstModule;
+    PR_ASSERT(pModule);
+    for (PRInt16 i=0; i<i_index; pModule = pModule->NextModule())
+    {
+        i++;
+        PR_ASSERT(pModule);
+    }
+    return pModule;
+}
+
+void 
+nsCacheManager::Init() 
+{
+    MonitorLocker ml(this);
+    if (m_pFirstModule)
+        delete m_pFirstModule;
+
+    m_pFirstModule = new nsMemModule(nsCachePref::GetInstance()->MemCacheSize());
+    PR_ASSERT(m_pFirstModule);
+    if (m_pFirstModule)
+    {
+        nsDiskModule* pTemp = new nsDiskModule(nsCachePref::GetInstance()->DiskCacheSize());
+        PR_ASSERT(pTemp);
+        m_pFirstModule->NextModule(pTemp);
+        m_pBkgThd = new nsCacheBkgThd(PR_SecondsToInterval(nsCachePref::GetInstance()->BkgSleepTime()));
+        PR_ASSERT(m_pBkgThd);
+    }
+}
+
+nsCacheModule* 
+nsCacheManager::LastModule() const 
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    if (m_pFirstModule) 
+    {
+        nsCacheModule* pModule = m_pFirstModule;
+        while(pModule->NextModule()) {
+            pModule = pModule->NextModule();
+        }
+        return pModule;
+    }
+    return 0;
+}
+
+PRBool
+nsCacheManager::Remove(const char* i_url)
+{
+    MonitorLocker ml(this);
+    PRBool bStatus = PR_FALSE;
+    if (m_pFirstModule)
+    {
+        nsCacheModule* pModule = m_pFirstModule;
+        bStatus |= pModule->Remove(i_url);
+        if (bStatus)
+            return bStatus;
+        while(pModule->NextModule()) {
+            pModule = pModule->NextModule();
+            if (bStatus)
+                return bStatus;
+        }
+    }
+    return bStatus;
+}
+
+PRUint32 
+nsCacheManager::WorstCaseTime(void) const 
+{
+    PRIntervalTime start = PR_IntervalNow();
+    if (this->Contains("a vague string that should not be in any of the modules"))
+    {
+        PR_ASSERT(0);
+    }
+    return PR_IntervalToMicroseconds(PR_IntervalNow() - start);
+}

mozilla/network/cache/nu/src/nsCacheModule.cpp

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsCacheModule.h"
+#include "nsCacheTrace.h"
+#include "nsCacheIterator.h"
+
+/* 
+ * nsCacheModule
+ *
+ * Gagan Saksena 02/02/98
+ * 
+ */
+
+
+#define DEFAULT_SIZE 10*0x100000L
+
+nsCacheModule::nsCacheModule(const PRUint32 i_size=DEFAULT_SIZE):
+    m_Size(i_size),
+    m_pEnumeration(0),
+    m_pNext(0),
+    m_Entries(0)
+{
+    m_pIterator = new nsCacheIterator(this);
+}
+
+nsCacheModule::~nsCacheModule()
+{
+    if (m_pNext)
+    {
+        delete m_pNext;
+        m_pNext = 0;
+    }
+    if (m_pIterator)
+    {
+        delete m_pIterator;
+        m_pIterator = 0;
+    }
+    if (m_pEnumeration)
+    {
+        delete m_pEnumeration;
+        m_pEnumeration = 0;
+    }
+}
+
+void nsCacheModule::GarbageCollect(void) 
+{
+}
+
+PRBool nsCacheModule::ReduceSizeTo(const PRUint32 i_NewSize)
+{
+	MonitorLocker ml(this);
+    //TODO
+    return PR_TRUE;
+}
+
+PRBool nsCacheModule::RemoveAll(void)
+{
+	MonitorLocker ml(this);
+    PRBool status = PR_TRUE;
+    while (m_Entries > 0)
+    {
+        status &= Remove(--m_Entries);
+    }
+    return status;
+}
+
+#if 0
+// Caller must free this 
+const char* nsCacheModule::Trace() const
+{
+    char linebuffer[128];
+    char* total;
+
+    PR_sprintf(linebuffer, "nsCacheModule: Objects = %d\n", Entries());
+
+    total = new char[PR_strlen(linebuffer) + 1];
+    strcpy(total, linebuffer);
+
+    return total;
+}
+#endif

mozilla/network/cache/nu/src/nsCacheObject.cpp

@@ -0,0 +1,580 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include <memory.h>
+#include "prmem.h"
+#include "prprf.h"
+#include "plstr.h"
+
+#include "nsCacheObject.h"
+#include "nsCacheTrace.h"
+#include "nsCacheModule.h"
+#include "nsCacheManager.h"
+#include "nsStream.h"
+
+/* 
+ * nsCacheObject
+ *
+ * Gagan Saksena 02/02/98
+ * 
+ */
+
+static const PRIntervalTime DEFAULT_EXPIRES = PR_SecondsToInterval(86400);
+
+#if !defined(IS_LITTLE_ENDIAN) && !defined(IS_BIG_ENDIAN)
+ERROR! Must have a byte order
+#endif
+
+#ifdef IS_LITTLE_ENDIAN
+#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32))
+#else
+#define COPY_INT32(_a,_b)  /* swap */                   \
+    do {                                                \
+    ((char *)(_a))[0] = ((char *)(_b))[3];              \
+    ((char *)(_a))[1] = ((char *)(_b))[2];              \
+    ((char *)(_a))[2] = ((char *)(_b))[1];              \
+    ((char *)(_a))[3] = ((char *)(_b))[0];              \
+    } while(0)
+#endif
+
+/* Convenient macros used in stuffing and reading back cache object to a void * */
+/* TODO: Change these to file scope functions */
+#define STUFF_STRING(string)                 \
+{                                            \
+  len = (string ? PL_strlen(string)+1 : 0);  \
+  COPY_INT32((void *)cur_ptr, &len);         \
+  cur_ptr = cur_ptr + sizeof(int32);         \
+  if(len)                                    \
+      memcpy((void *)cur_ptr, string, len);  \
+  cur_ptr += len;                            \
+}
+
+#define STUFF_NUMBER(number)                \
+{                                           \
+  COPY_INT32((void *)cur_ptr, &number);     \
+  cur_ptr = cur_ptr + sizeof(PRUint32);        \
+}
+
+#define STUFF_TIME(number)                      \
+{                                               \
+  COPY_INT32((void *)cur_ptr, &number);         \
+  cur_ptr = cur_ptr + sizeof(PRIntervalTime);   \
+}
+
+#define STUFF_BOOL(bool_val)                \
+{                                           \
+  if(bool_val)                              \
+    ((char *)(cur_ptr))[0] = 1;             \
+  else                                      \
+    ((char *)(cur_ptr))[0] = 0;             \
+  cur_ptr = cur_ptr + sizeof(char);         \
+}
+
+/* if any strings are larger than this then
+ * there was a serious database error
+ */
+#define MAX_HUGE_STRING_SIZE 10000
+
+#define RETRIEVE_STRING(string)     \
+{                                   \
+    if(cur_ptr > max_ptr)           \
+    {                               \
+        return PR_TRUE;             \
+    }                               \
+    COPY_INT32(&len, cur_ptr);      \
+    cur_ptr += sizeof(int32);       \
+    if(len)                         \
+    {                               \
+        if(len > MAX_HUGE_STRING_SIZE)  \
+        {                               \
+            return PR_FALSE;            \
+        }                               \
+        string = new char[len]; \
+        if(!string)                     \
+        {                               \
+            return PR_FALSE;            \
+        }                               \
+        memcpy(string, cur_ptr, len);   \
+        cur_ptr += len;                 \
+   }                                    \
+}
+
+#define RETRIEVE_NUMBER(number)     \
+{                                   \
+    if(cur_ptr > max_ptr)           \
+        return PR_TRUE;             \
+    COPY_INT32(&number, cur_ptr);   \
+    cur_ptr += sizeof(int32);       \
+}
+
+#define RETRIEVE_TIME(number)           \
+{                                       \
+    if(cur_ptr > max_ptr)               \
+        return PR_TRUE;                 \
+    COPY_INT32(&number, cur_ptr);       \
+    cur_ptr += sizeof(PRIntervalTime);  \
+}
+
+#define RETRIEVE_BOOL(bool)         \
+{                                   \
+  if(cur_ptr > max_ptr)             \
+    return PR_TRUE;                 \
+  if(((char *)(cur_ptr))[0])        \
+    bool = TRUE;                    \
+  else                              \
+    bool = FALSE;                   \
+  cur_ptr += sizeof(char);          \
+}
+
+/*  TODO- Further optimization, initialize these to null, 
+    but that will add more work on copy constructor which is ok */
+nsCacheObject::nsCacheObject():
+    m_Charset(new char[1]),
+    m_ContentEncoding(new char[1]),
+    m_ContentType(new char[1]),
+    m_Etag(new char[1]),
+    m_Filename(new char[1]),
+    m_Flags(INIT), 
+    m_Module(-1),
+    m_pInfo(0),
+    m_PageServicesURL(new char[1]),
+    m_PostData(new char[1]),
+    m_PostDataLen(0),
+    m_pStream(0),
+    m_URL(new char[1]) 
+{
+    Init();
+    *m_Charset = '\0';
+    *m_ContentEncoding = '\0';
+    *m_ContentType = '\0';
+    *m_Etag = '\0';
+    *m_Filename = '\0';
+    *m_PageServicesURL = '\0';
+    *m_PostData = '\0';
+    *m_URL = '\0';
+}
+
+nsCacheObject::~nsCacheObject() 
+{
+    if (m_Charset)
+        delete[] m_Charset;
+    if (m_ContentEncoding)
+        delete[] m_ContentEncoding;
+    if (m_ContentType)
+        delete[] m_ContentType;
+    if (m_Etag)
+        delete[] m_Etag;
+    if (m_Filename)
+        delete[] m_Filename;
+    if (m_PageServicesURL)
+        delete[] m_PageServicesURL;
+    if (m_PostData)
+        delete[] m_PostData;
+    if (m_URL)
+        delete[] m_URL;
+    if (m_pStream)
+        delete m_pStream;
+}
+
+nsCacheObject::nsCacheObject(const nsCacheObject& another):
+    m_Charset(new char[PL_strlen(another.m_Charset)+1]), 
+    m_ContentEncoding(new char[PL_strlen(another.m_ContentEncoding)+1]),
+    m_ContentType(new char[PL_strlen(another.m_ContentType)+1]),
+    m_Etag(new char[PL_strlen(another.m_Etag)+1]),
+    m_Filename(new char[PL_strlen(another.m_Filename)+1]),
+    m_Flags(another.m_Flags),
+    m_PageServicesURL(new char[PL_strlen(another.m_PageServicesURL)+1]),
+    m_PostDataLen(another.m_PostDataLen),
+    m_PostData(new char[another.m_PostDataLen+1]),
+    m_URL(new char[PL_strlen(another.m_URL)+1]), 
+    m_pStream(0),
+    m_pInfo(0) /* Should this be copied as well? */
+{
+    PL_strncpy(m_Charset, another.m_Charset, PL_strlen(another.m_Charset));
+    PL_strncpy(m_ContentEncoding, another.m_ContentEncoding, PL_strlen(another.m_ContentEncoding));
+    PL_strncpy(m_ContentType, another.m_ContentType, PL_strlen(another.m_ContentType));
+    PL_strncpy(m_Etag, another.m_Etag, PL_strlen(another.m_Etag));
+    PL_strncpy(m_Filename, another.m_Filename, PL_strlen(another.m_Filename));
+    PL_strncpy(m_PageServicesURL, another.m_PageServicesURL, PL_strlen(another.m_PageServicesURL));
+    PL_strncpy(m_PostData, another.m_PostData, another.m_PostDataLen);
+    PL_strncpy(m_URL, another.m_URL, PL_strlen(another.m_URL));
+
+    m_Hits = another.m_Hits;
+    m_LastAccessed = another.m_LastAccessed;
+    m_LastModified = another.m_LastModified;
+    m_Size = another.m_Size;
+    m_Module = another.m_Module;
+}
+
+nsCacheObject::nsCacheObject(const char* i_url):
+    m_Charset(new char[1]),
+    m_ContentEncoding(new char[1]),
+    m_ContentType(new char[1]),
+    m_Etag(new char[1]),
+    m_Filename(new char[1]),
+    m_Flags(INIT), 
+    m_PageServicesURL(new char[1]),
+    m_PostData(new char[1]),
+    m_PostDataLen(0),
+    m_URL(new char[PL_strlen(i_url)+1]), 
+    m_Module(-1),
+    m_pStream(0),
+    m_pInfo(0)
+{
+    Init();
+    PR_ASSERT(i_url);
+    PL_strncpy(m_URL, i_url, PL_strlen(i_url));
+
+    *m_Charset = '\0';
+    *m_ContentEncoding = '\0';
+    *m_ContentType = '\0';
+    *m_Etag = '\0';
+    *m_Filename = '\0';
+    *m_PageServicesURL = '\0';
+    *m_PostData = '\0';
+}
+
+void nsCacheObject::Address(const char* i_url) 
+{
+    PR_ASSERT(i_url && *i_url);
+    if (!i_url)
+        return;
+    if (m_URL)
+        delete[] m_URL;
+    m_URL = new char[PL_strlen(i_url) + 1];
+    PL_strncpy(m_URL, i_url, PL_strlen(i_url));
+}
+
+void nsCacheObject::Charset(const char* i_Charset) 
+{
+//    PR_ASSERT(i_Charset && *i_Charset);
+    if (!i_Charset)
+        return;
+    if (m_Charset)
+        delete[] m_Charset;
+    m_URL = new char[PL_strlen(i_Charset) + 1];
+    PL_strncpy(m_Charset, i_Charset, PL_strlen(i_Charset));
+}
+
+void nsCacheObject::ContentEncoding(const char* i_Encoding) 
+{
+//    PR_ASSERT(i_Encoding && *i_Encoding);
+    if (!i_Encoding)
+        return;
+    if (m_ContentEncoding)
+        delete[] m_ContentEncoding;
+    m_ContentEncoding = new char[PL_strlen(i_Encoding) + 1];
+    PL_strncpy(m_ContentEncoding, i_Encoding, PL_strlen(i_Encoding));
+}
+
+void nsCacheObject::ContentType(const char* i_Type) 
+{
+//    PR_ASSERT(i_Type && *i_Type);
+    if (!i_Type)
+    {
+        /* Reset to empty */ // TODO ??
+        return;
+    }
+    if (m_ContentType)
+        delete[] m_ContentType;
+    m_ContentType = new char[PL_strlen(i_Type) + 1];
+    PL_strncpy(m_ContentType, i_Type, PL_strlen(i_Type));
+}
+
+void nsCacheObject::Etag(const char* i_etag) 
+{
+//    PR_ASSERT(i_etag && *i_etag);
+    if (!i_etag)
+        return;
+    if (m_Etag)
+        delete[] m_Etag;
+    m_Etag = new char[PL_strlen(i_etag) + 1];
+    PL_strncpy(m_Etag, i_etag, PL_strlen(i_etag));
+}
+
+void nsCacheObject::Filename(const char* i_Filename)
+{
+//    PR_ASSERT(i_Filename && *i_Filename);
+    if (!i_Filename)
+        return;
+    if (m_Filename)
+        delete[] m_Filename;
+    m_Filename = new char[PL_strlen(i_Filename) +1];
+    PL_strncpy(m_Filename, i_Filename, PL_strlen(i_Filename));
+}
+
+void* nsCacheObject::Info(void) const
+{
+    if (m_pInfo)
+        return m_pInfo;
+    
+    nsCacheObject* pThis = (nsCacheObject*) this;
+    if (m_URL){
+
+        pThis->m_info_size = sizeof(nsCacheObject);
+        
+        pThis->m_info_size -= sizeof(void*); // m_info itself is not being serialized
+        pThis->m_info_size -= sizeof(char*); // And neither is PostData
+
+        //Add the strings sizes
+        pThis->m_info_size += PL_strlen(m_Charset)+1;
+        pThis->m_info_size += PL_strlen(m_ContentEncoding)+1;
+        pThis->m_info_size += PL_strlen(m_ContentType)+1;
+        pThis->m_info_size += PL_strlen(m_Etag)+1;
+        pThis->m_info_size += PL_strlen(m_Filename)+1;
+        pThis->m_info_size += PL_strlen(m_PageServicesURL)+1;
+        pThis->m_info_size += PL_strlen(m_URL)+1;
+        
+        //Add the Postdata len
+        pThis->m_info_size += m_PostDataLen+1;
+
+        void* new_obj = PR_Calloc(1, m_info_size * sizeof(char));
+     
+        if (!new_obj)
+        {
+            PR_Free(new_obj);
+            return 0;
+        }
+
+        PRUint32 len;
+
+        char* cur_ptr = (char*) new_obj;
+        /* put the total size of the struct into
+         * the first field so that we have
+         * a cross check against corruption
+         */
+        COPY_INT32((void *)cur_ptr, &m_info_size);
+        cur_ptr += sizeof(PRUint32);
+
+        /* put the version number of the structure
+         * format that we are using. By using a version 
+         * string when writting we can support 
+         * backwards compatibility in our reading code
+         */
+        COPY_INT32((void *)cur_ptr, &kCACHE_VERSION);
+        cur_ptr += sizeof(PRUint32);
+
+        STUFF_STRING(m_Charset);
+        STUFF_STRING(m_ContentEncoding);
+        STUFF_NUMBER(m_ContentLength);
+        STUFF_STRING(m_ContentType);
+        STUFF_STRING(m_Etag);
+        STUFF_TIME(m_Expires);
+        STUFF_STRING(m_Filename);
+        STUFF_NUMBER(m_Flags);
+        STUFF_NUMBER(m_Hits);
+        STUFF_TIME(m_LastAccessed);
+        STUFF_TIME(m_LastModified);
+        STUFF_NUMBER(m_Module);
+        STUFF_STRING(m_PageServicesURL);
+        STUFF_NUMBER(m_PostDataLen);
+        /* There is a possibility of it not being a string! */
+        if (m_PostData)
+        {
+	        memcpy(cur_ptr, m_PostData, m_PostDataLen+1);
+	        cur_ptr += m_PostDataLen+1;
+        }
+        STUFF_NUMBER(m_Size);
+        STUFF_STRING(m_URL);
+
+        // Important Assertion. Dont remove!
+        // If this fails then you or somebody has added a variable to the 
+        // nsCacheObject class and a decision on its "cacheability" has
+        // not yet been made. 
+        PR_ASSERT(cur_ptr == (char*) new_obj + m_info_size);
+        pThis->m_pInfo = new_obj;
+    }
+    return m_pInfo;
+}
+
+PRBool nsCacheObject::Info(void* i_data) 
+{
+    if (!i_data)
+        return PR_FALSE;
+    
+    char* cur_ptr = (char*) i_data;
+
+    //Reset the m_pInfo;
+    PR_FREEIF(m_pInfo);
+
+    //Reset all strings
+    if (m_Charset)
+        delete[] m_Charset;
+    if (m_ContentEncoding)
+        delete[] m_ContentEncoding;
+    if (m_ContentType)
+        delete[] m_ContentType;
+    if (m_Etag)
+        delete[] m_Etag;
+    if (m_Filename)
+        delete[] m_Filename;
+    if (m_PageServicesURL)
+        delete[] m_PageServicesURL;
+    if (m_URL)
+        delete[] m_URL;
+    if (m_PostData)
+        delete[] m_PostData;
+
+    m_PostDataLen = 0;
+
+    COPY_INT32(&m_info_size, cur_ptr);
+    char* max_ptr = cur_ptr + m_info_size;
+    cur_ptr += sizeof(PRUint32);
+
+    PRUint32 version;
+    COPY_INT32(&version, cur_ptr);
+    cur_ptr += sizeof(PRUint32);
+
+    PR_ASSERT(version == kCACHE_VERSION);
+    if (version != kCACHE_VERSION)
+    {
+        //TODO Bad cache version
+        return PR_FALSE;
+    }
+
+    PRUint32 len;
+    
+    RETRIEVE_STRING(m_Charset);
+    RETRIEVE_STRING(m_ContentEncoding);
+    RETRIEVE_NUMBER(m_ContentLength);
+    RETRIEVE_STRING(m_ContentType);
+    RETRIEVE_STRING(m_Etag);
+    RETRIEVE_TIME(m_Expires);
+    RETRIEVE_STRING(m_Filename);
+    RETRIEVE_NUMBER(m_Flags);
+    RETRIEVE_NUMBER(m_Hits);
+    RETRIEVE_TIME(m_LastAccessed);
+    RETRIEVE_TIME(m_LastModified);
+    RETRIEVE_NUMBER(m_Module);
+    RETRIEVE_STRING(m_PageServicesURL);
+    RETRIEVE_NUMBER(m_PostDataLen);
+    // Special case-
+    m_PostData = new char[m_PostDataLen + 1];
+    if (m_PostData)
+    {
+        memcpy(m_PostData, cur_ptr, m_PostDataLen+1);
+    }
+    cur_ptr += m_PostDataLen +1;
+
+    RETRIEVE_NUMBER(m_Size);
+    RETRIEVE_STRING(m_URL);
+ 
+    // Most important assertion! Don't ever remove!
+    PR_ASSERT(cur_ptr == max_ptr);
+    return PR_TRUE;
+}
+
+PRUint32 nsCacheObject::InfoSize(void) const
+{
+    if (!m_pInfo)
+    {
+        ((nsCacheObject*) this)->Info();
+    }
+    return m_info_size;
+}
+
+void nsCacheObject::Init() 
+{
+    m_Expires = PR_IntervalNow() + DEFAULT_EXPIRES;
+    m_Hits = 0;
+}
+
+void nsCacheObject::PageServicesURL(const char* i_Url) 
+{
+//    PR_ASSERT(i_Url && *i_Url);
+    if (!i_Url)
+        return;
+    if (m_PageServicesURL)
+        delete[] m_PageServicesURL;
+    m_PageServicesURL = new char[PL_strlen(i_Url) + 1];
+    PL_strncpy(m_PageServicesURL, i_Url, PL_strlen(i_Url));
+}
+
+void nsCacheObject::PostData(const char* i_data, const PRUint32 i_Len)
+{
+    if (!i_data || (0 ==i_Len))
+        return;
+    if (m_PostData)
+        delete[] m_PostData;
+    m_PostData = new char[i_Len+1];
+    PL_strncpy(m_PostData, i_data, i_Len);
+    m_PostDataLen = i_Len;
+}
+
+PRUint32 nsCacheObject::Read(char* o_Buffer, PRUint32 len)
+{
+    if (!m_pStream)
+    {
+        PR_ASSERT(m_Module >=0);
+        if (0 <= m_Module)
+        {
+            nsCacheModule* pModule = nsCacheManager::GetInstance()->GetModule(m_Module);
+            if (pModule)
+            {
+                m_pStream = pModule->GetStreamFor(this);
+                if (m_pStream)
+                    return m_pStream->Read(o_Buffer, len);
+            }
+        }
+        return 0;
+    }
+    return m_pStream->Read(o_Buffer, len);
+}
+
+#if 0
+/* Caller must free returned string */
+// TODO  change to use PR_stuff...
+const char* nsCacheObject::Trace() const
+{
+    char linebuffer[256];
+    char* total;
+
+    PR_Sprintf(linebuffer, "nsCacheObject:URL=%s,SIZE=%d,ET=%s,\n\tLM=%d,LA=%d,EXP=%d,HITS=%d\n", 
+        m_URL, 
+        m_Size,
+        m_Etag,
+        m_LastModified,
+        m_LastAccessed,
+        m_Expires,
+        m_Hits);
+
+    total = new char[PL_strlen(linebuffer) +1];
+    PL_strcpy(total, linebuffer);
+
+    return total;
+}
+#endif
+
+PRUint32 nsCacheObject::Write(const char* i_Buffer, const PRUint32 len)
+{
+    if (!m_pStream)
+    {
+        PR_ASSERT(m_Module >=0);
+        if (0 <= m_Module)
+        {
+            nsCacheModule* pModule = nsCacheManager::GetInstance()->GetModule(m_Module);
+            if (pModule)
+            {   
+                m_pStream = pModule->GetStreamFor(this);
+                if (m_pStream)
+                    return m_pStream->Write(i_Buffer, len);
+            }
+        }
+        return 0;
+    }
+    return m_pStream->Write(i_Buffer, len);
+}

mozilla/network/cache/nu/src/nsCachePref.cpp

@@ -0,0 +1,128 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsCachePref.h"
+//#include "prefapi.h"
+
+static const PRUint32 MEM_CACHE_SIZE_DEFAULT = 1024*1024;
+static const PRUint32 DISK_CACHE_SIZE_DEFAULT = 5*MEM_CACHE_SIZE_DEFAULT;
+static const PRUint32 BKG_THREAD_SLEEP = 15*60; /*in seconds, 15 minutes */
+static const PRUint16 BUGS_FOUND_SO_FAR = 0;
+/* Find a bug in NU_CACHE, get these many chocolates */
+static const PRUint16 CHOCOLATES_PER_BUG_FOUND = 2^BUGS_FOUND_SO_FAR; 
+
+/* TODO move this to InitNetLib */
+static nsCachePref ThePrefs;
+
+nsCachePref::nsCachePref(void):
+    m_BkgSleepTime(BKG_THREAD_SLEEP),
+    m_DiskCacheDBFilename(new char[6+1]),
+    m_DiskCacheFolder(0),
+    m_DiskCacheSize(DISK_CACHE_SIZE_DEFAULT),
+    m_MemCacheSize(MEM_CACHE_SIZE_DEFAULT),
+    m_RefreshFreq(ONCE)
+{
+    //Read all the stuff from pref here. 
+    //If this changes to nsPref, here is all that needs to be changed.
+    //PRUint32 nTemp;
+	//PREF_GetIntPref("browser.cache.memory_cache_size",&nTemp);
+    //*1024
+}
+
+nsCachePref::~nsCachePref()
+{
+}
+
+const PRUint32  
+nsCachePref::BkgSleepTime(void)
+{
+    return BKG_THREAD_SLEEP; 
+}
+
+PRUint32 nsCachePref::DiskCacheSize()
+{
+    return m_DiskCacheSize;
+}
+
+void nsCachePref::DiskCacheSize(const PRUint32 i_Size)
+{
+    m_DiskCacheSize = i_Size;
+}
+
+PRBool nsCachePref::DiskCacheSSL(void)
+{
+    return m_bDiskCacheSSL;
+}
+
+void nsCachePref::DiskCacheSSL(PRBool bSet)
+{
+    m_bDiskCacheSSL = bSet;
+}
+
+const char* nsCachePref::DiskCacheDBFilename(void)
+{
+    return "fat.db";
+}
+
+const char* nsCachePref::DiskCacheFolder(void)
+{
+    return 0;
+}
+
+nsCachePref* nsCachePref::GetInstance()
+{
+    return &ThePrefs;
+}
+
+PRUint32 nsCachePref::MemCacheSize()
+{
+    return m_MemCacheSize;
+}
+
+void nsCachePref::MemCacheSize(const PRUint32 i_Size)
+{
+    m_MemCacheSize = i_Size;
+}
+
+PRBool nsCachePref::RevalidateInBkg(void)
+{
+    return m_bRevalidateInBkg;
+}
+
+/*
+nsrefcnt nsCachePref::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsCachePref::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsCachePref::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+*/
+

mozilla/network/cache/nu/src/nsCacheTrace.cpp

@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* 
+ * nsCacheTrace
+ *
+ * Gagan Saksena 02/02/98
+ * 
+ */
+
+#include "nsCacheTrace.h"
+
+static nsCacheTrace TheTrace;
+
+nsCacheTrace::nsCacheTrace():m_bEnabled(PR_FALSE)
+{
+
+}
+
+void nsCacheTrace::Enable(PRBool bEnable)
+{
+    TheTrace.m_bEnabled = bEnable;
+}
+
+PRBool nsCacheTrace::IsEnabled(void)
+{
+    return TheTrace.m_bEnabled;
+}
+

mozilla/network/cache/nu/src/nsDiskModule.cpp

@@ -0,0 +1,271 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* 
+ * nsDiskModule
+ *
+ * Gagan Saksena 02/02/98
+ * 
+ */
+
+#include "prtypes.h"
+#include "prmem.h"
+#include "plstr.h"
+#include "prlog.h"
+
+#include "nsDiskModule.h"
+#include "nsCacheObject.h"
+#include "nsCacheManager.h"
+
+#include "mcom_db.h"
+
+#define ENSURE_INIT  \
+    if (!m_pDB)     \
+    {               \
+        nsDiskModule* pThis = (nsDiskModule*) this; \
+        PRBool res = pThis->InitDB();   \
+        PR_ASSERT(res);                 \
+    }
+
+//
+// Constructor: nsDiskModule
+//
+nsDiskModule::nsDiskModule(const PRUint32 size):
+    nsCacheModule(size),
+    m_pDB(0)
+{
+}
+
+nsDiskModule::~nsDiskModule()
+{
+    if (m_pDB)
+    {
+        (*m_pDB->sync)(m_pDB, 0);
+        (*m_pDB->close)(m_pDB);
+        m_pDB = 0;
+    }
+}
+
+PRBool nsDiskModule::AddObject(nsCacheObject* io_pObject)
+{
+    ENSURE_INIT;
+    
+    if (!m_pDB || !io_pObject)
+    {   
+        // Set some error state TODO
+        return PR_FALSE;
+    }   
+
+    if (io_pObject->Address())
+    {
+        MonitorLocker ml(this);
+        // TODO optimize these further- make static - Gagan
+        DBT* key = PR_NEW(DBT);
+        DBT* data = PR_NEW(DBT);
+        
+        io_pObject->Module(nsCacheManager::DISK);
+
+        
+        key->data = (void*)io_pObject->Address(); 
+        /* Later on change this to include post data- io_pObject->KeyData() */
+        key->size = PL_strlen(io_pObject->Address());
+
+        data->data = io_pObject->Info();
+        data->size = io_pObject->InfoSize();
+
+        int status = (*m_pDB->put)(m_pDB, key, data, 0);
+        if (status == 0)
+        {
+//            if (m_Sync == EVERYTIME)
+                status = (*m_pDB->sync)(m_pDB, 0);
+        }
+        PR_Free(key);
+        PR_Free(data);
+        return (status == 0);
+    }
+    return PR_FALSE;
+}
+
+PRBool nsDiskModule::Contains(nsCacheObject* io_pObject) const
+{
+    //return Contains(io_oObject->Address());
+
+    ENSURE_INIT;
+
+    if (!m_pDB || !io_pObject)
+        return PR_FALSE;
+
+    nsCacheObject* pTemp = GetObject(io_pObject->Address());
+    if (pTemp)
+    {
+        io_pObject = pTemp;  /*bug */
+        return PR_TRUE;
+    }
+    return PR_FALSE;
+}
+
+PRBool nsDiskModule::Contains(const char* i_url) const
+{
+
+    ENSURE_INIT;
+
+    if (!m_pDB || !i_url || !*i_url)
+        return PR_FALSE;
+
+    DBT key, data;
+
+    key.data = (void*) i_url;
+    key.size = PL_strlen(i_url);
+
+    int status = (*m_pDB->get)(m_pDB, &key, &data, 0);
+
+    return (status == 0);
+
+}
+
+void nsDiskModule::GarbageCollect(void)
+{
+    MonitorLocker ml(this);
+}
+
+nsCacheObject* nsDiskModule::GetObject(const PRUint32 i_index) const
+{
+    ENSURE_INIT;
+    if (!m_pDB)
+        return 0;
+//todo
+    return 0;
+}
+
+nsCacheObject* nsDiskModule::GetObject(const char* i_url) const
+{
+    ENSURE_INIT;
+
+    if (!m_pDB || !i_url || !*i_url)
+        return 0;
+
+    DBT key, data;
+
+    key.data = (void*) i_url;
+    key.size = PL_strlen(i_url);
+
+    if (0 == (*m_pDB->get)(m_pDB, &key, &data, 0))
+    {
+        nsCacheObject* pTemp = new nsCacheObject();
+        pTemp->Info(data.data);
+        return pTemp;
+    }
+
+    return 0;
+}
+
+nsStream* nsDiskModule::GetStreamFor(const nsCacheObject* i_pObject)
+{
+    ENSURE_INIT;
+    return 0;
+}
+
+PRBool nsDiskModule::InitDB(void) 
+{
+    MonitorLocker ml(this);
+
+    if (m_pDB)
+        return PR_TRUE;
+
+    HASHINFO hash_info = {
+        16*1024,  /* bucket size */
+        0,        /* fill factor */
+        0,        /* number of elements */
+        0,        /* bytes to cache */
+        0,        /* hash function */
+        0};       /* byte order */
+
+    m_pDB = dbopen(
+        nsCachePref::GetInstance()->DiskCacheDBFilename(), 
+        O_RDWR | O_CREAT, 
+        0600, 
+        DB_HASH, 
+        &hash_info);
+
+    if (!m_pDB)
+        return PR_FALSE;
+
+    /* Open and read in the number of existing entries */
+    m_Entries = 0;
+    int status;
+    DBT key, data;
+    if(!(status = (*m_pDB->seq)(m_pDB, &key, &data, R_FIRST)))
+    {
+        while(!(status = (*m_pDB->seq) (m_pDB, &key, &data, R_NEXT)))
+        {
+            /* Also validate the corresponding file here */
+            //TODO
+            m_Entries++;
+        }
+    }
+
+    if (status < 0)
+        return PR_FALSE;
+
+    return PR_TRUE;
+}
+
+PRBool nsDiskModule::ReduceSizeTo(const PRUint32 i_NewSize)
+{
+    //TODO
+    return PR_TRUE;
+}
+
+PRBool nsDiskModule::Remove(const char* i_url)
+{
+    ENSURE_INIT;
+    //TODO
+    // Also remove the file corresponding to this item. 
+    return PR_FALSE;
+}
+
+PRBool nsDiskModule::Remove(const PRUint32 i_index)
+{
+    ENSURE_INIT;
+    //TODO
+    // Also remove the file corresponding to this item. 
+    return PR_FALSE;
+}
+
+PRBool nsDiskModule::Revalidate(void)
+{
+    ENSURE_INIT;
+    //TODO - This will add a dependency on HTTP lib
+    return PR_FALSE;
+}
+
+void nsDiskModule::SetSize(const PRUint32 i_Size)
+{
+    MonitorLocker ml(this);
+    m_Size = i_Size;
+    if (m_Size >0)
+    {
+        ReduceSizeTo(m_Size);
+    }
+    else
+    {
+        RemoveAll();
+    }
+}
+
+#undef ENSURE_INIT

mozilla/network/cache/nu/src/nsFFEntry.cpp

@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsFFEntry.h"
+#include "prmem.h"
+#include "prlog.h"
+
+nsFFEntry::nsFFEntry():
+    m_ID(0),
+    m_pFirstObject(0),
+    m_pNextEntry(0),
+    m_Objects(0)
+{
+}
+
+nsFFEntry::nsFFEntry(const PRUint32 i_ID):
+    m_ID(i_ID),
+    m_pFirstObject(0),
+    m_pNextEntry(0),
+    m_Objects(0)
+{
+}
+
+nsFFEntry::nsFFEntry(const PRUint32 i_ID, const PRUint32 i_offset, const PRUint32 i_size):
+    m_ID(i_ID),
+    m_pFirstObject(new nsFFObject(i_ID, i_offset, i_size)),
+    m_pNextEntry(0),
+    m_Objects(1)
+{
+    //PR_ASSERT(i_offset > nsFlatFile::HeaderSize());
+}
+
+nsFFEntry::~nsFFEntry()
+{
+    PR_FREEIF(m_pFirstObject);
+    PR_FREEIF(m_pNextEntry);
+}
+
+
+/*
+nsrefcnt nsFFEntry::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsFFEntry::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsFFEntry::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+
+nsFFEntry::
+*/
+
+PRBool nsFFEntry::AddObject(const nsFFObject* i_object)
+{
+    PR_ASSERT(i_object);
+    if (!i_object)
+        return PR_FALSE;
+    if (!m_pFirstObject)
+    {
+        m_pFirstObject = (nsFFObject*) i_object;
+        m_Objects++;
+    }
+    return m_pFirstObject->Add(i_object);
+    return PR_FALSE;
+}

mozilla/network/cache/nu/src/nsFFObject.cpp

@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsFFObject.h"
+#include "prlog.h"
+
+nsFFObject::nsFFObject(PRUint32 i_ID, PRUint32 i_Offset, PRUint32 i_Size):
+    m_ID(i_ID), 
+    m_Offset(i_Offset),
+    m_Size(i_Size),
+    m_pNext(0)
+{
+}
+
+nsFFObject::~nsFFObject()
+{
+}
+
+
+PRBool nsFFObject::Add(const nsFFObject* i_object)
+{
+    PR_ASSERT(i_object);
+    if (!i_object)
+        return PR_FALSE;
+    if (m_pNext)
+        return m_pNext->Add(i_object);
+    m_pNext = (nsFFObject*) i_object;
+    return PR_TRUE;
+}

mozilla/network/cache/nu/src/nsFileStream.cpp

@@ -0,0 +1,71 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+#include "nsFileStream.h"
+
+nsFileStream::nsFileStream(XP_File* i_pFile):m_pFile(i_pFile)
+{
+    PR_ASSERT(m_pFile);
+}
+
+nsFileStream::~nsFileStream()
+{
+}
+
+/*
+nsrefcnt nsFileStream::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsFileStream::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsFileStream::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+*/
+
+PRInt32 nsFileStream::Read(void* o_Buffer, PRUint32 i_Len)
+{
+    if (m_pFile)
+    {
+        int status = XP_FileRead(o_Buffer, i_Len, *m_pFile);
+        return status;
+    }
+    return 0;
+}
+
+PRInt32 nsFileStream::Write(const void* i_Buffer, PRUint32 i_Len)
+{
+    if (m_pFile)
+    {
+        int status = XP_FileWrite(i_Buffer, i_Len, *m_pFile);
+        return status;
+    }
+    return 0;
+}

mozilla/network/cache/nu/src/nsFlatFile.cpp

@@ -0,0 +1,153 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsFlatFile.h"
+#include "plstr.h"
+#include "prmem.h"
+#include "memory.h"
+
+static const PRUint32 kFLAT_FILE_VERSION = 1;
+static const PRUint32 kMAGIC_NUMBER = 3739142906; // Facede de //TODO
+static const char kFILL_CHAR = 'G';
+
+nsFlatFile::nsFlatFile(const char* i_pFilename, const PRUint32 i_Size): 
+    m_bIsValid(PR_FALSE), 
+    m_pFD(0),
+    m_Size(i_Size),
+    m_HeaderSize(2*sizeof(PRUint32)),
+    m_pFilename(new char[PL_strlen(i_pFilename) + 1])
+
+{
+    PL_strcpy(m_pFilename, i_pFilename);
+    Init();
+}
+
+nsFlatFile::~nsFlatFile()
+{
+    delete[] m_pFilename;
+    if (m_pFD)
+    {
+        PR_Close(m_pFD);
+        m_pFD = 0;
+    }
+}
+
+void nsFlatFile::Init(void)
+{
+    if (m_pFilename)
+    {
+        m_pFD = PR_Open(m_pFilename, PR_CREATE_FILE | PR_RDWR, 0600);
+        if (!m_pFD)
+        {
+            return;
+        }
+        PRFileInfo info;
+        // if the file is just being created then write magic number 
+        // and flat file version, else verify
+        if (PR_SUCCESS == PR_GetOpenFileInfo(m_pFD, &info))
+        {
+            PRInt32 status;
+            if (info.size > 0)
+            {
+                char* buf = new char[m_HeaderSize];
+                //verify
+                status = PR_Read(m_pFD, buf, m_HeaderSize);
+                if (status > 0)
+                {
+                    char* cur_ptr = buf;
+                    PRUint32 test;
+                    COPY_INT32(&test, cur_ptr);
+                    if (test != kMAGIC_NUMBER)
+                    {
+                        PR_Close(m_pFD);
+                        m_pFD = 0;
+                        //PR_ASSERT(!"Bad flat file!");
+                        return;
+                    }
+                    cur_ptr += sizeof(PRUint32);
+                    COPY_INT32(&test, cur_ptr);
+                    if (test != kFLAT_FILE_VERSION)
+                    {
+                        PR_Close(m_pFD);
+                        m_pFD = 0;
+                        //PR_ASSERT(!"Bad version of flat file format!");
+                        return;
+                    }
+                    //Everything was as expected so
+                    m_bIsValid = PR_TRUE;
+                }
+                delete[] buf;
+            }
+            else
+            {
+                //write out
+                char* buf = new char[m_HeaderSize]; 
+                PRUint32 test = m_HeaderSize;
+                char* cur_ptr = buf;
+                COPY_INT32((void*) cur_ptr, &kMAGIC_NUMBER);
+                cur_ptr += sizeof(PRUint32);
+                COPY_INT32((void*) cur_ptr, &kFLAT_FILE_VERSION);
+                status = PR_Write(m_pFD, buf, m_HeaderSize);
+                delete[] buf;
+
+                PRBool bFillChar = PR_FALSE;
+
+                if (bFillChar)
+                {
+                    buf = new char[kPAGE_SIZE];
+                    for (int i = 0; i< kPAGE_SIZE; ++i)
+                        buf[i] = kFILL_CHAR;
+                    int j = (int)((m_Size - m_HeaderSize) / kPAGE_SIZE);
+                    int k;
+                    for (k = j; k > 0; --k)
+                    {
+                        status = PR_Write(m_pFD, (void*) buf, kPAGE_SIZE);
+                    }
+                    delete[] buf;
+                    int remaining = (m_Size-m_HeaderSize) % kPAGE_SIZE;
+                    for (k = remaining; k>0; --k)
+                    {
+                        status = PR_Write(m_pFD, (void*) &kFILL_CHAR, 1);
+                    }
+                }
+            }
+        }
+    }
+}
+
+/*
+nsrefcnt nsFlatFile::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsFlatFile::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsFlatFile::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+*/

mozilla/network/cache/nu/src/nsHash.cpp

@@ -0,0 +1,142 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "prmem.h"
+#include "nsHash.h"
+
+//
+// Key operations
+//
+
+static PR_CALLBACK PLHashNumber _hashValue(const void *key) 
+{
+  return ((const nsHashKey *) key)->HashValue();
+}
+
+static PR_CALLBACK PRIntn _hashKeyCompare(const void *key1, const void *key2) {
+  return ((const nsHashKey *) key1)->Equals((const nsHashKey *) key2);
+}
+
+static PR_CALLBACK PRIntn _hashValueCompare(const void *value1,
+                                            const void *value2) {
+  // We're not going to make any assumptions about value equality
+  return 0;
+}
+
+//
+// Memory callbacks
+//
+
+static PR_CALLBACK void *_hashAllocTable(void *pool, PRSize size) {
+  return PR_MALLOC(size);
+}
+
+static PR_CALLBACK void _hashFreeTable(void *pool, void *item) {
+  PR_DELETE(item);
+}
+
+static PR_CALLBACK PLHashEntry *_hashAllocEntry(void *pool, const void *key) {
+  return PR_NEW(PLHashEntry);
+}
+
+static PR_CALLBACK void _hashFreeEntry(void *pool, PLHashEntry *entry, 
+                                       PRUintn flag) {
+  if (flag == HT_FREE_ENTRY) {
+    delete (nsHashKey *) (entry->key);
+    PR_DELETE(entry);
+  }
+}
+
+static PLHashAllocOps _hashAllocOps = {
+    _hashAllocTable, _hashFreeTable,
+    _hashAllocEntry, _hashFreeEntry
+};
+
+//
+// Enumerator callback
+//
+
+static PR_CALLBACK PRIntn _hashEnumerate(PLHashEntry *he, PRIntn i, void *arg)
+{
+  return ((nsHashEnumFunc) arg)((nsHashKey *) he->key, he->value) ? 
+    HT_ENUMERATE_NEXT : 
+    HT_ENUMERATE_STOP;
+}
+
+//
+// HashKey 
+//
+nsHashKey::nsHashKey(void)
+{
+}
+
+nsHashKey::~nsHashKey(void)
+{
+}
+
+nsHash::nsHash(PRUint32 aInitSize) {
+  hashtable = PL_NewHashTable(aInitSize,
+                              _hashValue,
+                              _hashKeyCompare,
+                              _hashValueCompare,
+                              &_hashAllocOps,
+                              NULL);
+}
+
+nsHash::~nsHash() {
+  PL_HashTableDestroy(hashtable);
+}
+
+void *nsHash::Put(nsHashKey *aKey, void *aData) {
+  void *res =  NULL;
+  PLHashNumber hash = aKey->HashValue();
+  PLHashEntry *he;
+  PLHashEntry **hep = PL_HashTableRawLookup(hashtable, hash, (void *) aKey);
+
+  if ((he = *hep) != NULL) {
+    res = he->value;
+    he->value = aData;
+  } else {
+    PL_HashTableRawAdd(hashtable, hep, hash,
+                       (void *) aKey->Clone(), aData);
+  }
+
+  return res;
+}
+
+void *nsHash::Get(nsHashKey *aKey) {
+  return PL_HashTableLookup(hashtable, (void *) aKey);
+}
+
+void *nsHash::Remove(nsHashKey *aKey) {
+  PLHashNumber hash = aKey->HashValue();
+  PLHashEntry *he;
+  PLHashEntry **hep = PL_HashTableRawLookup(hashtable, hash, (void *) aKey);
+  void *res = NULL;
+  
+  if ((he = *hep) != NULL) {
+    res = he->value;
+    PL_HashTableRawRemove(hashtable, hep, he);
+  }
+
+  return res;
+}
+
+void nsHash::Enumerate(nsHashEnumFunc aEnumFunc) {
+  PL_HashTableEnumerateEntries(hashtable, _hashEnumerate, aEnumFunc);
+}

mozilla/network/cache/nu/src/nsMemCacheObject.cpp

@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* 
+ * nsMemCacheObject
+ *
+ * Gagan Saksena 04/22/98
+ * 
+ */
+#include "prtypes.h"
+#include "nsMemCacheObject.h"
+
+nsMemCacheObject::~nsMemCacheObject()
+{
+    if (m_pNextObject)
+    {
+        delete m_pNextObject;
+        m_pNextObject = 0;
+    }
+
+    if (m_pObject)
+    {
+        delete m_pObject;
+        m_pObject = 0;
+    }
+
+    // Free the void* if allocated - TODO
+
+}

mozilla/network/cache/nu/src/nsMemModule.cpp

@@ -0,0 +1,241 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "prtypes.h"
+#include "plstr.h"
+#include "prlog.h"
+
+#include "nsMemModule.h"
+#include "nsMemCacheObject.h"
+#include "nsCacheManager.h"
+
+/* 
+ * nsMemModule
+ *
+ * Gagan Saksena 02/02/98
+ * 
+ */
+
+//NS_DEFINE_IID(kMemModuleIID, NS_MEMMODULE_IID);
+
+nsMemModule::nsMemModule(const PRUint32 size): 
+    m_pFirstObject(0),
+    nsCacheModule(size)
+{
+    SetSize(size);
+}
+
+nsMemModule::~nsMemModule()
+{
+    if (m_pFirstObject) {
+        delete m_pFirstObject;
+        m_pFirstObject = 0;
+    }
+}
+
+PRBool nsMemModule::AddObject(nsCacheObject* io_pObject)
+{
+
+#if 0
+    if (io_pObject)
+    {
+        m_ht.Put(io_pObject->Address(), io_pObject);
+    }
+    return PR_FALSE;
+#endif
+
+    if (io_pObject)
+    {
+        MonitorLocker ml(this);
+        if (m_pFirstObject) 
+        {
+            LastObject()->Next(new nsMemCacheObject(io_pObject)); 
+        }
+        else
+        {
+            m_pFirstObject = new nsMemCacheObject(io_pObject);
+        }
+        m_Entries++;
+
+        io_pObject->Module(nsCacheManager::MEM);
+
+        return PR_TRUE;
+    }
+    return PR_FALSE;
+}
+
+PRBool nsMemModule::Contains(const char* i_url) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+
+    if (m_pFirstObject && i_url && *i_url)
+    {
+        nsMemCacheObject* pObj = m_pFirstObject;
+        PRUint32 inlen = PL_strlen(i_url);
+        do
+        {
+            if (0 == PL_strncasecmp(pObj->ThisObject()->Address(), i_url, inlen))
+                return PR_TRUE;
+            pObj = pObj->Next();
+        }
+        while (pObj);
+    }
+    return PR_FALSE;
+}
+
+PRBool nsMemModule::Contains(nsCacheObject* i_pObject) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+
+    if (i_pObject && *i_pObject->Address())
+    {
+        return this->Contains(i_pObject->Address());
+    }
+    return 0;
+}
+
+void nsMemModule::GarbageCollect(void)
+{
+    MonitorLocker ml(this);
+
+    if (m_Entries > 0)
+    {
+        nsEnumeration* pEnum = Enumeration();
+        PRUint32 index = 0;
+        while (pEnum->HasMoreElements())
+        {
+            nsCacheObject* pObj = (nsCacheObject*) pEnum->NextElement();
+            PR_ASSERT(pObj);
+            if (pObj->IsExpired())
+            {
+                PRBool status = Remove(index);
+                PR_ASSERT(status == PR_TRUE);
+            }
+            ++index;
+        }
+    }
+}
+
+nsCacheObject* nsMemModule::GetObject(const PRUint32 i_index) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    nsMemCacheObject* pNth = 0;
+    if (m_pFirstObject)
+    {
+        PRUint32 index = 0;
+        pNth = m_pFirstObject;
+        while (pNth->Next() && (index++ != i_index ))
+        {
+            pNth = pNth->Next();
+        }
+    }
+    return pNth->ThisObject();
+}
+
+nsCacheObject* nsMemModule::GetObject(const char* i_url) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    if (m_pFirstObject && i_url && *i_url)
+    {
+        nsMemCacheObject* pObj = m_pFirstObject;
+        int inlen = PL_strlen(i_url);
+        do
+        {
+            if (0 == PL_strncasecmp(pObj->ThisObject()->Address(), i_url, inlen))
+                return pObj->ThisObject();
+            pObj = pObj->Next();
+        }
+        while (pObj);
+    }
+    return 0;
+}
+
+nsStream* nsMemModule::GetStreamFor(const nsCacheObject* i_pObject)
+{
+    MonitorLocker ml(this);
+    return 0;
+}
+
+nsMemCacheObject* nsMemModule::LastObject(void) const
+{
+    MonitorLocker ml((nsMonitorable*)this);
+    
+    nsMemCacheObject* pLast = 0;
+    if (m_pFirstObject)
+    {
+        pLast = m_pFirstObject;
+        while (pLast->Next())
+            pLast = pLast->Next();
+    }
+    return pLast;
+}
+
+PRBool nsMemModule::ReduceSizeTo(const PRUint32 i_NewSize)
+{
+    //TODO
+    return PR_TRUE;
+}
+
+PRBool nsMemModule::Remove(const char* i_url)
+{
+    //TODO
+    return PR_FALSE;
+}
+
+PRBool nsMemModule::Remove(const PRUint32 i_index)
+{
+    //TODO
+    return PR_FALSE;
+}
+
+/*
+NS_IMETHOD nsMemModule::QueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+
+}
+NS_IMETHOD_(nsrefcnt) nsMemModule::AddRef(void)
+{
+
+}
+
+NS_IMETHOD_(nsrefcnt) nsMemModule::Release(void)
+{
+
+}
+*/
+
+/*
+PRUint32 nsMemModule::nsMemKey::HashValue()
+{
+    return 0;
+}
+PRBool nsMemModule::nsMemKey::Equals(nsHashKey *aKey)
+{
+    return PR_FALSE;
+}
+
+nsHashKey* nsMemModule::nsMemKey::Clone()
+{
+    return new nsMemModule::nsMemKey();
+}
+
+nsMemModule::nsMemKey::neMemKey()
+{
+}
+
+  */

mozilla/network/cache/nu/src/nsMemStream.cpp

@@ -0,0 +1,59 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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.
+ *
+ * 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.
+ */
+
+#include "nsMemStream.h"
+
+nsMemStream::nsMemStream()
+{
+}
+
+nsMemStream::~nsMemStream()
+{
+}
+/*
+nsrefcnt nsMemStream::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsMemStream::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsMemStream::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+*/
+
+PRInt32 nsMemStream::Read(void* o_Buffer, PRUint32 i_Len)
+{
+    return 0;
+}
+
+PRInt32 nsMemStream::Write(const void* i_Buffer, PRUint32 i_Len)
+{
+    return 0;
+}

mozilla/network/cache/nu/src/nsTOC.cpp

@@ -0,0 +1,262 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsTOC.h"
+#include "plstr.h"
+#include "memory.h"
+#include "prlog.h"
+
+static const PRUint32 kTOC_FLAT_FILE_VERSION = 1;
+static const PRUint32 kTOC_MAGIC_NUMBER = 19712809;
+static const PRUint32 kTOC_HEADER_SIZE = 2* sizeof(PRUint32);
+
+//TODO change this to a memory mapped file!
+nsTOC::nsTOC(const char* i_pFilename, nsFlatFile* i_pFlatFile):
+    m_pFilename( new char[PL_strlen(i_pFilename) + 1]),
+    m_pFD(0),
+    m_bIsValid(PR_FALSE),
+    m_pFlatFile(i_pFlatFile),
+    m_Entries(1)
+{
+    PL_strcpy(m_pFilename, i_pFilename);
+    Init();
+}
+
+nsTOC::~nsTOC()
+{
+    delete[] m_pFilename;
+    if (m_pFD)
+    {
+        PR_Close(m_pFD);
+        m_pFD = 0;
+    }
+}
+
+/*
+nsrefcnt nsTOC::AddRef(void)
+{
+    return ++m_RefCnt;
+}
+nsrefcnt nsTOC::Release(void)
+{
+    if (--m_RefCnt == 0)
+    {
+        delete this;
+        return 0;
+    }
+    return m_RefCnt;
+}
+
+nsresult nsTOC::QueryInterface(const nsIID& aIID,
+                                        void** aInstancePtrResult)
+{
+    return NS_OK;
+}
+
+*/
+
+void nsTOC::Init(void)
+{
+    if (m_pFilename)
+    {
+        m_pFD = PR_Open(m_pFilename, PR_CREATE_FILE | PR_RDWR, 0600);
+        if (!m_pFD)
+        {
+            return;
+        }
+        PRFileInfo info;
+        // if the file is just being created then write magic number 
+        // and flat file version, else verify
+        if (PR_SUCCESS == PR_GetOpenFileInfo(m_pFD, &info))
+        {
+            PRInt32 status;
+            if (info.size > 0)
+            {
+                char buf[kTOC_HEADER_SIZE];
+                //verify
+                status = PR_Read(m_pFD, &buf, kTOC_HEADER_SIZE);
+                if (status > 0)
+                {
+                    char* cur_ptr = &buf[0];
+                    PRUint32 test;
+                    COPY_INT32(&test, cur_ptr);
+                    if (test != kTOC_MAGIC_NUMBER)
+                    {
+                        PR_Close(m_pFD);
+                        m_pFD = 0;
+                        //PR_ASSERT(!"Bad TOC file!");
+                        return;
+                    }
+                    cur_ptr += sizeof(PRUint32);
+                    COPY_INT32(&test, cur_ptr);
+                    if (test != kTOC_FLAT_FILE_VERSION)
+                    {
+                        PR_Close(m_pFD);
+                        m_pFD = 0;
+                        //PR_ASSERT(!"Bad version of TOC file!");
+                        return;
+                    }
+
+                    // Number of entries in the TOC
+                    status = PR_Read(m_pFD, &buf, sizeof(PRUint32));
+                    if (status > 0)
+                    {
+                        cur_ptr = &buf[0];
+                        COPY_INT32(&m_Entries, cur_ptr);
+                    }
+                    //Read in the list of entries 
+                    nsFFEntry* pCurrent;
+                    Serialize(pCurrent, PR_TRUE);
+                    //There has got to be a free entry.
+                    PR_ASSERT(pCurrent /*&& pCurrent->IsValid() TODO*/);
+                    m_pContents = pCurrent;
+                    PRUint32 count = 1; //Definitely one!
+                    Serialize(pCurrent, PR_TRUE);
+                    while (pCurrent)
+                    {
+                        count++;
+                        m_pContents->AddEntry(pCurrent);
+                        Serialize(pCurrent, PR_TRUE);
+                    }
+
+                    PR_ASSERT(count == m_Entries);
+
+                    //Everything was as expected so
+                    m_bIsValid = PR_TRUE;
+                }
+            }
+            else
+            {
+                //write out
+                char* buf = new char[kTOC_HEADER_SIZE]; 
+                char* cur_ptr = buf;
+                COPY_INT32((void*) cur_ptr, &kTOC_MAGIC_NUMBER);
+                cur_ptr += sizeof(PRUint32);
+                COPY_INT32((void*) cur_ptr, &kTOC_FLAT_FILE_VERSION);
+                status = PR_Write(m_pFD, buf, kTOC_HEADER_SIZE);
+
+                // Number of entries in the TOC
+                COPY_INT32((void*)buf, &m_Entries);
+                status = PR_Write(m_pFD, buf, sizeof(PRUint32));
+
+                delete[] buf;
+
+                //Since the TOC is being created afresh, reset the flat file with everything marked as 
+                //free. 
+                m_pContents = new nsFFEntry(
+                                    0,
+                                    m_pFlatFile->HeaderSize(), 
+                                    m_pFlatFile->Size()-m_pFlatFile->HeaderSize());
+                //Serialize the only entry-
+                Serialize(m_pContents);
+
+                m_bIsValid = PR_TRUE;
+            }
+        }
+    }
+}
+
+nsFFEntry* nsTOC::AddEntry(PRUint32 i_Size)
+{
+    if (i_Size > FreeEntry()->Size())
+    {
+        //Garbage collect
+    }
+    nsFFEntry* pEntry = new nsFFEntry(
+            NextID(), 
+            FreeEntry()->FirstObject()->Offset(), 
+            i_Size);
+
+    return pEntry;
+}
+
+PRBool nsTOC::Serialize(nsFFEntry* io_Entry, PRBool bRead )
+{
+    PR_ASSERT(m_pFD);
+    if (bRead)
+    {
+        io_Entry = new nsFFEntry();
+        if (!io_Entry)
+            return PR_FALSE;
+        char* buf = new char[sizeof(PRUint32)];
+        PRUint32 temp, objects, size;
+        //Read ID
+        PR_Read(m_pFD, buf, sizeof(PRUint32));
+        COPY_INT32(&temp, buf);
+        io_Entry->ID(temp);
+        //Read number of objects
+        PR_Read(m_pFD, buf, sizeof(PRUint32));
+        COPY_INT32(&objects, buf);
+        //Read objects
+        for (int i= objects; i>0; --i)
+        {
+            PR_Read(m_pFD, buf, sizeof(PRUint32));
+            COPY_INT32(&temp, buf);
+            PR_Read(m_pFD, buf, sizeof(PRUint32));
+            COPY_INT32(&size, buf);
+            io_Entry->AddObject(new nsFFObject(io_Entry->ID(), temp, size));
+        }
+        delete[] buf;
+        PR_ASSERT(io_Entry->Objects() == objects);
+        if (io_Entry->Objects() != objects)
+            return PR_FALSE;
+        return PR_TRUE;
+    }
+    else
+    {
+        PR_ASSERT(io_Entry);
+        if (!io_Entry)
+            return PR_FALSE;
+        
+        //TODO speed this up by increasing the buffer size to write out
+        //more than one int at a time!
+
+        char* buf = new char[sizeof(PRUint32)];
+        PRUint32 temp;
+        //Write ID
+        temp = io_Entry->ID();
+        COPY_INT32((void*) buf, &temp);
+        PR_Write(m_pFD, buf, sizeof(PRUint32));
+        //Write number of Objects
+        temp = io_Entry->Objects();
+        COPY_INT32((void*) buf, &temp);
+        PR_Write(m_pFD, buf, sizeof(PRUint32));
+        //Write Objects
+        if (temp > 0)
+        {
+            nsFFObject* current = io_Entry->FirstObject();
+            while (current)
+            {
+                PR_ASSERT(current->ID() == io_Entry->ID());
+                //Offset
+                temp = current->Offset();
+                COPY_INT32((void*) buf, &temp);
+                PR_Write(m_pFD, buf, sizeof(PRUint32));
+                //size
+                temp = current->Size();
+                COPY_INT32((void*) buf, &temp);
+                PR_Write(m_pFD, buf, sizeof(PRUint32));
+
+                current = current->Next();
+            }
+        }
+        delete[] buf;
+        return PR_TRUE;
+    }
+    return PR_FALSE;
+}

mozilla/network/cache/nu/tests/cb/CacheTreeView.cpp

@@ -0,0 +1,104 @@
+// CacheTreeView.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "cb.h"
+#include "CacheTreeView.h"
+#include "cbdoc.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CCacheTreeView
+
+IMPLEMENT_DYNCREATE(CCacheTreeView, CTreeView)
+
+CCacheTreeView::CCacheTreeView()
+{
+	m_pImgList = new CImageList();
+}
+
+CCacheTreeView::~CCacheTreeView()
+{
+	delete m_pImgList;
+}
+
+
+BEGIN_MESSAGE_MAP(CCacheTreeView, CTreeView)
+	//{{AFX_MSG_MAP(CCacheTreeView)
+	ON_WM_CREATE()
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+int CCacheTreeView::OnCreate(LPCREATESTRUCT lpCreateStruct) 
+{
+
+	lpCreateStruct->style = TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT;
+	if (CView::OnCreate(lpCreateStruct) == -1)
+		return -1;
+
+	GetDocument()->m_pTreeView = this;
+
+	// Create the Image List
+	m_pImgList->Create(IDB_CACHEICONS,16,0,RGB(255,0,255));
+	m_pImgList->SetBkColor(GetSysColor(COLOR_WINDOW));
+
+	// Attach image list to Tree
+	GetTreeCtrl().SetImageList(m_pImgList, TVSIL_NORMAL);
+	GetTreeCtrl().SetIndent(10);
+	return 0;
+}
+
+void CCacheTreeView::OnDraw(CDC* pDC)
+{
+	CDocument* pDoc = GetDocument();
+	// TODO: add draw code here
+}
+
+
+#ifdef _DEBUG
+void CCacheTreeView::AssertValid() const
+{
+	CTreeView::AssertValid();
+}
+
+void CCacheTreeView::Dump(CDumpContext& dc) const
+{
+	CTreeView::Dump(dc);
+}
+
+CCbDoc* CCacheTreeView::GetDocument()
+{ 
+	ASSERT(m_pDocument->IsKindOf(RUNTIME_CLASS(CCbDoc)));
+	return (CCbDoc*)m_pDocument; 
+}
+
+#endif //_DEBUG
+
+void CCacheTreeView::Populate() {
+	AssertValid();
+	GetTreeCtrl().DeleteAllItems();
+
+	TV_INSERTSTRUCT insertStruct;
+	TV_ITEM itemStruct;
+
+	insertStruct.hParent = TVI_ROOT;
+	insertStruct.hInsertAfter = TVI_FIRST;
+	insertStruct.item = itemStruct;
+
+	HTREEITEM hti = GetTreeCtrl().InsertItem(&insertStruct);
+	GetTreeCtrl().SetItemText(hti, "Your Cache");
+
+	insertStruct.hParent = hti;
+	insertStruct.hInsertAfter = hti;
+	insertStruct.item = itemStruct;
+
+	HTREEITEM htiDisk = GetTreeCtrl().InsertItem(&insertStruct);
+	GetTreeCtrl().SetItemText(htiDisk, "Disk");
+	HTREEITEM htiMem = GetTreeCtrl().InsertItem(&insertStruct);
+	GetTreeCtrl().SetItemText(htiMem, "Memory");
+}

mozilla/network/cache/nu/tests/cb/CacheTreeView.h

@@ -0,0 +1,54 @@
+// CacheTreeView.h : header file
+//
+#ifndef _CacheTreeView_h_
+#define _CacheTreeView_h_
+
+#include <afxcview.h>
+class CImageList;
+class CCbDoc;
+class CCacheTreeView : public CTreeView
+{
+protected:
+	CCacheTreeView();           // protected constructor used by dynamic creation
+	DECLARE_DYNCREATE(CCacheTreeView)
+
+// Attributes
+public:
+	CCbDoc* GetDocument();
+	void Populate();
+// Operations
+public:
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CCacheTreeView)
+	protected:
+	virtual void OnDraw(CDC* pDC);      // overridden to draw this view
+	//}}AFX_VIRTUAL
+
+protected:
+	virtual ~CCacheTreeView();
+#ifdef _DEBUG
+	virtual void AssertValid() const;
+	virtual void Dump(CDumpContext& dc) const;
+#endif
+
+	// Generated message map functions
+protected:
+	//{{AFX_MSG(CCacheTreeView)
+	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
+	//}}AFX_MSG
+
+	DECLARE_MESSAGE_MAP()
+
+	CImageList* m_pImgList;
+};
+
+#ifndef _DEBUG  // debug version in AnimalView.cpp
+inline CCbDoc* CCacheTreeView::GetDocument()
+   { return (CCbDoc*)m_pDocument; }
+#endif
+
+#endif
+
+

mozilla/network/cache/nu/tests/cb/MainFrm.cpp

@@ -0,0 +1,128 @@
+// MainFrm.cpp : implementation of the CMainFrame class
+//
+
+#include "stdafx.h"
+#include "cb.h"
+
+#include "MainFrm.h"
+#include "CacheTreeView.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CMainFrame
+
+IMPLEMENT_DYNCREATE(CMainFrame, CFrameWnd)
+
+BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
+	//{{AFX_MSG_MAP(CMainFrame)
+	ON_WM_CREATE()
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+static UINT indicators[] =
+{
+	ID_SEPARATOR,           // status line indicator
+	ID_INDICATOR_CAPS,
+	ID_INDICATOR_NUM,
+	ID_INDICATOR_SCRL,
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// CMainFrame construction/destruction
+
+CMainFrame::CMainFrame()
+{
+}
+
+CMainFrame::~CMainFrame()
+{
+}
+
+int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
+{
+	if (CFrameWnd::OnCreate(lpCreateStruct) == -1)
+		return -1;
+	
+	if (!m_wndToolBar.Create(this) ||
+		!m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
+	{
+		TRACE0("Failed to create toolbar\n");
+		return -1;      // fail to create
+	}
+
+	if (!m_wndStatusBar.Create(this) ||
+		!m_wndStatusBar.SetIndicators(indicators,
+		  sizeof(indicators)/sizeof(UINT)))
+	{
+		TRACE0("Failed to create status bar\n");
+		return -1;      // fail to create
+	}
+	
+	m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() |
+		CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
+
+	m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
+	EnableDocking(CBRS_ALIGN_ANY);
+	DockControlBar(&m_wndToolBar);
+	return 0;
+}
+
+BOOL CMainFrame::OnCreateClient( LPCREATESTRUCT /*lpcs*/,
+	CCreateContext* pContext)
+{
+	// create a splitter with 1 row, 2 columns
+	if (!m_wndSplitter.CreateStatic(this, 1, 2))
+	{
+		TRACE0("Failed to CreateStaticSplitter\n");
+		return FALSE;
+	}
+
+	// add the first splitter pane - the default view in column 0
+	if (!m_wndSplitter.CreateView(0, 0, 
+			RUNTIME_CLASS(CCacheTreeView), CSize(250, 50), pContext))
+	{	
+		TRACE0("Failed to create first pane\n");
+		return FALSE;
+	}
+
+	// add the second splitter pane - an input view in column 1
+	if (!m_wndSplitter.CreateView(0, 1, pContext->m_pNewViewClass, CSize(0, 0), pContext))
+	{
+		TRACE0("Failed to create second pane\n");
+		return FALSE;
+	}
+
+	// activate the tree view
+	SetActiveView((CView*)m_wndSplitter.GetPane(0,1));
+	return TRUE;
+
+}
+
+BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
+{
+	return CFrameWnd::PreCreateWindow(cs);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CMainFrame diagnostics
+
+#ifdef _DEBUG
+void CMainFrame::AssertValid() const
+{
+	CFrameWnd::AssertValid();
+}
+
+void CMainFrame::Dump(CDumpContext& dc) const
+{
+	CFrameWnd::Dump(dc);
+}
+
+#endif //_DEBUG
+
+/////////////////////////////////////////////////////////////////////////////
+// CMainFrame message handlers

mozilla/network/cache/nu/tests/cb/MainFrm.h

@@ -0,0 +1,48 @@
+// MainFrm.h : interface of the CMainFrame class
+//
+/////////////////////////////////////////////////////////////////////////////
+
+class CMainFrame : public CFrameWnd
+{
+protected: // create from serialization only
+	CMainFrame();
+	DECLARE_DYNCREATE(CMainFrame)
+
+// Attributes
+protected:
+	CSplitterWnd m_wndSplitter;
+public:
+
+	void Status(const char* mesg);
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CMainFrame)
+	public:
+	virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext);
+	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
+	//}}AFX_VIRTUAL
+
+// Implementation
+public:
+	virtual ~CMainFrame();
+#ifdef _DEBUG
+	virtual void AssertValid() const;
+	virtual void Dump(CDumpContext& dc) const;
+#endif
+
+protected:  // control bar embedded members
+	CStatusBar  m_wndStatusBar;
+	CToolBar    m_wndToolBar;
+
+// Generated message map functions
+protected:
+	//{{AFX_MSG(CMainFrame)
+	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+inline void CMainFrame::Status(const char* mesg) {
+	m_wndStatusBar.SetPaneText(0, mesg);
+}
+/////////////////////////////////////////////////////////////////////////////

mozilla/network/cache/nu/tests/cb/StdAfx.cpp

@@ -0,0 +1,6 @@
+// stdafx.cpp : source file that includes just the standard includes
+//	cb.pch will be the pre-compiled header
+//	stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+

mozilla/network/cache/nu/tests/cb/StdAfx.h

@@ -0,0 +1,16 @@
+// stdafx.h : include file for standard system include files,
+//  or project specific include files that are used frequently, but
+//      are changed infrequently
+//
+
+#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+
+#include <afxwin.h>         // MFC core and standard components
+#include <afxext.h>         // MFC extensions
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#include <afxcmn.h>			// MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+
+
+
+

mozilla/network/cache/nu/tests/cb/cb.cpp

@@ -0,0 +1,140 @@
+// cb.cpp : Defines the class behaviors for the application.
+//
+
+#include "stdafx.h"
+#include "cb.h"
+
+#include "MainFrm.h"
+#include "cbDoc.h"
+#include "cbView.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CCbApp
+
+BEGIN_MESSAGE_MAP(CCbApp, CWinApp)
+	//{{AFX_MSG_MAP(CCbApp)
+	ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
+	//}}AFX_MSG_MAP
+	// Standard file based document commands
+	ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew)
+	ON_COMMAND(ID_FILE_OPEN, CWinApp::OnFileOpen)
+	// Standard print setup command
+	ON_COMMAND(ID_FILE_PRINT_SETUP, CWinApp::OnFilePrintSetup)
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CCbApp construction
+
+CCbApp::CCbApp()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// The one and only CCbApp object
+
+CCbApp theApp;
+
+/////////////////////////////////////////////////////////////////////////////
+// CCbApp initialization
+
+BOOL CCbApp::InitInstance()
+{
+	// Standard initialization
+
+#ifdef _AFXDLL
+	Enable3dControls();			// Call this when using MFC in a shared DLL
+#else
+	Enable3dControlsStatic();	// Call this when linking to MFC statically
+#endif
+
+	LoadStdProfileSettings(0);  // Load standard INI file options (including MRU)
+
+	// Register document templates
+
+	CSingleDocTemplate* pDocTemplate;
+	pDocTemplate = new CSingleDocTemplate(
+		IDR_MAINFRAME,
+		RUNTIME_CLASS(CCbDoc),
+		RUNTIME_CLASS(CMainFrame),       // main SDI frame window
+		RUNTIME_CLASS(CCbView));
+	AddDocTemplate(pDocTemplate);
+
+	// Enable DDE Execute open
+	EnableShellOpen();
+	RegisterShellFileTypes(TRUE);
+
+	// Parse command line for standard shell commands, DDE, file open
+	CCommandLineInfo cmdInfo;
+	ParseCommandLine(cmdInfo);
+
+	// Dispatch commands specified on the command line
+	if (!ProcessShellCommand(cmdInfo))
+		return FALSE;
+
+	// Enable drag/drop open
+	m_pMainWnd->DragAcceptFiles();
+
+	return TRUE;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CAboutDlg dialog used for App About
+
+class CAboutDlg : public CDialog
+{
+public:
+	CAboutDlg();
+
+// Dialog Data
+	//{{AFX_DATA(CAboutDlg)
+	enum { IDD = IDD_ABOUTBOX };
+	//}}AFX_DATA
+
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CAboutDlg)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+	//{{AFX_MSG(CAboutDlg)
+		// No message handlers
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
+{
+	//{{AFX_DATA_INIT(CAboutDlg)
+	//}}AFX_DATA_INIT
+}
+
+void CAboutDlg::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CAboutDlg)
+	//}}AFX_DATA_MAP
+}
+
+BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
+	//{{AFX_MSG_MAP(CAboutDlg)
+		// No message handlers
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+// App command to run the dialog
+void CCbApp::OnAppAbout()
+{
+	CAboutDlg aboutDlg;
+	aboutDlg.DoModal();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CCbApp commands