This commit was manufactured by cvs2svn to create branch 'RJCTEST_BASE'.

git-svn-id: svn://10.0.0.236/branches/RJCTEST_BASE@125040 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/xpfe/components/bookmarks/Makefile.in

@@ -0,0 +1,32 @@
+#
+# 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		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= public src resources
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/xpfe/components/bookmarks/macbuild/BookmarksPrefix.h

@@ -0,0 +1,26 @@
+/* -*- 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.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): 
+ */
+
+/* Defining the following causes NS_APPSHELL to be defined as NS_EXPORT. */
+#define _IMPL_NS_APPSHELL
+
+#include "MacSharedPrefix.h"

mozilla/xpfe/components/bookmarks/macbuild/BookmarksPrefix_debug.h

@@ -0,0 +1,26 @@
+/* -*- 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.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): 
+ */
+
+/* Defining the following causes NS_APPSHELL to be defined as NS_EXPORT. */
+#define _IMPL_NS_APPSHELL
+
+#include "MacSharedPrefix_debug.h"

mozilla/xpfe/components/bookmarks/makefile.win

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

mozilla/xpfe/components/bookmarks/public/MANIFEST_IDL

@@ -0,0 +1 @@
+nsIBookmarksService.idl

mozilla/xpfe/components/bookmarks/public/Makefile.in

@@ -0,0 +1,35 @@
+#
+# 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		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= appcomps
+XPIDL_MODULE	= bookmarks
+
+XPIDLSRCS	= nsIBookmarksService.idl
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/xpfe/components/bookmarks/public/makefile.win

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

mozilla/xpfe/components/bookmarks/public/nsIBookmarksService.idl

@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger              <ben@netscape.com> 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * The Browser Bookmarks service
+ */
+
+#include "nsISupports.idl"
+
+interface nsIRDFResource;
+
+[scriptable, uuid(a82e9300-e4af-11d2-8fdf-0008c70adc7b)]
+interface nsIBookmarksService : nsISupports
+{
+    const unsigned long BOOKMARK_DEFAULT_TYPE   = 0;
+    const unsigned long BOOKMARK_SEARCH_TYPE    = 1;
+    const unsigned long BOOKMARK_FIND_TYPE      = 2;
+
+    boolean ReadBookmarks();
+    boolean IsBookmarked(in string aURI);
+
+    void addBookmarkImmediately(in string aURI, in wstring aTitle, in long bmType, in wstring docCharset);
+        
+    nsIRDFResource createFolder(in wstring aName, in nsIRDFResource aParentFolder);
+    nsIRDFResource createFolderWithDetails(in wstring aName, in nsIRDFResource aParentFolder, 
+                                           in long aIndex);
+
+    nsIRDFResource createGroup(in wstring aName, in nsIRDFResource aParentFolder);
+    nsIRDFResource createGroupWithDetails(in wstring aName, in nsIRDFResource aParentFolder, 
+                                          in long aIndex);
+
+    nsIRDFResource createBookmark(in wstring aName, in string aURL, in nsIRDFResource aParentFolder);
+    nsIRDFResource createBookmarkWithDetails(in wstring aName, in string aURI, in wstring docCharSet, 
+                                             in nsIRDFResource aFolder, in long aIndex);
+
+    void updateBookmarkIcon(in string aURL, in wstring iconURL);
+    void removeBookmarkIcon(in string aURL, in wstring iconURL);
+
+    void updateLastVisitedDate(in string aURL, in wstring docCharset);
+    
+    string resolveKeyword(in wstring aName);
+    
+    wstring getLastCharset(in string aURI);
+
+    void importSystemBookmarks(in nsIRDFResource aParentFolder);
+};
+
+%{C++
+
+// {E638D760-8687-11d2-B530-000000000000}
+#define NS_BOOKMARKS_SERVICE_CID \
+{ 0xe638d760, 0x8687, 0x11d2, { 0xb5, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
+
+#define NS_BOOKMARKS_SERVICE_CONTRACTID \
+    "@mozilla.org/browser/bookmarks-service;1"
+
+#define NS_BOOKMARKS_DATASOURCE_CONTRACTID \
+    "@mozilla.org/rdf/datasource;1?name=bookmarks"
+
+%}

mozilla/xpfe/components/bookmarks/resources/MANIFEST-content

@@ -0,0 +1,9 @@
+bm-find.js
+bm-find.xul
+bm-panel.js
+bm-panel.xul
+bm-props.js
+bm-props.xul
+bookmarks.js
+bookmarksDD.js
+bookmarks.xul

mozilla/xpfe/components/bookmarks/resources/Makefile.in

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

mozilla/xpfe/components/bookmarks/resources/addBookmark.js

@@ -0,0 +1,348 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Add Bookmark Dialog. 
+ * ====================
+ * 
+ * This is a generic bookmark dialog that allows for bookmark addition
+ * and folder selection. It can be opened with various parameters that 
+ * result in appearance/purpose differences and initial state. 
+ * 
+ * Use: Open with 'openDialog', with the flags 
+ *        'centerscreen,chrome,dialog=no,resizable=yes'
+ * 
+ * Parameters: 
+ *   Apart from the standard openDialog parameters, this dialog can 
+ *   be passed additional information, which gets mapped to the 
+ *   window.arguments array:
+ * 
+ *   window.arguments[0]: Bookmark Name. The value to be prefilled
+ *                        into the "Name: " field (if visible).
+ *   window.arguments[1]: Bookmark URL: The location of the bookmark.
+ *                        The value to be filled in the "Location: "
+ *                        field (if visible).
+ *   window.arguments[2]: Bookmark Folder. The RDF Resource URI of the
+ *                        folder that this bookmark should be created in.
+ *   window.arguments[3]: Bookmark Charset. The charset that should be
+ *                        used when adding a bookmark to the specified
+ *                        URL. (Usually the charset of the current 
+ *                        document when launching this window). 
+ *   window.arguments[4]: The mode of operation. See notes for details.
+ *   window.arguments[5]: If the mode is "addGroup", this is an array
+ *                        of objects with name, URL and charset
+ *                        properties, one for each group member.
+ *
+ * Mode of Operation Notes:
+ * ------------------------
+ * This dialog can be opened in four different ways by using a parameter
+ * passed through the call to openDialog. The 'mode' of operation
+ * of the window is expressed in window.arguments[4]. The valid modes are:
+ *
+ * 1) <default> (no fifth open parameter).
+ *      Opens this dialog with the bookmark Name, URL and folder selection
+ *      components visible. 
+ * 2) "newBookmark" (fifth open parameter = String("newBookmark"))
+ *      Opens the dialog as in (1) above except the folder selection tree
+ *      is hidden. This type of mode is useful when the creation folder 
+ *      is pre-determined.
+ * 3) "selectFolder" (fifth open parameter = String("selectFolder"))
+ *      Opens the dialog as in (1) above except the Name/Location section
+ *      is hidden, and the dialog takes on the utility of a Folder chooser.
+ *      Used when the user must select a Folder for some purpose. 
+ * 4) "addGroup" (fifth open parameter = String("addGroup"))
+ *      Opens the dialog like <default>, with a checkbox to select between
+ *      filing a single bookmark or a group. For the single bookmark the
+ *      values are taken from the name, URL and charset arguments.
+ *      For the group, the values are taken from the sixth argument.
+ *      This parameter can also be String("addGroup,group") where "group"
+ *      specifies that the dialog starts in filing as a group.
+ */
+
+var gFld_Name   = null;
+var gFld_URL    = null; 
+var gFolderTree = null;
+var gCB_AddGroup = null;
+
+var gBookmarkCharset = null;
+
+const kRDFSContractID = "@mozilla.org/rdf/rdf-service;1";
+const kRDFSIID = Components.interfaces.nsIRDFService;
+const kRDF = Components.classes[kRDFSContractID].getService(kRDFSIID);
+
+var gSelectItemObserver = null;
+
+var gCreateInFolder = "NC:NewBookmarkFolder";
+
+function Startup()
+{
+  gFld_Name = document.getElementById("name");
+  gFld_URL = document.getElementById("url");
+  gCB_AddGroup = document.getElementById("addgroup");
+  var bookmarkView = document.getElementById("bookmarks-view");
+
+  var shouldSetOKButton = true;
+  var dialogElement = document.documentElement;
+  if ("arguments" in window) {
+    var ind;
+    var folderItem = null;
+    var arg;
+    if (window.arguments.length < 5)
+      arg = null;
+    else
+      arg = window.arguments[4];
+    switch (arg) {
+    case "selectFolder":
+      // If we're being opened as a folder selection window
+      document.getElementById("bookmarknamegrid").setAttribute("hidden", "true");
+      document.getElementById("createinseparator").setAttribute("hidden", "true");
+      document.getElementById("nameseparator").setAttribute("hidden", "true");
+      sizeToContent();
+      dialogElement.setAttribute("title", dialogElement.getAttribute("title-selectFolder"));
+      shouldSetOKButton = false;
+      if (window.arguments[2])
+        folderItem = bookmarkView.rdf.GetResource(window.arguments[2]);
+      if (folderItem) {
+        ind = bookmarkView.treeBuilder.getIndexOfResource(folderItem);
+        bookmarkView.treeBoxObject.selection.select(ind);
+      }
+      break;
+    case "newBookmark":
+      setupFields();
+      if (window.arguments[2])
+        gCreateInFolder = window.arguments[2];
+      document.getElementById("folderbox").setAttribute("hidden", "true");
+      sizeToFit();
+      break;
+    case "addGroup":
+      document.getElementById("showaddgroup").setAttribute("hidden", "false");
+      setupFields();
+      sizeToFit();
+      break;
+    case "addGroup,group":
+      document.getElementById("showaddgroup").setAttribute("hidden", "false");
+      gCB_AddGroup.setAttribute("checked", "true");
+      setupFields();
+      toggleGroup();
+      sizeToFit();
+      break;
+    default:
+      // Regular Add Bookmark
+      setupFields();
+      if (window.arguments[2]) {
+        gCreateInFolder = window.arguments[2];
+        folderItem = bookmarkView.rdf.GetResource(gCreateInFolder);
+        if (folderItem) {
+          ind = bookmarkView.treeBuilder.getIndexOfResource(folderItem);
+          bookmarkView.treeBoxObject.selection.select(ind);
+        }
+      }
+    }
+  }
+  
+  if (shouldSetOKButton)
+    onFieldInput();
+  if (document.getElementById("bookmarknamegrid").hasAttribute("hidden")) {
+    bookmarkView.tree.focus();
+    if (bookmarkView.currentIndex == -1)
+      bookmarkView.treeBoxObject.selection.select(0);
+  }
+  else {
+    gFld_Name.select();
+    gFld_Name.focus();
+  }
+} 
+
+function sizeToFit()
+{
+  var dialogElement = document.documentElement;
+  dialogElement.removeAttribute("persist");
+  dialogElement.removeAttribute("height");
+  dialogElement.removeAttribute("width");
+  dialogElement.setAttribute("style", dialogElement.getAttribute("style"));
+  sizeToContent();
+}
+
+function setupFields()
+{
+  // New bookmark in predetermined folder. 
+  gFld_Name.value = window.arguments[0] || "";
+  gFld_URL.value = window.arguments[1] || "";
+  onFieldInput();
+  gFld_Name.select();
+  gFld_Name.focus();
+  gBookmarkCharset = window.arguments[3] || null;
+}
+
+function onFieldInput()
+{
+  const ok = document.documentElement.getButton("accept");
+  ok.disabled = gFld_URL.value == "" && !addingGroup() ||
+                gFld_Name.value == "";
+}    
+
+function onOK()
+{
+  if (!document.getElementById("folderbox").hasAttribute("hidden")) {
+    var bookmarkView = document.getElementById("bookmarks-view");
+    var currentIndex = bookmarkView.currentIndex;
+    if (currentIndex != -1)
+      gCreateInFolder = bookmarkView.treeBuilder.getResourceAtIndex(currentIndex).Value;
+  }
+  // In Select Folder Mode, do nothing but tell our caller what
+  // folder was selected. 
+  if (window.arguments.length > 4 && window.arguments[4] == "selectFolder")
+    window.arguments[5].selectedFolder = gCreateInFolder;
+  else {
+    // Otherwise add a bookmark to the selected folder. 
+
+    const kBMDS = kRDF.GetDataSource("rdf:bookmarks");
+    const kBMSContractID = "@mozilla.org/browser/bookmarks-service;1";
+    const kBMSIID = Components.interfaces.nsIBookmarksService;
+    const kBMS = Components.classes[kBMSContractID].getService(kBMSIID);
+    var rFolder = kRDF.GetResource(gCreateInFolder, true);
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFIID = Components.interfaces.nsIRDFContainer;
+    const kRDFC = Components.classes[kRDFCContractID].getService(kRDFIID);
+    try {
+      kRDFC.Init(kBMDS, rFolder);
+    }
+    catch (e) {
+      // No "NC:NewBookmarkFolder" exists, just append to the root.
+      rFolder = kRDF.GetResource("NC:BookmarksRoot", true);
+      kRDFC.Init(kBMDS, rFolder);
+    }
+
+    // if no URL was provided and we're not filing as a group, do nothing
+    if (!gFld_URL.value && !addingGroup())
+      return;
+
+    var url;
+    if (addingGroup()) {
+      const group = kBMS.createGroup(gFld_Name.value, rFolder);
+      const groups = window.arguments[5];
+      for (var i = 0; i < groups.length; ++i) {
+        url = getNormalizedURL(groups[i].url);
+        kBMS.createBookmarkWithDetails(groups[i].name, url,
+                                       groups[i].charset, group, -1);
+      }
+    } else {
+      url = getNormalizedURL(gFld_URL.value);
+      var newBookmark = kBMS.createBookmarkWithDetails(gFld_Name.value, url, gBookmarkCharset, rFolder, -1);
+      if (window.arguments.length > 4 && window.arguments[4] == "newBookmark") {
+        window.arguments[5].newBookmark = newBookmark;
+      }
+    }
+  }
+}
+
+function getNormalizedURL(url)
+{
+  // Check to see if the item is a local directory path, and if so, convert
+  // to a file URL so that aggregation with rdf:files works
+  try {
+    const kLF = Components.classes["@mozilla.org/file/local;1"]
+                          .createInstance(Components.interfaces.nsILocalFile);
+    kLF.initWithPath(url);
+    if (kLF.exists()) {
+      var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                                .getService(Components.classes.nsIIOService);
+
+      url = ioService.getURLSpecFromFile(kLF);
+    }
+  }
+  catch (e) {
+  }
+
+  return url;
+}
+
+var gBookmarksShell = null;
+function createNewFolder ()
+{
+  var bookmarksView = document.getElementById("bookmarks-view");
+  bookmarksView.createNewFolder();
+}
+
+function useDefaultFolder ()
+{
+  const kBMDS = kRDF.GetDataSource("rdf:bookmarks");
+  var bookmarkView = document.getElementById("bookmarks-view");
+  var sources = kBMDS.GetSources(bookmarkView.rdf.GetResource(NC_NS + "FolderType"), bookmarkView.rdf.GetResource("NC:NewBookmarkFolder"), true);
+  var folder = null;
+  if (sources.hasMoreElements()) {
+    folder = sources.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
+  }
+  var ind = bookmarkView.treeBuilder.getIndexOfResource(folder);
+  if (ind != -1) {
+    bookmarkView.tree.focus();
+    bookmarkView.treeBoxObject.selection.select(ind);
+    gCreateInFolder = folder.Value;
+  }
+  else {
+    bookmarkView.treeBoxObject.selection.clearSelection();
+    gCreateInFolder = "NC:BookmarksRoot";
+  }
+}
+
+var gOldNameValue = "";
+var gOldURLValue = "";
+
+function toggleGroup()
+{
+  // swap between single bookmark and group name
+  var temp = gOldNameValue;
+  gOldNameValue = gFld_Name.value;
+  gFld_Name.value = temp;
+
+  // swap between single bookmark and group url
+  temp = gOldURLValue;
+  gOldURLValue = gFld_URL.value;
+  gFld_URL.value = temp;
+  gFld_URL.disabled = gCB_AddGroup.getAttribute("checked") == "true";
+
+  gFld_Name.select();
+  gFld_Name.focus();
+  onFieldInput();
+}
+
+function addingGroup()
+{
+  const showAddGroup = document.getElementById("showaddgroup");
+  return showAddGroup.getAttribute("hidden") != "true" && gCB_AddGroup.getAttribute("checked") == "true";
+}

mozilla/xpfe/components/bookmarks/resources/addBookmark.xul

@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!-- -*- Mode: HTML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  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): 
+    Ben Goodger <ben@netscape.com> (Original Author)
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css"?>
+<?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % addBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/addBookmark.dtd">
+%addBookmarkDTD;
+]>
+
+<dialog id="newBookmarkDialog" style="width: 36em;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        ondialogaccept="return onOK(event)"
+        title="&newBookmark.title;" title-selectFolder="&selectFolder.label;"
+        onload="Startup();"
+        persist="screenX screenY width height"
+        screenX="24" screenY="24">
+   
+  
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksTree.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/addBookmark.js"/>
+
+  <stringbundle id="bookmarksbundle"
+                src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+
+  <broadcaster id="showaddgroup" hidden="true"/>
+
+  <separator id="nameseparator" class="thin"/>
+  
+  <grid id="bookmarknamegrid">
+    <columns>
+      <column/>
+      <column flex="5"/>
+      <column flex="1"/>
+    </columns>
+    <rows>
+      <row align="center">
+        <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
+        <textbox id="name" oninput="onFieldInput();"/>
+        <spacer/>
+      </row>
+      <row>
+        <separator class="thin"/>
+        <separator class="thin"/>
+        <spacer/>
+      </row>
+      <row align="center">
+        <label value="&url.label;" accesskey="&url.accesskey;" control="url"/>
+        <textbox id="url" oninput="onFieldInput();"/>
+        <spacer/>
+      </row>
+      <row observes="showaddgroup">
+        <separator class="thin"/>
+        <separator class="thin"/>
+        <spacer/>
+      </row>
+      <row observes="showaddgroup">
+        <spacer/>
+        <hbox pack="start">
+          <checkbox id="addgroup" label="&addGroup.label;"
+                    accesskey="&addGroup.accesskey;" oncommand="toggleGroup();"/>
+        </hbox>
+        <spacer/>
+      </row>
+    </rows>
+  </grid>
+
+  <separator id="createinseparator"/>
+
+  <vbox id="folderbox" flex="1">
+    <separator/>
+    <hbox flex="1">
+      <label id="createinlabel" value="&createin.label;"/>
+      <hbox flex="1">
+        <bookmarks-tree id="bookmarks-view" flex="1" type="folders"/>
+        <vbox>
+          <button label="&button.newfolder.label;" accesskey="&button.newfolder.accesskey;"
+                  oncommand="createNewFolder();"/>
+          <button label="&button.defaultfolder.label;" 
+                  accesskey="&button.defaultfolder.accesskey;"
+                  oncommand="useDefaultFolder();"/>
+        </vbox>
+      </hbox>
+    </hbox>
+  </vbox>
+
+  <separator/>
+
+</dialog>

mozilla/xpfe/components/bookmarks/resources/bm-panel.xul

@@ -0,0 +1,87 @@
+<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- --> 
+<!--
+
+  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): 
+    Ben Goodger <ben@netscape.com> (Original Author, v2.0)
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebarListView.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksWindow.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
+
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/bookmarks/bookmarksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
+
+<page id="bookmarksPanel"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="Startup();" elementtofocus="bookmarks-view">
+
+  <!-- XXX - would like to cut this dependency out -->
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+
+  <!-- Bookmarks Shell -->
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksPanel.js"/>
+
+  <!-- Drag and Drop -->
+  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
+
+
+  <!-- context menu, tooltips, etc -->
+  <popupset id="bookmarksPopupset"/>
+  
+  <!-- bookmarks string bundle -->
+  <stringbundleset id="stringbundleset"/>
+  
+  <!-- bookmarks & edit commands -->
+  <commands id="commands">
+    <commandset id="CommandUpdate_Bookmarks"
+                commandupdater="true"
+                events="click,focus"
+                oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
+    </commandset>                
+    <commandset id="bookmarksItems"/>
+  </commands>
+  
+  <hbox id="panel-bar" class="toolbar">
+    <toolbarbutton id="btnAddBookmark" label="&command.addBookmark.label;"
+            oncommand="addBookmark();"/>
+    <toolbarbutton id="btnManageBookmarks" label="&command.manageBookmarks.label;"
+            oncommand="manageBookmarks();"/>
+    <spacer flex="1"/>
+    <toolbarseparator/>
+    <toolbarbutton id="btnFindBookmarks" label="&command.findBookmarks.label;"
+            oncommand="document.getElementById('bookmarks-view').openFindDialog();"/>
+  </hbox>
+  
+  <bookmarks-tree id="bookmarks-view" class="sidebar" type="single-column" flex="1"/>
+
+</page>

mozilla/xpfe/components/bookmarks/resources/bm-props.js

@@ -0,0 +1,387 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var NC_NAMESPACE_URI = "http://home.netscape.com/NC-rdf#";
+
+// XXX MAKE SURE that the "url" field is LAST!
+// This is important for what happens if/when the URL itself is changed.
+// Ask rjc@netscape.com if you want to know why exactly this is.
+
+// This is the set of fields that are visible in the window.
+var gFields     = ["name", "shortcut", "description", "url"];
+
+// ...and this is a parallel array that contains the RDF properties
+// that they are associated with.
+var gProperties = [NC_NAMESPACE_URI + "Name",
+                   NC_NAMESPACE_URI + "ShortcutURL",
+                   NC_NAMESPACE_URI + "Description",
+                   NC_NAMESPACE_URI + "URL"];
+
+var RDF = Components.classes["@mozilla.org/rdf/rdf-service;1"]
+                    .getService(Components.interfaces.nsIRDFService);
+
+var RDFC = Components.classes["@mozilla.org/rdf/container-utils;1"]
+                     .getService(Components.interfaces.nsIRDFContainerUtils);
+
+var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+
+var gBookmarkURL = "";
+
+function Init()
+{
+  var x;
+  gBookmarkURL = window.arguments[0];
+
+  // Initialize the properties panel by copying the values from the
+  // RDF graph into the fields on screen.
+
+  for (var i = 0; i < gFields.length; ++i) {
+    var field = document.getElementById(gFields[i]);
+
+    var value = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
+                                    RDF.GetResource(gProperties[i]),
+                                    true);
+
+    if (value)
+      value = value.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+
+    if (value) //make sure were aren't stuffing null into any fields
+      field.value = value;
+  }
+
+  var propsWindow = document.getElementById("bmPropsWindow");
+  var nameNode = document.getElementById("name");
+  var title = propsWindow.getAttribute("title");
+  title = title.replace(/\*\*bm_title\*\*/gi, nameNode.value);
+  propsWindow.setAttribute("title", title);
+
+  // check bookmark schedule
+  value = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
+                              RDF.GetResource("http://home.netscape.com/WEB-rdf#Schedule"),
+                              true);
+
+  if (value) {
+    value = value.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+
+    if (value) {
+      var values = value.split("|");
+      if (values.length == 4) {
+        // get day range
+        var days = values[0];
+        var dayNode = document.getElementById("dayRange");
+        var dayItems = dayNode.childNodes[0].childNodes;
+        for (x=0; x < dayItems.length; ++x) {
+          if (dayItems[x].getAttribute("value") == days) {
+            dayNode.selectedItem = dayItems[x];
+            break;
+          }
+        }
+
+        // get hour range
+        var hours = values[1].split("-");
+        var startHour = "";
+        var endHour = "";
+
+        if (hours.length == 2) {
+          startHour = hours[0];
+          endHour = hours[1];
+        }
+
+        // set start hour
+        var startHourNode = document.getElementById("startHourRange");
+        var startHourItems = startHourNode.childNodes[0].childNodes;
+        for (x=0; x < startHourItems.length; ++x) {
+          if (startHourItems[x].getAttribute("value") == startHour) {
+            startHourNode.selectedItem = startHourItems[x];
+            break;
+          }
+        }
+
+        // set end hour
+        var endHourNode = document.getElementById("endHourRange");
+        var endHourItems = endHourNode.childNodes[0].childNodes;
+        for (x=0; x < endHourItems.length; ++x) {
+          if (endHourItems[x].getAttribute("value") == endHour) {
+            endHourNode.selectedItem = endHourItems[x];
+            break;
+          }
+        }
+
+        // get duration
+        var duration = values[2];
+        var durationNode = document.getElementById("duration");
+        durationNode.value = duration;
+
+        // get notification method
+        var method = values[3];
+        if (method.indexOf("icon") >= 0)
+          document.getElementById("bookmarkIcon").checked = true;
+
+        if (method.indexOf("sound") >= 0)
+          document.getElementById("playSound").checked = true;
+
+        if (method.indexOf("alert") >= 0)
+          document.getElementById("showAlert").checked = true;
+
+        if (method.indexOf("open") >= 0)
+          document.getElementById("openWindow").checked = true;
+      }
+    }
+  }
+
+  // if its a container, disable some things
+  var isContainerFlag = RDFC.IsContainer(Bookmarks, RDF.GetResource(gBookmarkURL));
+  if (!isContainerFlag) {
+    // XXX To do: the "RDFC.IsContainer" call above only works for RDF sequences;
+    //            if its not a RDF sequence, we should to more checking to see if
+    //            the item in question is really a container of not.  A good example
+    //            of this is the "File System" container.
+  }
+
+  if (isContainerFlag) {
+    // If it is a folder, it has no URL or Keyword
+    document.getElementById("locationrow").setAttribute("hidden", "true");
+    document.getElementById("shortcutrow").setAttribute("hidden", "true");
+  }
+
+  if (gBookmarkURL.substr(0, 7).toLowerCase() != "http://" &&
+      gBookmarkURL.substr(0, 8).toLowerCase() != "https://") {
+    // only allow scheduling of http/https URLs
+    document.getElementById("ScheduleTab").setAttribute("hidden", "true");
+    document.getElementById("NotifyTab").setAttribute("hidden", "true");
+  }
+
+  sizeToContent();
+  
+  // Set up the enabled of controls on the scheduling panels
+  dayRangeChange(document.getElementById("dayRange"));
+
+  // set initial focus
+  var name = document.getElementById("name");
+  name.focus();
+  name.select();
+}
+
+
+
+function Commit()
+{
+  var changed = false;
+
+  // Grovel through the fields to see if any of the values have
+  // changed. If so, update the RDF graph and force them to be saved
+  // to disk.
+  for (var i = 0; i < gFields.length; ++i) {
+    var field = document.getElementById(gFields[i]);
+
+    if (field) {
+      // Get the new value as a literal, using 'null' if the value is empty.
+      var newvalue = field.value;
+
+      var oldvalue = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
+                                         RDF.GetResource(gProperties[i]),
+                                         true);
+
+      if (oldvalue)
+        oldvalue = oldvalue.QueryInterface(Components.interfaces.nsIRDFLiteral);
+
+      if (newvalue && gProperties[i] == (NC_NAMESPACE_URI + "ShortcutURL")) {
+        // shortcuts are always lowercased internally
+        newvalue = newvalue.toLowerCase();
+      }
+      else if (newvalue && gProperties[i] == (NC_NAMESPACE_URI + "URL")) {
+        // we're dealing with the URL attribute;
+        // if a scheme isn't specified, use "http://"
+        if (newvalue.indexOf(":") < 0)
+          newvalue = "http://" + newvalue;
+      }
+
+      if (newvalue)
+        newvalue = RDF.GetLiteral(newvalue);
+
+      if (updateAttribute(gProperties[i], oldvalue, newvalue)) {
+        // Update gBookmarkURL if the url changed
+        if (newvalue && gProperties[i] == NC_NAMESPACE_URI + "URL")
+          gBookmarkURL = newvalue.Value;
+
+        changed = true;
+      }
+    }
+  }
+
+  // Update bookmark schedule if necessary;
+  // if the tab was removed, just skip it
+  var scheduleTab = document.getElementById("ScheduleTab");
+  if (scheduleTab) {
+    var scheduleRes = "http://home.netscape.com/WEB-rdf#Schedule";
+    oldvalue = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
+                                   RDF.GetResource(scheduleRes), true);
+    newvalue = "";
+    var dayRangeNode = document.getElementById("dayRange");
+    var dayRange = dayRangeNode.selectedItem.getAttribute("value");
+
+    if (dayRange) {
+      var startHourRangeNode = document.getElementById("startHourRange");
+      var startHourRange = startHourRangeNode.selectedItem.getAttribute("value");
+
+      var endHourRangeNode = document.getElementById("endHourRange");
+      var endHourRange = endHourRangeNode.selectedItem.getAttribute("value");
+
+      if (parseInt(startHourRange) > parseInt(endHourRange)) {
+        var temp = startHourRange;
+        startHourRange = endHourRange;
+        endHourRange = temp;
+      }
+
+      var bookmarkBundle;
+      var duration = document.getElementById("duration").value;
+      if (!duration) {
+        bookmarkBundle = document.getElementById("bundle_bookmark");
+        alert (bookmarkBundle.getString("pleaseEnterADuration"));
+        return false;
+      }
+
+      var methods = [];
+      if (document.getElementById("bookmarkIcon").checked)
+        methods.push("icon");
+      if (document.getElementById("playSound").checked)
+        methods.push("sound");
+      if (document.getElementById("showAlert").checked)
+        methods.push("alert");
+      if (document.getElementById("openWindow").checked)
+        methods.push("open");
+
+      if (methods.length == 0) {
+        bookmarkBundle = document.getElementById("bundle_bookmark");
+        alert (bookmarkBundle.getString("pleaseSelectANotification"));
+        return false;
+      }
+
+      var method = methods.join(); // join string in array with ","
+
+      newvalue = dayRange + "|" + startHourRange + "-" + endHourRange + "|" + duration + "|" + method;
+    }
+
+    if (newvalue)
+      newvalue = RDF.GetLiteral(newvalue);
+
+    if (updateAttribute(scheduleRes, oldvalue, newvalue))
+      changed = true;
+  }
+
+  if (changed) {
+    var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+    if (remote)
+      remote.Flush();
+  }
+
+  window.close();
+  return true;
+}
+
+function updateAttribute(prop, oldvalue, newvalue)
+{
+  var changed = false;
+
+  if (prop && (oldvalue || newvalue) && oldvalue != newvalue) {
+
+    if (oldvalue && !newvalue) {
+      Bookmarks.Unassert(RDF.GetResource(gBookmarkURL),
+                         RDF.GetResource(prop),
+                         oldvalue);
+    }
+    else if (!oldvalue && newvalue) {
+      Bookmarks.Assert(RDF.GetResource(gBookmarkURL),
+                       RDF.GetResource(prop),
+                       newvalue,
+                       true);
+    }
+    else /* if (oldvalue && newvalue) */ {
+      Bookmarks.Change(RDF.GetResource(gBookmarkURL),
+                       RDF.GetResource(prop),
+                       oldvalue,
+                       newvalue);
+    }
+
+    changed = true;
+  }
+
+  return changed;
+}
+
+function setEndHourRange()
+{
+  // Get the values of the start-time and end-time as ints
+  var startHourRangeNode = document.getElementById("startHourRange");
+  var startHourRange = startHourRangeNode.selectedItem.getAttribute("value");
+  var startHourRangeInt = parseInt(startHourRange);
+
+  var endHourRangeNode = document.getElementById("endHourRange");
+  var endHourRange = endHourRangeNode.selectedItem.getAttribute("value");
+  var endHourRangeInt = parseInt(endHourRange);
+
+  var endHourItemNode = endHourRangeNode.firstChild.firstChild;
+
+  var index = 0;
+
+  // disable all those end-times before the start-time
+  for (; index < startHourRangeInt; ++index) {
+    endHourItemNode.setAttribute("disabled", "true");
+    endHourItemNode = endHourItemNode.nextSibling;
+  }
+
+  // update the selected value if it's out of the allowed range
+  if (startHourRangeInt >= endHourRangeInt)
+    endHourRangeNode.selectedItem = endHourItemNode;
+
+  // make sure all the end-times after the start-time are enabled
+  for (; index < 24; ++index) {
+    endHourItemNode.removeAttribute("disabled");
+    endHourItemNode = endHourItemNode.nextSibling;
+  }
+}
+
+function dayRangeChange (aMenuList)
+{
+  var controls = ["startHourRange", "endHourRange", "duration", "bookmarkIcon", 
+                  "showAlert", "openWindow", "playSound", "durationSubLabel", 
+                  "durationLabel", "startHourRangeLabel", "endHourRangeLabel"];
+  for (var i = 0; i < controls.length; ++i)
+    document.getElementById(controls[i]).disabled = !aMenuList.value;
+}
+
+

mozilla/xpfe/components/bookmarks/resources/bm-props.xul

@@ -0,0 +1,235 @@
+<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  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): 
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % bmpropsDTD SYSTEM "chrome://communicator/locale/bookmarks/bm-props.dtd">
+%bmpropsDTD;
+]>
+
+<dialog id="bmPropsWindow" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&bookmarks.windowtitle.label;"
+        onload="Init()" style="width: 30em;"
+        ondialogaccept="return Commit();">
+ 
+  <stringbundle id="bundle_bookmark" src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bm-props.js"/>
+ 
+  <keyset id="keyset"/>  
+    
+  <tabbox>
+    <tabs>
+      <tab label="&generalInfo.label;" accesskey="&generalInfo.accesskey;"/>
+      <tab id="ScheduleTab" label="&schedule.label;" accesskey="&schedule.accesskey;"/>
+      <tab id="NotifyTab" label="&notification.label;" accesskey="&notification.accesskey;"/>
+    </tabs>
+    <tabpanels>
+      <vbox>
+        <separator class="thin"/>
+        <hbox align="start">
+          <image class="message-icon"/>
+          <separator class="thin" orient="vertical"/>
+          <description flex="1">&generaldesc.label;</description>
+        </hbox>
+   
+        <separator class="thin"/>
+        
+        <vbox class="box-padded">    
+          <grid>
+            <columns>
+              <column />
+              <column flex="1"/>
+            </columns>
+            <rows>
+              <row align="center">
+                <label value="&bookmarks.name.label;" control="name"/>
+                <textbox id="name"/>
+              </row>
+              <row id="locationrow" align="center">
+                <label value="&bookmarks.location.label;" control="url"/>
+          			<textbox id="url" />
+              </row>
+              <row id="shortcutrow" align="center">
+                <label value="&bookmarks.shortcut.label;" control="shortcut"/>
+    		      	<textbox id="shortcut" />
+              </row>
+              <row>
+                <label value="&bookmarks.description.label;" control="description"/>
+                <textbox multiline="true" wrap="virtual" id="description" flex="1"/>
+              </row>
+            </rows>
+          </grid>
+          <separator/>
+        </vbox>
+      </vbox>
+      
+      <vbox>
+        <separator class="thin"/>
+        <hbox align="center">
+          <image id="schedule-icon"/>
+          <separator class="thin" orient="vertical"/>
+          <description flex="1">&schedule.description;</description>
+        </hbox>
+        <separator class="thin"/>
+        <hbox class="box-padded">
+          <spacer flex="1"/>
+          <groupbox>
+            <caption label="&checkforupdates.legend.label;"/>
+            <grid flex="1">
+              <columns>
+                <column/>
+                <column flex="1"/>
+              </columns>
+              <rows>
+                <row align="center">
+                  <label value="&when.label;" control="dayRange"/>
+                  <hbox>
+                    <menulist id="dayRange" oncommand="dayRangeChange(this);">
+                      <menupopup>
+                        <menuitem value="" label="&checknever.label;"/>
+                        <menuseparator />
+                        <menuitem value="0123456" label="&checkeveryday.label;"/>
+                        <menuitem value="12345" label="&checkweekdays.label;"/>
+                        <menuitem value="06" label="&checkweekends.label;"/>
+                        <menuitem value="1" label="&checkmondays.label;"/>
+                        <menuitem value="2" label="&checktuesdays.label;"/>
+                        <menuitem value="3" label="&checkwednesdays.label;"/>
+                        <menuitem value="4" label="&checkthursdays.label;"/>
+                        <menuitem value="5" label="&checkfridays.label;"/>
+                        <menuitem value="6" label="&checksaturdays.label;"/>
+                        <menuitem value="0" label="&checksundays.label;"/>
+                      </menupopup>
+                    </menulist>
+                  </hbox>
+                </row>
+                <row align="center">
+                  <label id="startHourRangeLabel" 
+                        value="&from.label;" control="startHourRange"/>
+                  <hbox align="center">
+                    <menulist id="startHourRange" oncommand="setEndHourRange()">
+                      <menupopup>
+                        <menuitem value="0" label="&midnight.label;"/>
+                        <menuitem value="1" label="&AMone.label;"/>
+                        <menuitem value="2" label="&AMtwo.label;"/>
+                        <menuitem value="3" label="&AMthree.label;"/>
+                        <menuitem value="4" label="&AMfour.label;"/>
+                        <menuitem value="5" label="&AMfive.label;"/>
+                        <menuitem value="6" label="&AMsix.label;"/>
+                        <menuitem value="7" label="&AMseven.label;"/>
+                        <menuitem value="8" label="&AMeight.label;"/>
+                        <menuitem value="9" label="&AMnine.label;"/>
+                        <menuitem value="10" label="&AMten.label;"/>
+                        <menuitem value="11" label="&AMeleven.label;"/>
+                        <menuitem value="12" label="&noon.label;"/>
+                        <menuitem value="13" label="&PMone.label;"/>
+                        <menuitem value="14" label="&PMtwo.label;"/>
+                        <menuitem value="15" label="&PMthree.label;"/>
+                        <menuitem value="16" label="&PMfour.label;"/>
+                        <menuitem value="17" label="&PMfive.label;"/>
+                        <menuitem value="18" label="&PMsix.label;"/>
+                        <menuitem value="19" label="&PMseven.label;"/>
+                        <menuitem value="20" label="&PMeight.label;"/>
+                        <menuitem value="21" label="&PMnine.label;"/>
+                        <menuitem value="22" label="&PMten.label;"/>
+                        <menuitem value="23" label="&PMeleven.label;"/>
+                      </menupopup>
+                    </menulist>
+                    <label id="endHourRangeLabel" 
+                          value="&to.label;" control="endHourRange"/>
+                    <menulist id="endHourRange">
+                      <menupopup onpopupshowing="setEndHourRange()">
+                        <menuitem value="1" label="&AMone.label;"/>
+                        <menuitem value="2" label="&AMtwo.label;"/>
+                        <menuitem value="3" label="&AMthree.label;"/>
+                        <menuitem value="4" label="&AMfour.label;"/>
+                        <menuitem value="5" label="&AMfive.label;"/>
+                        <menuitem value="6" label="&AMsix.label;"/>
+                        <menuitem value="7" label="&AMseven.label;"/>
+                        <menuitem value="8" label="&AMeight.label;"/>
+                        <menuitem value="9" label="&AMnine.label;"/>
+                        <menuitem value="10" label="&AMten.label;"/>
+                        <menuitem value="11" label="&AMeleven.label;"/>
+                        <menuitem value="12" label="&noon.label;"/>
+                        <menuitem value="13" label="&PMone.label;"/>
+                        <menuitem value="14" label="&PMtwo.label;"/>
+                        <menuitem value="15" label="&PMthree.label;"/>
+                        <menuitem value="16" label="&PMfour.label;"/>
+                        <menuitem value="17" label="&PMfive.label;"/>
+                        <menuitem value="18" label="&PMsix.label;"/>
+                        <menuitem value="19" label="&PMseven.label;"/>
+                        <menuitem value="20" label="&PMeight.label;"/>
+                        <menuitem value="21" label="&PMnine.label;"/>
+                        <menuitem value="22" label="&PMten.label;"/>
+                        <menuitem value="23" label="&PMeleven.label;"/>
+                        <menuitem value="24" label="&midnight.label;"/>
+                      </menupopup>
+                    </menulist>
+                  </hbox>
+                </row>
+                <row align="center">
+                  <label id="durationLabel" 
+                        value="&every.label;" control="duration"/>
+                  <hbox align="center">
+              	    <textbox id="duration" size="4" value="60" />
+                    <label id="durationSubLabel" value="&minutes.label;" />
+                  </hbox>
+                </row>
+              </rows>
+            </grid>
+            <separator class="thin"/>
+          </groupbox>
+          <spacer flex="1"/>
+        </hbox>
+      </vbox>
+          
+      <vbox>
+        <separator class="thin"/>
+        <hbox align="start">
+          <image id="notification-icon"/>
+          <separator class="thin" orient="vertical"/>
+          <description flex="1">&notification.description;</description>
+        </hbox>
+        <separator class="thin"/>
+        <hbox class="box-padded">
+          <spacer flex="1"/>
+          <groupbox>
+            <caption label="&notifications.legend.label;" />
+            <vbox align="start">
+              <checkbox id="bookmarkIcon" label="&notification.icon.label;" />
+              <checkbox id="showAlert" label="&notification.alert.label;" />
+              <checkbox id="openWindow" label="&notification.window.label;" />
+              <checkbox id="playSound" label="&notification.sound.label;" />
+            </vbox>
+          </groupbox>
+          <spacer flex="1"/>
+        </hbox>
+      </vbox>
+    </tabpanels>
+  </tabbox> 
+</dialog>

mozilla/xpfe/components/bookmarks/resources/bookmarks-temp.js

@@ -0,0 +1,854 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+  This is the old bookmarks code, included here for the sake of the bookmarks sidebar panel,
+  which will be fixed to use my new code in .9. In the mean time, this file provides a
+  life line to various functionality.
+ */
+
+
+
+var NC_NS  = "http://home.netscape.com/NC-rdf#";
+var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+
+function Init() {
+    var tree = document.getElementById("bookmarksTree");
+    tree.controllers.appendController(BookmarksController);
+    var children = document.getElementById('treechildren-bookmarks');
+    tree.selectItem(children.firstChild);
+    tree.focus();
+
+    RefreshSort();
+}
+
+var BookmarksController = {
+    supportsCommand: function(command)
+    {
+        switch(command)
+        {
+            case "cmd_undo":
+            case "cmd_redo":
+                return false;
+            case "cmd_cut":
+            case "cmd_copy":
+            case "cmd_paste":
+            case "cmd_delete":
+            case "cmd_selectAll":
+                return true;
+            default:
+                return false;
+        }
+    },
+    isCommandEnabled: function(command)
+    {
+        switch(command)
+        {
+            case "cmd_undo":
+            case "cmd_redo":
+                return false;
+            case "cmd_cut":
+            case "cmd_copy":
+            case "cmd_paste":
+            case "cmd_delete":
+            case "cmd_selectAll":
+                return true;
+            default:
+                return false;
+        }
+    },
+    doCommand: function(command)
+    {
+        switch(command)
+        {
+            case "cmd_undo":
+            case "cmd_redo":
+                break;
+            case "cmd_cut":
+                doCut();
+                break;
+            case "cmd_copy":
+                doCopy();
+                break;
+            case "cmd_paste":
+                doPaste();
+                break;
+            case "cmd_delete":
+                doDelete();
+                break;
+            case "cmd_selectAll":
+                doSelectAll();
+                break;
+        }
+    },
+    onEvent: function(event)
+    {
+        // On blur events set the menu item texts back to the normal values
+        /*if (event == 'blur' )
+          {
+          goSetMenuValue('cmd_undo', 'valueDefault');
+          goSetMenuValue('cmd_redo', 'valueDefault');
+          }*/
+    }
+};
+
+function CommandUpdate_Bookmarks()
+{
+    //goUpdateCommand('button_delete');
+    // get selection info from dir pane
+    /*
+    var oneAddressBookSelected = false;
+    if ( dirTree && dirTree.selectedItems && (dirTree.selectedItems.length == 1) )
+        oneAddressBookSelected = true;
+
+    // get selection info from results pane
+    var selectedCards = GetSelectedAddresses();
+    var oneOrMoreCardsSelected = false;
+    if ( selectedCards )
+        oneOrMoreCardsSelected = true;
+    */
+    // set commands to enabled / disabled
+    //goSetCommandEnabled('cmd_PrintCard', oneAddressBookSelected);
+    goSetCommandEnabled('bm_cmd_find', true/*oneAddressBookSelected*/);
+}
+
+function copySelectionToClipboard()
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var select_list = treeNode.selectedItems;
+    if (!select_list) return false;
+    if (select_list.length < 1) return false;
+
+    var rdf_uri = "@mozilla.org/rdf/rdf-service;1"
+    var RDF = Components.classes[rdf_uri].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!RDF) return false;
+
+    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+    if (!Bookmarks) return false;
+
+    var nameRes = RDF.GetResource(NC_NS + "Name");
+    if (!nameRes) return false;
+
+    // Build a url that encodes all the select nodes
+    // as well as their parent nodes
+    var url = "";
+    var text = "";
+    var html = "";
+
+    for (var nodeIndex = 0; nodeIndex < select_list.length; nodeIndex++)
+    {
+        var node = select_list[nodeIndex];
+        if (!node) continue;
+
+        var ID = getAbsoluteID("bookmarksTree", node);
+        if (!ID) continue;
+
+        var IDRes = RDF.GetResource(ID);
+        if (!IDRes) continue;
+        var nameNode = Bookmarks.GetTarget(IDRes, nameRes, true);
+        var theName = "";
+        if (nameNode)
+            nameNode =
+                nameNode.QueryInterface(Components.interfaces.nsIRDFLiteral);
+        if (nameNode) theName = nameNode.Value;
+
+        url += "ID:{" + ID + "};";
+        url += "NAME:{" + theName + "};";
+
+        if (node.getAttribute("container") == "true")
+        {
+            var type = node.getAttribute("type");
+            if (type == NC_NS + "BookmarkSeparator")
+            {
+                // Note: can't encode separators in text, just html
+                html += "<hr><p>";
+            }
+            else
+            {
+                text += ID + "\r";
+
+                html += "<a href='" + ID + "'>";
+                if (theName != "")
+                {
+                    html += theName;
+                }
+                html += "</a><p>";
+            }
+        }
+    }
+
+    if (url == "") return false;
+
+    // get some useful components
+    var trans_uri = "@mozilla.org/widget/transferable;1";
+    var trans = Components.classes[trans_uri].createInstance();
+    if (trans) trans = trans.QueryInterface(Components.interfaces.nsITransferable);
+    if (!trans) return false;
+
+    var clip_uri = "@mozilla.org/widget/clipboard;1";
+    var clip = Components.classes[clip_uri].getService();
+    if (clip) clip = clip.QueryInterface(Components.interfaces.nsIClipboard);
+    if (!clip) return false;
+    clip.emptyClipboard(Components.interfaces.nsIClipboard.kGlobalClipboard);
+
+    // save bookmark's ID
+    trans.addDataFlavor("moz/bookmarkclipboarditem");
+    var data_uri = "@mozilla.org/supports-wstring;1";
+    var data = Components.classes[data_uri].createInstance();
+    if (data) {
+        data = data.QueryInterface(Components.interfaces.nsISupportsWString);
+    }
+    if (!data) return false;
+    data.data = url;
+    // double byte data
+    trans.setTransferData("moz/bookmarkclipboarditem", data, url.length*2);
+
+    if (text != "")
+    {
+        trans.addDataFlavor("text/unicode");
+
+        var textData_uri = "@mozilla.org/supports-wstring;1";
+        var textData = Components.classes[textData_uri].createInstance();
+        if (textData) textData = textData.QueryInterface(Components.interfaces.nsISupportsWString);
+        if (!textData) return false;
+        textData.data = text;
+        // double byte data
+        trans.setTransferData("text/unicode", textData, text.length*2);
+    }
+    if (html != "")
+    {
+        trans.addDataFlavor("text/html");
+
+        var wstring_uri = "@mozilla.org/supports-wstring;1";
+        var htmlData = Components.classes[wstring_uri].createInstance();
+        if (htmlData) {
+            var wstring_interface = Components.interfaces.nsISupportsWString;
+            htmlData = htmlData.QueryInterface(wstring_interface);
+        }
+        if (!htmlData) return false;
+        htmlData.data = html;
+        // double byte data
+        trans.setTransferData("text/html", htmlData, html.length*2);
+    }
+    clip.setData(trans, null,
+                 Components.interfaces.nsIClipboard.kGlobalClipboard);
+    return true;
+}
+
+function doCut()
+{
+    if (copySelectionToClipboard() == true) {
+        doDelete(false);
+    }
+    return true;
+}
+
+function doCopy()
+{
+    copySelectionToClipboard();
+    return true;
+}
+
+function doPaste()
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var select_list = treeNode.selectedItems;
+    if (!select_list) return false;
+    if (select_list.length != 1) return false;
+
+    var pasteNodeID = select_list[0].getAttribute("id");
+    var isContainerFlag = (select_list[0].getAttribute("container") == "true");
+
+    var clip_uri = "@mozilla.org/widget/clipboard;1";
+    var clip = Components.classes[clip_uri].getService();
+    if (clip) clip = clip.QueryInterface(Components.interfaces.nsIClipboard);
+    if (!clip) return false;
+
+    var trans_uri = "@mozilla.org/widget/transferable;1";
+    var trans = Components.classes[trans_uri].createInstance();
+    if (trans) {
+        trans = trans.QueryInterface(Components.interfaces.nsITransferable);
+    }
+    if (!trans) return false;
+    trans.addDataFlavor("moz/bookmarkclipboarditem");
+
+    clip.getData(trans, Components.interfaces.nsIClipboard.kGlobalClipboard);
+    var data = new Object();
+    var dataLen = new Object();
+    trans.getTransferData("moz/bookmarkclipboarditem", data, dataLen);
+    if (data) {
+        var data_interface = Components.interfaces.nsISupportsWString
+        data = data.value.QueryInterface(data_interface);
+    }
+    var url = null;
+   // double byte data
+    if (data) url = data.data.substring(0, dataLen.value / 2);
+    if (!url) return false;
+
+    var strings = url.split(";");
+    if (!strings) return false;
+
+    var rdf_uri = "@mozilla.org/rdf/rdf-service;1";
+    var RDF = Components.classes[rdf_uri].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!RDF) return false;
+    var rdfc_uri = "@mozilla.org/rdf/container;1";
+    var RDFC = Components.classes[rdfc_uri].getService();
+    RDFC = RDFC.QueryInterface(Components.interfaces.nsIRDFContainer);
+    if (!RDFC) return false;
+    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+    if (!Bookmarks) return false;
+
+    var nameRes = RDF.GetResource(NC_NS + "Name");
+    if (!nameRes) return false;
+
+    pasteNodeRes = RDF.GetResource(pasteNodeID);
+    if (!pasteNodeRes) return false;
+    var pasteContainerRes = null;
+    var pasteNodeIndex = -1;
+    if (isContainerFlag == true)
+    {
+        pasteContainerRes = pasteNodeRes;
+    }
+    else
+    {
+        var parID = select_list[0].parentNode.parentNode.getAttribute("ref");
+        if (!parID) {
+            parID = select_list[0].parentNode.parentNode.getAttribute("id");
+        }
+        if (!parID) return false;
+        pasteContainerRes = RDF.GetResource(parID);
+        if (!pasteContainerRes) return false;
+    }
+    RDFC.Init(Bookmarks, pasteContainerRes);
+
+    if (isContainerFlag == false)
+    {
+        pasteNodeIndex = RDFC.IndexOf(pasteNodeRes);
+        if (pasteNodeIndex < 0) return false; // how did that happen?
+    }
+
+    var typeRes = RDF.GetResource(RDF_NS + "type");
+    if (!typeRes) return false;
+    var bmTypeRes = RDF.GetResource(NC_NS + "Bookmark");
+    if (!bmTypeRes) return false;
+
+    var dirty = false;
+    for (var x=0; x<strings.length; x=x+2)
+    {
+        var theID = strings[x];
+        var theName = strings[x+1];
+        if ((theID.indexOf("ID:{") == 0) && (theName.indexOf("NAME:{") == 0))
+        {
+            theID = theID.substr(4, theID.length-5);
+            theName = theName.substr(6, theName.length-7);
+
+            var IDRes = RDF.GetResource(theID);
+            if (!IDRes) continue;
+
+            if (RDFC.IndexOf(IDRes) > 0)
+                continue;
+
+            if (theName != "")
+            {
+                var NameLiteral = RDF.GetLiteral(theName);
+                if (NameLiteral)
+                {
+                    Bookmarks.Assert(IDRes, nameRes, NameLiteral, true);
+                    dirty = true;
+                }
+            }
+            if (isContainerFlag == true)
+              RDFC.AppendElement(IDRes);
+            else
+              RDFC.InsertElementAt(IDRes, pasteNodeIndex++, true);
+            dirty = true;
+
+            // make sure appropriate bookmark type is set
+            var bmTypeNode = Bookmarks.GetTarget( IDRes, typeRes, true );
+            if (!bmTypeNode)
+            {
+                // set default bookmark type
+                Bookmarks.Assert(IDRes, typeRes, bmTypeRes, true);
+            }
+        }
+    }
+    if (dirty == true)
+    {
+        var rdf_ds_interface = Components.interfaces.nsIRDFRemoteDataSource;
+        var remote = Bookmarks.QueryInterface(rdf_ds_interface);
+        if (remote)
+          remote.Flush();
+    }
+    return true;
+}
+
+function doDelete(promptFlag)
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var select_list = treeNode.selectedItems;
+    if (!select_list) return false;
+    if (select_list.length < 1) return false;
+
+    if (promptFlag == true)
+    {
+        var deleteStr = '';
+        if (select_list.length == 1) {
+            deleteStr = get_localized_string("DeleteItem");
+        } else {
+            deleteStr = get_localized_string("DeleteItems");
+        }
+        var ok = confirm(deleteStr);
+        if (!ok) return false;
+    }
+
+    var RDF_uri = "@mozilla.org/rdf/rdf-service;1";
+    var RDF = Components.classes[RDF_uri].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!RDF) return false;
+
+    var RDFC_uri = "@mozilla.org/rdf/container;1";
+    var RDFC = Components.classes[RDFC_uri].getService();
+    RDFC = RDFC.QueryInterface(Components.interfaces.nsIRDFContainer);
+    if (!RDFC) return false;
+
+    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+    if (!Bookmarks) return false;
+
+    var dirty = false;
+
+    // note: backwards delete so that we handle odd deletion cases such as
+    //       deleting a child of a folder as well as the folder itself
+    for (var nodeIndex=select_list.length-1; nodeIndex>=0; nodeIndex--)
+    {
+        var node = select_list[nodeIndex];
+        if (!node) continue;
+        var ID = node.getAttribute("id");
+        if (!ID) continue;
+
+        // don't allow deletion of various "special" folders
+        if ((ID == "NC:BookmarksRoot") || (ID == "NC:IEFavoritesRoot"))
+        {
+            continue;
+        }
+
+        var parentID = node.parentNode.parentNode.getAttribute("ref");
+        if (!parentID) parentID = node.parentNode.parentNode.getAttribute("id");
+        if (!parentID) continue;
+
+        var IDRes = RDF.GetResource(ID);
+        if (!IDRes) continue;
+        var parentIDRes = RDF.GetResource(parentID);
+        if (!parentIDRes) continue;
+
+        RDFC.Init(Bookmarks, parentIDRes);
+        RDFC.RemoveElement(IDRes, true);
+        dirty = true;
+    }
+
+    if (dirty == true)
+    {
+        var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+        if (remote)
+          remote.Flush();
+    }
+
+    return true;
+}
+
+function doSelectAll()
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    treeNode.selectAll();
+    return true;
+}
+
+function doUnload()
+{
+    // Get the current window position/size.
+    var x = window.screenX;
+    var y = window.screenY;
+    var h = window.outerHeight;
+    var w = window.outerWidth;
+
+    // Store these into the window attributes (for persistence).
+    var win = document.getElementById("bookmark-window");
+    win.setAttribute("x", x);
+    win.setAttribute("y", y);
+    win.setAttribute("height", h);
+    win.setAttribute("width", w);
+}
+
+function BookmarkProperties()
+{
+    var treeNode = document.getElementById('bookmarksTree');
+    var select_list = treeNode.selectedItems;
+
+    if (select_list.length >= 1) {
+        // don't bother showing properties on bookmark separators
+        var type = select_list[0].getAttribute('type');
+        if (type != NC_NS + "BookmarkSeparator") {
+            window.openDialog("chrome://communicator/content/bookmarks/bm-props.xul",
+                              "_blank", "centerscreen,chrome,menubar",
+                              select_list[0].getAttribute("id"));
+        }
+    }
+    return true;
+}
+
+
+
+function OpenBookmarksFind()
+{
+    window.openDialog("chrome://communicator/content/bookmarks/bm-find.xul",
+                      "FindBookmarksWindow",
+                      "dialog=no,close,chrome,resizable", "bookmarks");
+    return true;
+}
+
+
+
+function getAbsoluteID(root, node)
+{
+    var url = node.getAttribute("ref");
+    if ((url == null) || (url == ""))
+    {
+        url = node.getAttribute("id");
+    }
+    try
+    {
+        var rootNode = document.getElementById(root);
+        var ds = null;
+        if (rootNode)
+        {
+            ds = rootNode.database;
+        }
+
+        // add support for anonymous resources such as Internet Search results,
+        // IE favorites under Win32, and NetPositive URLs under BeOS
+        var rdf_uri = "@mozilla.org/rdf/rdf-service;1";
+        var rdf = Components.classes[rdf_uri].getService();
+        if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
+        if (rdf && ds)
+        {
+            var src = rdf.GetResource(url, true);
+            var prop = rdf.GetResource(NC_NS + "URL",
+                                       true);
+            var target = ds.GetTarget(src, prop, true);
+            if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
+            if (target) target = target.Value;
+            if (target) url = target;
+        }
+    }
+    catch(ex)
+    {
+    }
+    return url;
+}
+
+function OpenURL(event, node, root)
+{
+    if ((event.button != 0) || (event.detail != 2)
+        || (node.nodeName != "treeitem"))
+        return false;
+
+    if (node.getAttribute("container") == "true")
+        return false;
+
+    var url = getAbsoluteID(root, node);
+
+    // Ignore "NC:" urls.
+    if (url.substring(0, 3) == "NC:")
+        return false;
+
+    if (event.altKey)
+    {
+        BookmarkProperties();
+    }
+    else
+    {
+        // get right sized window
+        window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url);
+    }
+    return true;
+}
+
+const nsIFilePicker = Components.interfaces.nsIFilePicker;
+
+function doContextCmd(cmdName)
+{
+    // Do some prompting/confirmation for various bookmark
+    // commands that we know about.
+    // If we have values to pass it, they are added to the arguments array
+
+    var nameVal = "";
+    var urlVal = "";
+    var promptStr;
+
+    var picker_uri;
+    var filePicker;
+
+    if (cmdName == NC_NS + "command?cmd=newbookmark")
+    {
+        while (true)
+        {
+            promptStr = get_localized_string("NewBookmarkURLPrompt");
+            urlVal = prompt(promptStr, "");
+            if (!urlVal || urlVal=="") return false;
+
+            // ensure we get a fully qualified URL (protocol colon address)
+            var colonOffset = urlVal.indexOf(":");
+            if (colonOffset > 0) break;
+            alert(get_localized_string("NeedValidURL"));
+        }
+
+        promptStr = get_localized_string("NewBookmarkNamePrompt");
+        nameVal = prompt(promptStr, "");
+        if (!nameVal || nameVal=="") return false;
+    }
+    else if (cmdName == NC_NS + "command?cmd=newfolder")
+    {
+        promptStr = get_localized_string("NewFolderNamePrompt");
+        nameVal = prompt(promptStr, "");
+        if (!nameVal || nameVal=="") return false;
+    }
+    else if ((cmdName == NC_NS + "command?cmd=deletebookmark") ||
+         (cmdName == NC_NS + "command?cmd=deletebookmarkfolder") ||
+         (cmdName == NC_NS + "command?cmd=deletebookmarkseparator"))
+    {
+        return doDelete(true);
+        //var promptStr = get_localized_string("DeleteItems");
+        //if (!confirm(promptStr)) return false;
+    }
+    else if (cmdName == NC_NS + "command?cmd=import")
+    {
+        try
+        {
+            picker_uri = "@mozilla.org/filepicker;1";
+            filePicker = Components.classes[picker_uri].createInstance(nsIFilePicker);
+            if (!filePicker) return false;
+
+            promptStr = get_localized_string("SelectImport");
+            filePicker.init(window, promptStr, nsIFilePicker.modeOpen);
+            filePicker.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterAll);
+            if (filePicker.show() != nsIFilePicker.returnCancel)
+              var filename = filePicker.fileURL.spec;
+            if ((!filename) || (filename == "")) return false;
+
+            urlVal = filename;
+        }
+        catch(ex)
+        {
+            return false;
+        }
+    }
+    else if (cmdName == NC_NS + "command?cmd=export")
+    {
+        try
+        {
+            picker_uri = "@mozilla.org/filepicker;1";
+            filePicker = Components.classes[picker_uri].createInstance(nsIFilePicker);
+            if (!filePicker) return false;
+
+            promptStr = get_localized_string("EnterExport");
+            filePicker.init(window, promptStr, nsIFilePicker.modeSave);
+            filePicker.defaultString = "bookmarks.html";
+            filePicker.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterAll);
+            if (filePicker.show() != nsIFilePicker.returnCancel &&
+                filePicker.fileURL.spec &&
+                filePicker.fileURL.spec.length > 0) {
+              urlVal = filePicker.fileURL.spec;
+            } else {
+              return false;
+            }
+        }
+        catch(ex)
+        {
+            return false;
+        }
+    }
+
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var db = treeNode.database;
+    if (!db) return false;
+
+    var compositeDB = db.QueryInterface(Components.interfaces.nsIRDFDataSource);
+    if (!compositeDB) return false;
+
+    var isupports_uri = "@mozilla.org/rdf/rdf-service;1";
+    var isupports = Components.classes[isupports_uri].getService();
+    if (!isupports) return false;
+    var rdf = isupports.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!rdf) return false;
+
+    // need a resource for the command
+    var cmdResource = rdf.GetResource(cmdName);
+    if (!cmdResource) return false;
+    cmdResource = cmdResource.QueryInterface(Components.interfaces.nsIRDFResource);
+    if (!cmdResource) return false;
+
+    // set up selection nsISupportsArray
+    var selection_uri = "@mozilla.org/supports-array;1";
+    var selectionInstance = Components.classes[selection_uri].createInstance();
+    var selectionArray = selectionInstance.QueryInterface(Components.interfaces.nsISupportsArray);
+
+    // set up arguments nsISupportsArray
+    var arguments_uri = "@mozilla.org/supports-array;1";
+    var argumentsInstance = Components.classes[arguments_uri].createInstance();
+    var argumentsArray = argumentsInstance.QueryInterface(Components.interfaces.nsISupportsArray);
+
+    // get various arguments (parent, name)
+    var parentArc = rdf.GetResource(NC_NS + "parent");
+    if (!parentArc) return false;
+    var nameArc = rdf.GetResource(NC_NS + "Name");
+    if (!nameArc) return false;
+    var urlArc = rdf.GetResource(NC_NS + "URL");
+    if (!urlArc) return false;
+
+    var select_list = treeNode.selectedItems;
+
+    var uri;
+    var rdfNode;
+
+    if (select_list.length < 1)
+    {
+        // if nothing is selected, default to using the "ref"
+        // on the root of the tree
+        uri = treeNode.getAttribute("ref");
+        if (!uri || uri=="") return false;
+        rdfNode = rdf.GetResource(uri);
+        // add node into selection array
+        if (rdfNode)
+        {
+            selectionArray.AppendElement(rdfNode);
+        }
+
+        // add singular arguments into arguments array
+        if ((nameVal) && (nameVal != ""))
+        {
+            var nameLiteral = rdf.GetLiteral(nameVal);
+            if (!nameLiteral) return false;
+            argumentsArray.AppendElement(nameArc);
+            argumentsArray.AppendElement(nameLiteral);
+        }
+        if ((urlVal) && (urlVal != ""))
+        {
+            var urlLiteral = rdf.GetLiteral(urlVal);
+            if (!urlLiteral) return false;
+            argumentsArray.AppendElement(urlArc);
+            argumentsArray.AppendElement(urlLiteral);
+        }
+    }
+    else for (var nodeIndex=0; nodeIndex<select_list.length; nodeIndex++)
+    {
+        var node = select_list[nodeIndex];
+        if (!node) break;
+        uri = node.getAttribute("ref");
+        if ((uri) || (uri == ""))
+        {
+            uri = node.getAttribute("id");
+        }
+        if (!uri) return false;
+
+        rdfNode = rdf.GetResource(uri);
+        if (!rdfNode) break;
+
+        // add node into selection array
+        selectionArray.AppendElement(rdfNode);
+
+        // get the parent's URI
+        var parentURI = "";
+        var theParent = node.parentNode.parentNode;
+        parentURI = theParent.getAttribute("ref");
+        if ((!parentURI) || (parentURI == ""))
+        {
+                parentURI = theParent.getAttribute("id");
+        }
+        if (parentURI == "") return false;
+
+        var parentNode = rdf.GetResource(parentURI, true);
+        if (!parentNode) return false;
+
+        // add multiple arguments into arguments array
+        argumentsArray.AppendElement(parentArc);
+        argumentsArray.AppendElement(parentNode);
+
+        if ((nameVal) && (nameVal != ""))
+        {
+            var nameLiteral2 = rdf.GetLiteral(nameVal);
+            if (!nameLiteral2) return false;
+            argumentsArray.AppendElement(nameArc);
+            argumentsArray.AppendElement(nameLiteral2);
+        }
+        if ((urlVal) && (urlVal != ""))
+        {
+            var urlLiteral2 = rdf.GetLiteral(urlVal);
+            if (!urlLiteral2) return false;
+            argumentsArray.AppendElement(urlArc);
+            argumentsArray.AppendElement(urlLiteral2);
+        }
+    }
+
+    // do the command
+    compositeDB.DoCommand(selectionArray, cmdResource, argumentsArray);
+    return true;
+}
+
+function bookmarkSelect()
+{
+    var tree = document.getElementById("bookmarksTree");
+    var status = document.getElementById("statusbar-text");
+    var val = "";
+    if (tree.selectedItems.length == 1)
+    {
+        val = getAbsoluteID("bookmarksTree", tree.selectedItems[0]);
+
+        // Ignore "NC:" urls.
+        if (val.substring(0, 3) == "NC:")
+        {
+            val = "";
+        }
+    }
+    status.label = val;
+    return true;
+}

mozilla/xpfe/components/bookmarks/resources/bookmarks.css

@@ -0,0 +1,14 @@
+bookmarks-tree, bookmarks-tree[type="multi-column"]
+  {
+    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-full");
+  }
+  
+bookmarks-tree[type="single-column"]
+  {
+    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-name");
+  }
+
+bookmarks-tree[type="folders"]
+  {
+    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-folders");
+  }

mozilla/xpfe/components/bookmarks/resources/bookmarks.js

@@ -0,0 +1,219 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
+ *
+ * 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):
+ *   Ben Goodger <ben@netscape.com> (Original Author, v3.0)
+ */
+
+////////////////////////////////////////////////////////////////////////////////
+// Initialize the command controllers, set focus, tree root, 
+// window title state, etc. 
+function Startup()
+{
+  const windowNode = document.getElementById("bookmark-window");
+  const bookmarksView = document.getElementById("bookmarks-view");
+  var titleString;
+
+  // If we've been opened with a parameter, root the tree on it.
+  if ("arguments" in window && window.arguments[0]) {
+    var title;
+    var uri = window.arguments[0];
+    bookmarksView.tree.setAttribute("ref", uri);
+    if (uri.substring(0,5) == "find:") {
+      title = bookmarksView._bundle.GetStringFromName("search_results_title");
+      // Update the windowtype so that future searches are directed 
+      // there and the window is not re-used for bookmarks. 
+      windowNode.setAttribute("windowtype", "bookmarks:searchresults");
+    }
+    else {
+      const krNameArc = bookmarksView.rdf.GetResource(NC_NS + "Name");
+      const krRoot = bookmarksView.rdf.GetResource(window.arguments[0]);
+      var rName = bookmarksView.db.GetTarget(krRoot, krNameArc, true);
+      title = rName.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+    }
+    titleString = bookmarksView._bundle.GetStringFromName("window_title");
+    titleString = titleString.replace(/%folder_name%/gi, title);
+    windowNode.setAttribute("title", titleString);
+  }
+  else {
+    const kProfileContractID = "@mozilla.org/profile/manager;1";
+    const kProfileIID = Components.interfaces.nsIProfile;
+    const kProfile = Components.classes[kProfileContractID].getService(kProfileIID);
+    var length = {value:0};
+    var profileList = kProfile.getProfileList(length);
+    // unset the default BM title if the user has more than one profile
+    // or if he/she has changed the name of the default one.
+    // the profile "default" is not localizable.
+    if (length.value > 1 || kProfile.currentProfile.toLowerCase() != "default") {
+      titleString = bookmarksView._bundle.GetStringFromName("bookmarks_root");
+      titleString = titleString.replace(/%user_name%/, kProfile.currentProfile);
+      windowNode.setAttribute("title", titleString);
+    }
+  }
+ 
+  bookmarksView.treeBoxObject.selection.select(0);
+  bookmarksView.tree.focus();
+}
+
+function Shutdown ()
+{
+  // Store current window position and size in window attributes (for persistence).
+  var win = document.getElementById("bookmark-window");
+  win.setAttribute("x", screenX);
+  win.setAttribute("y", screenY);
+  win.setAttribute("height", outerHeight);
+  win.setAttribute("width", outerWidth);
+
+  var bookmarksView = document.getElementById("bookmarks-view");
+  bookmarksView.flushBMDatasource();
+}
+
+var gConstructedViewMenuSortItems = false;
+function fillViewMenu(aEvent)
+{
+  var adjacentElement = document.getElementById("fill-before-this-node");
+  var popupElement = aEvent.target;
+  
+  var bookmarksView = document.getElementById("bookmarks-view");
+  var columns = bookmarksView.columns;
+
+  if (!gConstructedViewMenuSortItems) {
+    for (var i = 0; i < columns.length; ++i) {
+      var name = columns[i].name;
+      var accesskey = columns[i].accesskey;
+      
+      var menuitem = document.createElement("menuitem");
+      var nameTemplate = bookmarksView._bundle.GetStringFromName("SortMenuItem");
+      name = nameTemplate.replace(/%NAME%/g, columns[i].label);
+      menuitem.setAttribute("label", name);
+      menuitem.setAttribute("accesskey", columns[i].accesskey);
+      menuitem.setAttribute("resource", columns[i].resource);
+      menuitem.setAttribute("id", "sortMenuItem:" + columns[i].resource);
+      menuitem.setAttribute("checked", columns[i].sortActive);
+      menuitem.setAttribute("name", "sortSet");
+      menuitem.setAttribute("type", "radio");
+      
+      popupElement.insertBefore(menuitem, adjacentElement);
+    }
+    
+    gConstructedViewMenuSortItems = true;
+  }  
+
+  const kPrefSvcContractID = "@mozilla.org/preferences;1";
+  const kPrefSvcIID = Components.interfaces.nsIPrefService;
+  var prefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
+  var bookmarksSortPrefs = prefSvc.getBranch("browser.bookmarks.sort.");
+
+  if (gConstructedViewMenuSortItems) {
+    var resource = bookmarksSortPrefs.getCharPref("resource");
+    var element = document.getElementById("sortMenuItem:" + resource);
+    if (element)
+      element.setAttribute("checked", "true");
+  }  
+
+  var sortAscendingMenu = document.getElementById("ascending");
+  var sortDescendingMenu = document.getElementById("descending");
+  var noSortMenu = document.getElementById("natural");
+  
+  sortAscendingMenu.setAttribute("checked", "false");
+  sortDescendingMenu.setAttribute("checked", "false");
+  noSortMenu.setAttribute("checked", "false");
+  var direction = bookmarksSortPrefs.getCharPref("direction");
+  if (direction == "natural")
+    sortAscendingMenu.setAttribute("checked", "true");
+  else if (direction == "ascending") 
+    sortDescendingMenu.setAttribute("checked", "true");
+  else
+    noSortMenu.setAttribute("checked", "true");
+}
+
+function onViewMenuSortItemSelected(aEvent)
+{
+  var resource = aEvent.target.getAttribute("resource");
+  
+  const kPrefSvcContractID = "@mozilla.org/preferences;1";
+  const kPrefSvcIID = Components.interfaces.nsIPrefService;
+  var prefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
+  var bookmarksSortPrefs = prefSvc.getBranch("browser.bookmarks.sort.");
+
+  switch (resource) {
+  case "":
+    break;
+  case "direction":
+    var dirn = bookmarksSortPrefs.getCharPref("direction");
+    if (aEvent.target.id == "ascending")
+      bookmarksSortPrefs.setCharPref("direction", "natural");
+    else if (aEvent.target.id == "descending")
+      bookmarksSortPrefs.setCharPref("direction", "ascending");
+    else
+      bookmarksSortPrefs.setCharPref("direction", "descending");
+    break;
+  default:
+    bookmarksSortPrefs.setCharPref("resource", resource);
+    var direction = bookmarksSortPrefs.getCharPref("direction");
+    if (direction == "descending")
+      bookmarksSortPrefs.setCharPref("direction", "natural");
+    break;
+  }
+
+  aEvent.preventCapture();
+}  
+
+var gConstructedColumnsMenuItems = false;
+function fillColumnsMenu(aEvent) 
+{
+  var bookmarksView = document.getElementById("bookmarks-view");
+  var columns = bookmarksView.columns;
+  var i;
+
+  if (!gConstructedColumnsMenuItems) {
+    for (i = 0; i < columns.length; ++i) {
+      var menuitem = document.createElement("menuitem");
+      menuitem.setAttribute("label", columns[i].label);
+      menuitem.setAttribute("resource", columns[i].resource);
+      menuitem.setAttribute("id", "columnMenuItem:" + columns[i].resource);
+      menuitem.setAttribute("type", "checkbox");
+      menuitem.setAttribute("checked", columns[i].hidden != "true");
+      aEvent.target.appendChild(menuitem);
+    }
+
+    gConstructedColumnsMenuItems = true;
+  }
+  else {
+    for (i = 0; i < columns.length; ++i) {
+      var element = document.getElementById("columnMenuItem:" + columns[i].resource);
+      if (element && columns[i].hidden != "true")
+        element.setAttribute("checked", "true");
+    }
+  }
+  
+  aEvent.preventBubble();
+}
+
+function onViewMenuColumnItemSelected(aEvent)
+{
+  var resource = aEvent.target.getAttribute("resource");
+  if (resource != "") {
+    var bookmarksView = document.getElementById("bookmarks-view");
+    bookmarksView.toggleColumnVisibility(resource);
+  }  
+
+  aEvent.preventBubble();
+}
+

mozilla/xpfe/components/bookmarks/resources/bookmarks.xul

@@ -0,0 +1,252 @@
+<?xml version="1.0"?>  
+
+<!-- -*- Mode: HTML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  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): 
+    Ben Goodger <ben@netscape.com>
+    Blake Ross <blakeross@telocity.com>
+    Dean Tessman <dean_tessman@hotmail.com>
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksWindow.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/bookmarks/bookmarksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
+
+<!DOCTYPE window [
+<!ENTITY % utilDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd" >
+%utilDTD;
+<!ENTITY % bmDTD SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
+%bmDTD;
+]>
+
+<window id="bookmark-window" windowtype="bookmarks:manager"
+        title="&bookmarksWindowTitle.label;" 
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:web="http://home.netscape.com/WEB-rdf#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        width="630" height="400" screenX="20" screenY="20"
+        persist="width height screenX screenY sizemode"
+        onload="Startup();" onunload="Shutdown();">
+
+  <!-- The order of loading of these script files is IMPORTANT -->
+
+  <!-- Shared Libraries -->
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"></script>
+
+  <!-- XXX - This should SO become an XBL widget -->
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"></script>
+  
+  <!-- Shared Bookmarks Utility Library -->
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <!-- Tree-based Bookmarks UI Utility Library -->
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksTree.js"/>
+  <!-- Bookmarks Window -->
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
+
+  <!-- Bookmarks Window Drag & Drop -->
+  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
+
+  <popupset id="bookmarksPopupset"/>
+
+  <commands id="commands">
+    <commandset id="CommandUpdate_Bookmarks"
+                commandupdater="true"
+                events="focus,tree-select"
+                oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
+    </commandset>                
+
+    <commandset id="tasksCommands"/> 
+
+    <!-- File Menu -->
+    <command id="cmd_close" oncommand="close()"/>
+    <command id="cmd_quit"/>
+    <!-- Edit Menu -->
+    <command id="cmd_undo"/>
+  </commands>
+
+  <stringbundleset id="stringbundleset"/>
+
+  <keyset id="tasksKeys">
+    <!-- File Menu -->
+    <key id="key_close"/>
+    <key id="key_quit"/>
+    <!-- Edit Menu -->
+    <key id="key_undo"/>
+
+    <!-- These keybindings do not have a command specified in the overlay, 
+         which is good, but we need to specify it ourselves here -->
+    <key id="key_cut" command="cmd_bm_cut"/>
+    <key id="key_copy" command="cmd_bm_copy"/>
+    <key id="key_paste" command="cmd_bm_paste"/>
+    <key id="key_selectAll" command="cmd_bm_selectAll"/>
+
+    <!-- We need to provide our own delete key binding because the key_delete
+         handler in platformGlobalOverlay.xul maps command to "cmd_delete" which
+         is NOT what we want! -->
+    <key id="key_bm_delete" keycode="VK_DELETE" command="cmd_bm_delete"/>
+
+    <key id="bm_key_find"  
+         key="&edit.find.keybinding;"  
+         command="cmd_bm_find" modifiers="accel"/>
+    <key id="bm_key_properties" 
+         key="&edit.properties.keybinding;"  
+         command="cmd_bm_properties" modifiers="accel"/>
+  </keyset>
+  
+  <toolbox id="bookmarks-toolbox">
+    <menubar id="main-menubar" grippytooltiptext="&menuBar.tooltip;">
+      <menu id="menu_File">
+        <menupopup id="menu_FilePopup">
+          <menu id="menu_New">
+            <menupopup>
+              <menuitem label="&menuitem.newBookmark.label;" 
+                        accesskey="&command.newBookmark.accesskey;"
+                        observes="cmd_bm_newbookmark"/>
+              <menuitem label="&menuitem.newFolder.label;" 
+                        accesskey="&command.newFolder.accesskey;"
+                        observes="cmd_bm_newfolder"/>
+              <menuitem label="&menuitem.newSeparator.label;"
+                        accesskey="&command.newSeparator.accesskey;"
+                        observes="cmd_bm_newseparator"/>
+            </menupopup>
+          </menu>
+          <menuitem id="menu_close"/>
+        </menupopup>
+      </menu>
+      <menu id="menu_Edit">
+        <menupopup>
+          <menuitem id="menu_undo" disabled="true"/>
+          <menuseparator/>
+          <menuitem id="menu_bm_cut"    
+                    label="&cutCmd.label;" accesskey="&cutCmd.accesskey;" 
+          key="key_cut" command="cmd_bm_cut"/>
+          <menuitem id="menu_bm_copy"
+                    label="&copyCmd.label;" accesskey="&copyCmd.accesskey;"
+                    key="key_copy" command="cmd_bm_copy"/>
+          <menuitem id="menu_bm_paste"  
+                    label="&pasteCmd.label;" accesskey="&pasteCmd.accesskey;"     
+                    key="key_paste" command="cmd_bm_paste"/>
+          <menuitem id="menu_bm_delete" 
+                    label="&deleteCmd.label;" accesskey="&deleteCmd.label;"     
+                    key="key_bm_delete" command="cmd_bm_delete"/>
+          <menuseparator/>
+          <menuitem id="menu_bm_selectAll" 
+                label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
+                    key="key_selectAll" command="cmd_bm_selectAll"/>
+          <menuseparator/>
+          <menuitem label="&command.fileBookmark.label;"
+                    accesskey="&command.fileBookmark.accesskey;"
+                    command="cmd_bm_fileBookmark"/>
+          <menuseparator/>
+            <menuitem observes="cmd_bm_properties" key="bm_key_properties" 
+                      label="&command.properties.label;" 
+                      accesskey="&command.properties.accesskey;" />
+        </menupopup>
+      </menu>
+  
+      <menu id="menu_View">
+        <menupopup onpopupshowing="fillViewMenu(event)"
+                   oncommand="onViewMenuSortItemSelected(event);">
+          <menuitem id="viewCommandToolbar" type="checkbox" class="menuitem-iconic"
+                    label="&menuitem.view.command.toolbar.label;"
+                    accesskey="&menuitem.view.command.toolbar.accesskey;"
+                    oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.preventBubble();"
+                    persist="checked"/>
+          <menuseparator id="fill-after-this-node"/>
+          <menuitem id="natural" label="&menuitem.view.unsorted.label;"
+                    accesskey="&menuitem.view.unsorted.accesskey;"
+                    type="radio"
+                    resource="direction" name="sortSet"/>
+          <menuseparator id="fill-before-this-node"/>
+          <menuitem id="ascending" label="&menuitem.view.ascending.label;"
+                    accesskey="&menuitem.view.ascending.accesskey;"
+                    type="radio"
+                    resource="direction" name="sortDirectionSet"/>
+          <menuitem id="descending" label="&menuitem.view.descending.label;"
+                    accesskey="&menuitem.view.descending.accesskey;"
+                    type="radio"
+                    resource="direction" name="sortDirectionSet"/>
+          <menuseparator/>
+          <menu id="descending" label="&menuitem.view.show_columns.label;"
+                accesskey="&menuitem.view.show_columns.accesskey;">
+            <menupopup id="columnsPopup" onpopupshowing="fillColumnsMenu(event);"
+                       oncommand="onViewMenuColumnItemSelected(event);"/>
+          </menu>
+          <menuseparator/>
+          <menuitem label="&menuitem.newbookmarkfolder.label;" 
+                    command="cmd_bm_setnewbookmarkfolder"
+                    accesskey="&menuitem.newbookmarkfolder.accesskey;"/>
+          <menuitem label="&menuitem.newinternetsearchfolder.label;"
+                    command="cmd_bm_setnewsearchfolder"
+                    accesskey="&menuitem.newinternetsearchfolder.accesskey;"/>
+          <menuitem label="&menuitem.personaltoolbarfolder.label;"    
+                    command="cmd_bm_setpersonaltoolbarfolder"
+                    accesskey="&menuitem.personaltoolbarfolder.accesskey;"/>
+        </menupopup>
+      </menu>
+      <menu id="tasksMenu">
+        <menupopup id="taskPopup">
+          <menuitem command="cmd_bm_find" key="bm_key_find"
+                    label="&menuitem.find.label;" 
+                    accesskey="&menuitem.find.accesskey;"/>
+          <menuitem label="&menuitem.import.label;"
+                    accesskey="&menuitem.import.accesskey;"
+                    observes="cmd_bm_import"/>
+          <menuitem label="&menuitem.export.label;"
+                    accesskey="&menuitem.export.accesskey;"
+                    observes="cmd_bm_export"/>
+          <menuseparator/>
+        </menupopup>
+      </menu>
+      <menu id="windowMenu"/>
+      <menu id="menu_Help"/>
+    </menubar>
+
+    <toolbar id="command-toolbar" tbalign="stretch" grippytooltiptext="&bookmarkToolbar.tooltip;">
+      <toolbarbutton id="newfolder" label="&button.newFolder.label;" 
+                     command="cmd_bm_newfolder"/>
+      <toolbarbutton id="newseparator" label="&button.newSeparator.label;" 
+                     command="cmd_bm_newseparator"/>
+      <toolbarseparator/>
+      <toolbarbutton id="fileBookmark" label="&command.fileBookmark.label;"
+                     command="cmd_bm_fileBookmark"/>
+      <toolbarseparator/>
+      <toolbarbutton id="properties" label="&command.properties.label;"
+                     command="cmd_bm_properties"/>
+      <toolbarbutton id="rename" label="&command.rename.label;"
+                     command="cmd_bm_rename"/>
+      <toolbarbutton id="delete" label="&command.delete.label;"
+                     command="cmd_bm_delete"/>
+    </toolbar>
+  </toolbox>
+  
+  <bookmarks-tree id="bookmarks-view" flex="1"/>
+
+</window>
+

mozilla/xpfe/components/bookmarks/resources/bookmarksDD-temp.js

@@ -0,0 +1,508 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+  This is the old bookmarks code, included here for the sake of the bookmarks sidebar panel,
+  which will be fixed to use my new code in .9. In the mean time, this file provides a 
+  life line to various functionality. 
+ */ 
+ 
+ 
+var NC_NS  = "http://home.netscape.com/NC-rdf#";
+var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+
+
+
+function TopLevelDrag ( event )
+{
+  return(true);
+}
+
+
+function BeginDragTree ( event )
+{
+  //XXX we rely on a capturer to already have determined which item the mouse was over
+  //XXX and have set an attribute.
+    
+  // if the click is on the tree proper, ignore it. We only care about clicks on items.
+
+  var tree = document.getElementById("bookmarksTree");
+  if ( event.target == tree || event.target.localName == "treechildren" )
+    return(true);         // continue propagating the event
+    
+  var childWithDatabase = tree;
+  if ( ! childWithDatabase )
+    return(false);
+    
+  var dragStarted = false;
+
+  var trans = 
+    Components.classes["@mozilla.org/widget/transferable;1"].createInstance(Components.interfaces.nsITransferable);
+  if ( !trans ) return(false);
+
+  var genData = 
+    Components.classes["@mozilla.org/supports-wstring;1"].createInstance(Components.interfaces.nsISupportsWString);
+  if (!genData) return(false);
+
+  var genDataURL = 
+    Components.classes["@mozilla.org/supports-wstring;1"].createInstance(Components.interfaces.nsISupportsWString);
+  if (!genDataURL) return(false);
+
+  trans.addDataFlavor("text/unicode");
+  trans.addDataFlavor("moz/rdfitem");
+        
+  // ref/id (url) is on the <treeitem> which is two levels above the <treecell> which is
+  // the target of the event.
+  var id = event.target.parentNode.parentNode.getAttribute("ref");
+  if (!id || id=="")
+  {
+	id = event.target.parentNode.parentNode.getAttribute("id");
+  }
+
+  var parentID = event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("ref");
+  if (!parentID || parentID == "")
+  {
+	parentID = event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("id");
+  }
+
+  var trueID = id;
+  if (parentID != null)
+  {
+  	trueID += "\n" + parentID;
+  }
+  genData.data = trueID;
+  genDataURL.data = id;
+
+  var database = childWithDatabase.database;
+  var rdf = 
+    Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+  if ((!rdf) || (!database))  { dump("CAN'T GET DATABASE\n"); return(false); }
+
+  // make sure its a bookmark, bookmark separator, or bookmark folder
+  var src = rdf.GetResource(id, true);
+  var prop = rdf.GetResource(RDF_NS + "type", true);
+  var target = database.GetTarget(src, prop, true);
+
+  if (target) target = target.QueryInterface(Components.interfaces.nsIRDFResource);
+  if (target) target = target.Value;
+  if ((!target) || (target == "")) {dump("BAD\n"); return(false);}
+
+  if ((target != NC_NS + "BookmarkSeparator") &&
+    (target != NC_NS + "Bookmark") &&
+    (target != NC_NS + "Folder")) return(false);
+
+  trans.setTransferData ( "moz/rdfitem", genData, genData.data.length * 2);  // double byte data
+  trans.setTransferData ( "text/unicode", genDataURL, genDataURL.data.length * 2);  // double byte data
+
+  var transArray = 
+    Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray);
+  if ( !transArray )  return(false);
+
+  // put it into the transferable as an |nsISupports|
+  var genTrans = trans.QueryInterface(Components.interfaces.nsISupports);
+  transArray.AppendElement(genTrans);
+  
+  var dragService = 
+    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
+  if ( !dragService ) return(false);
+
+  var nsIDragService = Components.interfaces.nsIDragService;
+  dragService.invokeDragSession ( event.target, transArray, null, nsIDragService.DRAGDROP_ACTION_COPY + 
+                                     nsIDragService.DRAGDROP_ACTION_MOVE );
+  dragStarted = true;
+
+  return(!dragStarted);
+}
+
+
+
+function DragOverTree ( event )
+{
+  var validFlavor = false;
+  var dragSession = null;
+  var retVal = true;
+
+  var dragService = 
+    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
+  if ( !dragService ) return(false);
+
+  dragSession = dragService.getCurrentSession();
+  if ( !dragSession ) return(false);
+
+  if ( dragSession.isDataFlavorSupported("moz/rdfitem") ) validFlavor = true;
+  else if ( dragSession.isDataFlavorSupported("text/unicode") ) validFlavor = true;
+  //XXX other flavors here...
+
+  // touch the attribute on the rowgroup to trigger the repaint with the drop feedback.
+  if ( validFlavor )
+  {
+    var treeRoot = document.getElementById("bookmarksTree");
+    if (!treeRoot)  return(false);
+    var treeDatabase = treeRoot.database;
+    if (!treeDatabase)  return(false);
+
+    //XXX this is really slow and likes to refresh N times per second.
+    var rowGroup = event.target.parentNode.parentNode;
+    var sortActive = treeRoot.getAttribute("sortActive");
+    if (sortActive == "true")
+      rowGroup.setAttribute ( "dd-triggerrepaintsorted", 0 );
+    else
+      rowGroup.setAttribute ( "dd-triggerrepaint", 0 );
+
+    dragSession.canDrop = true;
+    // necessary??
+    retVal = false;
+  }
+  return(retVal);
+}
+
+
+
+function DropOnTree ( event )
+{
+  var treeRoot = document.getElementById("bookmarksTree");
+  if (!treeRoot)  return(false);
+  var treeDatabase = treeRoot.database;
+  if (!treeDatabase)  return(false);
+
+  // for beta1, don't allow D&D if sorting is active
+  var sortActive = treeRoot.getAttribute("sortActive");
+  if (sortActive == "true")
+  {
+  	dump("Sorry, drag&drop is currently disabled when sorting is active.\n");
+  	return(false);
+  }
+
+  var RDF = 
+    Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+  if (!RDF) return(false);
+  var RDFC =
+    Components.classes["@mozilla.org/rdf/container;1"].getService(Components.interfaces.nsIRDFContainer);
+  if (!RDFC)  return(false);
+
+  var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+  if (!Bookmarks) return(false);
+
+  // target is the <treecell>, and "ref/id" is on the <treeitem> two levels above
+  var treeItem = event.target.parentNode.parentNode;
+  if (!treeItem)  return(false);
+
+  // get drop hint attributes
+  var dropBefore = treeItem.getAttribute("dd-droplocation");
+  var dropOn = treeItem.getAttribute("dd-dropon");
+
+  // calculate drop action
+  var dropAction;
+  if (dropBefore == "true") dropAction = "before";
+  else if (dropOn == "true")  dropAction = "on";
+  else        dropAction = "after";
+
+  // calculate parent container node
+  var containerItem = treeItem;
+  if (dropAction != "on")
+  {
+    containerItem = treeItem.parentNode.parentNode;
+  }
+
+	// magical fix for bug # 33546: handle dropping after open container
+	if (treeItem.getAttribute("container") == "true")
+	{
+		if (treeItem.getAttribute("open") == "true")
+		{
+			if (dropAction == "after")
+			{
+				dropAction = "before";
+				containerItem = treeItem;
+
+				// find <treechildren>, drop before first child
+				var treeChildren = treeItem;
+				treeItem = null;
+				for (var x = 0; x < treeChildren.childNodes.length; x++)
+				{
+					if (treeChildren.childNodes[x].tagName == "treechildren")
+					{
+						treeItem = treeChildren.childNodes[x].childNodes[0];
+						break;
+					}
+				}
+
+				if (!treeItem)
+				{
+					dropAction = "on";
+					containerItem = treeItem.parentNode.parentNode;
+				}
+			}
+		}
+	}
+
+  var targetID = getAbsoluteID("bookmarksTree", treeItem);
+  if (!targetID)  return(false);
+  var targetNode = RDF.GetResource(targetID, true);
+  if (!targetNode)  return(false);
+
+  var containerID = getAbsoluteID("bookmarksTree", containerItem);
+  if (!containerID) return(false);
+  var containerNode = RDF.GetResource(containerID);
+  if (!containerNode) return(false);
+
+  var dragService = 
+    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
+  if ( !dragService ) return(false);
+  
+  var dragSession = dragService.getCurrentSession();
+  if ( !dragSession ) return(false);
+
+  var trans = 
+    Components.classes["@mozilla.org/widget/transferable;1"].createInstance(Components.interfaces.nsITransferable);
+  if ( !trans )   return(false);
+  trans.addDataFlavor("moz/rdfitem");
+  trans.addDataFlavor("text/x-moz-url");
+  trans.addDataFlavor("text/unicode");
+
+    var typeRes = RDF.GetResource(RDF_NS + "type");
+    if (!typeRes) return false;
+    var bmTypeRes = RDF.GetResource(NC_NS + "Bookmark");
+    if (!bmTypeRes) return false;
+
+  var dirty = false;
+
+  for ( var i = 0; i < dragSession.numDropItems; ++i )
+  {
+    dragSession.getData ( trans, i );
+    var dataObj = new Object();
+    var bestFlavor = new Object();
+    var len = new Object();
+    trans.getAnyTransferData ( bestFlavor, dataObj, len );
+    if ( dataObj )  dataObj = dataObj.value.QueryInterface(Components.interfaces.nsISupportsWString);
+    if ( !dataObj ) continue;
+
+    var sourceID = null;
+    var parentID = null;
+    var checkNameHack = false;
+    var name=null;
+
+    if (bestFlavor.value == "moz/rdfitem")
+    {
+	    // pull the URL out of the data object
+	    var data = dataObj.data.substring(0, len.value / 2);
+
+        // moz/rdfitem allows parent ID specified on next line; check for it
+	    var cr = data.indexOf("\n");
+	    if (cr >= 0)
+	    {
+	    	sourceID = data.substr(0, cr);
+	    	parentID = data.substr(cr+1);
+	    }
+	    else
+	    {
+	        sourceID = data;
+	    }
+    }
+    else if (bestFlavor.value == "text/x-moz-url")
+    {
+	    // pull the URL out of the data object
+	    data = dataObj.data.substring(0, len.value / 2);
+	    sourceID = data;
+
+    	// we may need to synthesize a name (just use the URL)
+    	checkNameHack = true;
+    }
+    else if (bestFlavor.value == "text/unicode")
+    {
+    	sourceID = dataObj.data;
+
+    	// we may need to synthesize a name (just use the URL)
+    	checkNameHack = true;
+    }
+    else
+    {
+        // unknown flavor, skip
+        continue;
+    }
+
+    // pull the (optional) name out of the URL
+    var separator = sourceID.indexOf("\n");
+    if (separator >= 0)
+    {
+        name = sourceID.substr(separator+1);
+        sourceID = sourceID.substr(0, separator);
+    }
+
+    var sourceNode = RDF.GetResource(sourceID, true);
+    if (!sourceNode)  continue;
+
+    var parentNode = null;
+    if (parentID != null)
+    {
+    	parentNode = RDF.GetResource(parentID, true);
+    }
+    
+    // Prevent dropping of a node before, after, or on itself
+    if (sourceNode == targetNode) continue;
+    // Prevent dropping of a node onto its parent container
+    if ((dropAction == "on") && (containerID) && (containerID == parentID))	continue;
+
+    RDFC.Init(Bookmarks, containerNode);
+
+    // make sure appropriate bookmark type is set
+    var bmTypeNode = Bookmarks.GetTarget( sourceNode, typeRes, true );
+    if (!bmTypeNode)
+    {
+        // set default bookmark type
+        Bookmarks.Assert(sourceNode, typeRes, bmTypeRes, true);
+    }
+
+    if ((dropAction == "before") || (dropAction == "after"))
+    {
+      // drop before or after
+      var nodeIndex;
+
+      nodeIndex = RDFC.IndexOf(sourceNode);
+
+      if (nodeIndex >= 1)
+      {
+        // moving a node around inside of the container
+        // so remove, then re-add the node
+        RDFC.RemoveElementAt(nodeIndex, true, sourceNode);
+      }
+      
+      nodeIndex = RDFC.IndexOf(targetNode);
+
+      if (nodeIndex < 1)  return(false);
+      if (dropAction == "after")  ++nodeIndex;
+
+      RDFC.InsertElementAt(sourceNode, nodeIndex, true);
+
+	// select the newly added node
+	if (parentID)
+	{
+	      selectDroppedItems(treeRoot, containerID, sourceID);
+	}	     
+
+      dirty = true;
+    }
+    else
+    {
+      // drop on
+      RDFC.AppendElement(sourceNode);
+
+	// select the newly added node
+	if (parentID)
+	{
+	      selectDroppedItems(treeRoot, containerID, sourceID);
+	}	     
+
+      dirty = true;
+    }
+
+    if ((checkNameHack == true) || (name != null))
+    {
+    	var srcArc = RDF.GetResource(sourceID, true);
+    	var propArc = RDF.GetResource(NC_NS + "Name", true);
+    	if (srcArc && propArc && Bookmarks)
+    	{
+    		var targetArc = Bookmarks.GetTarget(srcArc, propArc, true);
+    		if (!targetArc)
+    		{
+    		    // if no name, fallback to using the URL as the name
+    			var defaultNameArc = RDF.GetLiteral((name != null && name != "") ? name : sourceID);
+    			if (defaultNameArc)
+    			{
+    				Bookmarks.Assert(srcArc, propArc, defaultNameArc, true); 
+    			}
+    		}
+    	}
+    }
+  }
+
+	// should we move the node? (i.e. take it out of the source container?)
+	if ((parentNode != null) && (containerNode != parentNode))
+	{
+	    try
+	    {
+    		RDFC.Init(Bookmarks, parentNode);
+    		nodeIndex = RDFC.IndexOf(sourceNode);
+
+    		if (nodeIndex >= 1)
+    		{
+    			RDFC.RemoveElementAt(nodeIndex, true, sourceNode);
+    		}
+        }
+        catch(ex)
+        {
+        }
+	}
+
+  if (dirty == true)
+  {
+    var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+    if (remote)
+    {
+      remote.Flush();
+    }
+  }
+
+  return(false);
+}
+
+
+
+function selectDroppedItems(treeRoot, containerID, targetID)
+{
+	var select_list = treeRoot.getElementsByAttribute("id", targetID);
+	for (var x=0; x<select_list.length; x++)
+	{
+		var node = select_list[x];
+		if (!node)	continue;
+
+		var parent = node.parentNode.parentNode;
+		if (!parent)	continue;
+
+		var id = parent.getAttribute("ref");
+		if (!id || id=="")
+		{
+			id = parent.getAttribute("id");
+		}
+		if (!id || id=="")	continue;
+
+		if (id == containerID)
+		{
+			treeRoot.selectItem(node);
+			break;
+		}
+	}
+}

mozilla/xpfe/components/bookmarks/resources/bookmarksDD.js

@@ -0,0 +1,397 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author, v2.0)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var NC_NS  = "http://home.netscape.com/NC-rdf#";
+var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+
+var gSpringLoadTracker = {
+  timeout: 0,
+  element: null,
+  
+  open: function (aRDFNode) 
+  {
+    if (this.element)
+      this.element.setAttribute("open", "true");
+    clearTimeout(this.timeout);
+  }
+};
+
+var bookmarksDNDObserver = {
+  _RDF: null,
+  get RDF ()
+  {
+    if (!this._RDF) {
+      const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFIID = Components.interfaces.nsIRDFService;
+      this._RDF = Components.classes[kRDFContractID].getService(kRDFIID);
+    }
+    return this._RDF;
+  },
+
+  // XXX I belong somewhere shared. 
+  getResource: function(aString)
+  {
+    return this.RDF.GetResource(aString, true);
+  },
+  
+  getTarget: function(aDS, aSourceID, aPropertyID)
+  {
+    var source = this.getResource(aSourceID);
+    var property = this.getResource(aPropertyID);
+    return aDS.GetTarget(source, property, true);
+  },
+  
+  onDragStart: function (aEvent, aXferData, aDragAction)
+  {
+    var bookmarksTree = document.getElementById("bookmarksTree");
+    if (aEvent.target == bookmarksTree || aEvent.target.localName == "treechildren" || 
+        aEvent.target.localName == "splitter" || aEvent.target.localName == "menu")
+      throw Components.results.NS_OK; // not a draggable item.
+    if (aEvent.target.parentNode && aEvent.target.parentNode.parentNode &&
+        aEvent.target.parentNode.parentNode.localName == "treehead")
+      throw Components.results.NS_OK; // don't drag treehead cells.
+    if (bookmarksTree.getAttribute("sortActive") == "true")
+      throw Components.results.NS_OK; 
+          
+    var selItems = null;
+    if (bookmarksTree.selectedItems.length <= 0)
+      selItems = [aEvent.target.parentNode.parentNode];
+    else 
+      selItems = bookmarksTree.selectedItems;
+    aXferData.data = new TransferDataSet();
+    for (var i = 0; i < selItems.length; ++i) {
+      var currItem = selItems[i];
+      var currURI = NODE_ID(currItem);
+    
+      var parentItem = currItem.parentNode.parentNode;
+      var parentURI = NODE_ID(parentItem);
+    
+      var type = this.getTarget(bookmarksTree.database, currURI, RDF_NS + "type");
+      type = type.QueryInterface(Components.interfaces.nsIRDFResource).Value;
+      if (!type || (type != (NC_NS + "BookmarkSeparator") && 
+                    type != (NC_NS + "Bookmark") && 
+                    type != (NC_NS + "Folder"))) 
+        throw Components.results.NS_OK;
+      var name = this.getTarget(bookmarksTree.database, currURI, NC_NS + "Name");        
+      var data = new TransferData();
+      if (name) {
+        name = name.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+        data.addDataForFlavour("text/x-moz-url", currURI + "\n" + name);
+      }
+      else {
+        data.addDataForFlavour("text/x-moz-url", currURI);
+      }
+      data.addDataForFlavour("moz/rdfitem", currURI + "\n" + parentURI);
+
+      data.addDataForFlavour("text/unicode", currURI);
+      aXferData.data.push(data);
+    }
+
+    if (aEvent.ctrlKey) {
+      const kDSIID = Components.interfaces.nsIDragService;
+      aDragAction.action = kDSIID.DRAGDROP_ACTION_COPY + kDSIID.DRAGDROP_ACTION_LINK;
+    }
+  },
+  
+  onDragOver: function (aEvent, aFlavour, aDragSession)
+  {
+    var bookmarksTree = document.getElementById("bookmarksTree");
+    var rowGroup = aEvent.target.parentNode.parentNode;
+    if (rowGroup)
+      rowGroup.setAttribute("dd-triggerrepaint" + 
+                            (bookmarksTree.getAttribute("sortActive") == "true" ? "sorted" : ""), 0);
+    
+    var rdfNode = gBookmarksShell.findRDFNode(aEvent.target, true);
+    var rdfParent = rdfNode.parentNode.parentNode;
+    var isContainer = false;
+    if (rdfParent && rdfParent.getAttribute("container") == "true") {
+      var rDragOverContainer = this.RDF.GetResource(NODE_ID(rdfParent));
+
+      const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+      const kRDFCUtilsContractID = "@mozilla.org/rdf/container-utils;1";
+      const kRDFCUtilsIID = Components.interfaces.nsIRDFContainerUtils;
+      const kRDFCUtils = Components.classes[kRDFCUtilsContractID].getService(kRDFCUtilsIID);
+      isContainer = kRDFCUtils.IsContainer(kBMDS, rDragOverContainer);
+    }     
+    
+    if (!isContainer || rowGroup.id == "headRow") {
+      // Not a container, or dropping onto something that isn't designed to take drops 
+      // (e.g. the tree header) 
+      aDragSession.canDrop = false;
+      return;
+    }        
+    
+    // Springloaded folders.
+    /* XXX - not yet. 
+    if (rdfNode && rdfNode.getAttribute("container") == "true" &&
+        rdfNode.getAttribute("open") != "true") {
+      if (!gSpringLoadTracker.element || gSpringLoadTracker.element.id != rdfNode.id) {
+        // XXX - this is not good enough. We need to keep track of nesting and close up
+        // folders after the user has dragged out of them otherwise we end up with 
+        // everything open and a big mess!
+        if (gSpringLoadTracker.timeout)
+          clearTimeout(gSpringLoadTracker.timeout);
+        gSpringLoadTracker.element = rdfNode;
+        gSpringLoadTracker.timeout = setTimeout("gSpringLoadTracker.open()", 100);
+      }
+    }
+    */
+  },  
+  
+  _flavourSet: null,
+  getSupportedFlavours: function ()
+  {
+    if (!this._flavourSet) {
+      this._flavourSet = new FlavourSet();
+      this._flavourSet.appendFlavour("moz/rdfitem");
+      this._flavourSet.appendFlavour("text/x-moz-url");
+      this._flavourSet.appendFlavour("text/unicode");
+    }
+    return this._flavourSet;
+  },
+  
+  canHandleMultipleItems: true,
+  
+  onDrop: function (aEvent, aXferData, aDragSession)
+  {
+    var bookmarksTree = document.getElementById("bookmarksTree");
+    // XXX lame
+    if (bookmarksTree.getAttribute("sortActive") == "true") return;
+
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFIID = Components.interfaces.nsIRDFContainer;
+    var RDFC = Components.classes[kRDFCContractID].getService(kRDFIID);
+    
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    
+    var dropItem = aEvent.target.parentNode.parentNode;
+    if (aEvent.target.localName == "treechildren") 
+      dropItem = aEvent.target.parentNode; // handle drop on blank space. 
+
+    // In the default view, the root node is the NC root, and we don't want to append
+    // to that. Adjust accordingly...
+    if (NODE_ID(dropItem) == "NC:NavCenter")
+      dropItem = document.getElementById("treechildren-bookmarks").firstChild;
+    
+    // Don't allow drops on the header row & prevent catastrophe
+    if (dropItem.id == "headRow" || !dropItem) return;
+      
+    // XXX we could probably compute this ourselves, but let the tree do this 
+    //     automagically for now.
+    var dropBefore = dropItem.getAttribute("dd-droplocation");
+    var dropOn = dropItem.getAttribute("dd-dropon");
+
+    var dropAction = dropBefore == "true" ? "before" : dropOn == "true" ? "on" : "after";
+    if (aEvent.target.localName == "treechildren")  
+      dropAction = "on"; // handle drop on blank space. 
+    var containerItem = dropAction == "on" ? dropItem : dropItem.parentNode.parentNode;
+
+  	// XXX magical fix for bug # 33546: handle dropping after open container
+    if (dropItem.getAttribute("container") && dropItem.getAttribute("open") &&
+        dropAction == "after") {    
+      dropAction = "before";
+      containerItem = dropItem;
+
+      dropItem = null;
+      for (var i = 0; i < containerItem.childNodes.length; ++i) {
+        if (containerItem.childNodes[i].localName == "treechildren") {
+          dropItem = containerItem.childNodes[i].firstChild;
+          break;
+        }
+      }
+      if (!dropItem) {
+        dropAction = "on";
+        dropItem = containerItem.parentNode.parentNode;
+      }
+    }
+    
+    var rTarget = this.getResource(NODE_ID(dropItem));
+    var rContainer = this.getResource(NODE_ID(containerItem));    
+
+    const kRDFCUtilsContractID = "@mozilla.org/rdf/container-utils;1";
+    const kRDFCUtilsIID = Components.interfaces.nsIRDFContainerUtils;
+    const kRDFCUtils = Components.classes[kRDFCUtilsContractID].getService(kRDFCUtilsIID);
+    var isContainer = kRDFCUtils.IsContainer(kBMDS, rContainer);
+
+    // XXX
+    var rType = this.getResource(RDF_NS + "type");
+    var rBookmark = this.getResource(NC_NS + "Bookmark");
+    
+    var dirty = false;
+    var additiveFlag = false;
+    var numObjects = aXferData.dataList.length;
+    /*
+    if (numObjects > 1) {
+      var bo = bookmarksTree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);
+      bo.beginBatch();
+    }
+    */
+
+    var sourceID = [], parentID = [], nameRequired = [], name = [];
+    var flavourData;
+    for (i = 0; i < numObjects; ++i) {
+      flavourData = aXferData.dataList[i].first;
+      nameRequired[i] = false;
+      name[i] = null;
+      var data = flavourData.data;
+      switch (flavourData.flavour.contentType) {
+      case "moz/rdfitem":
+        var ix = data.indexOf("\n");
+        sourceID[i] = ix >= 0 ? (parentID[i] = data.substr(ix+1), data.substr(0, ix)) : data;
+        break;
+      case "text/x-moz-url":
+        ix = data.indexOf("\n");
+        sourceID[i] = ix >= 0 ? (name[i] = data.substr(ix+1), data.substr(0, ix)) : data;
+        break;
+      case "text/unicode":
+        sourceID[i] = data;
+        nameRequired[i] = true;
+        break;
+      default: 
+        continue;
+      }
+      
+      var rSource = this.getResource(sourceID[i]);
+      var rParent = parentID[i] ? this.getResource(parentID[i]) : null;
+
+      // Prevent dropping node on itself, before or after itself, on its parent 
+      // container, or a weird situation when an open container is dropped into
+      // itself (which results in data loss!).
+      // Also prevent dropping into a folder that isn't actually a container 
+      // (and is thus probably a pseudo-container from an aggregated datasource,
+      //  see bug 68656 fir details).
+      if (rSource == rTarget || (dropAction == "on" && rContainer == rParent) ||
+          rContainer == rSource || !isContainer)
+        return;
+
+      // Prevent dropping node into one of its own subfolders
+      var dropItem2 = dropItem;
+      do {
+        var targetAncestor = NODE_ID(dropItem2);
+        dropItem2 = dropItem2.parentNode;
+      } while (targetAncestor != "NC:BookmarksRoot" && targetAncestor != sourceID[i]);
+      if (targetAncestor == sourceID[i]) {
+        return;
+      }
+    }
+
+    for (i = 0; i < numObjects; ++i) {
+      flavourData = aXferData.dataList[i].first;
+      rSource = this.getResource(sourceID[i]);
+      rParent = parentID[i] ? this.getResource(parentID[i]) : null;
+
+      // XXX if any of the following fails, the nodes are gone for good!
+      const kDSIID = Components.interfaces.nsIDragService;
+      const kCopyAction = kDSIID.DRAGDROP_ACTION_COPY + kDSIID.DRAGDROP_ACTION_LINK;
+      if (rParent) {
+        if (!(aDragSession.dragAction & kCopyAction)) {
+          try {
+            RDFC.Init(kBMDS, rParent);
+            ix = RDFC.IndexOf(rSource);
+            if (ix >= 1) 
+              RDFC.RemoveElementAt(ix, true);
+          }
+          catch (ex) { }
+        }
+      }
+
+      RDFC.Init(kBMDS, rContainer);
+      
+      // If this item already exists in this container, don't paste, as 
+      // this will result in the creation of multiple copies in the datasource
+      // but will not result in an update of the UI. (In Short: we don't
+      // handle multiple bookmarks well)
+      ix = RDFC.IndexOf(rSource);
+      if (ix != -1)
+        continue;
+      
+      var bmType = this.getTarget(bookmarksTree.database, sourceID[i], RDF_NS + "type");
+      if (!bmType) 
+        kBMDS.Assert(rSource, rType, rBookmark, true);
+      if (bmType == NC_NS + "Folder") {
+        // If we're going to copy a folder type, we need to clone the folder 
+        // rather than just asserting the new node as a child of the drop folder.
+        if (aDragSession.dragAction & kCopyAction)
+          rSource = BookmarksUtils.cloneFolder(rSource, rContainer, rTarget);
+      }
+      
+      if (dropAction == "before" || dropAction == "after") {
+        var dropIx = RDFC.IndexOf(rTarget);
+        RDFC.InsertElementAt(rSource, dropAction == "after" ? ++dropIx : dropIx, true);
+      }
+      else
+        RDFC.AppendElement(rSource); // drop on
+
+      dirty = true;
+
+      if (rParent) {
+        gBookmarksShell.selectFolderItem(rContainer.Value, sourceID[i], additiveFlag);
+        if (!additiveFlag) additiveFlag = true;
+      }
+
+      // If a name is supplied, we want to assert this information into the 
+      // graph. E.g. user drags an internet shortcut to the app, we want to 
+      // preserve not only the URL but the name of the shortcut. The other case
+      // where we need to assert a name is when the node does not already exist
+      // in the graph, in this case we'll just use the URL as the name.
+      if (name[i] || nameRequired[i]) {
+        var currentName = this.getTarget(bookmarksTree.database, sourceID[i], NC_NS + "Name");
+        if (!currentName) {
+          var rDefaultName = this.RDF.GetLiteral(name[i] || sourceID[i]);
+          if (rDefaultName) {
+            var rName = this.RDF.GetResource(NC_NS + "Name");
+            kBMDS.Assert(rSource, rName, rDefaultName, true);
+          }
+        }
+      }
+    }
+
+    /*
+    if (numObjects > 1) {
+      var bo = bookmarksTree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);
+      bo.endBatch();
+    }
+    */
+    
+    if (dirty) {
+      var remoteDS = kBMDS.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+      remoteDS.Flush();
+    }    
+  }
+}
+

mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.js

@@ -0,0 +1,954 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var NC_NS  = "http://home.netscape.com/NC-rdf#";
+var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+const NC_NS_CMD = NC_NS + "command?cmd=";
+
+/**
+ * XXX - 04/16/01
+ *  ACK! massive command name collision problems are causing big issues
+ *  in getting this stuff to work in the Navigator window. For sanity's 
+ *  sake, we need to rename all the commands to be of the form cmd_bm_*
+ *  otherwise there'll continue to be problems. For now, we're just 
+ *  renaming those that affect the personal toolbar (edit operations,
+ *  which were clashing with the textfield controller)
+ *
+ * There are also several places that need to be updated if you need
+ * to change a command name. 
+ *   1) the controller in ALL clients (bookmarksTree.js, personalToolbar.js)
+ *   2) the command nodes in the overlay
+ *   3) the command human-readable name key in bookmark.properties
+ *   4) the function 'getAllCmds' in bookmarksOverlay.js
+ *   5) the function 'execCommand' in bookmarksOverlay.js
+ * Yes, this blows crusty dead goats through straws, and I should probably
+ * create some constants somewhere to bring this number down to 3. 
+ * However, if you fail to do one of these, you WILL break something
+ * and I WILL come after you with a knife. 
+ */
+
+function LITERAL (aDB, aElement, aPropertyID)
+{
+  var RDF = BookmarksUIElement.prototype.RDF;
+  var rSource = RDF.GetResource(aElement.id);
+  var rProperty = RDF.GetResource(aPropertyID);
+  var node = aDB.GetTarget(rSource, rProperty, true);
+  return node ? node.QueryInterface(Components.interfaces.nsIRDFLiteral).Value : "";
+}
+
+function BookmarksUIElement () { }
+BookmarksUIElement.prototype = {
+  _rdf: null,
+  get RDF ()
+  {
+    if (!this._rdf) {
+      const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFIID = Components.interfaces.nsIRDFService;
+      this._rdf = Components.classes[kRDFContractID].getService(kRDFIID);
+    }
+    return this._rdf;
+  },
+
+  propertySet: function (sourceID, propertyID, newValue)
+  {
+    if (!newValue) return;
+    const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
+    const kRDFIID = Components.interfaces.nsIRDFService;
+    const kRDF = Components.classes[kRDFContractID].getService(kRDFIID);
+    // need to shuffle this into an API. 
+    const kBMDS = kRDF.GetDataSource("rdf:bookmarks");
+    const krProperty = kRDF.GetResource(propertyID);
+    const krItem = kRDF.GetResource(sourceID);
+    var rCurrValue = kBMDS.GetTarget(krItem, krProperty, true);
+    const krNewValue = kRDF.GetLiteral(newValue);
+    if (!rCurrValue)
+      kBMDS.Assert(krItem, krProperty, krNewValue, true);
+    else {
+      rCurrValue = rCurrValue.QueryInterface(Components.interfaces.nsIRDFLiteral);
+      if (rCurrValue.Value != newValue) 
+        kBMDS.Change(krItem, krProperty, rCurrValue, krNewValue);
+    }
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Fill a context menu popup with menuitems that are appropriate for the current
+  // selection.
+  createContextMenu: function (aEvent)
+  {
+    var popup = aEvent.target;
+    // clear out the old context menu contents (if any)
+    while (popup.hasChildNodes()) 
+      popup.removeChild(popup.firstChild);
+    
+    var popupNode = document.popupNode;
+    
+    if (!("findRDFNode" in this))
+      throw "Clients must implement findRDFNode!";
+    var itemNode = this.findRDFNode(popupNode, true);
+    if (!itemNode || !itemNode.getAttributeNS(RDF_NS, "type") || itemNode.getAttribute("mode") == "edit") {
+      aEvent.preventDefault();
+      return;
+    }
+    if (!("getContextSelection" in this)) 
+      throw "Clients must implement getContextSelection!";
+    var selection = this.getContextSelection (itemNode);
+    var commonCommands = [];
+    for (var i = 0; i < selection.length; ++i) {
+      var commands = this.getAllCmds(selection[i].id);
+      if (!commands) {
+        aEvent.preventDefault();
+        return;
+      }
+      commands = this.flattenEnumerator(commands);
+      if (!commonCommands.length) commonCommands = commands;
+      commonCommands = this.findCommonNodes(commands, commonCommands);
+    }
+
+    if (!commonCommands.length) {
+      aEvent.preventDefault();
+      return;
+    }
+    
+    // Now that we should have generated a list of commands that is valid
+    // for the entire selection, build a context menu.
+    for (i = 0; i < commonCommands.length; ++i) {
+      const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+      var currCommand = commonCommands[i].QueryInterface(Components.interfaces.nsIRDFResource).Value;
+      var element = null;
+      if (currCommand != NC_NS_CMD + "bm_separator") {
+        var commandName = this.getCommandName(currCommand);
+        element = this.createMenuItem(commandName, currCommand, itemNode);
+      }
+      else if (i != 0 && i < commonCommands.length-1) {
+        // Never append a separator as the first or last element in a context
+        // menu.
+        element = document.createElementNS(kXULNS, "menuseparator");
+      }
+      
+      if (element) 
+        popup.appendChild(element);
+    }
+    return;
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // Given two unique arrays, return an array that contains only the elements
+  // common to both. 
+  findCommonNodes: function (aNewArray, aOldArray)
+  {
+    var common = [];
+    for (var i = 0; i < aNewArray.length; ++i) {
+      for (var j = 0; j < aOldArray.length; ++j) {
+        if (common.length > 0 && common[common.length-1] == aNewArray[i])
+          continue;
+        if (aNewArray[i] == aOldArray[j])
+          common.push(aNewArray[i]);
+      }
+    }
+    return common;
+  },
+
+  flattenEnumerator: function (aEnumerator)
+  {
+    if ("_index" in aEnumerator)
+      return aEnumerator._inner;
+    
+    var temp = [];
+    while (aEnumerator.hasMoreElements()) 
+      temp.push(aEnumerator.getNext());
+    return temp;
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // For a given URI (a unique identifier of a resource in the graph) return 
+  // an enumeration of applicable commands for that URI. 
+  getAllCmds: function (aNodeID)
+  {
+    var type = this.resolveType(aNodeID);
+    if (!type) {
+      if (aNodeID == "NC:PersonalToolbarFolder" || aNodeID == "NC:BookmarksRoot")
+        type = "http://home.netscape.com/NC-rdf#Folder";
+      else
+        return null;
+    }
+    var commands = [];
+    // menu order:
+    // 
+    // bm_open
+    // bm_openfolder
+    // bm_openinnewwindow
+    // /* bm_openinnewtab not yet supported */
+    // ---------------------
+    // /* bm_find removed */
+    // bm_newfolder
+    // ---------------------
+    // bm_cut
+    // bm_copy
+    // bm_paste
+    // bm_fileBookmark
+    // ---------------------
+    // bm_delete
+    // bm_rename
+    // ---------------------
+    // bm_properties
+    switch (type) {
+    case "http://home.netscape.com/NC-rdf#BookmarkSeparator":
+      commands = ["bm_newfolder", "bm_separator", 
+                  "bm_cut", "bm_copy", "bm_paste", "bm_separator",
+                  "bm_delete"];
+      break;
+    case "http://home.netscape.com/NC-rdf#Bookmark":
+      commands = ["bm_open", "bm_openinnewwindow", /* "bm_openinnewtab", */ "bm_separator",
+                  "bm_newfolder", "bm_separator",
+                  "bm_cut", "bm_copy", "bm_paste", "bm_fileBookmark", "bm_separator",
+                  "bm_delete", "bm_rename", "bm_separator",
+                  "bm_properties"];
+      break;
+    case "http://home.netscape.com/NC-rdf#Folder":
+      commands = ["bm_openfolder", "bm_openinnewwindow", "bm_separator", 
+                  "bm_newfolder", "bm_separator",
+                  "bm_cut", "bm_copy", "bm_paste", "bm_fileBookmark", "bm_separator",
+                  "bm_delete", "bm_rename", "bm_separator",
+                  "bm_properties"];
+      break;
+    case "http://home.netscape.com/NC-rdf#IEFavoriteFolder":
+      commands = ["bm_openfolder", "bm_separator",
+                  "bm_delete"];
+      break;
+    case "http://home.netscape.com/NC-rdf#IEFavorite":
+      commands = ["bm_open", "bm_openinnewwindow", /* "bm_openinnewtab", */ "bm_separator",
+                  "bm_copy"];
+      break;
+    case "http://home.netscape.com/NC-rdf#FileSystemObject":
+      commands = ["bm_open", "bm_openinnewwindow", /* "bm_openinnewtab", */ "bm_separator",
+                  "bm_copy"];
+      break;
+    default: 
+      var source = this.RDF.GetResource(aNodeID);
+      return this.db.GetAllCmds(source);
+    }
+    return new CommandArrayEnumerator(commands);
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // Retrieve the human-readable name for a particular command. Used when 
+  // manufacturing a UI to invoke commands.
+  getCommandName: function (aCommand) 
+  {
+    var cmdName = aCommand.substring(NC_NS_CMD.length);
+    try {
+      // Note: this will succeed only if there's a string in the bookmarks
+      //       string bundle for this command name. Otherwise, <xul:stringbundle/>
+      //       will throw, we'll catch & stifle the error, and look up the command
+      //       name in the datasource. 
+      return this.getLocaleString ("cmd_" + cmdName);
+    }
+    catch (e) {
+    }   
+    // XXX - WORK TO DO HERE! (rjc will cry if we don't fix this) 
+    // need to ask the ds for the commands for this node, however we don't
+    // have the right params. This is kind of a problem. 
+    dump("*** BAD! EVIL! WICKED! NO! ACK! ARGH! ORGH!\n");
+    const rName = this.RDF.GetResource(NC_NS + "Name");
+    const rSource = this.RDF.GetResource(aNodeID);
+    return this.db.GetTarget(rSource, rName, true).Value;
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // Perform a command based on a UI event. XXX - work to do here. 
+  preExecCommand: function (aEvent)
+  {
+    var commandID = aEvent.target.getAttribute("cmd");
+    if (!commandID) return;
+    goDoCommand("cmd_" + commandID.substring(NC_NS_CMD.length));
+  },
+  
+  execCommand: function (aCommandID) 
+  {
+    var args = [];
+    var selection = this.getSelection ();
+    if (selection.length >= 1) 
+      var selectedItem = selection[0];
+    switch (aCommandID) {
+    case "bm_open":
+      this.open(null, selectedItem, false);
+      break;
+    case "bm_openfolder":
+      this.commands.openFolder(selectedItem);
+      break;
+    case "bm_openinnewwindow":
+      if (this.resolveType(selectedItem.id) == NC_NS + "Folder")
+        this.openFolderInNewWindow(selectedItem);
+      else
+        this.open(null, selectedItem, true);
+      break;
+    case "bm_rename":
+      // XXX - this is SO going to break if we ever do column re-ordering.
+      this.commands.editCell(selectedItem, 0);
+      break;
+    case "bm_editurl":
+      this.commands.editCell(selectedItem, 1);
+      break;
+    case "bm_setnewbookmarkfolder":
+    case "bm_setpersonaltoolbarfolder":
+    case "bm_setnewsearchfolder":
+      BookmarksUtils.doBookmarksCommand(selectedItem.id, NC_NS_CMD + aCommandID, args);
+      // XXX - The containing node seems to be closed here and the 
+      //       focus/selection is destroyed.
+      this.selectElement(selectedItem);
+      break;
+    case "bm_properties":
+      this.showPropertiesForNode(selectedItem);
+      break;
+    case "bm_find":
+      this.findInBookmarks();
+      break;
+    case "bm_cut":
+      this.copySelection(selection);
+      this.deleteSelection(selection);
+      break;
+    case "bm_copy":
+      this.copySelection(selection);
+      break;
+    case "bm_paste":
+      this.paste(selection);
+      break;
+    case "bm_delete":
+      this.deleteSelection(selection);
+      break;
+    case "bm_fileBookmark":
+      var rv = { selectedFolder: null };      
+      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
+                 "centerscreen,chrome,modal=yes,dialog=yes,resizable=yes", null, null, folder, null, "selectFolder", rv);
+      if (rv.selectedFolder) {
+        for (var k = 0; k < selection.length; ++k) {
+          if (selection[k].id == rv.selectedFolder)
+            return; // Selection contains the target folder. Just fail silently.
+        }
+        var additiveFlag = false;
+        var selectedItems = [].concat(this.getSelection())
+        for (var i = 0; i < selectedItems.length; ++i) {
+          var currItem = selectedItems[i];
+          var currURI = currItem.id;
+          var parent = gBookmarksShell.findRDFNode(currItem, false);
+          gBookmarksShell.moveBookmark(currURI, parent.id, rv.selectedFolder);
+          gBookmarksShell.selectFolderItem(rv.selectedFolder, currURI, additiveFlag);
+          if (!additiveFlag) additiveFlag = true;
+        }
+        gBookmarksShell.flushDataSource();
+      }
+      break;
+    case "bm_newfolder":
+      var nfseln = this.getBestItem();
+      this.commands.createBookmarkItem("folder", nfseln);
+      break;
+    case "bm_newbookmark":
+      var folder = this.getSelectedFolder();
+      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
+                 "centerscreen,chrome,modal=yes,dialog=yes,resizable=no", null, null, folder, null, "newBookmark");
+      break;
+    case "bm_newseparator":
+      nfseln = this.getBestItem();
+      var parentNode = this.findRDFNode(nfseln, false);
+      args = [{ property: NC_NS + "parent", 
+                resource: parentNode.id }];
+      BookmarksUtils.doBookmarksCommand(nfseln.id, NC_NS_CMD + "newseparator", args);
+      break;
+    case "bm_import":
+    case "bm_export":
+      const isImport = aCommandID == "bm_import";
+      try {
+        const kFilePickerContractID = "@mozilla.org/filepicker;1";
+        const kFilePickerIID = Components.interfaces.nsIFilePicker;
+        const kFilePicker = Components.classes[kFilePickerContractID].createInstance(kFilePickerIID);
+        
+        const kTitle = this.getLocaleString(isImport ? "SelectImport": "EnterExport");
+        kFilePicker.init(window, kTitle, kFilePickerIID[isImport ? "modeOpen" : "modeSave"]);
+        kFilePicker.appendFilters(kFilePickerIID.filterHTML | kFilePickerIID.filterAll);
+        if (!isImport) kFilePicker.defaultString = "bookmarks.html";
+        if (kFilePicker.show() != kFilePickerIID.returnCancel) {
+          var fileName = kFilePicker.fileURL.spec;
+          if (!fileName) break;
+        }
+        else break;
+      }
+      catch (e) {
+        break;
+      }
+      var seln = this.getBestItem();
+      args = [{ property: NC_NS + "URL", literal: fileName}];
+      BookmarksUtils.doBookmarksCommand(seln.id, NC_NS_CMD + aCommandID, args);
+      break;
+    }
+  },
+  
+  openFolderInNewWindow: function (aSelectedItem)
+  {
+    openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", 
+               "", "chrome,all,dialog=no", aSelectedItem.id);
+  },
+  
+  copySelection: function (aSelection)
+  {
+    const kSuppArrayContractID = "@mozilla.org/supports-array;1";
+    const kSuppArrayIID = Components.interfaces.nsISupportsArray;
+    var itemArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
+
+    const kSuppWStringContractID = "@mozilla.org/supports-wstring;1";
+    const kSuppWStringIID = Components.interfaces.nsISupportsWString;
+    var bmstring = Components.classes[kSuppWStringContractID].createInstance(kSuppWStringIID);
+    var unicodestring = Components.classes[kSuppWStringContractID].createInstance(kSuppWStringIID);
+    var htmlstring = Components.classes[kSuppWStringContractID].createInstance(kSuppWStringIID);
+  
+    var sBookmarkItem = ""; var sTextUnicode = ""; var sTextHTML = "";
+    for (var i = 0; i < aSelection.length; ++i) {
+      var url = LITERAL(this.db, aSelection[i], NC_NS + "URL");
+      var name = LITERAL(this.db, aSelection[i], NC_NS + "Name");
+      sBookmarkItem += aSelection[i].id + "\n";
+      sTextUnicode += url + "\n";
+      sTextHTML += "<A HREF=\"" + url + "\">" + name + "</A>";
+    }    
+    
+    const kXferableContractID = "@mozilla.org/widget/transferable;1";
+    const kXferableIID = Components.interfaces.nsITransferable;
+    var xferable = Components.classes[kXferableContractID].createInstance(kXferableIID);
+
+    xferable.addDataFlavor("moz/bookmarkclipboarditem");
+    bmstring.data = sBookmarkItem;
+    xferable.setTransferData("moz/bookmarkclipboarditem", bmstring, sBookmarkItem.length*2)
+    
+    xferable.addDataFlavor("text/html");
+    htmlstring.data = sTextHTML;
+    xferable.setTransferData("text/html", htmlstring, sTextHTML.length*2)
+    
+    xferable.addDataFlavor("text/unicode");
+    unicodestring.data = sTextUnicode;
+    xferable.setTransferData("text/unicode", unicodestring, sTextUnicode.length*2)
+    
+    const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
+    const kClipboardIID = Components.interfaces.nsIClipboard;
+    var clipboard = Components.classes[kClipboardContractID].getService(kClipboardIID);
+    clipboard.setData(xferable, null, kClipboardIID.kGlobalClipboard);
+  },
+
+  paste: function (aSelection)
+  {
+    const kXferableContractID = "@mozilla.org/widget/transferable;1";
+    const kXferableIID = Components.interfaces.nsITransferable;
+    var xferable = Components.classes[kXferableContractID].createInstance(kXferableIID);
+    xferable.addDataFlavor("moz/bookmarkclipboarditem");
+    xferable.addDataFlavor("text/x-moz-url");
+    xferable.addDataFlavor("text/unicode");
+
+    const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
+    const kClipboardIID = Components.interfaces.nsIClipboard;
+    var clipboard = Components.classes[kClipboardContractID].getService(kClipboardIID);
+    clipboard.getData(xferable, kClipboardIID.kGlobalClipboard);
+    
+    var flavour = { };
+    var data = { };
+    var length = { };
+    xferable.getAnyTransferData(flavour, data, length);
+    var nodes = []; var names = [];
+    data = data.value.QueryInterface(Components.interfaces.nsISupportsWString).data;
+    switch (flavour.value) {
+    case "moz/bookmarkclipboarditem":
+      nodes = data.split("\n");
+      break;
+    case "text/x-moz-url":
+      var ix = data.indexOf("\n");
+      nodes.push(data.substring(0, ix != -1 ? ix : data.length));
+      names.push(data.substring(ix));
+      break;
+    default: 
+      return;
+    }
+    
+    const lastSelected = aSelection[aSelection.length-1];  
+    const kParentNode = this.resolvePasteFolder(aSelection);
+    const krParent = this.RDF.GetResource(kParentNode.id);
+    const krSource = this.RDF.GetResource(lastSelected.id);
+    
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFCIID = Components.interfaces.nsIRDFContainer;
+    const ksRDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+
+    var additiveFlag = false;
+    for (var i = 0; i < nodes.length; ++i) {
+      if (!nodes[i]) continue;
+      var rCurrent = this.RDF.GetResource(nodes[i]);
+      const krTypeProperty = this.RDF.GetResource(RDF_NS + "type");
+      var rType = this.db.GetTarget(rCurrent, krTypeProperty, true);
+      try {
+        rType = rType.QueryInterface(Components.interfaces.nsIRDFResource);
+      }
+      catch (e) {
+        try {
+          rType = rType.QueryInterface(Components.interfaces.nsIRDFLiteral);
+        }
+        catch (e) {
+          // OK, no type exists, so node does not exist in the graph. 
+          // (e.g. user pastes url as text)
+          // Do some housekeeping. 
+          const krName = this.RDF.GetResource(names[i]);
+          const krNameProperty = this.RDF.GetResource(NC_NS + "Name");
+          const krBookmark = this.RDF.GetResource(NC_NS + "Bookmark");
+          kBMDS.Assert(rCurrent, krNameProperty, krName, true);
+          kBMDS.Assert(rCurrent, krTypeProperty, krBookmark, true);
+        }
+      }
+
+      // If the node is a folder, then we need to create a new anonymous 
+      // resource and copy all the arcs over.
+      if (rType && rType.Value == NC_NS + "Folder")
+        rCurrent = BookmarksUtils.cloneFolder(rCurrent, krParent, krSource);
+
+      // If this item already exists in this container, don't paste, as 
+      // this will result in the creation of multiple copies in the datasource
+      // but will not result in an update of the UI. (In Short: we don't
+      // handle multiple bookmarks well)
+      ksRDFC.Init(kBMDS, krParent);
+      ix = ksRDFC.IndexOf(rCurrent);
+      if (ix != -1)
+        continue;
+
+      ix = ksRDFC.IndexOf(krSource);
+      if (ix != -1) 
+        ksRDFC.InsertElementAt(rCurrent, ix+1, true);
+      else
+        ksRDFC.AppendElement(rCurrent);
+      this.selectFolderItem(krSource.Value, rCurrent.Value, additiveFlag);
+      if (!additiveFlag) additiveFlag = true;
+
+      var rds = kBMDS.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+      rds.Flush();
+    }
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // For the given selection, determines the element that should form the 
+  // container to paste items into.
+  resolvePasteFolder: function (aSelection)
+  {
+    const lastSelected = aSelection[aSelection.length-1];  
+    if (lastSelected.getAttribute("container") == "true" &&
+        aSelection.length == 1)
+      return lastSelected;
+    return this.findRDFNode(lastSelected, false);
+  },
+  
+  canPaste: function ()
+  {
+    const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
+    const kClipboardIID = Components.interfaces.nsIClipboard;
+    var clipboard = Components.classes[kClipboardContractID].getService(kClipboardIID);
+    const kSuppArrayContractID = "@mozilla.org/supports-array;1";
+    const kSuppArrayIID = Components.interfaces.nsISupportsArray;
+    var flavourArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
+    const kSuppStringContractID = "@mozilla.org/supports-string;1";
+    const kSuppStringIID = Components.interfaces.nsISupportsString;
+    
+    var flavours = ["moz/bookmarkclipboarditem", "text/x-moz-url"];
+    for (var i = 0; i < flavours.length; ++i) {
+      const kSuppString = Components.classes[kSuppStringContractID].createInstance(kSuppStringIID);
+      kSuppString.data = flavours[i];
+      flavourArray.AppendElement(kSuppString);
+    }
+    var hasFlavours = clipboard.hasDataMatchingFlavors(flavourArray, kClipboardIID.kGlobalClipboard);
+    return hasFlavours;
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // aSelection is a mutable array, not a NodeList. 
+  deleteSelection: function (aSelection)
+  {
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFCIID = Components.interfaces.nsIRDFContainer;
+    const ksRDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
+
+    var nextElement;
+    var count = 0;
+
+    var selectionLength = aSelection.length;
+    while (aSelection.length && aSelection[count]) {
+      const currParent = this.findRDFNode(aSelection[count], false);
+      const kSelectionURI = aSelection[count].id;
+
+      // Disallow the removal of certain 'special' nodes
+      if (kSelectionURI == "NC:BookmarksRoot") {
+        aSelection.splice(count++,1);
+        continue;
+      }
+
+      // If the current bookmark is the IE Favorites folder, we have a little
+      // extra work to do - set the pref |browser.bookmarks.import_system_favorites|
+      // to ensure that we don't re-import next time. 
+      if (aSelection[count].getAttribute("type") == (NC_NS + "IEFavoriteFolder")) {
+        const kPrefSvcContractID = "@mozilla.org/preferences-service;1";
+        const kPrefSvcIID = Components.interfaces.nsIPrefBranch;
+        const kPrefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
+        kPrefSvc.setBoolPref("browser.bookmarks.import_system_favorites", false);
+      }
+        
+      const krParent = this.RDF.GetResource(currParent.id);
+      const krBookmark = this.RDF.GetResource(kSelectionURI);
+      const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+
+      ksRDFC.Init(kBMDS, krParent);
+      nextElement = this.getNextElement(aSelection[count]);
+      ksRDFC.RemoveElement(krBookmark, true);
+
+      try {
+        // XXX - UGH. Template builder is NOT removing the element from the
+        //       tree, and so selection remains non-zero in length and we go into
+        //       an infinite loop here. Tear the node out of the document. 
+        var parent = aSelection[count].parentNode;
+        parent.removeChild(aSelection[count]);
+      }
+      catch (e) {
+      }
+      // Manipulate the selection array ourselves. 
+      aSelection.splice(count,1);
+    }
+    this.selectElement(nextElement);
+  },
+
+  moveBookmark: function (aBookmarkURI, aFromFolderURI, aToFolderURI)
+  {
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFCIID = Components.interfaces.nsIRDFContainer;
+    const kRDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
+    const krSrc = this.RDF.GetResource(aBookmarkURI);
+    const krOldParent = this.RDF.GetResource(aFromFolderURI);
+    const krNewParent = this.RDF.GetResource(aToFolderURI);
+    kRDFC.Init(kBMDS, krNewParent);
+    kRDFC.AppendElement(krSrc);
+    kRDFC.Init(kBMDS, krOldParent);
+    kRDFC.RemoveElement(krSrc, true);
+  },
+  
+  open: function (aEvent, aRDFNode, aInNewWindow) 
+  { 
+    var urlValue = LITERAL(this.db, aRDFNode, NC_NS + "URL");
+    
+    // Ignore "NC:" and empty urls.
+    if (urlValue.substring(0,3) == "NC:" || !urlValue) return;
+    
+    if (aEvent && aEvent.altKey)   
+      this.showPropertiesForNode (aRDFNode);
+    else if (aInNewWindow)
+      openDialog (getBrowserURL(), "_blank", "chrome,all,dialog=no", urlValue);
+    else
+      openTopWin (urlValue);
+    if (aEvent) 
+      aEvent.preventBubble();
+  },
+
+  showPropertiesForNode: function (aBookmarkItem) 
+  {
+    if (aBookmarkItem.getAttribute("type") != NC_NS + "BookmarkSeparator") 
+      openDialog("chrome://communicator/content/bookmarks/bm-props.xul",
+                 "", "centerscreen,chrome,resizable=no", aBookmarkItem.id);
+  },
+
+  findInBookmarks: function ()
+  {
+    openDialog("chrome://communicator/content/bookmarks/findBookmark.xul",
+               "FindBookmarksWindow",
+               "centerscreen,resizable=no,chrome,dependent");
+  },
+
+  getLocaleString: function (aStringKey)
+  {
+    var bundle = document.getElementById("bookmarksbundle");
+    return bundle.getString (aStringKey);
+  },
+  
+  flushDataSource: function ()
+  {
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    var remoteDS = kBMDS.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+    remoteDS.Flush();
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // Determine the rdf:type property for the given resource.
+  resolveType: function (aID)
+  {
+    const krType = this.RDF.GetResource(RDF_NS + "type");
+    const krElement = this.RDF.GetResource(aID);
+    const type = gBookmarksShell.db.GetTarget(krElement, krType, true);
+    try {
+      return type.QueryInterface(Components.interfaces.nsIRDFResource).Value;
+    }
+    catch (e) {
+      try { 
+        return type.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+      }
+      catch (e) {
+        return null;
+      }
+    }    
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // takes a node and adds the appropriate adornments for a bookmark container. 
+  createBookmarkFolderDecorations: function (aNode)
+  {
+    aNode.setAttribute("type", "http://home.netscape.com/NC-rdf#Folder");
+    aNode.setAttribute("container", "true");
+    return aNode;
+  }
+};
+
+function CommandArrayEnumerator (aCommandArray)
+{
+  this._inner = [];
+  const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
+  const kRDFIID = Components.interfaces.nsIRDFService;
+  const RDF = Components.classes[kRDFContractID].getService(kRDFIID);
+  for (var i = 0; i < aCommandArray.length; ++i)
+    this._inner.push(RDF.GetResource(NC_NS_CMD + aCommandArray[i]));
+    
+  this._index = 0;
+}
+
+CommandArrayEnumerator.prototype = {
+  getNext: function () 
+  {
+    return this._inner[this._index];
+  },
+  
+  hasMoreElements: function ()
+  {
+    return this._index < this._inner.length;
+  }
+};
+
+var BookmarksUtils = {
+  _rdf: null,
+  get RDF ()
+  {
+    if (!this._rdf) {
+      const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFIID = Components.interfaces.nsIRDFService;
+      this._rdf = Components.classes[kRDFContractID].getService(kRDFIID);
+    }
+    return this._rdf;
+  },
+
+  ///////////////////////////////////////////////////////////////////////////
+  // Execute a command with the given source and arguments
+  doBookmarksCommand: function (aSourceURI, aCommand, aArgumentsArray)
+  {
+    var rCommand = this.RDF.GetResource(aCommand);
+  
+    var kSuppArrayContractID = "@mozilla.org/supports-array;1";
+    var kSuppArrayIID = Components.interfaces.nsISupportsArray;
+    var sourcesArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
+    if (aSourceURI) {
+      var rSource = this.RDF.GetResource(aSourceURI);
+      sourcesArray.AppendElement (rSource);
+    }
+  
+    var argsArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
+    for (var i = 0; i < aArgumentsArray.length; ++i) {
+      var rArc = this.RDF.GetResource(aArgumentsArray[i].property);
+      argsArray.AppendElement(rArc);
+      var rValue = null;
+      if ("resource" in aArgumentsArray[i]) { 
+        rValue = this.RDF.GetResource(aArgumentsArray[i].resource);
+      }
+      else
+        rValue = this.RDF.GetLiteral(aArgumentsArray[i].literal);
+      argsArray.AppendElement(rValue);
+    }
+
+    // Exec the command in the Bookmarks datasource. 
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    kBMDS.DoCommand(sourcesArray, rCommand, argsArray);
+  },
+
+  cloneFolder: function (aFolder, aParent, aRelativeItem) 
+  {
+    var BMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    
+    var nameArc = this.RDF.GetResource(NC_NS + "Name");
+    var rName = BMDS.GetTarget(aFolder, nameArc, true);
+    rName = rName.QueryInterface(Components.interfaces.nsIRDFLiteral);
+    
+    var newFolder = this.createFolderWithID(rName.Value, aRelativeItem, aParent);
+    
+    // Now need to append kiddies. 
+    try {
+      const kRDFCContractID = "@mozilla.org/rdf/container;1";
+      const kRDFCIID = Components.interfaces.nsIRDFContainer;
+      var RDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
+      const kRDFCUContractID = "@mozilla.org/rdf/container-utils;1";
+      const kRDFCUIID = Components.interfaces.nsIRDFContainerUtils;
+      var RDFCU = Components.classes[kRDFCUContractID].getService(kRDFCUIID);
+
+      RDFC.Init(BMDS, aFolder);
+      var elts = RDFC.GetElements();
+      RDFC.Init(BMDS, newFolder);
+
+      while (elts.hasMoreElements()) {
+        var curr = elts.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
+        if (RDFCU.IsContainer(BMDS, curr))
+          BookmarksUtils.cloneFolder(curr, newFolder);
+        else
+          RDFC.AppendElement(curr);
+      }
+    }
+    catch (e) {
+    }
+    return newFolder;
+  },
+  
+  createFolderWithID: function (aTitle, aRelativeItem, aParentFolder)
+  {
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFCIID = Components.interfaces.nsIRDFContainer;
+    var RDFC = Components.classes[kRDFCContractID].createInstance(kRDFCIID);
+    var BMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    try {
+      RDFC.Init(BMDS, aParentFolder);
+    }
+    catch (e) {
+      return null;
+    }
+
+    var ix = RDFC.IndexOf(aRelativeItem);
+    var BMSvc = BMDS.QueryInterface(Components.interfaces.nsIBookmarksService);
+    return BMSvc.createFolderWithDetails(aTitle, aParentFolder, ix);
+  },
+
+
+  addBookmarkForTabBrowser: function( aTabBrowser, aSelect )
+  {
+    var tabsInfo = [];
+    var currentTabInfo = { name: "", url: "", charset: null };
+
+    const activeBrowser = aTabBrowser.selectedBrowser;
+    const browsers = aTabBrowser.browsers;
+    for (var i = 0; i < browsers.length; ++i) {
+      var webNav = browsers[i].webNavigation;
+      var url = webNav.currentURI.spec;
+      var name = "";
+      var charset;
+      try {
+        var doc = webNav.document;
+        name = doc.title || url;
+        charset = doc.characterSet;
+      } catch (e) {
+        name = url;
+      }
+
+      tabsInfo[i] = { name: name, url: url, charset: charset };
+
+      if (browsers[i] == activeBrowser)
+        currentTabInfo = tabsInfo[i];
+    }
+
+    openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "",
+               "centerscreen,chrome,dialog=yes,resizable,dependent",
+               currentTabInfo.name, currentTabInfo.url, null,
+               currentTabInfo.charset, "addGroup" + (aSelect ? ",group" : ""), tabsInfo);
+  },
+
+  addBookmarkForBrowser: function (aDocShell, aShowDialog)
+  {
+    // Bug 52536: We obtain the URL and title from the nsIWebNavigation 
+    //            associated with a <browser/> rather than from a DOMWindow.
+    //            This is because when a full page plugin is loaded, there is
+    //            no DOMWindow (?) but information about the loaded document
+    //            may still be obtained from the webNavigation. 
+    var url = aDocShell.currentURI.spec;
+    var title, docCharset = null;
+    try {
+      title = aDocShell.document.title || url;
+      docCharset = aDocShell.document.characterSet;
+    }
+    catch (e) {
+      title = url;
+    }
+
+    this.addBookmark(url, title, docCharset, aShowDialog);
+  },
+  
+  addBookmark: function (aURL, aTitle, aCharset, aShowDialog)
+  {
+    if (aCharset === undefined) {
+      var fw = document.commandDispatcher.focusedWindow;
+      aCharset = fw.document.characterSet;
+    }
+
+    if (aShowDialog)
+      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
+                 "centerscreen,chrome,dialog=yes,resizable,dependent", aTitle, aURL, null, aCharset);
+    else {
+      // User has elected to override the file dialog and always file bookmarks
+      // into the default bookmark folder. 
+      const kBMSvcContractID = "@mozilla.org/browser/bookmarks-service;1";
+      const kBMSvcIID = Components.interfaces.nsIBookmarksService;
+      const kBMSvc = Components.classes[kBMSvcContractID].getService(kBMSvcIID);
+      kBMSvc.addBookmarkImmediately(aURL, aTitle, kBMSvcIID.BOOKMARK_DEFAULT_TYPE, aCharset);
+    }
+  }
+};
+
+var ContentUtils = {
+  childByLocalName: function (aSelectedItem, aLocalName)
+  {
+    var temp = aSelectedItem.firstChild;
+    while (temp) {
+      if (temp.localName == aLocalName)
+        return temp;
+      temp = temp.nextSibling;
+    }
+    return null;
+  }
+};
+
+
+
+
+
+

mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.xul

@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+
+<!-- -*- Mode: HTML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  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): 
+    Ben Goodger <ben@netscape.com> (Original Author) 
+-->
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd">
+
+<overlay id="bookmarksOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <stringbundleset id="stringbundleset">
+    <stringbundle id="bookmarksbundle"
+                  src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+  </stringbundleset>
+         
+  <popupset id="bookmarksPopupset">
+    <popup id="bmContext" 
+           onpopupshowing="gBookmarksShell.createContextMenu(event);"/>
+  </popupset>
+
+  <commands id="commands">
+    <commandset id="bookmarksItems">
+      <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
+      <command id="cmd_bm_openfolder"                oncommand="goDoCommand('cmd_bm_openfolder');"/>
+      <command id="cmd_bm_newfolder"                 oncommand="goDoCommand('cmd_bm_newfolder');"/>
+      <command id="cmd_bm_newbookmark"               oncommand="goDoCommand('cmd_bm_newbookmark');"/>
+      <command id="cmd_bm_newseparator"              oncommand="goDoCommand('cmd_bm_newseparator');"/>
+      <command id="cmd_bm_find"                      oncommand="goDoCommand('cmd_bm_find');"/>
+      <command id="cmd_bm_setnewbookmarkfolder"      oncommand="goDoCommand('cmd_bm_setnewbookmarkfolder');"/>
+      <command id="cmd_bm_setpersonaltoolbarfolder"  oncommand="goDoCommand('cmd_bm_setpersonaltoolbarfolder');"/>
+      <command id="cmd_bm_setnewsearchfolder"        oncommand="goDoCommand('cmd_bm_setnewsearchfolder');"/>
+      <command id="cmd_bm_properties"                oncommand="goDoCommand('cmd_bm_properties');"/>
+      <command id="cmd_bm_rename"                    oncommand="goDoCommand('cmd_bm_rename');"/>
+      <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
+      <command id="cmd_bm_import"                    oncommand="goDoCommand('cmd_bm_import');"/>
+      <command id="cmd_bm_export"                    oncommand="goDoCommand('cmd_bm_export');"/>
+      <command id="cmd_bm_fileBookmark"           oncommand="goDoCommand('cmd_bm_fileBookmark');"/>
+
+      <command id="cmd_bm_cut"                    oncommand="goDoCommand('cmd_bm_cut');"/>
+      <command id="cmd_bm_copy"                   oncommand="goDoCommand('cmd_bm_copy');"/>
+      <command id="cmd_bm_paste"                  oncommand="goDoCommand('cmd_bm_paste');"/>
+      <command id="cmd_bm_delete"                 oncommand="goDoCommand('cmd_bm_delete');"/>
+      <command id="cmd_bm_selectAll"              oncommand="goDoCommand('cmd_bm_selectAll');"/>
+    </commandset>
+    <commandset id="selectEditMenuItems"/>
+    <commandset id="globalEditMenuItems"/>
+  </commands>
+
+</overlay>

mozilla/xpfe/components/bookmarks/resources/bookmarksPanel.js

@@ -0,0 +1,64 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Get the two bookmarks utility libraries running, attach controllers, focus
+// tree widget, etc. 
+function Startup() 
+{
+  var bookmarksView = document.getElementById("bookmarks-view");  
+  bookmarksView.treeBoxObject.selection.select(0);
+}
+
+function manageBookmarks() {
+  openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", "", "chrome,dialog=no,resizable=yes");
+}
+
+function addBookmark() {
+  var contentArea = top.document.getElementById('content');                   
+  if (contentArea) {
+    const browsers = contentArea.browsers;
+    if (browsers.length > 1)
+      BookmarksUtils.addBookmarkForTabBrowser(contentArea);
+    else
+      BookmarksUtils.addBookmarkForBrowser(contentArea.webNavigation, true);    
+  }
+  else
+    BookmarksUtils.addBookmark(null, null, undefined, true);
+}

mozilla/xpfe/components/bookmarks/resources/bookmarksTree.js

@@ -0,0 +1,759 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var gBookmarksShell = null;
+
+///////////////////////////////////////////////////////////////////////////////
+// Tracks the selected item, the cell last clicked on, and the number of clicks
+// given to it. Used to activate inline edit mode.
+var gSelectionTracker = { currentItem: null, currentCell: null, clickCount: 0 };
+
+///////////////////////////////////////////////////////////////////////////////
+// Class which defines methods for a bookmarks UI implementation based around
+// a treeview. Subclasses BookmarksBase in bookmarksOverlay.js. Some methods
+// are required by the base class, others are for event handling. Window specific
+// glue code should go into the BookmarksWindow class in bookmarks.js
+function BookmarksTree (aID)
+{
+  this.id = aID;
+}
+
+BookmarksTree.prototype = {
+  __proto__: BookmarksUIElement.prototype,
+
+  // XXX - change this to .element and move into base. 
+  get tree ()
+  {
+    return document.getElementById(this.id);
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // This method constructs a menuitem for a context menu for the given command.
+  // This is implemented by the client so that it can intercept menuitem naming
+  // as appropriate.
+  createMenuItem: function (aDisplayName, aCommandName, aItemNode)
+  {
+    const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    var xulElement = document.createElementNS(kXULNS, "menuitem");
+    xulElement.setAttribute("cmd", aCommandName);
+    xulElement.setAttribute("command", "cmd_" + aCommandName.substring(NC_NS_CMD.length));
+
+    switch (aCommandName) {
+    case NC_NS_CMD + "open":
+      xulElement.setAttribute("label", aDisplayName);
+      xulElement.setAttribute("default", "true");
+      break;
+    case NC_NS_CMD + "openfolder":
+      aDisplayName = aItemNode.getAttribute("open") == "true" ? this.getLocaleString("cmd_openfolder2") : aDisplayName;
+      xulElement.setAttribute("label", aDisplayName);
+      xulElement.setAttribute("default", "true");
+      break;
+    case NC_NS_CMD + "renamebookmark":
+      if (!document.popupNode.hasAttribute("type")) {
+        xulElement.setAttribute("label", this.getLocaleString("cmd_renamebookmark2"));
+        xulElement.setAttribute("cmd", (NC_NS_CMD + "editurl"));
+      }
+      else
+        xulElement.setAttribute("label", aDisplayName);
+      break;
+    default:
+      xulElement.setAttribute("label", aDisplayName);
+      break;
+    }
+    return xulElement;
+  },
+
+  // XXX - ideally this would be in the base. this.tree needs to change to 
+  // this.element and then we can do just that. 
+  setRoot: function (aRoot)
+  {
+    this.tree.setAttribute("ref", aRoot);
+  },
+
+  // Command implementation
+  commands: {
+    openFolder: function (aSelectedItem)
+    {
+      if (aSelectedItem.getAttribute("open") == "true")
+        aSelectedItem.removeAttribute("open");
+      else
+        aSelectedItem.setAttribute("open", "true");
+    },
+
+    // Things Needed to Satisfy Mac Weenies:
+    // 1) need to implement timed single click edit. This could be Hard.
+    // 2) need to implement some other method of key access apart from F2.
+    //    mpt claims that 'Cmd+U' is the excel equivalent.
+    editCell: function (aSelectedItem, aCell)
+    {
+      // XXX throw up properties dialog with name selected so user can rename
+      //     that way, until tree conversion allows us to use IL again. 
+      goDoCommand("cmd_properties");
+      return; // Disable inline edit for now.
+
+      var editCell = aSelectedItem.firstChild.childNodes[aCell];
+      if (editCell.getAttribute("editable") != "true")
+        return;
+      
+      // Cause the inline edit cell binding to be used.
+      editCell.setAttribute("class", "treecell-indent treecell-editable");
+      var editColGroup = document.getElementById("theColumns");
+      var count = 0;
+      var property = "";
+      for (var i = 0; i < editColGroup.childNodes.length; ++i) {
+        var currCol = editColGroup.childNodes[i];
+        if (currCol.getAttribute("hidden") == "true")
+          return;
+        if (count == aCell) {
+          property = currCol.getAttribute("resource");
+          break;
+        }
+        ++count;
+
+        // Deal with interleaved column resizer splitters
+        if (currCol.nextSibling.localName == "splitter") ++i;
+      }
+
+      if (property) {
+        editCell.setMode("edit");
+        editCell.addObserver(this.postModifyCallback, "accept",
+                             [editCell, aSelectedItem, property]);
+      }
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Called after an inline-edit cell has left inline-edit mode, and data
+    // needs to be modified in the datasource.
+    postModifyCallback: function (aParams)
+    {
+      var selItemURI = NODE_ID(aParams[1]);
+      gBookmarksShell.propertySet(selItemURI, aParams[2], aParams[3]);
+      gBookmarksShell.selectFolderItem(NODE_ID(gBookmarksShell.findRDFNode(aParams[1], false)),
+                                       selItemURI, false);
+      gBookmarksShell.tree.focus();
+      gSelectionTracker.clickCount = 0;
+      
+      // Set the cell back to use the standard treecell binding.
+      var editCell = aParams[0];
+      editCell.setAttribute("class", "treecell-indent");
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // New Folder Creation
+    // Strategy: create a dummy row with edit fields to harvest information
+    //           from the user, then destroy these rows and create an item
+    //           in its place.
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Edit folder name & update the datasource if name is valid
+    onEditFolderName: function (aParams, aTopic)
+    {
+      var name = aParams[3];
+      var shell = gBookmarksShell.commands; // suck
+      var dummyItem = aParams[2];
+      var relativeNode = aParams[1];
+      var parentNode = relativeNode ? gBookmarksShell.findRDFNode(relativeNode, false) : gBookmarksShell.tree;
+
+      dummyItem.parentNode.removeChild(dummyItem);
+
+      if (!shell.validateNameAndTopic(name, aTopic, relativeNode, dummyItem)) {
+        gBookmarksShell.tree.selectItem(relativeNode);
+        gBookmarksShell.tree.focus();
+        return;
+      }
+
+      if (relativeNode) {
+        // If we're attempting to create a folder as a subfolder of an open folder,
+        // we need to set the parentFolder to be relativeNode, which will be the
+        // parent of the new folder, rather than the parent of the relativeNode,
+        // which will result in the folder being created in an incorrect position
+        // (adjacent to the relativeNode).
+        var selKids = ContentUtils.childByLocalName(relativeNode, "treechildren");
+        if (selKids && selKids.hasChildNodes() && selKids.lastChild == dummyItem)
+          parentNode = relativeNode;
+      }
+
+      var args = [{ property: NC_NS + "parent",
+                    resource: NODE_ID(parentNode) },
+                  { property: NC_NS + "Name",
+                    literal:  name }];
+
+      const kBMDS = gBookmarksShell.RDF.GetDataSource("rdf:bookmarks");
+      kBMDS.AddObserver(newFolderRDFObserver);
+      var relId = relativeNode ? NODE_ID(relativeNode) : "NC:BookmarksRoot";
+      BookmarksUtils.doBookmarksCommand(relId, NC_NS_CMD + "newfolder", args);
+      kBMDS.RemoveObserver(newFolderRDFObserver);
+      var newFolderItem = document.getElementById(newFolderRDFObserver._newFolderURI);
+      gBookmarksShell.tree.focus();
+      gBookmarksShell.tree.selectItem(newFolderItem);
+      // Can't use newFolderItem because it may not have been created yet. Hack, huh?
+      var index = gBookmarksShell.tree.getIndexOfItem(relativeNode);
+      gBookmarksShell.tree.ensureIndexIsVisible(index+1);
+      gSelectionTracker.clickCount = 0;
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Performs simple validation on what the user has entered:
+    //  1) prevents entering an empty string
+    //  2) in the case of a canceled operation, remove the dummy item and
+    //     restore selection.
+    validateNameAndTopic: function (aName, aTopic, aOldSelectedItem, aDummyItem)
+    {
+      // Don't allow user to enter an empty string "";
+      if (!aName) return false;
+
+      // If the user hit escape, go no further.
+      if (aTopic == "reject") {
+        if (aOldSelectedItem)
+          gBookmarksShell.tree.selectItem(aOldSelectedItem);
+        return false;
+      }
+      return true;
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Creates a dummy item that can be placed in edit mode to retrieve data
+    // to create new bookmarks/folders.
+    createBookmarkItem: function (aMode, aSelectedItem)
+    {
+      /////////////////////////////////////////////////////////////////////////
+      // HACK HACK HACK HACK HACK         
+      // Disable Inline-Edit for now and just use a dialog. 
+      
+      // XXX - most of this is just copy-pasted from the other two folder
+      //       creation functions. Yes it's ugly, but it'll do the trick for 
+      //       now as this is in no way intended to be a long-term solution.
+
+      const kPromptSvcContractID = "@mozilla.org/embedcomp/prompt-service;1";
+      const kPromptSvcIID = Components.interfaces.nsIPromptService;
+      const kPromptSvc = Components.classes[kPromptSvcContractID].getService(kPromptSvcIID);
+      
+      var defaultValue  = gBookmarksShell.getLocaleString("ile_newfolder");
+      var dialogTitle   = gBookmarksShell.getLocaleString("newfolder_dialog_title");
+      var dialogMsg     = gBookmarksShell.getLocaleString("newfolder_dialog_msg");
+      var stringValue   = { value: defaultValue };
+      if (kPromptSvc.prompt(window, dialogTitle, dialogMsg, stringValue, null, { value: 0 })) {
+        var relativeNode = gBookmarksShell.tree;
+        var parentNode;
+        if (aSelectedItem && aSelectedItem.localName != "tree") {
+          // By default, create adjacent to the selected item
+          relativeNode = aSelectedItem;
+          if (relativeNode.getAttribute("container") == "true" && 
+              relativeNode.getAttribute("open") == "true") {
+            // But if it's an open container, the relative node should be the last child. 
+            var treechildren = ContentUtils.childByLocalName(relativeNode, "treechildren");
+            if (treechildren && treechildren.hasChildNodes())
+              relativeNode = treechildren.lastChild; // folder non-empty, set relativeNode
+            parentNode = aSelectedItem; // no matter what, folder is open, so make it parent
+          } else {
+            parentNode = relativeNode ? gBookmarksShell.findRDFNode(relativeNode, false) : gBookmarksShell.tree;
+          }
+        }
+
+        var args = [{ property: NC_NS + "parent",
+                      resource: NODE_ID(parentNode) },
+                    { property: NC_NS + "Name",
+                      literal:  stringValue.value }];
+        
+        const kBMDS = gBookmarksShell.RDF.GetDataSource("rdf:bookmarks");
+        kBMDS.AddObserver(newFolderRDFObserver);
+        var relId = relativeNode ? NODE_ID(relativeNode) : "NC:BookmarksRoot";
+        BookmarksUtils.doBookmarksCommand(relId, NC_NS_CMD + "newfolder", args);
+        kBMDS.RemoveObserver(newFolderRDFObserver);
+        var newFolderItem = document.getElementById(newFolderRDFObserver._newFolderURI);
+        gBookmarksShell.tree.focus();
+        gBookmarksShell.tree.selectItem(newFolderItem);
+        // Can't use newFolderItem because it may not have been created yet. Hack, huh?
+        var index = gBookmarksShell.tree.getIndexOfItem(relativeNode);
+        gBookmarksShell.tree.ensureIndexIsVisible(index+1);
+      }
+      
+      return; 
+      
+      // HACK HACK HACK HACK HACK         
+      /////////////////////////////////////////////////////////////////////////
+
+      /* Disable inline edit for now
+      const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+      var dummyItem = document.createElementNS(kXULNS, "treeitem");
+      dummyItem = gBookmarksShell.createBookmarkFolderDecorations(dummyItem);
+      dummyItem.setAttribute("class", "bookmark-item");
+
+      var dummyRow    = document.createElementNS(kXULNS, "treerow");
+      var dummyCell   = document.createElementNS(kXULNS, "treecell");
+      var dummyCell2  = document.createElementNS(kXULNS, "treecell");
+      dummyCell.setAttribute("label", gBookmarksShell.getLocaleString("ile_newfolder") + "  ");
+      dummyCell.setAttribute("type", NC_NS + "Folder");
+      dummyCell.setAttribute("editable", "true");
+      dummyCell.setAttribute("class", "treecell-indent treecell-editable");
+      dummyRow.appendChild(dummyCell);
+      dummyItem.appendChild(dummyRow);
+      
+      var relativeNode = null;
+
+      // If there are selected items, try to create the dummy item relative to the 
+      // best item, and position the bookmark there when created. Otherwise just
+      // append to the root. 
+      if (aSelectedItem && aSelectedItem.localName != "tree") {
+        // By default, create adjacent to the selected item
+        relativeNode = aSelectedItem;
+        if (relativeNode.getAttribute("container") == "true" && 
+            relativeNode.getAttribute("open") == "true") {
+          // But if it's an open container, the relative node should be the last child. 
+          var treechildren = ContentUtils.childByLocalName(relativeNode, "treechildren");
+          if (treechildren && treechildren.hasChildNodes()) 
+            relativeNode = treechildren.lastChild;
+        }
+
+        if (aSelectedItem.getAttribute("container") == "true") {
+          if (aSelectedItem.getAttribute("open") == "true") {
+            var treechildren = ContentUtils.childByLocalName(aSelectedItem, "treechildren");
+            if (!treechildren) {
+              treechildren = document.createElementNS(kXULNS, "treechildren");
+              aSelectedItem.appendChild(treechildren);
+            }
+            // Insert new item after last item.
+            treechildren.appendChild(dummyItem);
+          }
+          else {
+            if (aSelectedItem.nextSibling)
+              aSelectedItem.parentNode.insertBefore(dummyItem, aSelectedItem.nextSibling);
+            else
+              aSelectedItem.parentNode.appendChild(dummyItem);
+          }
+          var index = gBookmarksShell.tree.getIndexOfItem(dummyItem);
+          gBookmarksShell.tree.ensureIndexIsVisible(index);
+        }
+        else {
+          if (aSelectedItem.nextSibling)
+            aSelectedItem.parentNode.insertBefore(dummyItem, aSelectedItem.nextSibling);
+          else
+            aSelectedItem.parentNode.appendChild(dummyItem);
+        }
+      }
+      else {
+        // No items in the tree. Append to the root. 
+        var rootKids = document.getElementById("treechildren-bookmarks");
+        rootKids.appendChild(dummyItem);
+      }
+
+      dummyCell.setMode("edit");
+      dummyCell.addObserver(this.onEditFolderName, "accept", [dummyCell, relativeNode, dummyItem]);
+      dummyCell.addObserver(this.onEditFolderName, "reject", [dummyCell, relativeNode, dummyItem]);
+      */
+    }
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Evaluates an event to determine whether or not it affords opening a tree
+  // item. Typically, this is when the left mouse button is used, and provided
+  // the click-rate matches that specified by our owning tree class. For example,
+  // some trees open an item when double clicked (bookmarks/history windows) and
+  // others on a single click (sidebar panels).
+  isValidOpenEvent: function (aEvent)
+  {
+    return !(aEvent.type == "click" && 
+             (aEvent.button != 0 || aEvent.detail != this.openClickCount))
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // For the given selection, selects the best adjacent element. This method is
+  // useful when an action such as a cut or a deletion is performed on a
+  // selection, and focus/selection needs to be restored after the operation
+  // is performed.
+  getNextElement: function (aElement)
+  {
+    if (aElement.nextSibling)
+      return aElement.nextSibling;
+    else if (aElement.previousSibling)
+      return aElement.previousSibling;
+    else
+      return aElement.parentNode.parentNode;
+  },
+
+  selectElement: function (aElement)
+  {
+    this.tree.selectItem(aElement);
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Add the treeitem element specified by aURI to the tree's current selection.
+  addItemToSelection: function (aURI)
+  {
+    var item = document.getElementById(aURI) // XXX flawed for multiple ids
+    this.tree.addItemToSelection(item);
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Return a set of DOM nodes that represent the selection in the tree widget.
+  // This method is takes a node parameter which is the popupNode for the
+  // document. If the popupNode is not contained by the selection, the
+  // popupNode is selected and the new selection returned.
+  getSelection: function ()
+  {
+    // Note that we don't just the selectedItems NodeList here because that
+    // is a reference to a LIVE DOM NODE LIST. We want to maintain control
+    // over what is in the selection array ourselves.
+    return [].concat(this.tree.selectedItems);
+  },
+
+  getBestItem: function ()
+  {
+    var seln = this.getSelection ();
+    if (seln.length < 1) {
+      var kids = ContentUtils.childByLocalName(this.tree, "treechildren");
+      return kids.lastChild || this.tree;
+    }
+    else
+      return seln[0];
+    return this.tree;
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Return a set of DOM nodes that represent the selection in the tree widget.
+  // This method is takes a node parameter which is the popupNode for the
+  // document. If the popupNode is not contained by the selection, the
+  // popupNode is selected and the new selection returned.
+  getContextSelection: function (aItemNode)
+  {
+    // How a context-click works:
+    // if the popup node is contained by the selection, the context menu is
+    // built for that selection. However, if the popup node is invoked on a
+    // non-selected node, unless modifiers are pressed**, the previous
+    // selection is discarded and that node selected.
+    var selectedItems = this.tree.selectedItems;
+    for (var i = 0; i < selectedItems.length; ++i) {
+      if (selectedItems[i] == aItemNode)
+        return selectedItems;
+    }
+    if (aItemNode.localName == "treeitem")
+      this.tree.selectItem(aItemNode);
+    return this.tree.selectedItems.length ? this.tree.selectedItems : [this.tree];
+  },
+
+  getSelectedFolder: function ()
+  {
+    var selectedItem = this.getBestItem();
+    if (!selectedItem) return "NC:BookmarksRoot";
+    while (selectedItem && selectedItem.nodeType == Node.ELEMENT_NODE) {
+      if (selectedItem.getAttribute("container") == "true" && 
+          selectedItem.getAttribute("open") == "true")
+        return NODE_ID(selectedItem);
+      selectedItem = selectedItem.parentNode.parentNode;
+    }
+    return "NC:BookmarksRoot";
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // For a given start DOM element, find the enclosing DOM element that contains
+  // the template builder RDF resource decorations (id, ref, etc).
+  findRDFNode: function (aStartNode, aIncludeStartNodeFlag)
+  {
+    var temp = aIncludeStartNodeFlag ? aStartNode : aStartNode.parentNode;
+    while (temp && temp.localName != "treeitem")
+      temp = temp.parentNode;
+    return temp || this.tree;
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Tree click events. This handles when to go into inline-edit mode for
+  // editable cells.
+  treeClicked: function (aEvent)
+  {
+    // We are disabling Inline Edit for now. It's too buggy in the old XUL tree widget.
+    // A more solid implementation will follow the conversion to tree
+/*
+    if (this.tree.selectedItems.length > 1 || aEvent.detail > 1 || aEvent.button != 0) {
+      gSelectionTracker.clickCount = 0;
+      return;
+    }
+    if (gSelectionTracker.currentItem == this.tree.currentItem &&
+        gSelectionTracker.currentCell == aEvent.target)
+      ++gSelectionTracker.clickCount;
+    else
+      gSelectionTracker.clickCount = 0;
+
+    if (!this.tree.currentItem)
+      return;
+
+    gSelectionTracker.currentItem = this.tree.currentItem;
+    gSelectionTracker.currentCell = aEvent.target;
+
+    if (gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Bookmark" &&
+        gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Folder")
+      return;
+
+    var row = gSelectionTracker.currentItem.firstChild;
+    if (row) {
+      for (var i = 0; i < row.childNodes.length; ++i) {
+        if (row.childNodes[i] == gSelectionTracker.currentCell) {
+          // Don't allow inline-edit of cells other than name for folders.
+          // XXX - so so skeezy. Change this to look for NC:Name or some such.
+          if (gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Bookmark" && i)
+            return;
+          // Don't allow editing of the root folder name
+          if (gSelectionTracker.currentItem.id == "NC:BookmarksRoot")
+            return;
+          if (gSelectionTracker.clickCount == 1 && this.openClickCount > 1)
+            gBookmarksShell.commands.editCell(this.tree.currentItem, i);
+          break;
+        }
+      }
+    }
+*/
+  },
+
+  treeOpen: function (aEvent)
+  {
+    if (this.isValidOpenEvent(aEvent)) {
+      var rdfNode = this.findRDFNode(aEvent.target, true);
+      if (rdfNode.getAttribute("container") != "true")
+        this.open(aEvent, rdfNode);
+    }
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Tree key events. This handles when to go into inline-edit mode for editable
+  // cells, when to load a URL, etc.
+  treeKeyPress: function (aEvent)
+  {
+    if (this.tree.selectedItems.length > 1) return;
+
+ /* Disabling Inline Edit
+    if (aEvent.keyCode == 113 && aEvent.shiftKey) {
+      const kNodeId = NODE_ID(this.tree.currentItem);
+      if (this.resolveType(kNodeId) == NC_NS + "Bookmark")
+        gBookmarksShell.commands.editCell (this.tree.currentItem, 1);
+    }
+    else */
+    if (aEvent.keyCode == 113)
+      goDoCommand("cmd_rename");
+    else if (aEvent.keyCode == 13) // && this.tree.currentItem.firstChild.getAttribute("inline-edit") != "true")
+      goDoCommand(aEvent.altKey ? "cmd_properties" : "cmd_open");
+  },
+
+  selectFolderItem: function (aFolderURI, aItemURI, aAdditiveFlag)
+  {
+    var folder = document.getElementById(aFolderURI);
+    var kids = ContentUtils.childByLocalName(folder, "treechildren");
+    if (!kids) return;
+
+    var item = kids.firstChild;
+    while (item) {
+      if (item.id == aItemURI) break;
+      item = item.nextSibling;
+    }
+    if (!item) return;
+
+    this.tree[aAdditiveFlag ? "addItemToSelection" : "selectItem"](item);
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Command handling & Updating.
+  controller: {
+    supportsCommand: function (aCommand)
+    {
+      switch(aCommand) {
+      case "cmd_undo":
+      case "cmd_redo":
+        return false;
+      case "cmd_bm_cut":
+      case "cmd_bm_copy":
+      case "cmd_bm_paste":
+      case "cmd_bm_delete":
+      case "cmd_bm_selectAll":
+        return true;
+      case "cmd_open":
+      case "cmd_openfolder":
+      case "cmd_openfolderinnewwindow":
+      case "cmd_newbookmark":
+      case "cmd_newfolder":
+      case "cmd_newseparator":
+      case "cmd_find":
+      case "cmd_properties":
+      case "cmd_rename":
+      case "cmd_setnewbookmarkfolder":
+      case "cmd_setpersonaltoolbarfolder":
+      case "cmd_setnewsearchfolder":
+      case "cmd_import":
+      case "cmd_export":
+      case "cmd_bm_fileBookmark":
+        return true;
+      default:
+        return false;
+      }
+    },
+
+    isCommandEnabled: function (aCommand)
+    {
+      var numSelectedItems = gBookmarksShell.tree.selectedItems.length;
+      var seln, firstSelected, folderType, bItemCountCorrect;
+      switch(aCommand) {
+      case "cmd_undo":
+      case "cmd_redo":
+        return false;
+      case "cmd_bm_paste":
+        return gBookmarksShell.canPaste();
+      case "cmd_bm_cut":
+      case "cmd_bm_copy":
+      case "cmd_bm_delete":
+        return numSelectedItems >= 1;
+      case "cmd_bm_selectAll":
+        return true;
+      case "cmd_open":
+         seln = gBookmarksShell.tree.selectedItems;
+        return numSelectedItems == 1 && seln[0].getAttribute("type") == NC_NS + "Bookmark";
+      case "cmd_openfolder":
+      case "cmd_openfolderinnewwindow":
+        seln = gBookmarksShell.tree.selectedItems;
+        return numSelectedItems == 1 && seln[0].getAttribute("type") == NC_NS + "Folder";
+      case "cmd_find":
+      case "cmd_newbookmark":
+      case "cmd_newfolder":
+      case "cmd_newseparator":
+      case "cmd_import":
+      case "cmd_export":
+        return true;
+      case "cmd_properties":
+      case "cmd_rename":
+        seln = gBookmarksShell.tree.selectedItems;
+        return numSelectedItems == 1 && seln[0].getAttribute("type") != NC_NS + "BookmarkSeparator";
+      case "cmd_setnewbookmarkfolder":
+        seln = gBookmarksShell.tree.selectedItems;
+        firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
+        folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
+        bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
+        return bItemCountCorrect && !(NODE_ID(firstSelected) == "NC:NewBookmarkFolder") && folderType;
+      case "cmd_setpersonaltoolbarfolder":
+        seln = gBookmarksShell.tree.selectedItems;
+        firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
+        folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
+        bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
+        return bItemCountCorrect && !(NODE_ID(firstSelected) == "NC:PersonalToolbarFolder") && folderType;
+      case "cmd_setnewsearchfolder":
+        seln = gBookmarksShell.tree.selectedItems;
+        firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
+        folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
+        bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
+        return bItemCountCorrect == 1 && !(NODE_ID(firstSelected) == "NC:NewSearchFolder") && folderType;
+      case "cmd_bm_fileBookmark":
+        seln = gBookmarksShell.tree.selectedItems;
+        return seln.length > 0;
+      default:
+        return false;
+      }
+    },
+
+    doCommand: function (aCommand)
+    {
+      switch(aCommand) {
+      case "cmd_undo":
+      case "cmd_redo":
+        break;
+      case "cmd_bm_paste":
+      case "cmd_bm_copy":
+      case "cmd_bm_cut":
+      case "cmd_bm_delete":
+      case "cmd_newbookmark":
+      case "cmd_newfolder":
+      case "cmd_newseparator":
+      case "cmd_properties":
+      case "cmd_rename":
+      case "cmd_open":
+      case "cmd_openfolder":
+      case "cmd_openfolderinnewwindow":
+      case "cmd_setnewbookmarkfolder":
+      case "cmd_setpersonaltoolbarfolder":
+      case "cmd_setnewsearchfolder":
+      case "cmd_find":
+      case "cmd_import":
+      case "cmd_export":
+      case "cmd_bm_fileBookmark":
+        gBookmarksShell.execCommand(aCommand.substring("cmd_".length));
+        break;
+      case "cmd_bm_selectAll":
+        gBookmarksShell.tree.selectAll();
+        break;
+      }
+    },
+
+    onEvent: function (aEvent)
+    {
+      switch (aEvent) {
+      case "tree-select":
+        this.onCommandUpdate();
+        break;
+      }
+    },
+
+    onCommandUpdate: function ()
+    {
+      var commands = ["cmd_properties", "cmd_rename", "cmd_bm_copy",
+                      "cmd_bm_paste", "cmd_bm_cut", "cmd_bm_delete",
+                      "cmd_setpersonaltoolbarfolder", 
+                      "cmd_setnewbookmarkfolder",
+                      "cmd_setnewsearchfolder", "cmd_bm_fileBookmark", 
+                      "cmd_openfolderinnewwindow", "cmd_openfolder"];
+      for (var i = 0; i < commands.length; ++i)
+        goUpdateCommand(commands[i]);
+    }
+  }
+};
+
+var newFolderRDFObserver = {
+  _newFolderURI: null,
+  onAssert: function (aDS, aSource, aProperty, aValue)
+  {
+    try {
+      var value = aValue.QueryInterface(Components.interfaces.nsIRDFResource);
+      if (aDS.URI == "rdf:bookmarks" && aProperty.Value == RDF_NS + "type" &&
+          value.Value == NC_NS + "Folder")
+        this._newFolderURI = aSource.Value;
+    }
+    catch (e) {
+      // Failures are OK, the value could be a literal instead of a resource.
+    }
+  },
+
+  onUnassert: function (aDS, aSource, aProperty, aTarget) { },
+  onChange: function (aDS, aSource, aProperty, aOldTarget, aNewTarget) { },
+  onMove: function (aDS, aOldSource, aNewSource, aProperty, aTarget) { },
+  beginUpdateBatch: function (aDS) { },
+  endUpdateBatch: function (aDS) { }
+};
+

mozilla/xpfe/components/bookmarks/resources/findBookmark.js

@@ -0,0 +1,97 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const BMARKS_CONTRACTID        = "@mozilla.org/browser/bookmarks-service;1";
+const nsIBookmarksService      = Components.interfaces.nsIBookmarksService;
+
+var gOKButton;
+var gSearchField;
+function Startup()
+{
+  var bundle = document.getElementById("bookmarksBundle");
+  gOKButton = document.documentElement.getButton("accept");
+  gOKButton.label = bundle.getString("search_button_label");
+  gOKButton.disabled = true;
+  gSearchField = document.getElementById("searchField");
+  gSearchField.focus();
+}
+var gCreatingNewWindow = false;
+function find()
+{
+  // Build up a find URI from the search fields and open a new window
+  // rooted on the URI. 
+  var match = document.getElementById("matchList");
+  var method = document.getElementById("methodList");
+  var searchURI = "find:datasource=rdf:bookmarks"
+  searchURI += "&match=" + match.selectedItem.value;
+  searchURI += "&method=" + method.selectedItem.value;
+  searchURI += "&text=" + escape(gSearchField.value);
+  var bmWindow = findMostRecentWindow("bookmarks:searchresults", "chrome://communicator/content/bookmarks/bookmarks.xul", searchURI);
+  
+  // Update the root of the tree if we're using an existing search window. 
+  if (!gCreatingNewWindow) 
+    bmWindow.document.getElementById("bookmarks-view").tree.setAttribute("ref", searchURI);
+ 
+  bmWindow.focus();
+
+  if (document.getElementById("saveQuery").checked == true)
+  {
+    var bundle = document.getElementById("bookmarksBundle");
+    var findTitle = bundle.stringBundle.formatStringFromName(
+                      "ShortFindTitle", [gSearchField.value], 1);
+    var bmks = Components.classes[BMARKS_CONTRACTID].getService(nsIBookmarksService);
+    bmks.addBookmarkImmediately(searchURI, findTitle, bmks.BOOKMARK_FIND_TYPE, null);
+  }
+
+  return true;
+}
+
+function findMostRecentWindow(aType, aURI, aParam)
+{
+  var WM = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
+  WM = WM.QueryInterface(Components.interfaces.nsIWindowMediator);
+  var topWindow = WM.getMostRecentWindow(aType);
+  if (!topWindow) gCreatingNewWindow = true;
+  return topWindow || openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", 
+                                 "", "chrome,all,dialog=no", aParam);
+}
+
+function doEnabling()
+{
+  gOKButton.disabled = !gSearchField.value;
+}

mozilla/xpfe/components/bookmarks/resources/findBookmark.xul

@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+
+<!-- -*- Mode: HTML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  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): 
+    Ben Goodger <ben@netscape.com> (Original Author)
+-->
+
+<!--
+    "Find Bookmarks" window
+  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/"?>
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/findBookmark.dtd">
+
+<dialog id="findBookmarkWindow" style="width: 36em;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&findBookmark.title;" 
+        onload="Startup();"
+        ondialogaccept="return find();">
+
+  <stringbundle id="bookmarksBundle" src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+  
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/findBookmark.js"/>
+
+  <label value="&search.for.label;"/>
+  <hbox align="center">
+    <menulist id="matchList" class="menulist-toolbar">
+      <menupopup>
+        <menuitem value="http://home.netscape.com/NC-rdf#Name" label="&search.name.label;"/>
+        <menuitem value="http://home.netscape.com/NC-rdf#URL" label="&search.url.label;"/>
+        <menuitem value="http://home.netscape.com/NC-rdf#Description" label="&search.description.label;"/>
+        <menuitem value="http://home.netscape.com/NC-rdf#ShortcutURL" label="&search.shortcut.label;"/>
+      </menupopup>
+    </menulist>
+    <menulist id="methodList" class="menulist-toolbar">
+      <menupopup>
+        <menuitem value="contains" label="&search.contains.label;"/>
+        <menuitem value="startswith" label="&search.startswith.label;"/>
+        <menuitem value="endswith" label="&search.endswith.label;"/>
+        <menuitem value="is" label="&search.is.label;"/>
+        <menuitem value="isnot" label="&search.isnot.label;"/>
+        <menuitem value="doesntcontain" label="&search.doesntcontain.label;"/>
+      </menupopup>
+    </menulist>
+    <textbox id="searchField" flex="1" oninput="doEnabling();"/>
+  </hbox>
+  <checkbox id="saveQuery" label="&save.query.label;" />
+</dialog>
+

mozilla/xpfe/components/bookmarks/resources/jar.mn

@@ -0,0 +1,47 @@
+# 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): 
+
+comm.jar:
+	content/communicator/bookmarks/addBookmark.xul
+	content/communicator/bookmarks/addBookmark.js
+	content/communicator/bookmarks/bm-props.js
+	content/communicator/bookmarks/bm-props.xul
+	content/communicator/bookmarks/bookmarksDD.js
+	content/communicator/bookmarks/bookmarks.xul
+	content/communicator/bookmarks/bookmarks.js
+	content/communicator/bookmarks/bookmarks.css
+	content/communicator/bookmarks/bookmarks.xml
+	content/communicator/bookmarks/bookmarksTree.js
+	content/communicator/bookmarks/bookmarksOverlay.xul
+	content/communicator/bookmarks/bookmarksOverlay.js
+	content/communicator/bookmarks/bm-panel.xul
+	content/communicator/bookmarks/bookmarksPanel.js
+	content/communicator/bookmarks/findBookmark.js
+	content/communicator/bookmarks/findBookmark.xul
+	content/communicator/bookmarks/pref-bookmarks.xul
+	content/communicator/bookmarks/oTest.xul
+
+en-US.jar:
+	locale/en-US/communicator/bookmarks/addBookmark.dtd         (locale/en-US/addBookmark.dtd)
+	locale/en-US/communicator/bookmarks/bm-props.dtd            (locale/en-US/bm-props.dtd)
+	locale/en-US/communicator/bookmarks/bookmarks.dtd           (locale/en-US/bookmarks.dtd)
+	locale/en-US/communicator/bookmarks/bookmark.properties     (locale/en-US/bookmark.properties)
+	locale/en-US/communicator/bookmarks/bookmarksOverlay.dtd    (locale/en-US/bookmarksOverlay.dtd)
+	locale/en-US/communicator/bookmarks/findBookmark.dtd	    (locale/en-US/findBookmark.dtd)
+	locale/en-US/communicator/bookmarks/pref-bookmarks.dtd	    (locale/en-US/pref-bookmarks.dtd)

mozilla/xpfe/components/bookmarks/resources/locale/MANIFEST

@@ -0,0 +1,4 @@
+en-US:bm-find.dtd
+en-US:bm-props.dtd
+en-US:bookmarks.dtd
+en-US:bookmark.properties

mozilla/xpfe/components/bookmarks/resources/locale/en-US/MANIFEST

@@ -0,0 +1,4 @@
+bm-find.dtd
+bm-props.dtd
+bookmark.properties
+bookmarks.dtd

mozilla/xpfe/components/bookmarks/resources/locale/en-US/addBookmark.dtd

@@ -0,0 +1,46 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is Mozilla Communicator.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp. Portions created by Netscape Communications
+   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Ben Goodger <ben@netscape.com> (Original Author)
+  --> 
+  
+<!ENTITY newBookmark.title          "Add Bookmark">
+<!ENTITY newbookmark.label          "&brandShortName; will add a bookmark to this page.">
+<!ENTITY name.label                 "Name:">
+<!ENTITY name.accesskey             "n">
+<!ENTITY url.label                  "Location:">
+<!ENTITY url.accesskey              "l">
+<!ENTITY button.createin.label      "Create In &gt;&gt;">
+<!ENTITY button.createin.accesskey  "c">
+<!ENTITY button.createin2.label     "Create In &lt;&lt;">
+<!ENTITY createin.label             "Create in:">
+<!ENTITY createin.accesskey         "i">
+<!ENTITY button.newfolder.label     "New Folder...">
+<!ENTITY button.newfolder.accesskey "w">
+<!ENTITY alwayscreateinfolder.label "Don't show this dialog again">
+<!ENTITY alwayscreateinfolder.accesskey "a">
+<!ENTITY dontshowmessage.tooltip    "When this option is selected, new Bookmarks will be added using the title provided by the page.">
+<!ENTITY button.defaultfolder.label "Use Default">
+<!ENTITY button.defaultfolder.accesskey "d">
+<!ENTITY selectFolder.label         "Choose Folder">
+<!ENTITY addGroup.label             "Bookmark this group of tabs">
+<!ENTITY addGroup.accesskey         "B">
+
+
+

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bm-props.dtd

@@ -0,0 +1,92 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is Mozilla Communicator.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp. Portions created by Netscape Communications
+   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): Stephen Lamm          <slamm@netscape.com>
+   -                 Robert John Churchill <rjc@netscape.com>
+   -                 Ben Goodger           <ben@netscape.com>
+  --> 
+
+<!ENTITY bookmarks.windowtitle.label  "Properties for &quot;**bm_title**&quot;">
+
+<!ENTITY generalInfo.label            "Info">
+<!ENTITY generalInfo.accesskey        "i">
+<!ENTITY generaldesc.label            "&brandShortName; can remember the locations of sites on the Internet for you. Enter the site's name and location in the fields below, then select the site from the Bookmarks menu or your Bookmarks Sidebar tab to visit the site.">
+
+<!ENTITY schedule.label               "Schedule">
+<!ENTITY schedule.accesskey           "s">
+<!ENTITY schedule.description         "&brandShortName; can check this site for updates and notify you when one occurs. Use these settings to customize the schedule for this Bookmark.">
+<!ENTITY notification.label           "Notify">
+<!ENTITY notification.accesskey       "n">
+<!-- ICK. fix me -->
+<!ENTITY notification.description     "&brandShortName; will notify you when this site changes. Use these settings to customize notification.">
+
+<!ENTITY bookmarks.information.label  "Information:">
+<!ENTITY bookmarks.name.label         "Name:">
+<!ENTITY bookmarks.location.label     "Location:">
+<!ENTITY bookmarks.shortcut.label     "Keyword:">
+<!ENTITY bookmarks.description.label  "Description:">
+
+<!ENTITY checkforupdates.legend.label "Check this location for updates:">
+<!ENTITY when.label                   "When:">
+<!ENTITY from.label                   "from:">
+<!ENTITY to.label                     "to: ">
+<!ENTITY every.label                  "every">
+<!ENTITY minutes.label                "minute(s)">
+<!ENTITY notifications.legend.label   "Notification:">
+
+<!ENTITY checknever.label             "Never">
+<!ENTITY checkeveryday.label          "Every day">
+<!ENTITY checkweekdays.label          "Weekdays">
+<!ENTITY checkweekends.label          "Weekends">
+<!ENTITY checkmondays.label           "Mondays">
+<!ENTITY checktuesdays.label          "Tuesdays">
+<!ENTITY checkwednesdays.label        "Wednesdays">
+<!ENTITY checkthursdays.label         "Thursdays">
+<!ENTITY checkfridays.label           "Fridays">
+<!ENTITY checksaturdays.label         "Saturdays">
+<!ENTITY checksundays.label           "Sundays">
+
+<!ENTITY midnight.label               "Midnight">
+<!ENTITY AMone.label                  "1 AM">
+<!ENTITY AMtwo.label                  "2 AM">
+<!ENTITY AMthree.label                "3 AM">
+<!ENTITY AMfour.label                 "4 AM">
+<!ENTITY AMfive.label                 "5 AM">
+<!ENTITY AMsix.label                  "6 AM">
+<!ENTITY AMseven.label                "7 AM">
+<!ENTITY AMeight.label                "8 AM">
+<!ENTITY AMnine.label                 "9 AM">
+<!ENTITY AMten.label                  "10 AM">
+<!ENTITY AMeleven.label               "11 AM">
+<!ENTITY noon.label                   "Noon">
+<!ENTITY PMone.label                  "1 PM">
+<!ENTITY PMtwo.label                  "2 PM">
+<!ENTITY PMthree.label                "3 PM">
+<!ENTITY PMfour.label                 "4 PM">
+<!ENTITY PMfive.label                 "5 PM">
+<!ENTITY PMsix.label                  "6 PM">
+<!ENTITY PMseven.label                "7 PM">
+<!ENTITY PMeight.label                "8 PM">
+<!ENTITY PMnine.label                 "9 PM">
+<!ENTITY PMten.label                  "10 PM">
+<!ENTITY PMeleven.label               "11 PM">
+
+<!ENTITY notification.icon.label      "Change the bookmark's icon">
+<!ENTITY notification.sound.label     "Play a sound">
+<!ENTITY notification.alert.label     "Display an alert">
+<!ENTITY notification.window.label    "Open web page in a new window">

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmark.properties

@@ -0,0 +1,80 @@
+# 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): 
+#
+
+cmd_bm_open = Open
+cmd_bm_openfolder = Expand
+cmd_bm_openfolder2 = Collapse
+cmd_bm_find = Find a Bookmark...
+cmd_bm_cut = Cut
+cmd_bm_copy = Copy
+cmd_bm_paste = Paste
+cmd_bm_delete = Delete
+cmd_bm_selectAll = Select All
+cmd_bm_rename = Rename...
+cmd_bm_renamebookmark2 = Change Location...
+cmd_bm_properties = Properties
+cmd_bm_fileBookmark = File Bookmark(s)...
+
+cmd_bm_openinnewwindow = Open in New Window
+cmd_bm_newfolder = New Folder...
+cmd_bm_newbookmark = New Bookmark...
+cmd_bm_newseparator = New Separator
+cmd_bm_setnewbookmarkfolder = Set as New Bookmark folder
+cmd_bm_setpersonaltoolbarfolder = Set as Personal Toolbar folder
+cmd_bm_setnewsearchfolder = Set as Saved Search Results folder
+
+ile_newfolder = New Folder
+ile_newbookmark = New Bookmark
+newfolder_dialog_title = Create New Folder
+newfolder_dialog_msg = Create a New Folder named:
+
+window_title = %folder_name% - Bookmarks
+search_results_title = Search Results
+
+file_in = File in "%folder_name%"
+
+bookmarks_root = Bookmarks for %user_name%
+status_foldercount = %num_items% object(s)
+
+WebPageUpdated = The following web page has been updated:
+WebPageTitle = Title:
+WebPageURL = URL:
+WebPageAskDisplay = Would you like to display it?
+WebPageAskStopOption = Stop checking for updates on this web page
+
+pleaseEnterALocation = Please enter a location
+pleaseEnterADuration = Please enter a duration.
+pleaseSelectANotification = Please enter at least one notification method.
+
+SortMenuItem = Sorted by %NAME%
+
+ShortFindTitle = Find: '%S'
+FindTitle = Find: %S %S '%S' in %S
+
+ImportedIEFavorites = Imported IE Favorites                                     
+ImportedIEStaticFavorites = Imported IE Favorites
+ImportedNetPositiveBookmarks = Imported NetPositive Bookmarks                   
+DefaultPersonalToolbarFolder = Personal Toolbar Folder                          
+
+SelectImport = Import bookmark file:                                            
+EnterExport = Export bookmark file:                                             
+
+search_button_label = Find
+

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmarks.dtd

@@ -0,0 +1,87 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is Mozilla Communicator.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp. Portions created by Netscape Communications
+   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Stephen Lamm <slamm@netscape.com>
+   -   Blake Ross <blakeross@telocity.com>
+  --> 
+
+<!-- extracted from ./bookmarks.xul -->
+<!ENTITY menuBar.tooltip               "Menu Bar">
+<!ENTITY bookmarkToolbar.tooltip       "Bookmark Toolbar">
+<!ENTITY menuitem.newBookmark.label    "Bookmark">
+<!ENTITY command.newBookmark.accesskey "B">
+<!ENTITY menuitem.newFolder.label      "Folder">
+<!ENTITY button.newFolder.label        "New Folder">
+<!ENTITY command.newFolder.accesskey   "F">
+<!ENTITY menuitem.newSeparator.label   "Separator">
+<!ENTITY button.newSeparator.label     "New Separator">
+<!ENTITY command.newSeparator.accesskey "S">
+<!ENTITY menuitem.import.label         "Import...">
+<!ENTITY menuitem.import.accesskey     "i">
+<!ENTITY menuitem.export.label         "Export...">
+<!ENTITY menuitem.export.accesskey     "e">
+<!ENTITY menuitem.find.label           "Search Bookmarks...">
+<!ENTITY command.findBookmarks.label   "Search...">
+<!ENTITY menuitem.find.accesskey       "S">
+<!ENTITY edit.find.keybinding          "f">
+<!ENTITY command.properties.label      "Properties...">
+<!ENTITY command.properties.accesskey  "r">
+<!ENTITY edit.properties.keybinding    "i">
+<!ENTITY command.rename.label          "Rename...">
+<!ENTITY command.delete.label          "Delete">
+<!ENTITY command.fileBookmark.label    "File Bookmark(s)...">
+<!ENTITY command.fileBookmark.accesskey "l">
+<!ENTITY command.addBookmark.label     "Add...">
+<!ENTITY command.manageBookmarks.label "Manage">
+
+
+<!ENTITY menuitem.view.command.toolbar.label        "Toolbar">
+<!ENTITY menuitem.view.command.toolbar.accesskey    "t">
+<!ENTITY menuitem.view.unsorted.label               "Unsorted">
+<!ENTITY menuitem.view.unsorted.accesskey           "u">
+<!ENTITY menuitem.view.ascending.label              "A > Z Sort Order">
+<!ENTITY menuitem.view.ascending.accesskey          "a">
+<!ENTITY menuitem.view.descending.label             "Z > A Sort Order">
+<!ENTITY menuitem.view.descending.accesskey         "z">
+<!ENTITY menuitem.view.show_columns.label           "Show columns">
+<!ENTITY menuitem.view.show_columns.accesskey       "S">
+<!ENTITY menuitem.newbookmarkfolder.label           "Set as New Bookmark Folder">
+<!ENTITY menuitem.newbookmarkfolder.accesskey       "b">
+<!ENTITY menuitem.newinternetsearchfolder.label     "Set as New Internet Search Folder">
+<!ENTITY menuitem.newinternetsearchfolder.accesskey "i">
+<!ENTITY menuitem.personaltoolbarfolder.label       "Set as Personal Toolbar Folder">
+<!ENTITY menuitem.personaltoolbarfolder.accesskey   "p">
+
+<!ENTITY treecol.name.label             "Name">
+<!ENTITY treecol.name.accesskey         "n">
+<!ENTITY treecol.url.label              "Location">
+<!ENTITY treecol.url.accesskey          "l">
+<!ENTITY treecol.shortcut.label         "Keyword">
+<!ENTITY treecol.shortcut.accesskey     "k">
+<!ENTITY treecol.addedon.label          "Added">
+<!ENTITY treecol.addedon.accesskey      "a">
+<!ENTITY treecol.lastmod.label          "Last Modified">
+<!ENTITY treecol.lastmod.accesskey      "m">
+<!ENTITY treecol.lastvisit.label        "Last Visited">
+<!ENTITY treecol.lastvisit.accesskey    "b">
+<!ENTITY treecol.description.label      "Description">
+<!ENTITY treecol.description.accesskey  "d">
+
+<!ENTITY bookmarksWindowTitle.label     "Bookmark Manager">
+

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmarksOverlay.dtd

@@ -0,0 +1,22 @@
+
+<!ENTITY  findABookmark.label               "Find a Bookmark...">
+<!ENTITY  findABookmark.accesskey           "f">
+<!ENTITY  newBookmark.label                 "New Bookmark...">
+<!ENTITY  newBookmark.accesskey             "n">
+<!ENTITY  newFolder.label                   "New Folder...">
+<!ENTITY  newFolder.accesskey               "e">
+<!ENTITY  newSeparator.label                "New Separator">
+<!ENTITY  newSeparator.accesskey            "s">
+<!ENTITY  setAsNewBookmarkFolder.label      "Set as new Bookmark folder">
+<!ENTITY  setAsNewBookmarkFolder.accesskey  "b">
+<!ENTITY  setAsNewSearchFolder.label        "Set as new Search Results folder">
+<!ENTITY  setAsNewSearchFolder.accesskey    "r">
+<!ENTITY  setAsNewToolbarFolder.label       "Set as new Personal Toolbar folder">
+<!ENTITY  setAsNewToolbarFolder.accesskey   "p">
+<!ENTITY  exportBookmarks.label             "Export...">
+<!ENTITY  exportBookmarks.accesskey         "x">
+<!ENTITY  importBookmarks.label             "Import...">
+<!ENTITY  importBookmarks.accesskey         "i">
+
+
+

mozilla/xpfe/components/bookmarks/resources/locale/en-US/findBookmark.dtd

@@ -0,0 +1,15 @@
+
+<!ENTITY search.name.label              "name">
+<!ENTITY search.url.label               "location">
+<!ENTITY search.shortcut.label          "keyword">
+<!ENTITY search.description.label       "description">
+<!ENTITY search.startswith.label        "starts with">
+<!ENTITY search.endswith.label          "ends with">
+<!ENTITY search.is.label                "is">
+<!ENTITY search.isnot.label             "is not">
+<!ENTITY search.contains.label          "contains">
+<!ENTITY search.doesntcontain.label     "doesn't contain">
+<!ENTITY save.query.label               "Save query in bookmarks">
+<!ENTITY search.for.label               "Find Bookmarks whose">
+<!ENTITY findBookmark.title             "Find Bookmarks">
+

mozilla/xpfe/components/bookmarks/resources/locale/en-US/makefile.win

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

mozilla/xpfe/components/bookmarks/resources/locale/en-US/pref-bookmarks.dtd

@@ -0,0 +1,13 @@
+
+<!ENTITY  lHeader                       "Bookmarks">
+<!ENTITY  filingBookmarks.label         "Adding Bookmarks">
+<!ENTITY  autoFile.label                "&brandShortName; will ask you to choose a title and folder when adding a new Bookmark.">
+<!ENTITY  enableAutoFile.label          "Automatically set title and destination">
+<!ENTITY  defaultFolder.label           "By default, all new Bookmarks will be added into this folder:">
+<!ENTITY  chooseDefaultFolder.label     "Choose Folder...">
+<!ENTITY  chooseDefaultFolder.accesskey "c">
+<!ENTITY  extendedDataViews.label       "Extended Data Views">
+<!ENTITY  extendedDataExplanation.label "&brandShortName; can display some types of special data (e.g. local file folders and ftp directories) in the bookmarks window or menu as folders, rather than as normal links.">
+<!ENTITY  showExtendedData.label        "Show Extended Data as folders in the Bookmarks window and menu">
+<!ENTITY  showExtendedData.accesskey    "x">
+

mozilla/xpfe/components/bookmarks/resources/locale/makefile.win

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

mozilla/xpfe/components/bookmarks/resources/makefile.win

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

mozilla/xpfe/components/bookmarks/resources/manifest.jm

@@ -0,0 +1,29 @@
+# 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): 
+
+packages/core.jar:
+	communicator/content/bookmarks/bm-find.js
+	communicator/content/bookmarks/bm-find.xul
+	communicator/content/bookmarks/bm-panel.js
+	communicator/content/bookmarks/bm-panel.xul
+	communicator/content/bookmarks/bm-props.js
+	communicator/content/bookmarks/bm-props.xul
+	communicator/content/bookmarks/bookmarks.js
+	communicator/content/bookmarks/bookmarksDD.js
+	communicator/content/bookmarks/bookmarks.xul

mozilla/xpfe/components/bookmarks/resources/oTest.css

@@ -0,0 +1,2 @@
+
+

mozilla/xpfe/components/bookmarks/resources/oTest.xul

@@ -0,0 +1,162 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://communicator/skin/"?>
+<?xml-stylesheet href="chrome://communicator/content/bookmarks/oTest.css"?>
+
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+
+<window id="bookmarksTreeTest" width="640" height="480"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        orient="vertical"
+        onload="Startup();">
+
+
+  <script>
+  <![CDATA[
+    var bookmarksBuilderObserver = {
+      onToggleOpenState: function (aIndex) {
+        dump("*** onToggleOpenState(" + aIndex + ");\n");
+      },
+
+      onCycleHeader: function (aColID, aDOMElement) {
+        dump("*** onCycleHeader(" + aColID + ", " + aDOMElement + ");\n");
+      },
+
+      onCycleCell: function (aIndex, aColID) {
+        dump("*** onCycleCell(" + aIndex + ", " + aColID + ");\n");
+      },
+
+      onSelectionChanged: function () {
+        dump("*** onSelectionChanged\n");
+      },
+
+      isEditable: function (aIndex, aColID) {
+        dump("*** isEditable(" + aIndex + ", " + aColID + ");\n");
+        return aColID == "NameColumn";
+      },
+
+      onSetCellText: function (aIndex, aColID, aValue) {
+        dump("*** onSetCellText(" + aIndex + ", " + aColID + ", " + aValue + ");\n");
+      },
+
+      onPerformAction: function (aAction) {
+        dump("*** onPerformAction(" + aAction + ");\n");
+      },
+
+      onPerformActionOnRow: function (aAction, aIndex) {
+        dump("*** onPerformActionOnRow(" + aAction + ", " + aIndex + ");\n");
+      },
+
+      onPerformActionOnCell: function (aAction, aIndex, aColID) {
+        dump("*** onPerformActionOnCell(" + aAction + ", " + aIndex + ", " + aColID + ");\n");
+      }
+    };
+
+    function Startup()
+    {
+      var tree = document.getElementById("tree");
+      var builder = tree.builder.QueryInterface(Components.interfaces.nsIXULTreeBuilder);
+      builder.addObserver(bookmarksBuilderObserver);
+    }
+
+    function getItemRect(aEvent)
+    {
+      var tree = document.getElementById("tree-proper");
+      var obo = tree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);  
+      var row = { };
+      var col = { };
+      var elt = { };
+      obo.getCellAt(aEvent.clientX, aEvent.clientY, row, col, elt);
+
+      var x = { };
+      var y = { };
+      var w = { };
+      var h = { };
+      var crp = { };
+      obo.getCoordsForCellItem(row.value, col.value, elt.value, x, y, w, h, crp);
+      dump("*** (x,y) = (" + x.value + "," + y.value + "); (w,h) = (" + w.value + "," + h.value + ");\n");
+    }
+
+    const kRDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+    function createContextMenu (aEvent)
+    {
+      var tree = document.getElementById("tree-proper");
+      var obo = tree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);
+      var row = { };
+      var col = { };
+      var elt = { };
+      obo.getCellAt(aEvent.clientX, aEvent.clientY, row, col, elt);
+      dump("*** row.value = " + row.value + "\n") 
+      
+      var treeBody = document.getElementById("tree");
+      var rowResource = treeBody.builder.getResourceAtIndex(row.value);
+      
+      const kRDFSvcContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFSvcIID = Components.interfaces.nsIRDFService;
+      const kRDFSvc = Components.classes[kRDFSvcContractID].getService(kRDFSvcIID);
+      var database = treeBody.database;
+
+      const krType = kRDFSvc.GetResource(kRDF_NS + "type");
+      var typeNode = kDatabase.GetTarget(rowResource, krType, true);
+      typeNode = typeNode.QueryInterface(Components.interfaces.nsIRDFResource);
+      dump("*** typeNode = " + typeNode.Value + "\n");
+      aEvent.preventBubble();
+    }
+  ]]>
+  </script>
+
+  <popupset id="contextSet">
+    <popup id="bookmarkContextMenu" onpopupshowing="createContextMenu(event);"/>
+  </popupset>
+
+  <toolbox>
+    <toolbar>
+      <button class="button-toolbar-2" label="Foopy Noopy" oncommand="alert('hi');"/>
+    </toolbar>
+  </toolbox>
+
+  <stack>
+    <button label="Foopy Noopy" flex="1"/>
+    <bulletinboard flex="1">
+      <textbox value="NerpNerp" left="10" top="50" onblur="this.setAttribute('hidden','true');"/>
+    </bulletinboard>  
+  </stack>
+
+  <tree flex="1" flags="dont-test-empty" id="tree-proper">
+    <treecols>
+      <treecol id="NameColumn"
+                   class="treecol-header treecol-inset-header sortDirectionIndicator"
+                   flex="1"
+                   sort="rdf:http://home.netscape.com/NC-rdf#Name"
+                   sortActive="true"
+                   label="Name"
+                   persist="width hidden sortActive sortDirection"
+                   primary="true" />
+
+      <splitter class="tree-splitter"/>
+
+      <treecol id="URLColumn"
+                   class="treecol-header treecol-inset-header sortDirectionIndicator"
+                   flex="1"
+                   sort="rdf:http://home.netscape.com/NC-rdf#URL"
+                   label="Location"
+                   persist="width hidden sortActive sortDirection" />
+    </treecols>
+
+    <treebody id="tree" datasources="rdf:bookmarks rdf:internetsearch rdf:files" flex="1"
+                  onclick="getItemRect(event);" ref="NC:BookmarksRoot">
+      <template>
+        <treerow uri="rdf:*" properties="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type rdf:http://home.netscape.com/NC-rdf#loading">
+          <treecell ref="NameColumn"
+                        label="rdf:http://home.netscape.com/NC-rdf#Name" />
+
+          <treecell ref="URLColumn"
+                        label="rdf:http://home.netscape.com/NC-rdf#URL" />
+        </treerow>
+      </template>
+    </treebody>
+  </tree>
+
+</window>
+

mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul

@@ -0,0 +1,116 @@
+<?xml version="1.0"?> 
+<!--
+   The contents of this file are subject to the Netscape Public
+   License Version 1.1 (the "License"); you may not use this file
+   except in compliance with the License. You may obtain a copy of
+   the License at http://www.mozilla.org/NPL/
+    
+   Software distributed under the License is distributed on an "AS
+   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   implied. See the License for the specific language governing
+   rights and limitations under the License.
+    
+   The Original Code is Mozilla Communicator client code, released
+   March 31, 1998.
+   
+   The Initial Developer of the Original Code is Netscape
+   Communications Corporation. Portions created by Netscape are
+   Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   Rights Reserved.
+   
+   Contributor(s): 
+  -->
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/pref-bookmarks.dtd">
+%prefBookmarkDTD;
+]>
+
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://communicator/content/bookmarks/pref-bookmarks.xul');"
+      headertitle="&lHeader;">
+
+  <script type="application/x-javascript">
+  <![CDATA[
+    var _elementIDs = ["enableAutoFile", "showExtendedData"];
+
+    var gCreateInFolder = "NC:NewBookmarkFolder";
+    function Startup ()
+    {
+      const kDisplay = document.getElementById("defaultFolder");
+      const kRDFSvcContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFSvcIID = Components.interfaces.nsIRDFService;
+      const kRDFSvc = Components.classes[kRDFSvcContractID].getService(kRDFSvcIID);
+      const kBMDS = kRDFSvc.GetDataSource("rdf:bookmarks");
+      const krDefaultFolder = kRDFSvc.GetResource("NC:NewBookmarkFolder");
+      const krType = kRDFSvc.GetResource("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
+      const krFolder = kRDFSvc.GetResource("http://home.netscape.com/NC-rdf#Folder");
+      const isFolder = kBMDS.HasAssertion(krDefaultFolder, krType, krFolder, true);
+      const krNameArc = kRDFSvc.GetResource("http://home.netscape.com/NC-rdf#Name");
+      if (!isFolder) {
+        const krRoot = kRDFSvc.GetResource("NC:BookmarksRoot");
+        gCreateInFolder = "NC:BookmarksRoot";
+      }
+      var rName = kBMDS.GetTarget(isFolder ? krDefaultFolder : krRoot, krNameArc, true);
+      rName = rName.QueryInterface(Components.interfaces.nsIRDFLiteral);
+      kDisplay.value = rName.Value;
+    }
+  
+    function chooseDefaultFolder ()
+    {
+      var rv = { selectedFolder: null };
+      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
+                 "centerscreen,chrome,dialog=no,resizable=no", 
+                 null, null, gCreateInFolder, null, "selectFolder", rv);
+      if (rv && rv.selectedFolder) {
+        const kRDFSvcContractID = "@mozilla.org/rdf/rdf-service;1";
+        const kRDFSvcIID = Components.interfaces.nsIRDFService;
+        const kRDFSvc = Components.classes[kRDFSvcContractID].getService(kRDFSvcIID);
+        const kBMDS = kRDFSvc.GetDataSource("rdf:bookmarks");
+        const krDefaultFolder = kRDFSvc.GetResource(rv.selectedFolder);
+        const krNameArc = kRDFSvc.GetResource("http://home.netscape.com/NC-rdf#Name");
+        rName = kBMDS.GetTarget(krDefaultFolder, krNameArc, true);
+        rName = rName.QueryInterface(Components.interfaces.nsIRDFLiteral);
+        document.getElementById("defaultFolder").value = rName.Value;
+      }  
+        
+    }
+  ]]>
+  </script>
+        
+  <groupbox>
+    <caption label="&filingBookmarks.label;"/>
+    <description flex="1">&autoFile.label;</description>
+    <hbox align="center">
+      <checkbox id="enableAutoFile" label="&enableAutoFile.label;"
+                preftype="bool" prefstring="browser.bookmarks.add_without_dialog"
+                prefattribute="checked"/>
+    </hbox>
+    <separator/>
+    <description flex="1">&defaultFolder.label;</description>
+    <hbox align="center">
+      <textbox readonly="true" id="defaultFolder" crop="right" flex="1"/>
+      <button label="&chooseDefaultFolder.label;" accesskey="&chooseDefaultFolder.accesskey;"
+              oncommand="chooseDefaultFolder();"
+              id="browser.bookmarks.choosefolder" preftype="bool"
+              prefstring="pref.browser.homepage.disable_button.choose_folder" prefattribute="disabled"/>
+    </hbox>
+  </groupbox>
+
+  <groupbox>
+    <caption label="&extendedDataViews.label;"/>
+    <vbox align="start">
+      <description>&extendedDataExplanation.label;</description>
+      <checkbox id="showExtendedData" label="&showExtendedData.label;"
+                accesskey="&showExtendedData.accesskey;"
+                preftype="bool" prefstring="browser.bookmarks.show_extended_data"
+                prefattribute="checked"/>
+    </vbox>
+  </groupbox>              
+
+
+</page>
+

mozilla/xpfe/components/bookmarks/src/Makefile.in

@@ -0,0 +1,54 @@
+#
+# 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		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= appcomps
+LIBRARY_NAME	= bookmarks_s
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  appshell \
+		  widget \
+		  necko \
+		  nkcache \
+		  uconv \
+		  pref \
+		  dom \
+		  intl \
+		  webshell \
+		  windowwatcher \
+		  unicharutil \
+		  $(NULL)
+
+CPPSRCS		= nsBookmarksService.cpp
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/xpfe/components/bookmarks/src/makefile.win

@@ -0,0 +1,58 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..
+MODULE=bookmarks
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  appshell \
+		  widget \
+		  necko \
+		  nkcache \
+		  uconv \
+		  pref \
+		  dom \
+		  intl \
+		  webshell \
+		  windowwatcher \
+		  unicharutil \
+		  $(NULL)
+
+CPP_OBJS=                               \
+ .\$(OBJDIR)\nsBookmarksService.obj     \
+ $(NULL)
+
+LIBRARY_NAME=bookmarks_s
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+

mozilla/xpfe/components/bookmarks/src/nsBookmarksService.h

@@ -0,0 +1,258 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef bookmarksservice___h___
+#define bookmarksservice___h___
+
+#include "nsIRDFDataSource.h"
+#include "nsIRDFRemoteDataSource.h"
+#include "nsIStreamListener.h"
+#include "nsIRDFObserver.h"
+#include "nsISupportsArray.h"
+#include "nsIStringBundle.h"
+#include "nsITimer.h"
+#include "nsIRDFNode.h"
+#include "nsIBookmarksService.h"
+#include "nsString.h"
+#include "nsIFileSpec.h"
+#include "nsIObserver.h"
+#include "nsWeakReference.h"
+#include "nsIIOService.h"
+#include "nsICacheService.h"
+#include "nsICacheSession.h"
+#include "nsILocalFile.h"
+
+#ifdef	DEBUG
+#ifdef	XP_MAC
+#include <Timer.h>
+#endif
+#endif
+
+class nsBookmarksService : public nsIBookmarksService,
+			   public nsIRDFDataSource,
+			   public nsIRDFRemoteDataSource,
+			   public nsIStreamListener,
+			   public nsIRDFObserver,
+			   public nsIObserver,
+			   public nsSupportsWeakReference
+{
+protected:
+  nsIRDFDataSource*		            mInner;
+  nsCOMPtr<nsIRDFResource>	      busyResource;
+  nsCOMPtr<nsISupportsArray>      mObservers;
+  nsCOMPtr<nsIStringBundle>	      mBundle;
+  nsCOMPtr<nsITimer>              mTimer;
+  nsCOMPtr<nsIIOService>          mNetService;
+  nsCOMPtr<nsICacheService>       mCacheService;
+  nsCOMPtr<nsICacheSession>       mCacheSession;
+
+  PRUint32      htmlSize;
+  PRInt32       mUpdateBatchNest;
+  nsString      mPersonalToolbarName;
+  PRBool        mBookmarksAvailable;
+  PRBool        mDirty;
+  PRBool        mBrowserIcons;
+  PRBool        busySchedule;
+
+  // System Bookmark parsing
+#ifdef XP_WIN
+  // @param aDirectory      - Favorites Folder to import from.
+  // @param aParentResource - Folder into which to place imported
+  //                          Favorites.
+  nsresult      ParseFavoritesFolder(nsIFile* aDirectory, 
+                                     nsIRDFResource* aParentResource);
+#elif XP_MAC
+  PRBool        mIEFavoritesAvailable;
+
+  nsresult      ReadFavorites();
+#endif
+
+#if defined(XP_WIN) || defined(XP_MAC)
+  void          HandleSystemBookmarks(nsIRDFNode* aNode);
+#endif
+
+  static void FireTimer(nsITimer* aTimer, void* aClosure);
+  nsresult ExamineBookmarkSchedule(nsIRDFResource *theBookmark, PRBool & examineFlag);
+  nsresult GetBookmarkToPing(nsIRDFResource **theBookmark);
+
+	nsresult GetBookmarksFile(nsFileSpec* aResult);
+	nsresult WriteBookmarks(nsFileSpec *bookmarksFile, nsIRDFDataSource *ds, nsIRDFResource *root);
+	nsresult WriteBookmarksContainer(nsIRDFDataSource *ds, nsOutputFileStream& strm, nsIRDFResource *container, PRInt32 level, nsISupportsArray *parentArray);
+	nsresult GetTextForNode(nsIRDFNode* aNode, nsString& aResult);
+	nsresult GetSynthesizedType(nsIRDFResource *aNode, nsIRDFNode **aType);
+	nsresult UpdateBookmarkLastModifiedDate(nsIRDFResource *aSource);
+	nsresult WriteBookmarkProperties(nsIRDFDataSource *ds, nsOutputFileStream& strm, nsIRDFResource *node,
+					 nsIRDFResource *property, const char *htmlAttrib, PRBool isFirst);
+	PRBool   CanAccept(nsIRDFResource* aSource, nsIRDFResource* aProperty, nsIRDFNode* aTarget);
+
+	nsresult getArgumentN(nsISupportsArray *arguments, nsIRDFResource *res, PRInt32 offset, nsIRDFNode **argValue);
+	nsresult insertBookmarkItem(nsIRDFResource *src, nsISupportsArray *aArguments, nsIRDFResource *objType);
+	nsresult deleteBookmarkItem(nsIRDFResource *src, nsISupportsArray *aArguments, PRInt32 parentArgIndex, nsIRDFResource *objType);
+	nsresult setFolderHint(nsIRDFResource *src, nsIRDFResource *objType);
+	nsresult getFolderViaHint(nsIRDFResource *src, PRBool fallbackFlag, nsIRDFResource **folder);
+	nsresult importBookmarks(nsISupportsArray *aArguments);
+	nsresult exportBookmarks(nsISupportsArray *aArguments);
+  nsresult ProcessCachedBookmarkIcon(nsIRDFResource* aSource, const PRUnichar *iconURL, nsIRDFNode** aTarget);
+	nsresult getResourceFromLiteralNode(nsIRDFNode *node, nsIRDFResource **res);
+  void AnnotateBookmarkSchedule(nsIRDFResource* aSource, PRBool scheduleFlag);
+  nsresult IsBookmarkedInternal(nsIRDFResource *bookmark, PRBool *isBookmarkedFlag);
+
+	nsresult ChangeURL(nsIRDFResource* aOldURL,
+                           nsIRDFResource* aNewURL);
+
+	nsresult getLocaleString(const char *key, nsString &str);
+
+        nsresult CreateFolderWithDetails(const PRUnichar* aName, 
+                                         nsIRDFResource* aParentFolder, PRInt32 aIndex,
+                                         nsIRDFResource** aResult, PRBool aIsGroup);
+
+	nsresult LoadBookmarks();
+	nsresult initDatasource();
+
+	// nsIStreamObserver methods:
+	NS_DECL_NSIREQUESTOBSERVER
+
+	// nsIStreamListener methods:
+	NS_DECL_NSISTREAMLISTENER
+
+	// nsIObserver methods:
+	NS_DECL_NSIOBSERVER
+
+public:
+	nsBookmarksService();
+	virtual ~nsBookmarksService();
+	nsresult Init();
+
+	// nsISupports
+	NS_DECL_ISUPPORTS
+
+	// nsIBookmarksService
+	NS_DECL_NSIBOOKMARKSSERVICE
+
+	// nsIRDFDataSource
+	NS_IMETHOD GetURI(char* *uri);
+
+	NS_IMETHOD GetSource(nsIRDFResource* property,
+			     nsIRDFNode* target,
+			     PRBool tv,
+			     nsIRDFResource** source) {
+		return mInner->GetSource(property, target, tv, source);
+	}
+
+	NS_IMETHOD GetSources(nsIRDFResource* property,
+			      nsIRDFNode* target,
+			      PRBool tv,
+			      nsISimpleEnumerator** sources) {
+		return mInner->GetSources(property, target, tv, sources);
+	}
+
+	NS_IMETHOD GetTarget(nsIRDFResource* source,
+			     nsIRDFResource* property,
+			     PRBool tv,
+			     nsIRDFNode** target);
+
+	NS_IMETHOD GetTargets(nsIRDFResource* source,
+			      nsIRDFResource* property,
+			      PRBool tv,
+			      nsISimpleEnumerator** targets) {
+		return mInner->GetTargets(source, property, tv, targets);
+	}
+
+	NS_IMETHOD Assert(nsIRDFResource* aSource,
+			  nsIRDFResource* aProperty,
+			  nsIRDFNode* aTarget,
+			  PRBool aTruthValue);
+
+	NS_IMETHOD Unassert(nsIRDFResource* aSource,
+			    nsIRDFResource* aProperty,
+			    nsIRDFNode* aTarget);
+
+	NS_IMETHOD Change(nsIRDFResource* aSource,
+			  nsIRDFResource* aProperty,
+			  nsIRDFNode* aOldTarget,
+			  nsIRDFNode* aNewTarget);
+
+	NS_IMETHOD Move(nsIRDFResource* aOldSource,
+			nsIRDFResource* aNewSource,
+			nsIRDFResource* aProperty,
+			nsIRDFNode* aTarget);
+			
+	NS_IMETHOD HasAssertion(nsIRDFResource* source,
+				nsIRDFResource* property,
+				nsIRDFNode* target,
+				PRBool tv,
+				PRBool* hasAssertion);
+
+	NS_IMETHOD AddObserver(nsIRDFObserver* aObserver);
+	NS_IMETHOD RemoveObserver(nsIRDFObserver* aObserver);
+
+	NS_IMETHOD HasArcIn(nsIRDFNode *aNode, nsIRDFResource *aArc, PRBool *_retval);
+	NS_IMETHOD HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc, PRBool *_retval);
+
+	NS_IMETHOD ArcLabelsIn(nsIRDFNode* node,
+			       nsISimpleEnumerator** labels) {
+		return mInner->ArcLabelsIn(node, labels);
+	}
+
+    NS_IMETHOD ArcLabelsOut(nsIRDFResource* source,
+				nsISimpleEnumerator** labels);
+
+	NS_IMETHOD GetAllResources(nsISimpleEnumerator** aResult);
+
+	NS_IMETHOD GetAllCommands(nsIRDFResource* source,
+				  nsIEnumerator/*<nsIRDFResource>*/** commands);
+
+	NS_IMETHOD GetAllCmds(nsIRDFResource* source,
+                              nsISimpleEnumerator/*<nsIRDFResource>*/** commands);
+
+	NS_IMETHOD IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+				    nsIRDFResource*   aCommand,
+				    nsISupportsArray/*<nsIRDFResource>*/* aArguments,
+				    PRBool* aResult);
+
+	NS_IMETHOD DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+			     nsIRDFResource*   aCommand,
+			     nsISupportsArray/*<nsIRDFResource>*/* aArguments);
+
+	// nsIRDFRemoteDataSource
+	NS_DECL_NSIRDFREMOTEDATASOURCE
+
+	// nsIRDFObserver
+	NS_DECL_NSIRDFOBSERVER
+};
+
+#endif // bookmarksservice___h___

mozilla/xpfe/components/build/Makefile.in

@@ -0,0 +1,121 @@
+#
+# 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		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= appcomps
+LIBRARY_NAME	= appcomps
+EXPORT_LIBRARY = 1
+IS_COMPONENT	= 1
+MODULE_NAME	= application
+REQUIRES	= xpcom \
+		  string \
+		  content \
+		  rdf \
+		  necko \
+		  necko2 \
+		  nkcache \
+		  intl \
+		  locale \
+		  mork \
+		  widget \
+		  dom \
+		  downloadmanager \
+                  alerts\
+                  uriloader \
+                  mimetype \
+                  webbrowserpersist \
+                  progressDlg \
+		  pref \
+		  docshell \
+		  webshell \
+		  appshell \
+		  history \
+		  $(NULL)
+
+CPPSRCS		= nsModule.cpp
+
+ifdef MOZ_LDAP_XPCOM
+REQUIRES	+= mozldap
+DEFINES		+= -DMOZ_LDAP_XPCOM
+endif
+
+ifdef MOZ_PERF_METRICS
+EXTRA_DSO_LIBS	+= mozutil_s
+endif
+
+SHARED_LIBRARY_LIBS = \
+	$(DIST)/lib/$(LIB_PREFIX)autocomplete_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)history_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)appcompintl_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)related_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)search_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)urlbarhistory_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)timebomb_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)windowds_s.$(LIB_SUFFIX) \
+	$(NULL)
+
+LOCAL_INCLUDES	= \
+	-I$(srcdir)/../autocomplete/src  \
+	-I$(srcdir)/../bookmarks/src     \
+	-I$(srcdir)/../directory         \
+	-I$(srcdir)/../download-manager/src \
+	-I$(srcdir)/../history/src       \
+	-I$(srcdir)/../related/src       \
+	-I$(srcdir)/../search/src        \
+	-I$(srcdir)/../timebomb          \
+	-I$(srcdir)/../urlbarhistory/src \
+	-I$(srcdir)/../windowds \
+	$(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+SHARED_LIBRARY_LIBS += \
+	$(DIST)/lib/$(LIB_PREFIX)urlwidgt_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)winhooks_s.$(LIB_SUFFIX) \
+        $(DIST)/lib/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX) \
+	$(NULL)
+OS_LIBS		+= ole32.lib shell32.lib
+LOCAL_INCLUDES	+= \
+	-I$(srcdir)/../urlwidget \
+	-I$(srcdir)/../winhooks \
+        -I$(srcdir)/../alerts/src \
+	$(NULL)
+endif
+
+EXTRA_DSO_LDOPTS = \
+	$(MOZ_COMPONENT_LIBS) \
+	$(EXTRA_DSO_LIBS) \
+	$(MOZ_UNICHARUTIL_LIBS) \
+	$(MOZ_JS_LIBS) \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+ 

mozilla/xpfe/components/build/makefile.win

@@ -0,0 +1,112 @@
+#!gmake
+#
+# 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=..\..\..
+MODULE=appcomps
+LIBRARY_NAME=appcomps
+MODULE_NAME=application
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  necko \
+		  necko2 \
+		  nkcache \
+		  intl \
+		  locale \
+		  mork \
+		  widget \
+		  dom \
+		  pref \
+		  docshell \
+		  downloadmanager \
+		  webshell \
+                  timebomb \
+		  bookmarks \
+		  content \
+		  history \
+		  search \
+                  alerts \
+		  progressDlg \
+		  related \
+		  urlbarhistory \
+		  uriloader \
+		  mimetype \
+		  mozldap \
+		  webbrowserpersist \
+		  appshell \
+		  $(NULL)
+
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
+
+!if !defined(DISABLE_LDAP)
+LCFLAGS = $(LCFLAGS) -DMOZ_LDAP_XPCOM
+!endif
+
+CPP_OBJS=                            \
+        .\$(OBJDIR)\nsModule.obj  \
+	$(NULL)
+
+SUB_LIBRARIES=                           \
+        $(DIST)\lib\autocomplete_s.lib   \
+        $(DIST)\lib\bookmarks_s.lib      \
+        $(DIST)\lib\directory_s.lib      \
+        $(DIST)\lib\downloadmanager_s.lib \
+        $(DIST)\lib\history_s.lib        \
+        $(DIST)\lib\appcompintl_s.lib    \
+        $(DIST)\lib\related_s.lib        \
+        $(DIST)\lib\search_s.lib         \
+        $(DIST)\lib\alerts_s.lib         \
+        $(DIST)\lib\timebomb_s.lib       \
+        $(DIST)\lib\urlbarhistory_s.lib  \
+        $(DIST)\lib\urlwidgt_s.lib       \
+        $(DIST)\lib\windowds_s.lib       \
+        $(DIST)\lib\winhooks_s.lib       \
+	$(NULL)
+
+WIN_LIBS = \
+		ole32.lib \
+		shell32.lib \
+		$(NULL)
+
+LLIBS=                                   \
+        $(DIST)\lib\js3250.lib           \
+        $(DIST)\lib\xpcom.lib            \
+		$(DIST)\lib\unicharutil_s.lib    \
+        $(LIBNSPR)                       \
+	$(NULL)
+
+INCS = $(INCS)                                       \
+        -I$(DEPTH)\xpfe\components\autocomplete\src  \
+        -I$(DEPTH)\xpfe\components\bookmarks\src     \
+        -I$(DEPTH)\xpfe\components\directory         \
+        -I$(DEPTH)\xpfe\components\download-manager\src \
+        -I$(DEPTH)\xpfe\components\history\src       \
+        -I$(DEPTH)\xpfe\components\related\src       \
+        -I$(DEPTH)\xpfe\components\search\src        \
+        -I$(DEPTH)\xpfe\components\timebomb          \
+        -I$(DEPTH)\xpfe\components\urlbarhistory\src \
+        -I$(DEPTH)\xpfe\components\urlwidget         \
+        -I$(DEPTH)\xpfe\components\windowds          \
+        -I$(DEPTH)\xpfe\components\winhooks          \
+        -I$(DEPTH)\xpfe\components\alerts\src        \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpfe/components/build/nsModule.cpp

@@ -0,0 +1,207 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include "nsIGenericFactory.h"
+#include "nsICategoryManager.h"
+#include "nsAutoComplete.h"
+#include "nsBookmarksService.h"
+#include "nsDirectoryViewer.h"
+#include "nsDownloadManager.h"
+#include "nsDownloadProxy.h"
+#include "nsGlobalHistory.h"
+#include "rdf.h"
+#include "nsTimeBomb.h"
+#include "nsLocalSearchService.h"
+#include "nsInternetSearchService.h"
+#include "nsRelatedLinksHandlerImpl.h"
+#include "nsUrlbarHistory.h"
+#include "nsXPIDLString.h"
+#include "nsCharsetMenu.h"
+#include "nsFontPackageHandler.h"
+#include "nsWindowDataSource.h"
+#if defined(XP_WIN)
+#include "nsAlertsService.h" 
+#include "nsUrlWidget.h"
+#include "nsWindowsHooks.h"
+#endif // Windows
+#if defined(MOZ_LDAP_XPCOM)
+#include "nsLDAPAutoCompleteSession.h"
+#endif
+
+// Factory constructors
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteItem)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteResults)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsHTTPIndex, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirectoryViewerFactory)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(LocalSearchDataSource, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(InternetSearchDataSource, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(RelatedLinksHandlerImpl, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimeBomb)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlbarHistory)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontPackageHandler)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowDataSource, Init)
+#if defined(XP_WIN)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUrlWidget, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsHooks)
+#endif // Windows
+#if defined(MOZ_LDAP_XPCOM)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPAutoCompleteSession)
+#endif
+
+static NS_METHOD
+RegisterProc(nsIComponentManager *aCompMgr,
+             nsIFile *aPath,
+             const char *registryLocation,
+             const char *componentType,
+             const nsModuleComponentInfo *info)
+{
+    nsresult rv;
+    nsCOMPtr<nsICategoryManager> catman = do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    // add the MIME types layotu can handle to the handlers category.
+    // this allows users of layout's viewers (the docshell for example)
+    // to query the types of viewers layout can create.
+    nsXPIDLCString previous;
+    rv = catman->AddCategoryEntry("Gecko-Content-Viewers", "application/http-index-format",
+                                   NS_DOCUMENT_LOADER_FACTORY_CONTRACTID_PREFIX "view;1?type=application/http-index-format",
+                                   PR_TRUE,
+                                   PR_TRUE,
+                                   getter_Copies(previous));
+    if (NS_FAILED(rv)) return rv;
+
+    rv = catman->AddCategoryEntry("Gecko-Content-Viewers", "application/http-index-format; x-view-type=view-source",
+                                  NS_DOCUMENT_LOADER_FACTORY_CONTRACTID_PREFIX "view;1?type=application/http-index-format; x-view-type=view-source",
+                                  PR_TRUE,
+                                  PR_TRUE,
+                                  getter_Copies(previous));
+
+    return rv;
+}
+static NS_METHOD
+UnregisterProc(nsIComponentManager *aCompMgr,
+               nsIFile *aPath,
+               const char *registryLocation,
+               const nsModuleComponentInfo *info)
+{
+    nsresult rv;
+    nsCOMPtr<nsICategoryManager> catman = do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = catman->DeleteCategoryEntry("Gecko-Content-Viewers",
+                                     "application/http-index-format", PR_TRUE);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = catman->DeleteCategoryEntry("Gecko-Content-Viewers",
+                                     "application/http-index-format; x-view-type=view-source", PR_TRUE);
+
+    return rv;
+}
+
+static const nsModuleComponentInfo components[] = {
+    { "AutoComplete Search Results", NS_AUTOCOMPLETERESULTS_CID, NS_AUTOCOMPLETERESULTS_CONTRACTID,
+      nsAutoCompleteResultsConstructor},
+    { "AutoComplete Search Item", NS_AUTOCOMPLETEITEM_CID, NS_AUTOCOMPLETEITEM_CONTRACTID,
+      nsAutoCompleteItemConstructor},
+    { "Bookmarks", NS_BOOKMARKS_SERVICE_CID, NS_BOOKMARKS_SERVICE_CONTRACTID,
+      nsBookmarksServiceConstructor },
+    { "Bookmarks", NS_BOOKMARKS_SERVICE_CID, NS_BOOKMARKS_DATASOURCE_CONTRACTID,
+      nsBookmarksServiceConstructor },
+    { "Directory Viewer", NS_DIRECTORYVIEWERFACTORY_CID,
+      NS_DOCUMENT_LOADER_FACTORY_CONTRACTID_PREFIX "view;1?type=application/http-index-format",
+      nsDirectoryViewerFactoryConstructor, RegisterProc, UnregisterProc  },
+    { "Directory Viewer", NS_DIRECTORYVIEWERFACTORY_CID,
+      NS_DOCUMENT_LOADER_FACTORY_CONTRACTID_PREFIX "view;1?type=application/http-index-format; x-view-type=view-source",
+      nsDirectoryViewerFactoryConstructor }, // Let the standard type do the registration
+    { "Directory Viewer", NS_HTTPINDEX_SERVICE_CID, NS_HTTPINDEX_SERVICE_CONTRACTID,
+      nsHTTPIndexConstructor },
+    { "Directory Viewer", NS_HTTPINDEX_SERVICE_CID, NS_HTTPINDEX_DATASOURCE_CONTRACTID,
+      nsHTTPIndexConstructor },
+    { "Download Manager", NS_DOWNLOADMANAGER_CID, NS_DOWNLOADMANAGER_CONTRACTID,
+      nsDownloadManagerConstructor },
+    { "Download", NS_DOWNLOAD_CID, NS_DOWNLOAD_CONTRACTID,
+      nsDownloadProxyConstructor },
+    { "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_CONTRACTID,
+      nsGlobalHistoryConstructor },
+    { "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_DATASOURCE_CONTRACTID,
+      nsGlobalHistoryConstructor },
+    { "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_AUTOCOMPLETE_CONTRACTID,
+      nsGlobalHistoryConstructor },
+    { "Local Search", NS_RDFFINDDATASOURCE_CID,
+      NS_LOCALSEARCH_SERVICE_CONTRACTID, LocalSearchDataSourceConstructor },
+    { "Local Search", NS_RDFFINDDATASOURCE_CID,
+      NS_LOCALSEARCH_DATASOURCE_CONTRACTID, LocalSearchDataSourceConstructor },
+    { "Internet Search", NS_RDFSEARCHDATASOURCE_CID,
+      NS_INTERNETSEARCH_SERVICE_CONTRACTID, InternetSearchDataSourceConstructor },
+    { "Internet Search", NS_RDFSEARCHDATASOURCE_CID,
+      NS_INTERNETSEARCH_DATASOURCE_CONTRACTID, InternetSearchDataSourceConstructor },
+    { "Related Links Handler", NS_RELATEDLINKSHANDLER_CID, NS_RELATEDLINKSHANDLER_CONTRACTID,
+	  RelatedLinksHandlerImplConstructor},
+    { "Netscape TimeBomb", NS_TIMEBOMB_CID, NS_TIMEBOMB_CONTRACTID, nsTimeBombConstructor},
+    { "nsUrlbarHistory", NS_URLBARHISTORY_CID,
+      NS_URLBARHISTORY_CONTRACTID, nsUrlbarHistoryConstructor },
+    { "nsUrlbarHistory", NS_URLBARHISTORY_CID,
+      NS_URLBARAUTOCOMPLETE_CONTRACTID, nsUrlbarHistoryConstructor },
+    { "nsCharsetMenu", NS_CHARSETMENU_CID,
+      NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_CHARSETMENU_PID,
+      NS_NewCharsetMenu },
+    { "nsFontPackageHandler", NS_FONTPACKAGEHANDLER_CID,
+      "@mozilla.org/locale/default-font-package-handler;1",
+      nsFontPackageHandlerConstructor },
+    { "nsWindowDataSource",
+      NS_WINDOWDATASOURCE_CID,
+      NS_RDF_DATASOURCE_CONTRACTID_PREFIX "window-mediator",
+      nsWindowDataSourceConstructor },
+#if defined(XP_WIN)
+    { NS_IURLWIDGET_CLASSNAME, NS_IURLWIDGET_CID, NS_IURLWIDGET_CONTRACTID,
+      nsUrlWidgetConstructor },
+    { "nsAlertsService", NS_ALERTSSERVICE_CID, NS_ALERTSERVICE_CONTRACTID, nsAlertsServiceConstructor},
+    { NS_IWINDOWSHOOKS_CLASSNAME, NS_IWINDOWSHOOKS_CID, NS_IWINDOWSHOOKS_CONTRACTID,
+      nsWindowsHooksConstructor },
+#endif // Windows
+#if defined(MOZ_LDAP_XPCOM)
+    { "LDAP Autocomplete Session", NS_LDAPAUTOCOMPLETESESSION_CID,
+	  "@mozilla.org/autocompleteSession;1?type=ldap",
+	  nsLDAPAutoCompleteSessionConstructor },
+#endif
+};
+
+NS_IMPL_NSGETMODULE(application, components)

mozilla/xpfe/components/build/win32.order

@@ -0,0 +1,256 @@
+?StartAssignment@?$nsMdbPtr@VnsIMdbThumb@@@@QAEPAPAVnsIMdbThumb@@XZ ; 18413
+??1?$nsMdbPtr@VnsIMdbRow@@@@QAE@XZ ; 18363
+?assign_assuming_AddRef@nsCOMPtr_base@@IAEXPAVnsISupports@@@Z ; 12166
+?ExamineBookmarkSchedule@nsBookmarksService@@IAEIPAVnsIRDFResource@@AAH@Z ; 10780
+?HasAssertion@nsBookmarksService@@UAGIPAVnsIRDFResource@@0PAVnsIRDFNode@@HPAH@Z ; 10016
+?HasAssertion@LocalSearchDataSource@@UAGIPAVnsIRDFResource@@0PAVnsIRDFNode@@HPAH@Z ; 9886
+?OpenDB@nsGlobalHistory@@IAEIXZ ; 9142
+?FindRow@nsGlobalHistory@@IAEIIPBDPAPAVnsIMdbRow@@@Z ; 9142
+?IsVisited@nsGlobalHistory@@UAGIPBDPAH@Z ; 8972
+?HasAssertion@InternetSearchDataSource@@UAGIPAVnsIRDFResource@@0PAVnsIRDFNode@@HPAH@Z ; 8845
+?WriteBookmarkProperties@nsBookmarksService@@IAEIPAVnsIRDFDataSource@@AAVnsOutputFileStream@@PAVnsIRDFResource@@2PBDH@Z ; 2484
+?HasAssertion@nsHTTPIndex@@UAGIPAVnsIRDFResource@@0PAVnsIRDFNode@@HPAH@Z ; 2326
+?AddRef@nsBookmarksService@@UAGKXZ ; 1466
+?Release@nsBookmarksService@@UAGKXZ ; 1459
+?isSearchURI@InternetSearchDataSource@@IAEHPAVnsIRDFResource@@@Z ; 1154
+?isSearchCategoryURI@InternetSearchDataSource@@IAEHPAVnsIRDFResource@@@Z ; 923
+?isSearchCategoryEngineURI@InternetSearchDataSource@@IAEHPAVnsIRDFResource@@@Z ; 921
+?OnAssert@nsBookmarksService@@UAGIPAVnsIRDFDataSource@@PAVnsIRDFResource@@1PAVnsIRDFNode@@@Z ; 911
+?isEngineURI@InternetSearchDataSource@@IAEHPAVnsIRDFResource@@@Z ; 686
+?GetTextForNode@nsBookmarksService@@IAEIPAVnsIRDFNode@@AAVnsString@@@Z ; 618
+?GetData@InternetSearchDataSource@@IAEIPBGPBDI1AAVnsString@@@Z ; 589
+?NotifyAssert@nsGlobalHistory@@IAEIPAVnsIRDFResource@@0PAVnsIRDFNode@@@Z ; 570
+?updateAtom@BookmarkParser@@IAEIPAVnsIRDFDataSource@@PAVnsIRDFResource@@1PAVnsIRDFNode@@PAH@Z ; 536
+?GetHostIndex@nsUrlbarHistory@@MAGIPBGPAH@Z ; 505
+?GetTarget@InternetSearchDataSource@@UAGIPAVnsIRDFResource@@0HPAPAVnsIRDFNode@@@Z ; 437
+?isSearchCommand@InternetSearchDataSource@@IAEHPAVnsIRDFResource@@@Z ; 437
+?QueryInterface@nsBookmarksService@@UAGIABUnsID@@PAPAX@Z ; 371
+?GetFindUriPrefix@nsGlobalHistory@@IAEXABUsearchQuery@@HAAVnsACString@@@Z ; 324
+?GetSources@nsBookmarksService@@UAGIPAVnsIRDFResource@@PAVnsIRDFNode@@HPAPAVnsISimpleEnumerator@@@Z ; 291
+?QueryInterface@InternetSearchDataSource@@UAGIABUnsID@@PAPAX@Z ; 262
+?ParseDate@BookmarkParser@@KAIPAVnsIRDFResource@@AAVnsString@@PAPAVnsIRDFNode@@@Z ; 256
+?AddRef@nsAutoCompleteResults@@UAGKXZ ; 249
+?HasArcOut@InternetSearchDataSource@@UAGIPAVnsIRDFResource@@0PAH@Z ; 248
+?FindData@InternetSearchDataSource@@IAEIPAVnsIRDFResource@@PAPAVnsIRDFLiteral@@@Z ; 247
+?GetTargets@InternetSearchDataSource@@UAGIPAVnsIRDFResource@@0HPAPAVnsISimpleEnumerator@@@Z ; 237
+?AddRef@InternetSearchDataSource@@UAGKXZ ; 234
+?GetTargets@LocalSearchDataSource@@UAGIPAVnsIRDFResource@@0HPAPAVnsISimpleEnumerator@@@Z ; 230
+?GetTargets@nsHTTPIndex@@UAGIPAVnsIRDFResource@@0HPAPAVnsISimpleEnumerator@@@Z ; 230
+?GetTargets@nsBookmarksService@@UAGIPAVnsIRDFResource@@0HPAPAVnsISimpleEnumerator@@@Z ; 230
+?Release@InternetSearchDataSource@@UAGKXZ ; 228
+?Release@nsAutoCompleteItem@@UAGKXZ ; 225
+?ArcLabelsIn@nsBookmarksService@@UAGIPAVnsIRDFNode@@PAPAVnsISimpleEnumerator@@@Z ; 181
+?ParseLiteral@BookmarkParser@@KAIPAVnsIRDFResource@@AAVnsString@@PAPAVnsIRDFNode@@@Z ; 167
+?GetTarget@nsHTTPIndex@@UAGIPAVnsIRDFResource@@0HPAPAVnsIRDFNode@@@Z ; 165
+??1searchTerm@@QAE@XZ ; 162
+??0searchTerm@@QAE@PBDI0I0I0I@Z ; 162
+?GetNow@nsGlobalHistory@@IAE_JXZ ; 162
+?getEOL@BookmarkParser@@IAEHPBDHH@Z ; 153
+?isWellknownContainerURI@nsHTTPIndex@@IAEHPAVnsIRDFResource@@@Z ; 153
+?GetDestination@nsHTTPIndex@@IAEPADPAVnsIRDFResource@@@Z ; 153
+?ProcessLine@BookmarkParser@@QAEIPAVnsIRDFContainer@@PAVnsIRDFResource@@AAV?$nsCOMPtr@VnsIRDFResource@@@@ABVnsString@@AAV5@AAH5@Z ; 152
+?DecodeBuffer@BookmarkParser@@QAEIAAVnsString@@PADI@Z ; 152
+?AddRef@nsGlobalHistory@@UAGKXZ ; 132
+?SetRowValue@nsGlobalHistory@@IAEIPAVnsIMdbRow@@IAB_J@Z ; 131
+?Release@nsGlobalHistory@@UAGKXZ ; 128
+?HasArcOut@nsBookmarksService@@UAGIPAVnsIRDFResource@@0PAH@Z ; 124
+?HasArcOut@nsHTTPIndex@@UAGIPAVnsIRDFResource@@0PAH@Z ; 122
+?HasArcOut@LocalSearchDataSource@@UAGIPAVnsIRDFResource@@0PAH@Z ; 122
+?QueryInterface@nsAutoCompleteItem@@UAGIABUnsID@@PAPAX@Z ; 118
+?OnUnassert@nsBookmarksService@@UAGIPAVnsIRDFDataSource@@PAVnsIRDFResource@@1PAVnsIRDFNode@@@Z ; 115
+?ParseResource@BookmarkParser@@KAIPAVnsIRDFResource@@AAVnsString@@PAPAVnsIRDFNode@@@Z ; 114
+?ParseBookmarkInfo@BookmarkParser@@IAEIPAUBookmarkField@1@HABVnsString@@ABV?$nsCOMPtr@VnsIRDFContainer@@@@PAVnsIRDFResource@@AAV?$nsCOMPtr@VnsIRDFResource@@@@@Z ; 114
+?Unescape@RelatedLinksStreamListener@@QAEIAAVnsString@@@Z ; 114
+?GetRowValue@nsGlobalHistory@@IAEIPAVnsIMdbRow@@IPA_J@Z ; 112
+?FireTimer@nsBookmarksService@@KAXPAVnsITimer@@PAX@Z ; 110
+?GetBookmarkToPing@nsBookmarksService@@IAEIPAPAVnsIRDFResource@@@Z ; 110
+?QueryInterface@nsGlobalHistory@@UAGIABUnsID@@PAPAX@Z ; 105
+?SetRowValue@nsGlobalHistory@@IAEIPAVnsIMdbRow@@IPBD@Z ; 100
+?ParseHeaderEnd@BookmarkParser@@IAEIABVnsString@@@Z ; 96
+?GetLastCharset@nsBookmarksService@@UAGIPBDPAPAG@Z ; 91
+?SetPageTitle@nsGlobalHistory@@UAGIPBDPBG@Z ; 89
+?GetItems@nsAutoCompleteResults@@UAGIPAPAVnsISupportsArray@@@Z ; 89
+?GetRowValue@nsGlobalHistory@@IAEIPAVnsIMdbRow@@IAAVnsAString@@@Z ; 87
+?SetRowValue@nsGlobalHistory@@IAEIPAVnsIMdbRow@@IPBG@Z ; 87
+?NotifyChange@nsGlobalHistory@@IAEIPAVnsIRDFResource@@0PAVnsIRDFNode@@1@Z ; 84
+?GetRowValue@nsGlobalHistory@@IAEIPAVnsIMdbRow@@IAAVnsACString@@@Z ; 82
+?AddPage@nsGlobalHistory@@UAGIPBD@Z ; 81
+?AddPageToDatabase@nsGlobalHistory@@IAEIPBD_J@Z ; 81
+?SaveLastPageVisited@nsGlobalHistory@@IAEIPBD@Z ; 81
+?do_GetService@@YA?BVnsGetServiceByCID@@ABUnsID@@PAI@Z ; 81
+?NotifyFindAssertions@nsGlobalHistory@@IAEIPAVnsIRDFResource@@PAVnsIMdbRow@@@Z ; 81
+?SetDirty@nsGlobalHistory@@IAEIXZ ; 81
+?GetTarget@nsBookmarksService@@UAGIPAVnsIRDFResource@@0HPAPAVnsIRDFNode@@@Z ; 78
+?QueryInterface@nsAutoCompleteResults@@UAGIABUnsID@@PAPAX@Z ; 76
+?Release@InternetSearchContext@@UAGKXZ ; 62
+?AddRef@InternetSearchContext@@UAGKXZ ; 62
+?GetValue@nsAutoCompleteItem@@UAGIPAPAG@Z ; 58
+?updateAtom@InternetSearchDataSource@@IAEIPAVnsIRDFDataSource@@PAVnsIRDFResource@@1PAVnsIRDFNode@@PAH@Z ; 58
+?SetURLToHiddenControl@nsUrlWidget@@UAGIPBDPAVnsIDOMWindowInternal@@@Z ; 50
+?FindInternetSearchResults@InternetSearchDataSource@@UAGIPBDPAH@Z ; 50
+?UpdateBookmarkLastVisitedDate@nsBookmarksService@@UAGIPBDPBG@Z ; 50
+?AddNewPageToDatabase@nsGlobalHistory@@IAEIPBD_JPAPAVnsIMdbRow@@@Z ; 50
+?do_GetIOService@@YA?BVnsGetServiceByCID@@PAI@Z ; 48
+?NS_NewURI@@YAIPAPAVnsIURI@@PBDPAV1@PAVnsIIOService@@@Z ; 48
+?ArcLabelsOut@nsBookmarksService@@UAGIPAVnsIRDFResource@@PAPAVnsISimpleEnumerator@@@Z ; 45
+?QueryInterface@InternetSearchContext@@UAGIABUnsID@@PAPAX@Z ; 44
+?ArcLabelsOut@nsHTTPIndex@@UAGIPAVnsIRDFResource@@PAPAVnsISimpleEnumerator@@@Z ; 43
+??_GnsArrayEnumerator@@UAEPAXI@Z ; 43
+?ArcLabelsOut@InternetSearchDataSource@@UAGIPAVnsIRDFResource@@PAPAVnsISimpleEnumerator@@@Z ; 43
+?ArcLabelsOut@LocalSearchDataSource@@UAGIPAVnsIRDFResource@@PAPAVnsISimpleEnumerator@@@Z ; 43
+?isSearchResultFiltered@InternetSearchDataSource@@IAEHABVnsString@@@Z ; 42
+?ConvertEntities@InternetSearchDataSource@@IAEIAAVnsString@@HHH@Z ; 42
+?OnDataAvailable@InternetSearchDataSource@@UAGIPAVnsIRequest@@PAVnsISupports@@PAVnsIInputStream@@II@Z ; 38
+?GetUnicodeDecoder@InternetSearchContext@@UAGIPAPAVnsIUnicodeDecoder@@@Z ; 38
+?AppendUnicodeBytes@InternetSearchContext@@UAGIPBGH@Z ; 37
+?GetDefaultItemIndex@nsAutoCompleteResults@@UAGIPAH@Z ; 36
+?AddRef@nsUrlbarHistory@@UAGKXZ ; 32
+?SetRowValue@nsGlobalHistory@@IAEIPAVnsIMdbRow@@IH@Z ; 31
+?GetRowValue@nsGlobalHistory@@IAEIPAVnsIMdbRow@@IPAH@Z ; 31
+?AddExistingPageToDatabase@nsGlobalHistory@@IAEIPAVnsIMdbRow@@_JPA_JPAH@Z ; 31
+?WriteBookmarksContainer@nsBookmarksService@@IAEIPAVnsIRDFDataSource@@AAVnsOutputFileStream@@PAVnsIRDFResource@@HPAVnsISupportsArray@@@Z ; 30
+?GetSearchEngineToPing@InternetSearchDataSource@@IAEIPAPAVnsIRDFResource@@AAVnsCString@@@Z ; 28
+?FireTimer@InternetSearchDataSource@@KAXPAVnsITimer@@PAX@Z ; 28
+?Flush@nsGlobalHistory@@UAGIXZ ; 26
+?SetValue@nsAutoCompleteItem@@UAGIPBG@Z ; 26
+?Commit@nsGlobalHistory@@IAEIW4eCommitType@1@@Z ; 26
+?Sync@nsGlobalHistory@@IAEXXZ ; 25
+?fireSyncTimer@nsGlobalHistory@@KAXPAVnsITimer@@PAX@Z ; 25
+??1RegistryEntry@@QAE@XZ ; 24
+??_EnsString@@UAEPAXI@Z ; 20
+?SetDefaultItemIndex@nsAutoCompleteResults@@UAGIH@Z ; 17
+?OnChange@nsBookmarksService@@UAGIPAVnsIRDFDataSource@@PAVnsIRDFResource@@1PAVnsIRDFNode@@2@Z ; 16
+?Release@nsUrlbarHistory@@UAGKXZ ; 16
+?Refresh@nsBookmarksService@@UAGIH@Z ; 16
+?Parse@BookmarkParser@@QAEIPAVnsIRDFResource@@0@Z ; 15
+??1nsAutoCompleteItem@@UAE@XZ ; 15
+??_EnsAutoCompleteItem@@UAEPAXI@Z ; 15
+??0nsAutoCompleteItem@@QAE@XZ ; 15
+?currentSetting@RegistryEntry@@QBE?AVnsCString@@XZ ; 13
+??BBoolRegistryEntry@@QAEPAXXZ ; 13
+??0RegistryEntry@@QAE@PAUHKEY__@@PBD11@Z ; 13
+?valueNameArg@RegistryEntry@@QBEPBDXZ ; 13
+??0nsAutoCompleteResults@@QAE@XZ ; 12
+??1nsAutoCompleteResults@@UAE@XZ ; 12
+?AddRef@nsHTTPIndex@@UAGKXZ ; 12
+?QueryInterface@nsUrlbarHistory@@UAGIABUnsID@@PAPAX@Z ; 12
+??_EnsAutoCompleteResults@@UAEPAXI@Z ; 12
+?GetTarget@LocalSearchDataSource@@UAGIPAVnsIRDFResource@@0HPAPAVnsIRDFNode@@@Z ; 12
+??0ProtocolRegistryEntry@@QAE@PBD@Z ; 11
+?Release@LocalSearchDataSource@@UAGKXZ ; 10
+?Release@nsWindowsHooks@@UAGKXZ ; 10
+?Release@nsUrlWidget@@UAGKXZ ; 10
+?QueryInterface@nsUrlWidget@@UAGIABUnsID@@PAPAX@Z ; 10
+?QueryInterface@nsWindowsHooks@@UAGIABUnsID@@PAPAX@Z ; 10
+?CheckItemAvailability@nsUrlbarHistory@@MAGIPBGPAVnsIAutoCompleteResults@@PAH@Z ; 9
+?AddObserver@InternetSearchDataSource@@UAGIPAVnsIRDFObserver@@@Z ; 8
+?SetParam@nsAutoCompleteItem@@UAGIPAVnsISupports@@@Z ; 8
+?Release@nsHTTPIndex@@UAGKXZ ; 8
+?NS_GetSpecialDirectory@@YAIPBDPAPAVnsIFile@@@Z ; 8
+?SaveEngineInfoIntoGraph@InternetSearchDataSource@@IAEIPAVnsIFile@@0PBG1H@Z ; 7
+?GetContextType@InternetSearchContext@@UAGIPAI@Z ; 6
+?MapEncoding@InternetSearchDataSource@@IAEIABVnsString@@AAV2@@Z ; 6
+??0InternetSearchContext@@QAE@IPAVnsIRDFResource@@0PAVnsIUnicodeDecoder@@PBG@Z ; 6
+??1InternetSearchContext@@UAE@XZ ; 6
+?OnStopRequest@InternetSearchDataSource@@UAGIPAVnsIRequest@@PAVnsISupports@@IPBG@Z ; 6
+?AddObserver@LocalSearchDataSource@@UAGIPAVnsIRDFObserver@@@Z ; 6
+?AddObserver@nsBookmarksService@@UAGIPAVnsIRDFObserver@@@Z ; 6
+?updateDataHintsInGraph@InternetSearchDataSource@@IAEIPAVnsIRDFResource@@PBG@Z ; 6
+??_EInternetSearchContext@@UAEPAXI@Z ; 6
+?ReadFileContents@InternetSearchDataSource@@IAEIABVnsFileSpec@@AAVnsString@@@Z ; 6
+?NS_OpenURI@@YAIPAPAVnsIChannel@@PAVnsIURI@@PAVnsIIOService@@PAVnsILoadGroup@@PAVnsIInterfaceRequestor@@I@Z ; 6
+??1FileTypeRegistryEntry@@QAE@XZ ; 6
+?NS_NewInternetSearchContext@@YAIIPAVnsIRDFResource@@0PAVnsIUnicodeDecoder@@PBGPAPAVnsIInternetSearchContext@@@Z ; 6
+?OnStartLookup@nsUrlbarHistory@@UAGIPBGPAVnsIAutoCompleteResults@@PAVnsIAutoCompleteListener@@@Z ; 5
+?VerifyAndCreateEntry@nsUrlbarHistory@@MAGIPBGPAGPAVnsIAutoCompleteResults@@@Z ; 5
+?GetBufferConst@InternetSearchContext@@UAGIPAPBG@Z ; 5
+?SearchCache@nsUrlbarHistory@@MAGIPBGPAVnsIAutoCompleteResults@@@Z ; 5
+?OnStartRequest@InternetSearchDataSource@@UAGIPAVnsIRequest@@PAVnsISupports@@@Z ; 4
+?Truncate@InternetSearchContext@@UAGIXZ ; 4
+?GetEngine@InternetSearchContext@@UAGIPAPAVnsIRDFResource@@@Z ; 4
+?AddObserver@nsHTTPIndex@@UAGIPAVnsIRDFObserver@@@Z ; 4
+?OnAutoComplete@nsUrlbarHistory@@UAGIPBGPAVnsIAutoCompleteResults@@PAVnsIAutoCompleteListener@@@Z ; 3
+?Release@nsTimeBomb@@UAGKXZ ; 3
+?DoSearch@InternetSearchDataSource@@IAEIPAVnsIRDFResource@@0ABVnsString@@1@Z ; 3
+?QueryInterface@nsHTTPIndex@@UAGIABUnsID@@PAPAX@Z ; 3
+?validateEngine@InternetSearchDataSource@@IAEIPAVnsIRDFResource@@@Z ; 3
+?QueryInterface@LocalSearchDataSource@@UAGIABUnsID@@PAPAX@Z ; 3
+?ParseHTML@InternetSearchDataSource@@IAEIPAVnsIURI@@PAVnsIRDFResource@@1PBG@Z ; 3
+?Stop@InternetSearchDataSource@@UAGIXZ ; 3
+?FindShortcut@nsBookmarksService@@UAGIPBGPAPAD@Z ; 3
+?GetBookmarksFile@nsBookmarksService@@IAEIPAVnsFileSpec@@@Z ; 3
+?GetSource@nsBookmarksService@@UAGIPAVnsIRDFResource@@PAVnsIRDFNode@@HPAPAV2@@Z ; 3
+?GetParent@InternetSearchContext@@UAGIPAPAVnsIRDFResource@@@Z ; 3
+?GetNumInterpretSections@InternetSearchDataSource@@IAEIPBGAAI@Z ; 3
+?GetSearchFolder@InternetSearchDataSource@@IAEIPAPAVnsIFile@@@Z ; 3
+?RememberLastSearchText@InternetSearchDataSource@@UAGIPBG@Z ; 3
+?ClearResults@InternetSearchDataSource@@UAGIH@Z ; 3
+?webSearchFinalize@InternetSearchDataSource@@IAEIPAVnsIChannel@@PAVnsIInternetSearchContext@@@Z ; 3
+?GetInputs@InternetSearchDataSource@@IAEIPBGAAVnsString@@ABV2@1@Z ; 3
+?Flush@nsBookmarksService@@UAGIXZ ; 2
+?CheckSettings@nsWindowsHooks@@UAGIPAVnsIDOMWindowInternal@@@Z ; 2
+?saveContents@InternetSearchDataSource@@IAEIPAVnsIChannel@@PAVnsIInternetSearchContext@@I@Z ; 2
+?RemoveObserver@InternetSearchDataSource@@UAGIPAVnsIRDFObserver@@@Z ; 2
+?NS_NewLoadGroup@@YAIPAPAVnsILoadGroup@@PAVnsIStreamObserver@@@Z ; 2
+?WriteBookmarks@nsBookmarksService@@IAEIPAVnsFileSpec@@PAVnsIRDFDataSource@@PAVnsIRDFResource@@@Z ; 2
+?getLocaleString@nsBookmarksService@@IAEIPBDAAVnsString@@@Z ; 2
+?GetBufferLength@InternetSearchContext@@UAGIPAH@Z ; 2
+??1nsWindowsHooksSettings@@UAE@XZ ; 1
+??1nsUrlbarHistory@@MAE@XZ ; 1
+??1nsUrlWidget@@UAE@XZ ; 1
+?Init@nsTimeBomb@@UAGIXZ ; 1
+?CreateAnonymousResource@BookmarkParser@@KAIPAV?$nsCOMPtr@VnsIRDFResource@@@@@Z ; 1
+?GetURI@nsBookmarksService@@UAGIPAPAD@Z ; 1
+?validateEngineNow@InternetSearchDataSource@@IAEIPAVnsIRDFResource@@@Z ; 1
+?DeferredInit@InternetSearchDataSource@@QAGIXZ ; 1
+??_EnsUrlbarHistory@@MAEPAXI@Z ; 1
+??0nsGlobalHistory@@QAE@XZ ; 1
+?GetURI@LocalSearchDataSource@@UAGIPAPAD@Z ; 1
+??0InternetSearchDataSource@@QAE@XZ ; 1
+?GetSettings@nsWindowsHooks@@MAGIPAPAVnsWindowsHooksSettings@@@Z ; 1
+?Init@nsBookmarksService@@QAEIXZ ; 1
+?Init@LocalSearchDataSource@@QAEIXZ ; 1
+?GetSearchEngineList@InternetSearchDataSource@@IAEIPAVnsIFile@@H@Z ; 1
+?Release@nsWindowsHooksSettings@@UAGKXZ ; 1
+?CreateTokens@nsGlobalHistory@@IAEIXZ ; 1
+??0nsUrlWidget@@QAE@XZ ; 1
+?AppendBytes@InternetSearchContext@@UAGIPBDH@Z ; 1
+?GetInt64ForPref@nsTimeBomb@@IAEIPBDPA_J@Z ; 1
+?Init@nsGlobalHistory@@QAGIXZ ; 1
+?Init@nsHTTPIndex@@QAEIXZ ; 1
+?GetFirstLaunch@nsTimeBomb@@UAGIPA_J@Z ; 1
+??0nsWindowsHooksSettings@@QAE@XZ ; 1
+??0BookmarkParser@@QAE@XZ ; 1
+??_EnsWindowsHooksSettings@@UAEPAXI@Z ; 1
+?GetURI@nsHTTPIndex@@UAGIPAPAD@Z ; 1
+??_GnsUrlWidget@@UAEPAXI@Z ; 1
+??_EnsWindowsHooks@@UAEPAXI@Z ; 1
+?CommonInit@nsHTTPIndex@@IAEIXZ ; 1
+?GetURI@InternetSearchDataSource@@UAGIPAPAD@Z ; 1
+??0nsUrlbarHistory@@QAE@XZ ; 1
+??1BookmarkParser@@QAE@XZ ; 1
+??1nsTimeBomb@@UAE@XZ ; 1
+??0nsHTTPIndex@@QAE@XZ ; 1
+?GetCategoryList@InternetSearchDataSource@@IAEIXZ ; 1
+??_GnsTimeBomb@@UAEPAXI@Z ; 1
+?GetCategoryDataSource@InternetSearchDataSource@@UAGIPAPAVnsIRDFDataSource@@@Z ; 1
+?CheckHostnameEntries@nsGlobalHistory@@IAEIXZ ; 1
+??0nsTimeBomb@@QAE@XZ ; 1
+_NSGetModule ; 1
+??0LocalSearchDataSource@@QAE@XZ ; 1
+?Init@InternetSearchDataSource@@QAGIXZ ; 1
+?ParseBookmarkSeparator@BookmarkParser@@IAEIABVnsString@@ABV?$nsCOMPtr@VnsIRDFContainer@@@@@Z ; 1
+?setFolderHint@BookmarkParser@@IAEIPAVnsIRDFResource@@0@Z ; 1
+?Init@BookmarkParser@@QAEIPAVnsFileSpec@@PAVnsIRDFDataSource@@ABVnsString@@@Z ; 1
+??1nsWindowsHooks@@UAE@XZ ; 1
+?GetEnabled@nsTimeBomb@@UAGIPAH@Z ; 1
+?QueryInterface@nsTimeBomb@@UAGIABUnsID@@PAPAX@Z ; 1
+?CheckWithUI@nsTimeBomb@@UAGIPAH@Z ; 1
+?AddSearchEngine@InternetSearchDataSource@@UAGIPBD0PBG1@Z ; 1
+?OpenExistingFile@nsGlobalHistory@@IAEIPAVnsIMdbFactory@@PBD@Z ; 1
+??0nsWindowsHooks@@QAE@XZ ; 1
+??0nsBookmarksService@@QAE@XZ ; 1
+?ParseMetaTag@BookmarkParser@@IAEIABVnsString@@PAPAVnsIUnicodeDecoder@@@Z ; 1
+?GetURI@nsGlobalHistory@@UAGIPAPAD@Z ; 1
+?ReadBookmarks@nsBookmarksService@@UAGIXZ ; 1
+?Init@nsUrlWidget@@QAEIXZ ; 1