Compare commits
1 Commits
montulli1
...
tags/RDF_B
| Author | SHA1 | Date | |
|---|---|---|---|
|
35c4ab6562 |
37715
mozilla/CHANGES.html
37715
mozilla/CHANGES.html
File diff suppressed because it is too large
Load Diff
@@ -1,18 +1,15 @@
|
||||
Please be apprised of the following Legal Notices:
|
||||
|
||||
A) The U.S. District Court for the Eastern District of Virginia has
|
||||
ruled that the Netscape Navigator code does not infringe Wang's U.S.
|
||||
Patent No. 4,751,669 ("the '669 Patent") because: 1) HTML is not
|
||||
Videotex as defined by the '669 patent; 2) web servers are not central
|
||||
suppliers; and 3) Navigator does not "connect," as defined by the '669
|
||||
Patent, to web servers on the Internet. Wang may appeal this decision to
|
||||
the Federal Circuit. Wang contended that its Patent disclosing a
|
||||
"Videotext" system, is infringed by the following functionality in the
|
||||
Netscape Navigator code: 1) the animated logo and status line indicators
|
||||
--See Claims 1,8 and 9; 2) the "File Save As" function --See Claims
|
||||
23-27; 3) Bookmarks and Rename Bookmarks in the Properties window --See
|
||||
Claims 20-22; 4) storing HTML, GIF, and JPEG files and adding filename
|
||||
extensions --See Claim 38
|
||||
A) Wang contends that its U.S. Patent No. 4, 751,669 ("the '669
|
||||
Patent") disclosing a "video text" system, is infringed by the following
|
||||
functionality in the Netscape Navigator code: 1) the animated logo and
|
||||
status line indicators --See Claims 1,8 and 9; 2) the "File Save As"
|
||||
function --See Claims 23-27; 3) Bookmarks and Rename Bookmarks in the
|
||||
Properties window --See Claims 20-22; 4) storing HTML, GIF, and JPEG
|
||||
files and adding filename extensions based on mime types (performed in
|
||||
Windows OS) --See Claim 38. Netscape believes the '669 Patent is
|
||||
invalid and non-infringed. Netscape is vigorously defending against
|
||||
Wang's claims.
|
||||
|
||||
B) Intermind owns pending U.S. patent applications on communications
|
||||
systems which employ metadata ("channel objects") to define a control
|
||||
|
||||
@@ -1,287 +0,0 @@
|
||||
#!perl
|
||||
|
||||
package BuildList;
|
||||
require Exporter;
|
||||
|
||||
@ISA = qw(Exporter);
|
||||
@EXPORT = qw(BuildMozilla DistMozilla);
|
||||
|
||||
=head1 NAME
|
||||
|
||||
BuildList - build the [ordered] set of projects needed to construct Mozilla
|
||||
|
||||
=head1 SYNOPSIS
|
||||
|
||||
...
|
||||
|
||||
=head1 COPYRIGHT
|
||||
|
||||
The contents of this file are subject to the Netscape Public License
|
||||
Version 1.0 (the "NPL"); you may not use this file except in
|
||||
compliance with the NPL. You may obtain a copy of the NPL at
|
||||
http://www.mozilla.org/NPL/
|
||||
|
||||
Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
for the specific language governing rights and limitations under the
|
||||
NPL.
|
||||
|
||||
The Initial Developer of this code under the NPL is Netscape
|
||||
Communications Corporation. Portions created by Netscape are
|
||||
Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
Reserved.
|
||||
|
||||
=cut
|
||||
|
||||
use Moz;
|
||||
use File::Path;
|
||||
|
||||
sub BuildMozilla()
|
||||
{
|
||||
if ( $main::DEBUG )
|
||||
{
|
||||
$D = "Debug";
|
||||
$dist_dir = ":mozilla:dist:client_debug:";
|
||||
}
|
||||
else
|
||||
{
|
||||
$D = "";
|
||||
$dist_dir = ":mozilla:dist:client:";
|
||||
}
|
||||
|
||||
#
|
||||
# Build the appropriate target of each project
|
||||
#
|
||||
|
||||
BuildProjectClean(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp", "Stubs");
|
||||
BuildProjectClean(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp", "Stubs");
|
||||
BuildProjectClean(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp", "Stubs");
|
||||
BuildProjectClean(":mozilla:cmd:macfe:projects:client:NavigatorStubs.mcp", "Stubs");
|
||||
|
||||
BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp", "NSRuntime$D.shlb");
|
||||
MakeAlias(":mozilla:lib:mac:NSRuntime:NSRuntime$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:cmd:macfe:restext:StringLib.mcp", "Strings$D.shlb");
|
||||
MakeAlias(":mozilla:cmd:macfe:restext:Strings$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.mcp", "MoreFiles$D.shlb");
|
||||
MakeAlias(":mozilla:lib:mac:MoreFiles:build:MoreFiles$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp", "NSPR20$D.shlb");
|
||||
MakeAlias(":mozilla:nsprpub:macbuild:NSPR20$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:dbm:macbuild:DBMPPC.mcp", "DBM$D.shlb");
|
||||
MakeAlias(":mozilla:dbm:macbuild:DBM$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp", "MemAllocator$D.shlb");
|
||||
MakeAlias(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp", "NSStdLib$D.shlb");
|
||||
MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp", "xpcom$D.shlb");
|
||||
MakeAlias(":mozilla:xpcom:macbuild:xpcom$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp", "PowerPlant$D.shlb");
|
||||
MakeAlias(":mozilla:lib:mac:PowerPlant:PowerPlant$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp", "zlib$D.shlb");
|
||||
MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp", "JPEG$D.shlb");
|
||||
MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:sun-java:stubs:macbuild:JavaStubs.mcp", "JavaRuntime$D.shlb");
|
||||
MakeAlias(":mozilla:sun-java:stubs:macbuild:JavaRuntime$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:js:jsj:macbuild:JSJ_PPC.mcp", "JSJ$D.o");
|
||||
|
||||
BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp", "JavaScript$D.shlb");
|
||||
MakeAlias(":mozilla:js:macbuild:JavaScript$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:nav-java:stubs:macbuild:NavJavaStubs.mcp", "NavJava$D.shlb");
|
||||
MakeAlias(":mozilla:nav-java:stubs:macbuild:NavJava$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp", "RDF$D.shlb");
|
||||
MakeAlias(":mozilla:modules:rdf:macbuild:RDF$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:modules:xml:macbuild:XML.mcp", "XML$D.shlb");
|
||||
MakeAlias(":mozilla:modules:xml:macbuild:XML$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:modules:schedulr:macbuild:Schedulr.mcp", "Scheduler$D.shlb");
|
||||
MakeAlias(":mozilla:modules:schedulr:macbuild:Scheduler$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:build:mac:CustomLib:CustomLib.mcp", "CustomLib$D.shlb");
|
||||
MakeAlias(":mozilla:build:mac:CustomLib:CustomLib$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp", "Security.o");
|
||||
BuildProject(":mozilla:modules:libfont:macbuild:FontBroker.mcp", "FontBroker$D.o");
|
||||
BuildProject(":mozilla:lib:libmocha:macbuild:LibMocha.mcp", "LibMocha$D.o");
|
||||
BuildProject(":mozilla:network:macbuild:network.mcp", "Network$D.o");
|
||||
|
||||
BuildProject(":mozilla:build:mac:CustomLib:CustomLib.mcp", "CustomStaticLib$D.o");
|
||||
|
||||
if ( $main::MOZ_LITE == 0 )
|
||||
{
|
||||
BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp", "Composer$D.o");
|
||||
|
||||
# Build the appropriate resources target
|
||||
BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", "Moz_Resources");
|
||||
}
|
||||
else
|
||||
{
|
||||
# Build a project with dummy targets to make stub libraries
|
||||
BuildProject("cmd:macfe:projects:dummies:MakeDummies.mcp", "Composer$D.o");
|
||||
|
||||
# Build the appropriate resources target
|
||||
BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", "Nav_Resources");
|
||||
}
|
||||
|
||||
BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", "Client$D");
|
||||
}
|
||||
|
||||
|
||||
sub DistMozilla()
|
||||
{
|
||||
mkpath([ ":mozilla:dist:", ":mozilla:dist:client:", ":mozilla:dist:client_debug:", ":mozilla:dist:client_stubs:" ]);
|
||||
|
||||
#INCLUDE
|
||||
InstallFromManifest(":mozilla:config:mac:MANIFEST", ":mozilla:dist:config:");
|
||||
InstallFromManifest(":mozilla:include:MANIFEST", ":mozilla:dist:include:");
|
||||
InstallFromManifest(":mozilla:cmd:macfe:pch:MANIFEST", ":mozilla:dist:include:");
|
||||
|
||||
#MAC_COMMON
|
||||
InstallFromManifest(":mozilla:build:mac:MANIFEST", ":mozilla:dist:mac:common:");
|
||||
InstallFromManifest(":mozilla:lib:mac:NSStdLib:include:MANIFEST", ":mozilla:dist:mac:common:");
|
||||
InstallFromManifest(":mozilla:lib:mac:MacMemoryAllocator:include:MANIFEST", ":mozilla:dist:mac:common:");
|
||||
InstallFromManifest(":mozilla:lib:mac:Misc:MANIFEST", ":mozilla:dist:mac:common:");
|
||||
InstallFromManifest(":mozilla:lib:mac:MoreFiles:MANIFEST", ":mozilla:dist:mac:common:morefiles:");
|
||||
InstallFromManifest(":mozilla:cmd:macfe:MANIFEST", ":mozilla:dist:mac:macfe:");
|
||||
|
||||
#NSPR
|
||||
InstallFromManifest(":mozilla:nsprpub:pr:include:MANIFEST", ":mozilla:dist:nspr:");
|
||||
InstallFromManifest(":mozilla:nsprpub:pr:src:md:mac:MANIFEST", ":mozilla:dist:nspr:mac:");
|
||||
InstallFromManifest(":mozilla:nsprpub:lib:ds:MANIFEST", ":mozilla:dist:nspr:");
|
||||
InstallFromManifest(":mozilla:nsprpub:lib:libc:include:MANIFEST", ":mozilla:dist:nspr:");
|
||||
InstallFromManifest(":mozilla:nsprpub:lib:msgc:include:MANIFEST", ":mozilla:dist:nspr:");
|
||||
|
||||
#DBM
|
||||
InstallFromManifest(":mozilla:dbm:include:MANIFEST", ":mozilla:dist:dbm:");
|
||||
|
||||
#LIBIMAGE
|
||||
InstallFromManifest(":mozilla:modules:libimg:png:MANIFEST", ":mozilla:dist:libimg:");
|
||||
InstallFromManifest(":mozilla:modules:libimg:src:MANIFEST", ":mozilla:dist:libimg:");
|
||||
InstallFromManifest(":mozilla:modules:libimg:public:MANIFEST", ":mozilla:dist:libimg:");
|
||||
|
||||
#SECURITY_freenav
|
||||
InstallFromManifest(":mozilla:modules:security:freenav:MANIFEST", ":mozilla:dist:security:");
|
||||
|
||||
#XPCOM
|
||||
InstallFromManifest(":mozilla:xpcom:src:MANIFEST", ":mozilla:dist:xpcom:");
|
||||
|
||||
#ZLIB
|
||||
InstallFromManifest(":mozilla:modules:zlib:src:MANIFEST", ":mozilla:dist:zlib:");
|
||||
|
||||
#JPEG
|
||||
InstallFromManifest(":mozilla:jpeg:MANIFEST", ":mozilla:dist:jpeg:");
|
||||
|
||||
#JSJ
|
||||
InstallFromManifest(":mozilla:js:jsj:MANIFEST", ":mozilla:dist:jsj:");
|
||||
|
||||
#JSDEBUG
|
||||
InstallFromManifest(":mozilla:js:jsd:MANIFEST", ":mozilla:dist:jsdebug:");
|
||||
|
||||
#JS
|
||||
InstallFromManifest(":mozilla:js:src:MANIFEST", ":mozilla:dist:js:");
|
||||
|
||||
#RDF
|
||||
InstallFromManifest(":mozilla:modules:rdf:include:MANIFEST", ":mozilla:dist:rdf:");
|
||||
|
||||
#XML
|
||||
InstallFromManifest(":mozilla:modules:xml:glue:MANIFEST", ":mozilla:dist:xml:");
|
||||
InstallFromManifest(":mozilla:modules:xml:expat:xmlparse:MANIFEST", ":mozilla:dist:xml:");
|
||||
|
||||
#LIBFONT
|
||||
InstallFromManifest(":mozilla:modules:libfont:MANIFEST", ":mozilla:dist:libfont:");
|
||||
InstallFromManifest(":mozilla:modules:libfont:src:MANIFEST", ":mozilla:dist:libfont:");
|
||||
|
||||
#LDAP
|
||||
if ( $main::MOZ_LDAP )
|
||||
{
|
||||
InstallFromManifest(":mozilla:directory:c-sdk:ldap:include:MANIFEST", ":mozilla:dist:ldap:");
|
||||
}
|
||||
|
||||
#SCHEDULER
|
||||
InstallFromManifest(":mozilla:modules:schedulr:public:MANIFEST", ":mozilla:dist:schedulr:");
|
||||
|
||||
#NETWORK
|
||||
InstallFromManifest(":mozilla:network:cache:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:client:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:cnvts:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:cstream:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:main:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:mimetype:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:util:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:about:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:certld:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:dataurl:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:file:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:ftp:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:gopher:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:http:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:js:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:mailbox:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:marimba:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:nntp:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:pop3:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:remote:MANIFEST", ":mozilla:dist:network:");
|
||||
InstallFromManifest(":mozilla:network:protocol:smtp:MANIFEST", ":mozilla:dist:network:");
|
||||
|
||||
#HTML_DIALOGS
|
||||
InstallFromManifest(":mozilla:lib:htmldlgs:MANIFEST", ":mozilla:dist:htmldlgs:");
|
||||
|
||||
#LAYOUT
|
||||
InstallFromManifest(":mozilla:lib:layout:MANIFEST", ":mozilla:dist:layout:");
|
||||
|
||||
#LAYERS
|
||||
InstallFromManifest(":mozilla:lib:liblayer:include:MANIFEST", ":mozilla:dist:layers:");
|
||||
|
||||
#PARSE
|
||||
InstallFromManifest(":mozilla:lib:libparse:MANIFEST", ":mozilla:dist:libparse:");
|
||||
|
||||
#STYLE
|
||||
InstallFromManifest(":mozilla:lib:libstyle:MANIFEST", ":mozilla:dist:libstyle:");
|
||||
|
||||
#PLUGIN
|
||||
InstallFromManifest(":mozilla:lib:plugin:MANIFEST", ":mozilla:dist:plugin:");
|
||||
|
||||
#LIBHOOK
|
||||
InstallFromManifest(":mozilla:modules:libhook:public:MANIFEST", ":mozilla:dist:libhook:");
|
||||
|
||||
#LIBPREF
|
||||
InstallFromManifest(":mozilla:modules:libpref:public:MANIFEST", ":mozilla:dist:libpref:");
|
||||
|
||||
#LIBREG
|
||||
InstallFromManifest(":mozilla:modules:libreg:include:MANIFEST", ":mozilla:dist:libreg:");
|
||||
|
||||
#LIBUTIL
|
||||
InstallFromManifest(":mozilla:modules:libutil:public:MANIFEST", ":mozilla:dist:libutil:");
|
||||
|
||||
#PROGRESS
|
||||
InstallFromManifest(":mozilla:modules:progress:public:MANIFEST", ":mozilla:dist:progress:");
|
||||
|
||||
#EDTPLUG
|
||||
InstallFromManifest(":mozilla:modules:edtplug:include:MANIFEST", ":mozilla:dist:edtplug:");
|
||||
|
||||
#NAV_JAVA
|
||||
InstallFromManifest(":mozilla:nav-java:stubs:include:MANIFEST", ":mozilla:dist:nav-java:");
|
||||
InstallFromManifest(":mozilla:nav-java:stubs:macjri:MANIFEST", ":mozilla:dist:nav-java:");
|
||||
|
||||
#SUN_JAVA
|
||||
InstallFromManifest(":mozilla:sun-java:stubs:include:MANIFEST", ":mozilla:dist:sun-java:");
|
||||
InstallFromManifest(":mozilla:sun-java:stubs:macjri:MANIFEST", ":mozilla:dist:sun-java:");
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
|
||||
@@ -1,143 +0,0 @@
|
||||
#!perl
|
||||
|
||||
package BuildListObsolete;
|
||||
require Exporter;
|
||||
|
||||
@ISA = qw(Exporter);
|
||||
@EXPORT = qw(BuildMozilla);
|
||||
|
||||
=head1 NAME
|
||||
|
||||
BuildList - build the [ordered] set of projects needed to construct Mozilla
|
||||
|
||||
=head1 SYNOPSIS
|
||||
|
||||
...
|
||||
|
||||
=head1 COPYRIGHT
|
||||
|
||||
The contents of this file are subject to the Netscape Public License
|
||||
Version 1.0 (the "NPL"); you may not use this file except in
|
||||
compliance with the NPL. You may obtain a copy of the NPL at
|
||||
http://www.mozilla.org/NPL/
|
||||
|
||||
Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
for the specific language governing rights and limitations under the
|
||||
NPL.
|
||||
|
||||
The Initial Developer of this code under the NPL is Netscape
|
||||
Communications Corporation. Portions created by Netscape are
|
||||
Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
Reserved.
|
||||
|
||||
=cut
|
||||
|
||||
|
||||
sub BuildMozilla()
|
||||
{
|
||||
use Moz;
|
||||
|
||||
chdir(":::"); # assuming this script is in "...:mozilla:build:mac:", change dir to just inside "mozilla"
|
||||
|
||||
|
||||
if ( $main::DEBUG )
|
||||
{
|
||||
$D = " (Debug)";
|
||||
$LibD = "Debug";
|
||||
$dist_dir = ":dist:client_debug:";
|
||||
}
|
||||
else
|
||||
{
|
||||
$D = "";
|
||||
$LibD = "";
|
||||
$dist_dir = ":dist:client:";
|
||||
}
|
||||
|
||||
#
|
||||
# Build the appropriate target of each project
|
||||
#
|
||||
|
||||
BuildProjectClean(":lib:mac:NSStdLib:NSStdLib.mcp", "Stub Library");
|
||||
BuildProjectClean(":lib:mac:MacMemoryAllocator:MemAllocator.mcp", "Stub Library");
|
||||
BuildProjectClean(":cmd:macfe:projects:client:Navigator.mcp", "Stub Library");
|
||||
|
||||
BuildProject(":lib:mac:NSRuntime:NSRuntime.mcp");
|
||||
MakeAlias(":lib:mac:NSRuntime:NSRuntimePPCLib", "$dist_dir");
|
||||
|
||||
BuildProject(":cmd:macfe:restext:NavStringLibPPC.mcp");
|
||||
MakeAlias(":cmd:macfe:restext:StringsPPCLib", "$dist_dir");
|
||||
|
||||
BuildProject(":lib:mac:MoreFiles:build:MoreFilesPPC.prj");
|
||||
MakeAlias(":lib:mac:MoreFiles:build:MoreFilesPPC.lib", "$dist_dir");
|
||||
|
||||
BuildProject(":nsprpub:macbuild:NSPR20PPC".$LibD.".mcp");
|
||||
MakeAlias(":nsprpub:macbuild:NSPR20PPC".$LibD."Lib", "$dist_dir");
|
||||
|
||||
BuildProject(":dbm:macbuild:DBMPPC".$LibD.".mcp");
|
||||
MakeAlias(":dbm:macbuild:DBMPPC".$LibD."Lib", "${dist_dir}");
|
||||
|
||||
BuildProject(":lib:mac:MacMemoryAllocator:MemAllocator.mcp", "PPC Shared Library$D");
|
||||
MakeAlias(":lib:mac:MacMemoryAllocator:MemAllocatorPPC".$LibD."Lib", "$dist_dir");
|
||||
|
||||
BuildProject(":lib:mac:NSStdLib:NSStdLib.mcp", "PPC Shared Library");
|
||||
MakeAlias(":lib:mac:NSStdLib:NSStdLibPPCLib", "$dist_dir");
|
||||
|
||||
BuildProject(":modules:security:freenav:macbuild:NoSecurity.mcp", "PPC Shared Library$D");
|
||||
MakeAlias(":modules:security:freenav:macbuild:NoSecurity".$LibD."Lib", "$dist_dir");
|
||||
|
||||
BuildProject(":xpcom:macbuild:xpcomPPC".$LibD.".mcp");
|
||||
MakeAlias(":xpcom:macbuild:xpcomPPC".$LibD."Lib", "$dist_dir");
|
||||
|
||||
BuildProject(":lib:mac:PowerPlant:PowerPlant.mcp");
|
||||
MakeAlias(":lib:mac:PowerPlant:PowerPlantPPC".$LibD."Lib", "$dist_dir");
|
||||
|
||||
BuildProject(":modules:zlib:macbuild:zlib.mcp", "PPC Shared Library$D");
|
||||
MakeAlias(":modules:zlib:macbuild:zlibPPC".$LibD."Lib", "$dist_dir");
|
||||
|
||||
BuildProject(":jpeg:macbuild:JPEG.mcp", "PPC Shared Library$D");
|
||||
MakeAlias(":jpeg:macbuild:JPEGPPC".$LibD."Lib", "$dist_dir");
|
||||
|
||||
BuildProject(":sun-java:stubs:macbuild:JavaStubs.mcp", "PPC Shared Library$D");
|
||||
MakeAlias(":sun-java:stubs:macbuild:JavaRuntimePPC".$LibD."Lib", "$dist_dir");
|
||||
|
||||
BuildProject(":js:jsj:macbuild:JSJ_PPC".$LibD.".mcp");
|
||||
|
||||
BuildProject(":js:macbuild:JavaScriptPPC".$LibD.".mcp");
|
||||
MakeAlias(":js:macbuild:JavaScriptPPC".$LibD."Lib", "$dist_dir");
|
||||
|
||||
BuildProject(":nav-java:stubs:macbuild:NavJavaStubs.mcp", "PPC Shared Library$D");
|
||||
MakeAlias(":nav-java:stubs:macbuild:NavJavaPPC".$LibD."Lib", "$dist_dir");
|
||||
|
||||
if ( $main::DEBUG )
|
||||
{
|
||||
BuildProject(":modules:rdf:macbuild:RDF.mcp", "PPC Shared Library +D -LDAP");
|
||||
MakeAlias(":modules:rdf:macbuild:RDFPPCDebugLib", "${dist_dir}");
|
||||
}
|
||||
else
|
||||
{
|
||||
Moz::BuildProject(":modules:rdf:macbuild:RDF.mcp", "PPC Shared Library -LDAP");
|
||||
MakeAlias(":modules:rdf:macbuild:RDFPPCLib", "${dist_dir}");
|
||||
}
|
||||
|
||||
BuildProject(":modules:xml:macbuild:XML.mcp", "PPC Shared Library$D");
|
||||
MakeAlias(":modules:xml:macbuild:XMLPPC".$LibD."Lib", "$dist_dir");
|
||||
|
||||
BuildProject(":modules:libfont:macbuild:FontBroker.mcp", "PPC Library$D");
|
||||
|
||||
BuildProject(":modules:schedulr:macbuild:Schedulr.mcp", "PPC Shared Library$D");
|
||||
MakeAlias(":modules:schedulr:macbuild:Schedulr".$LibD."PPCLib", "$dist_dir");
|
||||
|
||||
BuildProject(":network:macbuild:network.mcp", "PPC Library (Debug Moz)");
|
||||
|
||||
if ( $main::MOZ_LITE == 0 )
|
||||
{
|
||||
BuildProject(":cmd:macfe:Composer:build:Composer.mcp", "PPC Library$D");
|
||||
}
|
||||
|
||||
BuildProject(":cmd:macfe:projects:client:Navigator.mcp", "Moz PPC App$D");
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
|
||||
@@ -18,18 +18,41 @@
|
||||
#
|
||||
|
||||
use Moz;
|
||||
use BuildList;
|
||||
|
||||
$DEBUG = 0;
|
||||
$MOZ_LITE = 0; # build moz medium. This will come from a config file at some stage.
|
||||
|
||||
Moz::OpenErrorLog(":::Mozilla.BuildLog");
|
||||
Moz::StopForErrors();
|
||||
chdir("::::"); # assuming this script is in "...:mozilla:build:mac:", change dir to just above "mozilla"
|
||||
Moz::Configure(":Mozilla.Configuration");
|
||||
Moz::OpenErrorLog("::Mozilla.BuildLog");
|
||||
|
||||
chdir("::::");
|
||||
|
||||
# Make and popuplate the dist directory
|
||||
DistMozilla();
|
||||
#
|
||||
# Build the appropriate target of each project
|
||||
#
|
||||
|
||||
# Now build the projects
|
||||
BuildMozilla();
|
||||
Moz::BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp", "Stub Library");
|
||||
Moz::BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp", "Stub Library");
|
||||
Moz::BuildProject(":mozilla:cmd:macfe:projects:client:Navigator.mcp", "Stub Library");
|
||||
|
||||
Moz::BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp");
|
||||
Moz::BuildProject(":mozilla:cmd:macfe:restext:NavStringLibPPC.mcp");
|
||||
Moz::BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.prj");
|
||||
Moz::BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPCDebug.mcp");
|
||||
Moz::BuildProject(":mozilla:dbm:macbuild:DBMPPCDebug.mcp");
|
||||
Moz::BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp", "PPC Shared Library (Debug)");
|
||||
Moz::BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp", "PPC Shared Library");
|
||||
Moz::BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp", "PPC Shared Library (Debug)");
|
||||
Moz::BuildProject(":mozilla:xpcom:macbuild:xpcomPPCDebug.mcp");
|
||||
Moz::BuildProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp");
|
||||
Moz::BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp", "PPC Shared Library (Debug)");
|
||||
Moz::BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp", "PPC Shared Library (Debug)");
|
||||
Moz::BuildProject(":mozilla:sun-java:stubs:macbuild:JavaStubs.mcp", "PPC Shared Library (Debug)");
|
||||
Moz::BuildProject(":mozilla:js:jsj:macbuild:JSJ_PPCDebug.mcp");
|
||||
Moz::BuildProject(":mozilla:js:macbuild:JavaScriptPPCDebug.mcp");
|
||||
Moz::BuildProject(":mozilla:nav-java:stubs:macbuild:NavJavaStubs.mcp", "PPC Shared Library (Debug)");
|
||||
Moz::BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp", "PPC Shared Library +D -LDAP");
|
||||
Moz::BuildProject(":mozilla:modules:xml:macbuild:XML.mcp", "PPC Shared Library (Debug)");
|
||||
Moz::BuildProject(":mozilla:modules:libfont:macbuild:FontBroker.mcp", "PPC Library (Debug)");
|
||||
Moz::BuildProject(":mozilla:modules:schedulr:macbuild:Schedulr.mcp", "PPC Shared Library (Debug)");
|
||||
Moz::BuildProject(":mozilla:network:macbuild:network.mcp", "PPC Library (Debug Moz)");
|
||||
Moz::BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp", "PPC Library (Debug)");
|
||||
Moz::BuildProject(":mozilla:cmd:macfe:projects:client:Navigator.mcp", "Moz PPC App (Debug)");
|
||||
|
||||
@@ -1,124 +0,0 @@
|
||||
#!perl
|
||||
|
||||
package BuildMozilla;
|
||||
require Exporter;
|
||||
|
||||
@ISA = qw(Exporter);
|
||||
@EXPORT = qw(BuildMozilla);
|
||||
|
||||
=head1 NAME
|
||||
|
||||
BuildMozilla - build the [ordered] set of projects needed to construct Mozilla
|
||||
|
||||
=head1 COPYRIGHT
|
||||
|
||||
The contents of this file are subject to the Netscape Public License
|
||||
Version 1.0 (the "NPL"); you may not use this file except in
|
||||
compliance with the NPL. You may obtain a copy of the NPL at
|
||||
http://www.mozilla.org/NPL/
|
||||
|
||||
Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
for the specific language governing rights and limitations under the
|
||||
NPL.
|
||||
|
||||
The Initial Developer of this code under the NPL is Netscape
|
||||
Communications Corporation. Portions created by Netscape are
|
||||
Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
Reserved.
|
||||
|
||||
=cut
|
||||
|
||||
|
||||
sub BuildMozilla()
|
||||
{
|
||||
use Moz;
|
||||
|
||||
chdir("::::"); # assuming this script is in "...:mozilla:build:mac:", change dir to just above "mozilla"
|
||||
|
||||
|
||||
# Ideally, we would set the target name like so:
|
||||
# $target = $main::DEBUG ? "debug" : "optimized";
|
||||
# ...and all projects would have corresponding targets
|
||||
|
||||
|
||||
$D = $main::DEBUG ? " (Debug)" : ""; # $D becomes a suffix to target names for selecting either the debug or non-debug target of a project
|
||||
|
||||
|
||||
#
|
||||
# Build the appropriate target of each project
|
||||
#
|
||||
|
||||
Moz::BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp", "Stub Library");
|
||||
Moz::BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp", "Stub Library");
|
||||
Moz::BuildProject(":mozilla:cmd:macfe:projects:client:Navigator.mcp", "Stub Library");
|
||||
|
||||
Moz::BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp");
|
||||
Moz::BuildProject(":mozilla:cmd:macfe:restext:NavStringLibPPC.mcp");
|
||||
Moz::BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.prj");
|
||||
|
||||
if ( $main::DEBUG )
|
||||
{
|
||||
Moz::BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPCDebug.mcp");
|
||||
Moz::BuildProject(":mozilla:dbm:macbuild:DBMPPCDebug.mcp");
|
||||
}
|
||||
else
|
||||
{
|
||||
Moz::BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp");
|
||||
Moz::BuildProject(":mozilla:dbm:macbuild:DBMPPC.mcp");
|
||||
}
|
||||
|
||||
Moz::BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp", "PPC Shared Library$D");
|
||||
Moz::BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp", "PPC Shared Library");
|
||||
Moz::BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp", "PPC Shared Library$D");
|
||||
|
||||
if ( $main::DEBUG )
|
||||
{
|
||||
Moz::BuildProject(":mozilla:xpcom:macbuild:xpcomPPCDebug.mcp");
|
||||
}
|
||||
else
|
||||
{
|
||||
Moz::BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp");
|
||||
}
|
||||
|
||||
Moz::BuildProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp");
|
||||
Moz::BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp", "PPC Shared Library$D");
|
||||
Moz::BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp", "PPC Shared Library$D");
|
||||
Moz::BuildProject(":mozilla:sun-java:stubs:macbuild:JavaStubs.mcp", "PPC Shared Library$D");
|
||||
|
||||
if ( $main::DEBUG )
|
||||
{
|
||||
Moz::BuildProject(":mozilla:js:jsj:macbuild:JSJ_PPCDebug.mcp");
|
||||
Moz::BuildProject(":mozilla:js:macbuild:JavaScriptPPCDebug.mcp");
|
||||
}
|
||||
else
|
||||
{
|
||||
Moz::BuildProject(":mozilla:js:jsj:macbuild:JSJ_PPC.mcp");
|
||||
Moz::BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp");
|
||||
}
|
||||
|
||||
Moz::BuildProject(":mozilla:nav-java:stubs:macbuild:NavJavaStubs.mcp", "PPC Shared Library$D");
|
||||
|
||||
|
||||
# the following `if' can be fixed when we either rename the debug target of the RDF project, or of all the other projects
|
||||
|
||||
if ( $main::DEBUG )
|
||||
{
|
||||
Moz::BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp", "PPC Shared Library +D -LDAP");
|
||||
}
|
||||
else
|
||||
{
|
||||
Moz::BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp", "PPC Shared Library -LDAP");
|
||||
}
|
||||
|
||||
Moz::BuildProject(":mozilla:modules:xml:macbuild:XML.mcp", "PPC Shared Library$D");
|
||||
Moz::BuildProject(":mozilla:modules:libfont:macbuild:FontBroker.mcp", "PPC Library$D");
|
||||
Moz::BuildProject(":mozilla:modules:schedulr:macbuild:Schedulr.mcp", "PPC Shared Library$D");
|
||||
Moz::BuildProject(":mozilla:network:macbuild:network.mcp", "PPC Library (Debug Moz)");
|
||||
Moz::BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp", "PPC Library$D");
|
||||
Moz::BuildProject(":mozilla:cmd:macfe:projects:client:Navigator.mcp", "Moz PPC App$D");
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
#!perl
|
||||
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
use Moz;
|
||||
use BuildList;
|
||||
|
||||
$DEBUG = 1;
|
||||
$MOZ_LITE = 0; # build moz medium. This will come from a config file at some stage.
|
||||
|
||||
Moz::OpenErrorLog(":::Mozilla.BuildLog");
|
||||
Moz::StopForErrors();
|
||||
|
||||
chdir("::::");
|
||||
|
||||
# Make and popuplate the dist directory
|
||||
DistMozilla();
|
||||
|
||||
# Now build the projects
|
||||
BuildMozilla();
|
||||
@@ -1,120 +0,0 @@
|
||||
#!perl
|
||||
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
#
|
||||
# nglayout build script (debug)
|
||||
#
|
||||
use NGLayoutBuildList;
|
||||
use Cwd;
|
||||
use Moz;
|
||||
|
||||
# configuration variables
|
||||
$DEBUG = 1;
|
||||
$pull{all} = 0;
|
||||
$pull{lizard} = 0;
|
||||
$pull{xpcom} = 0;
|
||||
$pull{imglib} = 0;
|
||||
$pull{netlib} = 0;
|
||||
$pull{nglayout} = 0;
|
||||
$pull{mac} = 0;
|
||||
|
||||
$build{all} = 0;
|
||||
$build{dist} = 0;
|
||||
$build{projects}= 0;
|
||||
|
||||
#
|
||||
# UI
|
||||
#
|
||||
|
||||
@choices = ("pull_and_build_all",
|
||||
"pull_all",
|
||||
"build_all",
|
||||
"pull_nglayout",
|
||||
"build_dist",
|
||||
"build_projects");
|
||||
#damn, this does not work on
|
||||
if (0)
|
||||
{
|
||||
@pick = MacPerl::Pick("What would you like to do?", @choices);
|
||||
$pull{all} = 0;
|
||||
$build{all} = 1;
|
||||
foreach $i (@pick)
|
||||
{
|
||||
if ($i eq "pull_and_build_all")
|
||||
{
|
||||
$pull{all} = 1;
|
||||
$build{all} = 1;
|
||||
}
|
||||
elsif ($i eq "pull_all")
|
||||
{
|
||||
$pull{all} = 1;
|
||||
}
|
||||
elsif ($i eq "build_all")
|
||||
{
|
||||
$build{all} = 1;
|
||||
}
|
||||
elsif ($i eq "build_dist")
|
||||
{
|
||||
$build{dist} = 1;
|
||||
}
|
||||
elsif ($i eq "build_projects")
|
||||
{
|
||||
$build{projects} = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$pull{all} = 1;
|
||||
$build{all} = 1;
|
||||
# $build{projects} = 1;
|
||||
# $build{dist} = 1;
|
||||
# $pull{nglayout} = 1;
|
||||
}
|
||||
|
||||
if ($pull{all})
|
||||
{
|
||||
foreach $k (keys(%pull))
|
||||
{
|
||||
$pull{$k} = 1;
|
||||
}
|
||||
}
|
||||
if ($build{all})
|
||||
{
|
||||
foreach $k (keys(%build))
|
||||
{
|
||||
$build{$k} = 1;
|
||||
}
|
||||
}
|
||||
|
||||
# do the work
|
||||
# you should not have to edit anything bellow
|
||||
|
||||
chdir("::::");
|
||||
$MOZ_SRC = cwd();
|
||||
Moz::StopForErrors();
|
||||
#Moz::DontStopForErrors();
|
||||
OpenErrorLog("::NGLayoutBuildLog");
|
||||
|
||||
Checkout();
|
||||
chdir($MOZ_SRC);
|
||||
BuildDist();
|
||||
chdir($MOZ_SRC);
|
||||
BuildProjects();
|
||||
print "Build layout complete\n";
|
||||
Binary file not shown.
@@ -1,78 +0,0 @@
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
if {#} != 1
|
||||
echo "CopyExports requires 1 parameters:"
|
||||
echo "Parameter 1: path relative to {SourceRootDir} of the file which contains"
|
||||
echo " the list of files to be copied, one per line. This path"
|
||||
echo " may not begin with a colon"
|
||||
echo
|
||||
Exit 1
|
||||
end if
|
||||
|
||||
|
||||
Set SourceList "{SourceRootDir}{1}"
|
||||
|
||||
Set ScriptsDir "{SourceRootDir}mozilla:build:mac:"
|
||||
|
||||
#set sourceList "{SourceRootDir}mozilla:{1}"
|
||||
|
||||
if {verbose}
|
||||
echo "Source list is in file ¶"{SourceList}¶""
|
||||
echo "Scripts directory is ¶"{ScriptsDir}¶""
|
||||
end if
|
||||
|
||||
# for each line in the source file, remove it if it starts with #, otherwise quote it
|
||||
|
||||
for curLine in `streamedit "{sourceList}" -e '/¥#Å/ Delete; /¥/ Replace /(Å)¨1/ "¶""¨1"¶""'`
|
||||
|
||||
echo "{curLine}"
|
||||
|
||||
# ignore empty lines
|
||||
if `evaluate "{{curLine}}" != ""`
|
||||
|
||||
echo "{curLine}"
|
||||
|
||||
# strip out trailing comments
|
||||
if `evaluate "{curLine}" =~ /(Å)¨1[ ¶t]+(#Å)¨2/`
|
||||
set sourceLine "{¨1}"
|
||||
# echo "Discarding comment {¨2}"
|
||||
else
|
||||
set sourceLine "{curLine}"
|
||||
end if
|
||||
|
||||
if `evaluate "{sourceLine}" =~ /([Â ¶t]+)¨1[ ¶t]+[:]*(Å)¨2/`
|
||||
|
||||
if {verbose}
|
||||
echo "Cur line is {sourceLine}"
|
||||
end if
|
||||
|
||||
set exportFile "{¨1}"
|
||||
set theTarget "{¨2}"
|
||||
|
||||
if {verbose}
|
||||
echo "Export file name is {exportFile}"
|
||||
echo "Target directory is {theTarget}"
|
||||
end if
|
||||
|
||||
"{ScriptsDir}CopyList.script" "{exportFile}" "{theTarget}"
|
||||
|
||||
end if
|
||||
|
||||
end if
|
||||
|
||||
end for
|
||||
@@ -1,81 +0,0 @@
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
|
||||
# This is the controlling script for a set of scripts that copy public
|
||||
# header files in one or more source trees into a single, "dist" directory.
|
||||
#
|
||||
# It relies on the two accompanying scripts, ÒCopyList.scriptÓ and
|
||||
# ÒCopyExports.scriptÓ, which must be in the same directory.
|
||||
#
|
||||
# To execute this script, select everything from "# Get the..." to
|
||||
# " the end" and hit the Enter key.
|
||||
#
|
||||
# Known bugs:
|
||||
# Header files are always copied if the export.mac file contains
|
||||
# non-local paths.
|
||||
# Spurious output is produced even when verbose is off.
|
||||
#
|
||||
|
||||
# Uncomment this to get some progress information
|
||||
# set -e verbose 1
|
||||
|
||||
# Get the root of everything
|
||||
|
||||
set magicfilepath "{systempfolder}filepath" # Temporary items folder, "filepath"
|
||||
if !`Exists "{{magicFilePath}}"`
|
||||
Echo "No file path file seems to have been created in the temporary items folder."
|
||||
Echo "Was this script executed from the perl script? That's the way it was designed."
|
||||
Exit 1
|
||||
end if
|
||||
|
||||
set myDirectory "`catenate "{{magicFilePath}}"`"
|
||||
delete -i "{{magicFilePath}}"
|
||||
|
||||
Set SourceList "{myDirectory}{1}"
|
||||
(Evaluate "{myDirectory}" =~ /(Å:)¨1[Â:]+:[Â:]+:[Â:]+/) #·· dev:null
|
||||
Set -e mozillaDir "{¨1}"
|
||||
|
||||
if !`Exists "{{mozillaDir}}"`
|
||||
Echo "A file path was passed, but it doesn't seem to be the mozilla directory."
|
||||
Exit 1
|
||||
end if
|
||||
echo "Mozilla directory found at {mozillaDir}"
|
||||
|
||||
#Calculate the root directory by stripping off the leaf name.
|
||||
(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2/) #·· dev:null
|
||||
Set -e SourceRootDir "{¨1}"
|
||||
Set -e DestRootDir "{mozillaDir}dist:"
|
||||
|
||||
# Ensure the build and stubs folders exist
|
||||
|
||||
if !`exists -d "{mozillaDir}dist"`
|
||||
newfolder "{mozillaDir}dist"
|
||||
end if
|
||||
if !`exists -d "{mozillaDir}dist:client"`
|
||||
newfolder "{mozillaDir}dist:client"
|
||||
end if
|
||||
if !`exists -d "{mozillaDir}dist:client_debug"`
|
||||
newfolder "{mozillaDir}dist:client_debug"
|
||||
end if
|
||||
if !`exists -d "{mozillaDir}dist:client_stubs"`
|
||||
newfolder "{mozillaDir}dist:client_stubs"
|
||||
end if
|
||||
|
||||
"{SourceRootDir}mozilla:build:mac:CopyExports.script" "mozilla:build:mac:MacExportListPublic"
|
||||
|
||||
# the end
|
||||
@@ -1,97 +0,0 @@
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
if {#} != 2
|
||||
echo "CopyList requires 2 parameters:"
|
||||
echo "Parameter 1: path relative to {SourceRootDir} of the file which contains"
|
||||
echo " the list of files to be copied, one per line. This path"
|
||||
echo " may not begin with a colon"
|
||||
echo
|
||||
echo "Parameter 2: path relative to {DestRootDir} of the directory where all the"
|
||||
echo " files are to be copied. No initial colons!"
|
||||
echo
|
||||
Exit 1
|
||||
end if
|
||||
|
||||
set debugEcho "" # This setting will actually duplicate the files
|
||||
#set debugEcho "echo" # This setting will merely print the "duplicate" commands.
|
||||
|
||||
set sourceList "{SourceRootDir}{1}"
|
||||
set targetDir "{DestRootDir}{2}"
|
||||
|
||||
# targetDir may not end in a colon for this script to work.
|
||||
if `Evaluate "{targetDir}" =~ /(Å)¨1:/`
|
||||
#echo "Removed a colon"
|
||||
set targetDir "{¨1}"
|
||||
end if
|
||||
|
||||
#Ensure the target hierarchy exists
|
||||
# Volume name
|
||||
(Evaluate "{TargetDir}" =~ /([Â:]+)¨1:Å/) ·· dev:null
|
||||
Set PartialPath "{¨1}"
|
||||
Loop
|
||||
(Evaluate "{TargetDir}" =~ /("{PartialPath}":[Â:]+)¨1([:]*)¨2Å/) ·· dev:null
|
||||
Set PartialPath "{¨1}"
|
||||
Set Exit 0
|
||||
(NewFolder "{PartialPath}") ·· dev:null
|
||||
Set Exit 1
|
||||
break if "{¨2}" == ""
|
||||
End Loop
|
||||
|
||||
#Calculate the source directory by stripping off the leaf name.
|
||||
(Evaluate "{SourceList}" =~ /(Å:)¨1([Â:]+)¨2/) #·· dev:null
|
||||
Set SourceDir "{¨1}"
|
||||
|
||||
if {verbose}
|
||||
echo "Source list is in file ¶"{sourceList}¶""
|
||||
echo "Source directory is ¶"{SourceDir}¶""
|
||||
echo "Target directory is ¶"{targetDir}¶""
|
||||
end if
|
||||
|
||||
# Strip all comment lines, pipe the stripped lines into the "for" loop.
|
||||
# We quote each whole line here so that we deal with a line at a time in the
|
||||
# for loop. Don't ya just love MPW quoting rulesÉ
|
||||
|
||||
for f in `streamedit "{sourceList}" -e '/¥#Å/ Delete; /¥/ Replace /(Å)¨1/ "¶""¨1"¶""'`
|
||||
|
||||
if `evaluate "{{f}}" != ""`
|
||||
|
||||
# strip out trailing comments (in fact, anything following whitespace)
|
||||
if `evaluate "{f}" =~ /([Â ¶t]+)¨1[ ¶t]+([#]*Å)¨2/`
|
||||
set sourceFile "{¨1}"
|
||||
# echo "Discarding comment {¨2}"
|
||||
else
|
||||
set sourceFile "{f}"
|
||||
end if
|
||||
|
||||
# sourceFile can be a relative path, so need to get the file name for date comparisons
|
||||
if `evaluate "{sourceFile}" =~ /Å:([Â:]+)¨1/`
|
||||
set filename "{¨1}"
|
||||
else
|
||||
set filename "{sourceFile}"
|
||||
end if
|
||||
|
||||
# now copy the file if newer
|
||||
if "`Newer "{sourceDir}{sourceFile}" "{targetDir}:{filename}"`" #|| !`Exists "{targetDir}:{filename}"`
|
||||
if {verbose} ; echo "{sourceDir}{sourceFile} is newer than {targetDir}:{filename}" ; end if
|
||||
#{debugEcho} duplicate -y "{sourceDir}{sourceFile}" "{targetDir}"
|
||||
{debugEcho} newalias "{sourceDir}{sourceFile}" "{targetDir}:{filename}"
|
||||
end if
|
||||
|
||||
end if
|
||||
|
||||
end for
|
||||
@@ -1,4 +0,0 @@
|
||||
|
||||
/* This library only exists to provide a dummy library for the final project */
|
||||
|
||||
/* There is nothing to do here. */
|
||||
Binary file not shown.
@@ -1,69 +0,0 @@
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
|
||||
# This is the controlling script for a set of scripts that copy public
|
||||
# header files in one or more source trees into a single, "dist" directory.
|
||||
#
|
||||
# It relies on the two accompanying scripts, ÒCopyList.scriptÓ and
|
||||
# ÒCopyExports.scriptÓ, which must be in the same directory.
|
||||
#
|
||||
# To execute this script, select everything from "# Get the..." to
|
||||
# " the end" and hit the Enter key.
|
||||
#
|
||||
# Known bugs:
|
||||
# Spurious output is produced even when verbose is off.
|
||||
#
|
||||
|
||||
# Uncomment this to get some progress information
|
||||
# set -e verbose 1
|
||||
|
||||
# Get the root of everything
|
||||
|
||||
set moz ""
|
||||
loop
|
||||
set mozillaDir `GetFileName -d -m "Please select the ÒmozillaÓ directory"`
|
||||
#set SourceRootDir
|
||||
(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2:/) #·· dev:null
|
||||
set moz "{¨2}"
|
||||
break if "{moz}" == "mozilla"
|
||||
Alert "Sorry, this only works if you select the folder called ÒmozillaÓ."
|
||||
end loop
|
||||
|
||||
#Calculate the root directory by stripping off the leaf name.
|
||||
(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2/) #·· dev:null
|
||||
Set -e SourceRootDir "{¨1}"
|
||||
Set -e DestRootDir "{mozillaDir}dist:"
|
||||
|
||||
# Ensure the build and stubs folders exist
|
||||
|
||||
if !`exists -d "{mozillaDir}dist"`
|
||||
newfolder "{mozillaDir}dist"
|
||||
end if
|
||||
if !`exists -d "{mozillaDir}dist:client"`
|
||||
newfolder "{mozillaDir}dist:client"
|
||||
end if
|
||||
if !`exists -d "{mozillaDir}dist:client_debug"`
|
||||
newfolder "{mozillaDir}dist:client_debug"
|
||||
end if
|
||||
if !`exists -d "{mozillaDir}dist:client_stubs"`
|
||||
newfolder "{mozillaDir}dist:client_stubs"
|
||||
end if
|
||||
|
||||
"{SourceRootDir}mozilla:build:mac:CopyExports.script" "mozilla:build:mac:MacExportListPublic"
|
||||
|
||||
# the end
|
||||
@@ -26,69 +26,63 @@
|
||||
*/
|
||||
|
||||
/* warning pragmas */
|
||||
#pragma warn_hidevirtual on
|
||||
#pragma warn_emptydecl on
|
||||
#pragma warn_unusedvar on
|
||||
#pragma warn_extracomma on
|
||||
#pragma warn_illpragma on
|
||||
#pragma warn_possunwant on
|
||||
#pragma warn_unusedarg off /* turned off to reduce warnings */
|
||||
#pragma warn_hidevirtual on
|
||||
|
||||
#pragma check_header_flags on
|
||||
#pragma check_header_flags on
|
||||
|
||||
/* Language features that must be the same across libraries... */
|
||||
#pragma enumsalwaysint on
|
||||
#pragma unsigned_char off
|
||||
#pragma exceptions on
|
||||
#pragma bool on
|
||||
#pragma enumsalwaysint on
|
||||
#pragma unsigned_char off
|
||||
#pragma exceptions on
|
||||
#pragma bool on
|
||||
|
||||
|
||||
/* Save as much space as possible with strings... */
|
||||
#pragma pool_strings on
|
||||
#pragma dont_reuse_strings off
|
||||
#pragma dont_reuse_strings off
|
||||
|
||||
#pragma options align=native
|
||||
#pragma sym on /* Takes no memory. OK in non-debug. */
|
||||
#pragma sym on /* Takes no memory. OK in non-debug. */
|
||||
|
||||
|
||||
|
||||
#ifdef powerc /* ...generating PowerPC */
|
||||
#pragma toc_data on
|
||||
#pragma fp_contract on
|
||||
#pragma readonly_strings on
|
||||
#pragma toc_data on
|
||||
#pragma fp_contract on
|
||||
#pragma readonly_strings on
|
||||
|
||||
#ifdef DEBUG
|
||||
#pragma traceback on
|
||||
#pragma global_optimizer off
|
||||
#pragma scheduling off
|
||||
#pragma peephole off
|
||||
#pragma optimize_for_size off
|
||||
#pragma traceback on
|
||||
#pragma global_optimizer off
|
||||
#pragma scheduling off
|
||||
#pragma peephole off
|
||||
#pragma optimize_for_size off
|
||||
#else
|
||||
#pragma traceback off
|
||||
#pragma global_optimizer on
|
||||
#pragma optimization_level 4
|
||||
#pragma scheduling 604
|
||||
#pragma peephole on
|
||||
#pragma optimize_for_size on
|
||||
#pragma traceback off
|
||||
#pragma global_optimizer on
|
||||
#pragma optimization_level 4
|
||||
#pragma scheduling 604
|
||||
#pragma peephole on
|
||||
#pragma optimize_for_size on
|
||||
#endif
|
||||
|
||||
#else /* ...generating 68k */
|
||||
#pragma code68020 on
|
||||
#pragma code68881 off
|
||||
#pragma code68020 on
|
||||
#pragma code68881 off
|
||||
|
||||
/* Far everything... */
|
||||
#pragma far_code
|
||||
#pragma far_data on
|
||||
#pragma far_strings on
|
||||
#pragma far_vtables on
|
||||
#pragma far_data on
|
||||
#pragma far_strings on
|
||||
#pragma far_vtables on
|
||||
|
||||
#pragma fourbyteints on /* 4-byte ints */
|
||||
#pragma IEEEdoubles on /* 8-byte doubles (as required by Java and NSPR) */
|
||||
#pragma fourbyteints on /* 4-byte ints */
|
||||
#pragma IEEEdoubles on /* 8-byte doubles (as required by Java and NSPR) */
|
||||
|
||||
#ifdef DEBUG
|
||||
#pragma macsbug on
|
||||
#pragma macsbug on
|
||||
#pragma oldstyle_symbols off
|
||||
#else
|
||||
#pragma macsbug off
|
||||
#pragma macsbug off
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
#
|
||||
# This is a list of local files which get copied to the mozilla:dist directory
|
||||
#
|
||||
|
||||
IDE_Options.h
|
||||
@@ -1,198 +0,0 @@
|
||||
#!perl -w
|
||||
package 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 vars qw($VERSION @ISA @EXPORT $MacCVSLib);
|
||||
use Mac::StandardFile;
|
||||
use Moz;
|
||||
use Cwd;
|
||||
use Exporter;
|
||||
use File::Basename;
|
||||
|
||||
@ISA = qw(Exporter);
|
||||
@EXPORT = qw( new print checkout);
|
||||
$VERSION = "1.00";
|
||||
|
||||
# Architecture:
|
||||
# cvs session object:
|
||||
# name - session name
|
||||
# session_file - session file
|
||||
#
|
||||
# globals
|
||||
# $MacCVSLib - location of MacCVS applescript library
|
||||
#
|
||||
#
|
||||
|
||||
#
|
||||
# utility routines
|
||||
#
|
||||
|
||||
# just like Mac::DoAppleScript, 1 is success, 0 is failure
|
||||
sub _myDoAppleScript($)
|
||||
{
|
||||
my($script) = @_;
|
||||
my $asresult = MacPerl::DoAppleScript($script);
|
||||
if ($asresult eq "0")
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
print STDERR "AppleScript error: $asresult\n";
|
||||
print STDERR "AppleScript was: \n $script \n";
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
# _useMacCVSLib
|
||||
# returns 1 on success
|
||||
# Search the include path for the file called MacCVSLib
|
||||
sub _useMacCVSLib()
|
||||
{
|
||||
unless ( defined($MacCVSLib) )
|
||||
{
|
||||
my($libname) = "MacCVSLib";
|
||||
# try the directory we were run from
|
||||
my($c) = dirname($0) . ":" . $libname;
|
||||
if ( -e $c)
|
||||
{
|
||||
$MacCVSLib = $c;
|
||||
}
|
||||
else
|
||||
{
|
||||
# now search the include directories
|
||||
foreach (@INC)
|
||||
{
|
||||
unless ( m/^Dev:Pseudo/ ) # This is some bizarre MacPerl special-case directory
|
||||
{
|
||||
$c = $_ . $libname;
|
||||
if (-e $c)
|
||||
{
|
||||
$MacCVSLib = $c;
|
||||
last;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (! (-e $MacCVSLib))
|
||||
{
|
||||
print STDERR "MacCVS lib could not be found! $MacCVSLib";
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# 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 failure
|
||||
sub assertSessionOpen() {
|
||||
my ($self) = shift;
|
||||
_useMacCVSLib() || die "Could not load MacCVSLib\n";
|
||||
my $script = <<END_OF_APPLESCRIPT;
|
||||
tell (load script file "$MacCVSLib") to OpenSession("$self->{session_file}")
|
||||
END_OF_APPLESCRIPT
|
||||
return _myDoAppleScript($script);
|
||||
}
|
||||
|
||||
# prints the cvs object, used mostly for debugging
|
||||
sub print {
|
||||
my($self) = shift;
|
||||
print "MacCVS:: name: ", $self->{name}, " session file: ", $self->{session_file}, "\n";
|
||||
}
|
||||
|
||||
# checkout( self, module, revision, date)
|
||||
# MacCVS checkout command
|
||||
# returns 1 on failure
|
||||
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 = ""; }
|
||||
|
||||
$self->assertSessionOpen() || return 1;
|
||||
|
||||
my $script = <<END_OF_APPLESCRIPT;
|
||||
tell (load script file "$MacCVSLib") to Checkout given sessionName:"$self->{name}", module:"$module", revision:"$revision", date:"$date"
|
||||
END_OF_APPLESCRIPT
|
||||
return _myDoAppleScript($script);
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
=cut
|
||||
|
||||
__END__
|
||||
Binary file not shown.
@@ -1,152 +0,0 @@
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
# This is a list of paths to export.mac files, and destination
|
||||
# directories for the copied headers. Destinations are relative
|
||||
# to "mozilla:dist".
|
||||
|
||||
###################
|
||||
# PUBLIC TREE
|
||||
###################
|
||||
|
||||
#INCLUDE
|
||||
mozilla:config:mac:export.mac :config
|
||||
mozilla:include:export.mac :include
|
||||
mozilla:cmd:macfe:pch:export.mac :include
|
||||
|
||||
#MAC_COMMON
|
||||
mozilla:build:mac:export.mac :mac:common
|
||||
mozilla:lib:mac:NSStdLib:include:export.mac :mac:common
|
||||
mozilla:lib:mac:MacMemoryAllocator:include:export.mac :mac:common
|
||||
mozilla:lib:mac:Misc:export.mac :mac:common
|
||||
mozilla:lib:mac:MoreFiles:export.mac :mac:common:morefiles
|
||||
mozilla:cmd:macfe:export.mac :mac:macfe
|
||||
|
||||
#NSPR
|
||||
mozilla:nsprpub:pr:include:export.mac :nspr
|
||||
mozilla:nsprpub:pr:src:md:mac:export.mac :nspr:mac
|
||||
mozilla:nsprpub:lib:ds:export.mac :nspr
|
||||
mozilla:nsprpub:lib:libc:include:export.mac :nspr
|
||||
mozilla:nsprpub:lib:msgc:include:export.mac :nspr
|
||||
|
||||
#DBM
|
||||
mozilla:dbm:include:export.mac :dbm
|
||||
|
||||
#LIBIMAGE
|
||||
mozilla:modules:libimg:png:export.mac :libimg
|
||||
mozilla:modules:libimg:src:export.mac :libimg
|
||||
mozilla:modules:libimg:public:export.mac :libimg
|
||||
|
||||
#SECURITY_freenav
|
||||
mozilla:modules:security:freenav:export.mac :security
|
||||
|
||||
#XPCOM
|
||||
mozilla:xpcom:src:export.mac :xpcom
|
||||
|
||||
#ZLIB
|
||||
mozilla:modules:zlib:src:export.mac :zlib
|
||||
|
||||
#JPEG
|
||||
mozilla:jpeg:export.mac :jpeg
|
||||
|
||||
#JSJ
|
||||
mozilla:js:jsj:export.mac :jsj
|
||||
|
||||
#JSDEBUG
|
||||
mozilla:js:jsd:export.mac :jsdebug
|
||||
|
||||
#JS
|
||||
mozilla:js:src:export.mac :js
|
||||
|
||||
#RDF
|
||||
mozilla:modules:rdf:include:export.mac :rdf
|
||||
|
||||
#XML
|
||||
mozilla:modules:xml:glue:export.mac :xml
|
||||
mozilla:modules:xml:expat:xmlparse:export.mac :xml
|
||||
|
||||
#LIBFONT
|
||||
mozilla:modules:libfont:public:export.mac :libfont
|
||||
mozilla:modules:libfont:src:export.mac :libfont
|
||||
|
||||
#SCHEDULER
|
||||
mozilla:modules:schedulr:public:export.mac :schedulr
|
||||
|
||||
#NETWORK
|
||||
mozilla:network:cache:export.mac :network
|
||||
mozilla:network:client:export.mac :network
|
||||
mozilla:network:cnvts:export.mac :network
|
||||
mozilla:network:cstream:export.mac :network
|
||||
mozilla:network:main:export.mac :network
|
||||
mozilla:network:protocol:about:export.mac :network
|
||||
mozilla:network:protocol:certld:export.mac :network
|
||||
mozilla:network:protocol:dataurl:export.mac :network
|
||||
mozilla:network:protocol:file:export.mac :network
|
||||
mozilla:network:protocol:ftp:export.mac :network
|
||||
mozilla:network:protocol:gopher:export.mac :network
|
||||
mozilla:network:protocol:http:export.mac :network
|
||||
mozilla:network:protocol:js:export.mac :network
|
||||
mozilla:network:protocol:mailbox:export.mac :network
|
||||
mozilla:network:protocol:marimba:export.mac :network
|
||||
mozilla:network:protocol:nntp:export.mac :network
|
||||
mozilla:network:protocol:pop3:export.mac :network
|
||||
mozilla:network:protocol:remote:export.mac :network
|
||||
mozilla:network:protocol:smtp:export.mac :network
|
||||
|
||||
#HTML_DIALOGS
|
||||
mozilla:lib:htmldlgs:export.mac :htmldlgs
|
||||
|
||||
#LAYOUT
|
||||
mozilla:lib:layout:export.mac :layout
|
||||
|
||||
#LAYERS
|
||||
mozilla:lib:liblayer:include:export.mac :layers
|
||||
|
||||
#PARSE
|
||||
mozilla:lib:libparse:export.mac :libparse
|
||||
|
||||
#STYLE
|
||||
mozilla:lib:libstyle:export.mac :libstyle
|
||||
|
||||
#LIBHOOK
|
||||
mozilla:modules:libhook:public:export.mac :libhook
|
||||
|
||||
#LIBPREF
|
||||
mozilla:modules:libpref:public:export.mac :libpref
|
||||
|
||||
#LIBREG
|
||||
mozilla:modules:libreg:include:export.mac :libreg
|
||||
|
||||
#LIBUTIL
|
||||
mozilla:modules:libutil:public:export.mac :libutil
|
||||
|
||||
#OJI
|
||||
mozilla:modules:oji:src:export.mac :oji
|
||||
|
||||
#PROGRESS
|
||||
mozilla:modules:progress:public:export.mac :progress
|
||||
|
||||
#SOFTUPDATE
|
||||
mozilla:modules:softupdt:include:export.mac :softupdate
|
||||
|
||||
#NAV_JAVA
|
||||
mozilla:nav-java:stubs:macjri:export.mac :nav-java:macjri
|
||||
mozilla:nav-java:stubs:include:export.mac :nav-java
|
||||
|
||||
#SUN_JAVA
|
||||
mozilla:sun-java:stubs:include:export.mac :sun-java:include
|
||||
mozilla:sun-java:stubs:macjri:export.mac :sun-java:macjri
|
||||
Binary file not shown.
@@ -1,43 +1,30 @@
|
||||
=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.
|
||||
|
||||
=cut
|
||||
|
||||
|
||||
#!perl
|
||||
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
package Moz;
|
||||
require Exporter;
|
||||
|
||||
@ISA = qw(Exporter);
|
||||
@EXPORT = qw(BuildProject BuildProjectClean OpenErrorLog MakeAlias StopForErrors DontStopForErrors InstallFromManifest);
|
||||
@EXPORT_OK = qw(CloseErrorLog UseCodeWarriorLib QUIET);
|
||||
@EXPORT = qw();
|
||||
@EXPORT_OK = qw(BuildProject,OpenErrorLog,CloseErrorLog,UseCodeWarriorLib,Configure,StopForErrors,DontStopForErrors);
|
||||
|
||||
use Cwd;
|
||||
use File::Path;
|
||||
use ExtUtils::Manifest 'maniread';
|
||||
|
||||
sub current_directory()
|
||||
{
|
||||
@@ -62,16 +49,6 @@ sub full_path_to($)
|
||||
return $path;
|
||||
}
|
||||
|
||||
=head2 Setup
|
||||
|
||||
Pretty much, everything is taken care of for you.
|
||||
However, B<Moz> does use a little compiled AppleScript library (the file CodeWarriorLib) for some of its communcication with CodeWarrior.
|
||||
If this library isn't in the same directory as "Moz.pm", then you need to tell B<Moz> where to find it.
|
||||
Call C<UseCodeWarriorLib($path_to_CodeWarriorLib)>.
|
||||
This routine is not exported by default, nor are you likely to need it.
|
||||
|
||||
=cut
|
||||
|
||||
sub UseCodeWarriorLib($)
|
||||
{
|
||||
($CodeWarriorLib) = @_;
|
||||
@@ -91,25 +68,15 @@ BEGIN
|
||||
activate_CodeWarrior();
|
||||
}
|
||||
|
||||
sub Configure($)
|
||||
{
|
||||
my ($config_file) = @_;
|
||||
# read in the configuration file
|
||||
}
|
||||
|
||||
$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()
|
||||
{
|
||||
@@ -117,12 +84,9 @@ sub CloseErrorLog()
|
||||
{
|
||||
close(ERROR_LOG);
|
||||
$logging = 0;
|
||||
StopForErrors() if $stop_on_1st_error;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
sub OpenErrorLog($)
|
||||
{
|
||||
my ($log_file) = @_;
|
||||
@@ -140,28 +104,9 @@ sub OpenErrorLog($)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
=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()
|
||||
@@ -199,7 +144,7 @@ sub log_recent_errors($)
|
||||
|
||||
while( <RECENT_ERRORS> )
|
||||
{
|
||||
if ( /^Error/ || /^CouldnÕt find project file/ )
|
||||
if ( $_ =~ m/^Error/ )
|
||||
{
|
||||
$found_errors = 1;
|
||||
}
|
||||
@@ -217,9 +162,9 @@ sub log_recent_errors($)
|
||||
}
|
||||
}
|
||||
|
||||
sub build_project($$$)
|
||||
sub BuildProject($;$)
|
||||
{
|
||||
my ($project_path, $target_name, $clean_build) = @_;
|
||||
my ($project_path, $target_name) = @_;
|
||||
$project_path = full_path_to($project_path);
|
||||
|
||||
$project_path =~ m/.+:(.+)/;
|
||||
@@ -227,18 +172,9 @@ sub build_project($$$)
|
||||
|
||||
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\"\n";
|
||||
|
||||
$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)
|
||||
tell (load script file "$CodeWarriorLib") to BuildProject("$project_path", "$project_name", "$target_name", "$recent_errors_file")
|
||||
END_OF_APPLESCRIPT
|
||||
|
||||
# Append any errors to the globally accumulated log file
|
||||
@@ -248,121 +184,4 @@ END_OF_APPLESCRIPT
|
||||
}
|
||||
}
|
||||
|
||||
=head2 Getting CodeWarrior to build projects - C<BuildProject($project, $opt_target)>, C<BuildProjectClean($project, $opt_target)>
|
||||
|
||||
C<BuildProject()> and C<BuildProjectClean()> are identical, except that the latter first removes object code.
|
||||
In both, CodeWarrior opens the project if it wasn't already open; builds the given (or else current) target; and finally closes
|
||||
the project, if it wasn't already open.
|
||||
|
||||
=cut
|
||||
|
||||
sub BuildProject($;$)
|
||||
{
|
||||
my ($project_path, $target_name) = @_;
|
||||
build_project($project_path, $target_name, "false");
|
||||
}
|
||||
|
||||
sub BuildProjectClean($;$)
|
||||
{
|
||||
my ($project_path, $target_name) = @_;
|
||||
build_project($project_path, $target_name, "true");
|
||||
}
|
||||
|
||||
|
||||
=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\";";
|
||||
# die "$message symlink doesn't work on directories.\n" if -d $old_file;
|
||||
die "$message because \"$old_file\" doesn't exist.\n" unless -e $old_file;
|
||||
|
||||
unlink $new_file;
|
||||
# print "symlink(\"$old_file\", \"$new_file\");\n";
|
||||
symlink($old_file, $new_file) || die "$message symlink returned an unexpected error.\n";
|
||||
}
|
||||
|
||||
|
||||
=pod
|
||||
|
||||
C<InstallFromManifest()>
|
||||
|
||||
=cut
|
||||
|
||||
sub InstallFromManifest($;$)
|
||||
{
|
||||
my ($manifest_file, $dest_dir) = @_;
|
||||
|
||||
$dest_dir ||= ":";
|
||||
|
||||
$manifest_file =~ m/(.+):/;
|
||||
my $source_dir = $1;
|
||||
|
||||
chop($dest_dir) if $dest_dir =~ m/:$/;
|
||||
|
||||
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 ( $file =~ /:.+:/ )
|
||||
{
|
||||
$subdir = $&;
|
||||
}
|
||||
|
||||
$file = ":$file" unless $file =~ m/^:/;
|
||||
MakeAlias("$source_dir$file", "$dest_dir$subdir");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
1;
|
||||
|
||||
=head1 AUTHORS
|
||||
|
||||
Scott Collins <scc@netscape.com>, Simon Fraser <sfraser@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.0 (the "NPL"); you may not use this file except in
|
||||
compliance with the NPL. You may obtain a copy of the NPL at
|
||||
http://www.mozilla.org/NPL/
|
||||
|
||||
Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
for the specific language governing rights and limitations under the
|
||||
NPL.
|
||||
|
||||
The Initial Developer of this code under the NPL is Netscape
|
||||
Communications Corporation. Portions created by Netscape are
|
||||
Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
Reserved.
|
||||
|
||||
=cut
|
||||
1;
|
||||
@@ -1,341 +0,0 @@
|
||||
#!perl -w
|
||||
package NGLayoutBuildList;
|
||||
|
||||
require 5.004;
|
||||
require Exporter;
|
||||
|
||||
use strict;
|
||||
use vars qw( @ISA @EXPORT );
|
||||
|
||||
# perl includes
|
||||
use Mac::StandardFile;
|
||||
use Cwd;
|
||||
use File::Path;
|
||||
|
||||
# homegrown
|
||||
use Moz;
|
||||
use MacCVS;
|
||||
|
||||
@ISA = qw(Exporter);
|
||||
@EXPORT = qw( Checkout BuildDist BuildProjects);
|
||||
|
||||
# NGLayoutBuildList builds the nglayout project
|
||||
# it is configured by setting the following variables in the caller:
|
||||
# Usage:
|
||||
# caller variables that affect behaviour:
|
||||
# DEBUG : 1 if we are building a debug version
|
||||
# 3-part build process: checkout, dist, and build_projects
|
||||
# Hack alert:
|
||||
# NGLayout defines are located in :mozilla:config:mac:NGLayoutConfigInclude.h
|
||||
# An alias "MacConfigInclude.h" to this file is created inside dist:config
|
||||
# Note that the name of alias is different than the name of the file. This
|
||||
# is to trick CW into including NGLayout defines
|
||||
|
||||
#
|
||||
# Utility routines
|
||||
#
|
||||
|
||||
# pickWithMemoryFile stores the information about the user pick inside
|
||||
# the file $session_storage
|
||||
sub _pickWithMemoryFile($)
|
||||
{
|
||||
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))
|
||||
{
|
||||
# prompt user for the file name, and store it
|
||||
print "Choose a CVS session file in file dialog box:\n"; # no way to display a prompt?
|
||||
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\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
return $cvsfile;
|
||||
}
|
||||
|
||||
# assert that we are in the correct directory for the build
|
||||
sub _assertRightDirectory()
|
||||
{
|
||||
unless (-e ":mozilla")
|
||||
{
|
||||
my($dir) = cwd();
|
||||
print STDERR "NGLayoutBuildList called from incorrect directory: $dir";
|
||||
}
|
||||
}
|
||||
|
||||
sub _getDistDirectory()
|
||||
{
|
||||
return $main::DEBUG ? ":mozilla:dist:client_debug:" : ":mozilla:dist:client:";
|
||||
}
|
||||
|
||||
#
|
||||
# MAIN ROUTINES
|
||||
#
|
||||
sub Checkout()
|
||||
{
|
||||
_assertRightDirectory();
|
||||
my($cvsfile) = _pickWithMemoryFile("::nglayout.cvsloc");
|
||||
my($session) = MacCVS->new( $cvsfile );
|
||||
unless (defined($session)) { die "Checkout aborted. Cannot create session file: $session" }
|
||||
|
||||
if ($main::pull{lizard})
|
||||
{
|
||||
$session->checkout("mozilla/LICENSE") || die "checkout failure";
|
||||
$session->checkout("mozilla/LEGAL") || die "checkout failure";
|
||||
$session->checkout("mozilla/config") || die "checkout failure";
|
||||
$session->checkout("mozilla/lib/liblayer") || die "checkout failure";
|
||||
$session->checkout("mozilla/modules/zlib") || die "checkout failure";
|
||||
$session->checkout("mozilla/modules/libutil") || die "checkout failure";
|
||||
$session->checkout("mozilla/nsprpub") || die "checkout failure";
|
||||
$session->checkout("mozilla/sun-java") || die "checkout failure";
|
||||
$session->checkout("mozilla/nav-java") || die "checkout failure";
|
||||
$session->checkout("mozilla/js") || die "checkout failure";
|
||||
$session->checkout("mozilla/modules/security/freenav") || die "checkout failure";
|
||||
$session->checkout("mozilla/modules/libpref") || die "checkout failure";
|
||||
}
|
||||
if ($main::pull{xpcom})
|
||||
{
|
||||
$session->checkout("mozilla/modules/libreg ") || die "checkout failure";
|
||||
$session->checkout("mozilla/xpcom") || die "checkout failure";
|
||||
}
|
||||
if ($main::pull{imglib})
|
||||
{
|
||||
my($IMGLIB_BRANCH) = "MODULAR_IMGLIB_BRANCH";
|
||||
|
||||
$session->checkout("mozilla/jpeg ", $IMGLIB_BRANCH) || die "checkout failure";
|
||||
$session->checkout("mozilla/modules/libutil", $IMGLIB_BRANCH) || die "checkout failure";
|
||||
$session->checkout("mozilla/modules/libimg", $IMGLIB_BRANCH) || die "checkout failure";
|
||||
}
|
||||
if ($main::pull{netlib})
|
||||
{
|
||||
$session->checkout("mozilla/lib/xp ") || die "checkout failure";
|
||||
$session->checkout("mozilla/network") || die "checkout failure";
|
||||
$session->checkout("mozilla/include") || die "checkout failure";
|
||||
}
|
||||
if ($main::pull{nglayout})
|
||||
{
|
||||
$session->checkout("mozilla/base ") || die "checkout failure";
|
||||
$session->checkout("mozilla/dom") || die "checkout failure";
|
||||
$session->checkout("mozilla/gfx") || die "checkout failure";
|
||||
$session->checkout("mozilla/htmlparser") || die "checkout failure";
|
||||
$session->checkout("mozilla/layout") || die "checkout failure";
|
||||
$session->checkout("mozilla/view") || die "checkout failure";
|
||||
$session->checkout("mozilla/webshell") || die "checkout failure";
|
||||
$session->checkout("mozilla/widget") || die "checkout failure";
|
||||
}
|
||||
if ($main::pull{mac})
|
||||
{
|
||||
$session->checkout("mozilla/build/mac ") || die "checkout failure";
|
||||
$session->checkout("mozilla/cmd/macfe") || die "checkout failure";
|
||||
$session->checkout("mozilla/lib/mac/MacMemoryAllocator") || die "checkout failure";
|
||||
$session->checkout("mozilla/lib/mac/NSStdLib") || die "checkout failure";
|
||||
$session->checkout("mozilla/lib/mac/MoreFiles") || die "checkout failure";
|
||||
$session->checkout("mozilla/lib/mac/NSRuntime") || die "checkout failure";
|
||||
}
|
||||
}
|
||||
|
||||
# builds the dist directory
|
||||
sub BuildDist()
|
||||
{
|
||||
unless ( $main::build{dist} ) { return;}
|
||||
_assertRightDirectory();
|
||||
|
||||
# we really do not need all these paths, but many client projects include them
|
||||
mkpath([ ":mozilla:dist:", ":mozilla:dist:client:", ":mozilla:dist:client_debug:", ":mozilla:dist:client_stubs:" ]);
|
||||
|
||||
my($distdirectory) = ":mozilla:dist";
|
||||
|
||||
my($distlist) = [
|
||||
#MAC_COMMON
|
||||
[":mozilla:build:mac:MANIFEST", "$distdirectory:mac:common:"],
|
||||
[":mozilla:lib:mac:NSStdLib:include:MANIFEST", "$distdirectory:mac:common:"],
|
||||
[":mozilla:lib:mac:MacMemoryAllocator:include:MANIFEST", "$distdirectory:mac:common:"],
|
||||
[":mozilla:lib:mac:Misc:MANIFEST", "$distdirectory:mac:common:"],
|
||||
[":mozilla:lib:mac:MoreFiles:MANIFEST", "$distdirectory:mac:common:morefiles:"],
|
||||
#INCLUDE
|
||||
[":mozilla:config:mac:MANIFEST", "$distdirectory:config:"],
|
||||
[":mozilla:include:MANIFEST", "$distdirectory:include:"],
|
||||
[":mozilla:cmd:macfe:pch:MANIFEST", "$distdirectory:include:"],
|
||||
#NSPR
|
||||
[":mozilla:nsprpub:pr:include:MANIFEST", "$distdirectory:nspr:"],
|
||||
[":mozilla:nsprpub:pr:src:md:mac:MANIFEST", "$distdirectory:nspr:mac:"],
|
||||
[":mozilla:nsprpub:lib:ds:MANIFEST", "$distdirectory:nspr:"],
|
||||
[":mozilla:nsprpub:lib:libc:include:MANIFEST", "$distdirectory:nspr:"],
|
||||
[":mozilla:nsprpub:lib:msgc:include:MANIFEST", "$distdirectory:nspr:"],
|
||||
#JPEG
|
||||
[":mozilla:jpeg:MANIFEST", "$distdirectory:jpeg:"],
|
||||
#LIBREG
|
||||
[":mozilla:modules:libreg:include:MANIFEST", "$distdirectory:libreg:"],
|
||||
#XPCOM
|
||||
[":mozilla:xpcom:src:MANIFEST", "$distdirectory:xpcom:"],
|
||||
#ZLIB
|
||||
[":mozilla:modules:zlib:src:MANIFEST", "$distdirectory:zlib:"],
|
||||
#LIBUTIL
|
||||
[":mozilla:modules:libutil:public:MANIFEST", "$distdirectory:libutil:"],
|
||||
#SUN_JAVA
|
||||
[":mozilla:sun-java:stubs:include:MANIFEST", "$distdirectory:sun-java:"],
|
||||
[":mozilla:sun-java:stubs:macjri:MANIFEST", "$distdirectory:sun-java:"],
|
||||
#NAV_JAVA
|
||||
[":mozilla:nav-java:stubs:include:MANIFEST", "$distdirectory:nav-java:"],
|
||||
[":mozilla:nav-java:stubs:macjri:MANIFEST", "$distdirectory:nav-java:"],
|
||||
#JS
|
||||
[":mozilla:js:src:MANIFEST", "$distdirectory:js:"],
|
||||
#SECURITY_freenav
|
||||
[":mozilla:modules:security:freenav:MANIFEST", "$distdirectory:security:"],
|
||||
#LIBPREF
|
||||
[":mozilla:modules:libpref:public:MANIFEST", "$distdirectory:libpref:"],
|
||||
#LIBIMAGE
|
||||
[":mozilla:modules:libimg:png:MANIFEST", "$distdirectory:libimg:"],
|
||||
[":mozilla:modules:libimg:src:MANIFEST", "$distdirectory:libimg:"],
|
||||
[":mozilla:modules:libimg:public:MANIFEST", "$distdirectory:libimg:"],
|
||||
#NETWORK
|
||||
[":mozilla:network:cache:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:client:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:cnvts:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:cstream:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:main:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:mimetype:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:util:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:about:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:certld:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:dataurl:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:file:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:ftp:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:gopher:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:http:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:js:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:mailbox:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:marimba:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:nntp:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:pop3:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:remote:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:protocol:smtp:MANIFEST", "$distdirectory:network:"],
|
||||
[":mozilla:network:module:MANIFEST","$distdirectory:network:module"],
|
||||
#BASE
|
||||
[":mozilla:base:src:MANIFEST", "$distdirectory:base:"],
|
||||
[":mozilla:base:public:MANIFEST", "$distdirectory:base:"],
|
||||
#WEBSHELL
|
||||
[":mozilla:webshell:public:MANIFEST", "$distdirectory:webshell:"],
|
||||
#LAYOUT
|
||||
[":mozilla:layout:base:public:MANIFEST", "$distdirectory:layout:"],
|
||||
[":mozilla:layout:html:style:public:MANIFEST", "$distdirectory:layout:"],
|
||||
[":mozilla:layout:html:document:public:MANIFEST", "$distdirectory:layout:"],
|
||||
#WIDGET
|
||||
[":mozilla:widget:public:MANIFEST", "$distdirectory:widget:"],
|
||||
#GFX
|
||||
[":mozilla:gfx:src:MANIFEST", "$distdirectory:gfx:"],
|
||||
#VIEW
|
||||
[":mozilla:view:public:MANIFEST", "$distdirectory:view:"],
|
||||
#DOM
|
||||
[":mozilla:dom:public:MANIFEST", "$distdirectory:dom:"],
|
||||
[":mozilla:dom:public:coreDom:MANIFEST", "$distdirectory:dom:"],
|
||||
[":mozilla:dom:public:coreEvents:MANIFEST", "$distdirectory:dom:"],
|
||||
[":mozilla:dom:public:events:MANIFEST", "$distdirectory:dom:"],
|
||||
#HTMLPARSER
|
||||
[":mozilla:htmlparser:src:MANIFEST", "$distdirectory:htmlparser:"],
|
||||
|
||||
];
|
||||
foreach $a (@$distlist)
|
||||
{
|
||||
InstallFromManifest( $a->[0], $a->[1]);
|
||||
}
|
||||
|
||||
# To get out defines in all the project, dummy alias NGLayoutConfigInclude.h into MacConfigInclude.h
|
||||
MakeAlias(":mozilla:config:mac:NGLayoutConfigInclude.h", ":mozilla:dist:config:MacConfigInclude.h");
|
||||
}
|
||||
|
||||
# builds all projects
|
||||
# different targets controlled by $main::build
|
||||
sub BuildCommonProjects()
|
||||
{
|
||||
unless( $main::build{projects} ) { return; }
|
||||
_assertRightDirectory();
|
||||
|
||||
# $D becomes a suffix to target names for selecting either the debug or non-debug target of a project
|
||||
my($D) = $main::DEBUG ? "Debug" : "";
|
||||
my($dist_dir) = _getDistDirectory();
|
||||
|
||||
Moz::BuildProjectClean(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp", "Stubs");
|
||||
Moz::BuildProjectClean(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp", "Stubs");
|
||||
Moz::BuildProjectClean(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp", "Stubs");
|
||||
|
||||
Moz::BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp");
|
||||
MakeAlias(":mozilla:lib:mac:NSRuntime:NSRuntime$D.shlb", "$dist_dir");
|
||||
|
||||
Moz::BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.mcp");
|
||||
MakeAlias(":mozilla:lib:mac:MoreFiles:build:MoreFiles$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp", "NSPR20$D.shlb");
|
||||
MakeAlias(":mozilla:nsprpub:macbuild:NSPR20$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp", "MemAllocator$D.shlb");
|
||||
MakeAlias(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp", "NSStdLib$D.shlb");
|
||||
MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb", "$dist_dir");
|
||||
|
||||
# BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp", "Security.o");
|
||||
|
||||
BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp", "xpcom$D.shlb");
|
||||
MakeAlias(":mozilla:xpcom:macbuild:xpcom$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp", "JPEG$D.shlb");
|
||||
MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":mozilla:modules:libimg:macbuild:png.mcp", "png$D.o");
|
||||
|
||||
BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp", "libimg$D.o");
|
||||
|
||||
}
|
||||
|
||||
sub BuildLayoutProjects()
|
||||
{
|
||||
unless( $main::build{projects} ) { return; }
|
||||
_assertRightDirectory();
|
||||
|
||||
# $D becomes a suffix to target names for selecting either the debug or non-debug target of a project
|
||||
my($D) = $main::DEBUG ? "Debug" : "";
|
||||
my($dist_dir) = _getDistDirectory();
|
||||
|
||||
BuildProject(":mozilla:htmlparser:macbuild:htmlparser.mcp", "htmlparser$D.o");
|
||||
|
||||
BuildProject(":mozilla:dom:macbuild:dom.mcp", "dom$D.o");
|
||||
|
||||
BuildProject(":mozilla:gfx:macbuild:gfx.mcp", "gfx$D.o");
|
||||
|
||||
BuildProject(":mozilla:layout:macbuild:layout.mcp", "layout$D.o");
|
||||
|
||||
BuildProject(":mozilla:webshell:macbuild:webshell.mcp", "webshell$D.o");
|
||||
|
||||
}
|
||||
|
||||
sub BuildProjects()
|
||||
{
|
||||
BuildCommonProjects();
|
||||
BuildLayoutProjects();
|
||||
}
|
||||
@@ -16,8 +16,6 @@
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
#error "DonÕt use me!"
|
||||
|
||||
#define OLDROUTINELOCATIONS 0
|
||||
#define XP_MAC 1
|
||||
#ifndef NSPR20
|
||||
@@ -29,9 +27,6 @@
|
||||
#define NETSCAPE 1
|
||||
#define OTUNIXERRORS 1 /* We want OpenTransport error codes */
|
||||
|
||||
#define OJI 1
|
||||
#define MOCHA 1
|
||||
|
||||
/*
|
||||
This compiles in heap dumping utilities and other good stuff
|
||||
for developers -- maybe we only want it in for a special SDK
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
#!perl
|
||||
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
use Moz;
|
||||
use BuildList;
|
||||
|
||||
$DEBUG = 1;
|
||||
$MOZ_LITE = 0; # build moz medium. This will come from a config file at some stage.
|
||||
$MOZ_LDAP = 1;
|
||||
|
||||
Moz::OpenErrorLog("::::Mozilla.BuildLog");
|
||||
#Moz::StopForErrors();
|
||||
|
||||
chdir("::::");
|
||||
|
||||
# Make and popuplate the dist directory
|
||||
DistMozilla();
|
||||
|
||||
# Now build the projects
|
||||
BuildMozilla();
|
||||
@@ -1,5 +0,0 @@
|
||||
#
|
||||
# This is a list of local files which get copied to the mozilla:dist directory
|
||||
#
|
||||
|
||||
IDE_Options.h
|
||||
@@ -1,26 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
/*
|
||||
The only job of this file is for make dependencies:
|
||||
include files here that you want to cause MakeDist
|
||||
to happen again when they change.
|
||||
*/
|
||||
|
||||
|
||||
#include "MacExportListPublic"
|
||||
@@ -1,76 +0,0 @@
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
# This is the controlling script for a set of scripts that copy public
|
||||
# header files in one or more source trees into a single, "dist" directory.
|
||||
#
|
||||
# It relies on the two accompanying scripts, ÒCopyList.scriptÓ and
|
||||
# ÒCopyExports.scriptÓ, which must be in the same directory.
|
||||
#
|
||||
#
|
||||
# Known bugs:
|
||||
# Header files are always copied if the export.mac file contains
|
||||
# non-local paths.
|
||||
# Spurious output is produced even when verbose is off.
|
||||
#
|
||||
|
||||
set echo 0
|
||||
|
||||
Evaluate % = ("{{SourceFile}}" =~ /(Å:)¨0Å/)
|
||||
Directory "{{¨0}}"
|
||||
|
||||
set mozillaDir "{¨0}"
|
||||
if `evaluate "{mozillaDir}" =~ /(Å:)¨1[Â:]+:[Â:]+:/`
|
||||
set -e mozillaDir "{¨1}"
|
||||
else
|
||||
echo "Failed to find mozilla directory. Exitting"
|
||||
exit 1;
|
||||
end if
|
||||
|
||||
# Sanity check for mozilla
|
||||
|
||||
if !`exists -d "{mozillaDir}"`
|
||||
echo "Failed to find mozilla directory. Exitting"
|
||||
exit 1;
|
||||
end if
|
||||
|
||||
# Calculate the root directory by stripping off the leaf name.
|
||||
|
||||
(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2:/)
|
||||
Set -e SourceRootDir "{¨1}"
|
||||
Set -e DestRootDir "{mozillaDir}dist:"
|
||||
|
||||
# Ensure the build and stubs folders exist
|
||||
|
||||
if !`exists -d "{mozillaDir}dist"`
|
||||
newfolder "{mozillaDir}dist"
|
||||
end if
|
||||
if !`exists -d "{mozillaDir}dist:client"`
|
||||
newfolder "{mozillaDir}dist:client"
|
||||
end if
|
||||
if !`exists -d "{mozillaDir}dist:client_debug"`
|
||||
newfolder "{mozillaDir}dist:client_debug"
|
||||
end if
|
||||
if !`exists -d "{mozillaDir}dist:client_stubs"`
|
||||
newfolder "{mozillaDir}dist:client_stubs"
|
||||
end if
|
||||
|
||||
# Now do the grunt work of copying headers. This can take some time
|
||||
|
||||
"{SourceRootDir}mozilla:build:mac:CopyExports.script" "mozilla:build:mac:MacExportListPublic"
|
||||
|
||||
|
||||
@@ -24,13 +24,22 @@ MOZ_TOP=mozilla
|
||||
!endif
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#// Defines specific to MOZ_NGLAYOUT
|
||||
#// Defines specific to MOZ_RAPTOR
|
||||
#//------------------------------------------------------------------------
|
||||
!if defined(MOZ_NGLAYOUT)
|
||||
NGLAYOUT_MAKEFILE=nglayout.mak
|
||||
NGLAYOUT_ENV_VARS=STANDALONE_IMAGE_LIB=1 MODULAR_NETLIB=1 NGLAYOUT_BUILD_PREFIX=1
|
||||
MOZNGLAYOUT_BRANCH=RAPTOR_INTEGRATION0_BRANCH
|
||||
!if defined(MOZ_RAPTOR)
|
||||
RAPTOR_MAKEFILE=raptor.mak
|
||||
|
||||
CVSCO = cvs -q co -P
|
||||
|
||||
# Branch tags we use
|
||||
NETLIB_BRANCH = MODULAR_NETLIB_BRANCH
|
||||
MOZRAPTOR_BRANCH = RAPTOR_INTEGRATION0_BRANCH
|
||||
|
||||
# CVS commands to pull the appropriate branch versions
|
||||
CVSCO_NETLIB = $(CVSCO) -r $(NETLIB_BRANCH)
|
||||
CVSCO_CONFIG = $(CVSCO) -r $(MOZRAPTOR_BRANCH)
|
||||
|
||||
MOZ_BRANCH=$(MOZRAPTOR_BRANCH)
|
||||
!endif
|
||||
|
||||
|
||||
@@ -79,64 +88,45 @@ pull_clobber_build_all:: pull_all \
|
||||
clobber_build_all:: clobber_all \
|
||||
build_all
|
||||
|
||||
!if defined(MOZ_NGLAYOUT)
|
||||
# The MOZ_NGLAYOUT pull is complicated, be very careful choosing which files are on
|
||||
# the tip and which are on the branches.
|
||||
pull_all:: pull_client_source_product pull_nglayout pull_netlib repull_ngl_integration pull_imglib repull_include
|
||||
!if defined(MOZ_RAPTOR)
|
||||
pull_all:: pull_client_source_product pull_raptor pull_netlib
|
||||
!else
|
||||
pull_all:: pull_client_source_product
|
||||
!endif
|
||||
|
||||
!if defined(MOZ_NGLAYOUT)
|
||||
pull_nglayout:
|
||||
!if defined(MOZ_RAPTOR)
|
||||
pull_raptor:
|
||||
@cd $(MOZ_SRC)
|
||||
$(CVSCO) $(MOZ_TOP)/$(NGLAYOUT_MAKEFILE)
|
||||
$(CVSCO) $(MOZ_TOP)/raptor.mak
|
||||
@cd $(MOZ_SRC)/$(MOZ_TOP)
|
||||
$(NMAKE) -f $(NGLAYOUT_MAKEFILE) pull_nglayout $(NGLAYOUT_ENV_VARS)
|
||||
$(NMAKE) -f $(RAPTOR_MAKEFILE) pull_xpcom pull_imglib pull_raptor
|
||||
|
||||
pull_netlib:
|
||||
@cd $(MOZ_SRC)/$(MOZ_TOP)
|
||||
$(NMAKE) -f $(NGLAYOUT_MAKEFILE) pull_netlib $(NGLAYOUT_ENV_VARS)
|
||||
|
||||
# Here is where we pull everything on the layout integration branch
|
||||
repull_ngl_integration:
|
||||
@cd $(MOZ_SRC)
|
||||
$(CVSCO) -r $(MOZNGLAYOUT_BRANCH) $(MOZ_TOP)/include $(MOZ_TOP)/cmd $(MOZ_TOP)/lib $(MOZ_TOP)/modules
|
||||
@cd $(MOZ_SRC)/$(MOZ_TOP)
|
||||
|
||||
# Careful to put this after repull_ngl_integration, want modules/libutil and
|
||||
# modules/libimg to be on imglib branch
|
||||
pull_imglib:
|
||||
@cd $(MOZ_SRC)/$(MOZ_TOP)
|
||||
$(NMAKE) -f $(NGLAYOUT_MAKEFILE) pull_imglib $(NGLAYOUT_ENV_VARS)
|
||||
|
||||
# Want certain files in the include directory to be on the tip
|
||||
repull_include:
|
||||
@cd $(MOZ_SRC)
|
||||
$(CVSCO) -A $(MOZ_TOP)/include/net.h
|
||||
@cd $(MOZ_SRC)\.
|
||||
$(CVSCO_NETLIB) $(MOZ_TOP)/lib/xp
|
||||
$(CVSCO_NETLIB) $(MOZ_TOP)/lib/libnet
|
||||
$(CVSCO_NETLIB) $(MOZ_TOP)/include/net.h $(MOZ_TOP)/include/npapi.h
|
||||
!endif
|
||||
|
||||
|
||||
pull_client_source_product:
|
||||
@echo +++ client.mak: checking out the client with "$(CVS_BRANCH)"
|
||||
cd $(MOZ_SRC)\.
|
||||
-cvs -q co $(CVS_BRANCH) MozillaSourceWin
|
||||
|
||||
|
||||
!if defined(MOZ_NGLAYOUT)
|
||||
# Build NGLayout first.
|
||||
build_all: build_nglayout \
|
||||
!if defined(MOZ_RAPTOR)
|
||||
build_all: build_raptor \
|
||||
build_dist \
|
||||
build_client
|
||||
!else
|
||||
build_all: build_dist \
|
||||
build_all: build_dist \
|
||||
build_client
|
||||
!endif
|
||||
|
||||
!if defined(MOZ_NGLAYOUT)
|
||||
build_nglayout:
|
||||
!if defined(MOZ_RAPTOR)
|
||||
build_raptor:
|
||||
cd $(MOZ_SRC)\$(MOZ_TOP)
|
||||
$(NMAKE) -f $(NGLAYOUT_MAKEFILE) $(NGLAYOUT_ENV_VARS)
|
||||
$(NMAKE) -f $(RAPTOR_MAKEFILE) STANDALONE_IMAGE_LIB=1 RAPTOR=1
|
||||
!endif
|
||||
|
||||
build_dist:
|
||||
@@ -158,8 +148,8 @@ build_client:
|
||||
#
|
||||
# remove all source files from the tree and print a report of what was missed
|
||||
#
|
||||
!if defined(MOZ_NGLAYOUT)
|
||||
clobber_all:: clobber_moz clobber_nglayout
|
||||
!if defined(MOZ_RAPTOR)
|
||||
clobber_all:: clobber_moz clobber_raptor
|
||||
!else
|
||||
clobber_all:: clobber_moz
|
||||
!endif
|
||||
@@ -174,10 +164,10 @@ clobber_moz:
|
||||
$(NMAKE) -f nsldap.mak clobber_all
|
||||
!endif
|
||||
|
||||
!if defined(MOZ_NGLAYOUT)
|
||||
clobber_nglayout:
|
||||
!if defined(MOZ_RAPTOR)
|
||||
clobber_raptor:
|
||||
cd $(MOZ_SRC)\$(MOZ_TOP)
|
||||
$(NMAKE) -f $(NGLAYOUT_MAKEFILE) clobber $(NGLAYOUT_ENV_VARS)
|
||||
$(NMAKE) -f $(RAPTOR_MAKEFILE) STANDALONE_IMAGE_LIB=1 RAPTOR=1 clobber
|
||||
!endif
|
||||
|
||||
depend:
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
<HEAD>
|
||||
<TITLE>Account Setup</TITLE>
|
||||
<SCRIPT LANGUAGE="JavaScript" ARCHIVE="asw.jar" SRC="2step.js"></SCRIPT>
|
||||
<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="2step.js"></SCRIPT>
|
||||
<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js"></LINK>
|
||||
</HEAD>
|
||||
|
||||
@@ -29,7 +29,8 @@
|
||||
|
||||
<!-- The layer below contains the Account Setup identifier. -->
|
||||
|
||||
<LAYER NAME="tagtext" LEFT=420 TOP=0 VISIBILITY=SHOW>
|
||||
<LAYER NAME = "tagtext" LEFT = 420 TOP = 0 VISIBILITY = SHOW>
|
||||
|
||||
<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=200 ID="nospace">
|
||||
<TR><TD HEIGHT=20 VALIGN=MIDDLE BACKGROUND="images/tag.gif">
|
||||
<B CLASS="previewtag">ACCOUNT SETUP</B>
|
||||
@@ -39,19 +40,10 @@
|
||||
|
||||
<!-- The layer below contains the headline and text of this screen -->
|
||||
|
||||
<P CLASS="title"><B>Connect to
|
||||
<SCRIPT LANGUAGE="JavaScript" ID="2step101">insertISPName();</SCRIPT>
|
||||
</B></P>
|
||||
|
||||
<P>Account Setup will now connect you to
|
||||
<SCRIPT LANGUAGE="JavaScript" ID="2step102">insertISPName();</SCRIPT>
|
||||
so that you can create an account with this ISP. (Note: It may take a minute for your modem to connect to this ISP.)</P>
|
||||
<P>After you have connected to
|
||||
<SCRIPT LANGUAGE="JavaScript" ID="2step103">insertISPName();</SCRIPT>
|
||||
you will be asked to supply account and billing information, such as your desired electronic mail name and password, and credit card information.</P>
|
||||
|
||||
<P CLASS="title"><B>Download</B></P>
|
||||
<P>Connect to Internet Service Provider for account creation</P>
|
||||
<CENTER>
|
||||
<SCRIPT LANGUAGE="JavaScript" ID="2step104">
|
||||
<SCRIPT LANGUAGE = "JavaScript" ID="2step101">
|
||||
generatePopNumberList();
|
||||
</SCRIPT>
|
||||
</CENTER>
|
||||
|
||||
@@ -17,21 +17,19 @@
|
||||
*/
|
||||
<!-- to hide script contents from old browsers
|
||||
|
||||
var globals = parent.parent.globals;
|
||||
var controls = parent.controls;
|
||||
|
||||
function go( msg )
|
||||
{
|
||||
netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
|
||||
|
||||
// * skip if we're in edit mode
|
||||
if ( globals.document.vars.editMode.value != "yes" )
|
||||
if ( parent.parent.globals.document.vars.editMode.value != "yes" )
|
||||
{
|
||||
if ( document.forms && document.forms[ 0 ] && document.forms[ 0 ].popList )
|
||||
globals.document.setupPlugin.CreateConfigIAS(
|
||||
globals.selectedISP, document.forms[ 0 ].popList.selectedIndex );
|
||||
parent.parent.globals.document.setupPlugin.CreateConfigIAS(
|
||||
parent.parent.globals.selectedISP, document.forms[ 0 ].popList.selectedIndex );
|
||||
else
|
||||
globals.document.setupPlugin.CreateConfigIAS( globals.selectedISP, -1 );
|
||||
parent.parent.globals.document.setupPlugin.CreateConfigIAS(
|
||||
parent.parent.globals.selectedISP, -1 );
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -46,37 +44,27 @@ function checkData()
|
||||
return true;
|
||||
}
|
||||
|
||||
function saveData()
|
||||
{
|
||||
}
|
||||
|
||||
function insertISPName()
|
||||
{
|
||||
document.write( globals.getSelectedISPName() );
|
||||
}
|
||||
|
||||
function loadData()
|
||||
{
|
||||
//parent.twostepfooter.document.writeln( "<BODY BACKGROUND='images/bg.gif' BGCOLOR='cccccc'>" );
|
||||
//parent.twostepfooter.document.writeln( "<P>If you have trouble setting up your account call " );
|
||||
//parent.twostepfooter.document.writeln( globals.getSelectedISPName() );
|
||||
//parent.twostepfooter.document.writeln( "at (support number).</P>" );
|
||||
//parent.twostepfooter.document.close();
|
||||
if ( parent.controls.generateControls )
|
||||
parent.controls.generateControls();
|
||||
}
|
||||
|
||||
if ( controls.generateControls )
|
||||
controls.generateControls();
|
||||
function saveData()
|
||||
{
|
||||
}
|
||||
|
||||
function generatePopNumberList()
|
||||
{
|
||||
netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
|
||||
|
||||
var list = globals.document.setupPlugin.GetISPPopList( globals.selectedISP );
|
||||
var list = parent.parent.globals.document.setupPlugin.GetISPPopList(
|
||||
parent.parent.globals.selectedISP );
|
||||
|
||||
globals.debug( "generating pop list" );
|
||||
parent.parent.globals.debug( "generating pop list" );
|
||||
if ( list && list.length > 0 )
|
||||
{
|
||||
globals.debug( "emitting table" );
|
||||
parent.parent.globals.debug( "emitting table" );
|
||||
document.writeln( "<TABLE CELLPADDING=2 CELLSPACING=0 ID='minspace'><TR><TD ALIGN=LEFT VALIGN=TOP HEIGHT=25><spacer type=vertical size=2><B>Pick a phone number from the following list to connect to:</B></TD><TD ALIGN=LEFT VALIGN=TOP><FORM><SELECT NAME='popList'>");
|
||||
for ( var x = 0; x < list.length; x++ )
|
||||
{
|
||||
|
||||
@@ -49,6 +49,7 @@ Choose "Edit | Preferences | Advanced" and enable JavaScript, then reload this p
|
||||
<LAYER NAME="controls" WIDTH=620 HEIGHT=55 TOP=0 LEFT=0>
|
||||
|
||||
<LAYER NAME="help" LEFT=4 TOP=0 WIDTH=200 VISIBILITY=HIDE>
|
||||
|
||||
<LAYER LEFT=4 TOP=6>
|
||||
<A HREF="about:blank" onClick="document.images['help'].src='images/hlp_down.gif';var flag=go('Help');document.images['help'].src='images/hlp_up.gif';return false"
|
||||
onMouseOver="document.images['help'].src='images/hlp_mo.gif'"
|
||||
@@ -62,6 +63,7 @@ Choose "Edit | Preferences | Advanced" and enable JavaScript, then reload this p
|
||||
</LAYER>
|
||||
|
||||
<LAYER NAME="exit" LEFT=50 TOP=0 WIDTH=200 VISIBILITY=HIDE>
|
||||
|
||||
<LAYER LEFT=4 TOP=6>
|
||||
<A HREF="about:blank" onClick="document.images['exit'].src='images/ext_down.gif';var flag=go('Exit');document.images['exit'].src='images/ext_up.gif';return false"
|
||||
onMouseOver="document.images['exit'].src='images/ext_mo.gif'"
|
||||
@@ -148,20 +150,7 @@ Choose "Edit | Preferences | Advanced" and enable JavaScript, then reload this p
|
||||
</LAYER>
|
||||
|
||||
<LAYER LEFT=8 TOP=43>
|
||||
<B CLASS="clayer">CONNECT TO NETSCAPE</B>
|
||||
</LAYER>
|
||||
</LAYER>
|
||||
|
||||
<LAYER NAME="connectisp" LEFT=310 TOP=0 WIDTH=200 VISIBILITY=HIDE>
|
||||
<LAYER LEFT=4 TOP=6>
|
||||
<A HREF="about:blank" onClick="document.images['connectisp'].src='images/cn_down.gif';var flag=go('Next');document.images['connectisp'].src='images/cn_up.gif';return false"
|
||||
onMouseOver="document.images['connectisp'].src='images/cn_mo.gif'"
|
||||
onMouseOut="document.images['connectisp'].src='images/cn_up.gif'" ID="clayer114">
|
||||
<IMG NAME="connectisp" SRC="images/cn_up.gif" BORDER=0 HEIGHT=32 WIDTH=32></A>
|
||||
</LAYER>
|
||||
|
||||
<LAYER LEFT=8 TOP=43>
|
||||
<B CLASS="clayer">CONNECT TO ISP</B>
|
||||
<B CLASS="clayer">CONNECT TO SERVER</B>
|
||||
</LAYER>
|
||||
</LAYER>
|
||||
|
||||
|
||||
@@ -209,11 +209,10 @@ pages[20][0]=new page("ok.htm",null,null);
|
||||
pages[21]=new Array();
|
||||
pages[21][0]=new page("okreboot.htm",null,null);
|
||||
|
||||
pages[ 22 ] = new Array();
|
||||
pages[ 22 ][ 0 ] = new page( "error.htm", null, null );
|
||||
pages[ 22 ][ 1 ] = new method( "1step.htm", "parent.content.go( 'firstDial' )", true );
|
||||
pages[ 22 ][ 2 ] = new method( "register.htm", "parent.content.go( 'New Path' )", true );
|
||||
pages[ 22 ][ 3 ] = new method( "connect2.htm", "parent.content.go( 'Existing Path' )", true );
|
||||
pages[22]=new Array();
|
||||
pages[22][0]=new page("error.htm",null,null);
|
||||
pages[22][1]=new method("register.htm","parent.content.go('New Path')",true);
|
||||
pages[22][2]=new method("connect2.htm","parent.content.go('Existing Path')",true);
|
||||
|
||||
pages[23]=new Array();
|
||||
pages[23][0]=new page("later.htm",null,null);
|
||||
@@ -778,7 +777,7 @@ function go( msg )
|
||||
if ( longMsgFlag == true )
|
||||
{
|
||||
if ( globals.document.vars.editMode.value.toLowerCase() != "yes" )
|
||||
confirmFlag = confirm( "You haven't finished setting up your account. Are you sure you want to quit Account Setup?" );
|
||||
confirmFlag = confirm( "Your haven't finished setting up your account. Are you sure you want to quit Account Setup?" );
|
||||
else // this is for the account setup editor
|
||||
confirmFlag = confirm( "Are you sure you want to quit the Account Setup Editor?" );
|
||||
}
|
||||
|
||||
@@ -127,7 +127,6 @@ function generateControls()
|
||||
var showBack = true;
|
||||
var showNext = true;
|
||||
var showConnectServer = false;
|
||||
var showConnectISP = false;
|
||||
var showConnectNow = false;
|
||||
var showDownload = false;
|
||||
var showConnectLater = false;
|
||||
@@ -258,10 +257,10 @@ function generateControls()
|
||||
if ( editMode == true )
|
||||
showBack = true;
|
||||
}
|
||||
else if ( formName == "2stpwrap.htm" )
|
||||
else if ( formName == "2step.htm" )
|
||||
{
|
||||
showNext = false;
|
||||
showConnectISP = true;
|
||||
showConnectServer = true;
|
||||
if ( editMode == true )
|
||||
showScreenOptions = true;
|
||||
}
|
||||
@@ -399,10 +398,7 @@ function generateControls()
|
||||
editMode = false;
|
||||
}
|
||||
|
||||
if ( document && document.layers && document.layers[ "controls" ] &&
|
||||
document.layers[ "controls" ].document &&
|
||||
document.layers[ "controls" ].document.layers &&
|
||||
document.layers[ "controls" ].document.layers.length > 0 )
|
||||
if ( document && document.layers && document.layers[ "controls" ] && document.layers[ "controls" ].document && document.layers[ "controls" ].document.layers && document.layers[ "controls" ].document.layers.length > 0 )
|
||||
{
|
||||
document.layers[ "controls" ].layers[ "help" ].visibility = ( ( showHelp == true ) ? "show" : "hide" );
|
||||
document.layers[ "controls" ].layers[ "exit" ].visibility = ( ( showExit == true ) ? "show" : "hide" );
|
||||
@@ -411,7 +407,6 @@ function generateControls()
|
||||
document.layers[ "controls" ].layers[ "connectnow" ].visibility = ( ( showConnectNow == true ) ? "show" : "hide" );
|
||||
document.layers[ "controls" ].layers[ "download" ].visibility = ( ( showDownload == true ) ? "show" : "hide" );
|
||||
document.layers[ "controls" ].layers[ "connectserver" ].visibility = ( ( showConnectServer == true ) ? "show" : "hide" );
|
||||
document.layers[ "controls" ].layers[ "connectisp" ].visibility = ( ( showConnectISP == true ) ? "show" : "hide" );
|
||||
document.layers[ "controls" ].layers[ "connectagain" ].visibility = ( ( showAgain == true ) ? "show" : "hide" );
|
||||
document.layers[ "controls" ].layers[ "done" ].visibility = ( ( showDone == true) ? "show" : "hide" );
|
||||
document.layers[ "controls" ].layers[ "restart" ].visibility = ( ( showRestart == true ) ? "show" : "hide" );
|
||||
|
||||
@@ -33,12 +33,11 @@
|
||||
</LAYER>
|
||||
|
||||
<P CLASS="title"><B>Compare Internet Service Providers</B></P>
|
||||
<P>Select an Internet Service Provider (ISP) to get more information and begin
|
||||
account creation.</P>
|
||||
<P CLASS="comparesmall">
|
||||
<B CLASS="compare">Provider Highlights:</B>
|
||||
<IMG SRC="metadata/images/feature1.gif" HEIGHT=16 WIDTH=16><B>Free Account Time!</B>
|
||||
<IMG SRC="metadata/images/feature2.gif" HEIGHT=16 WIDTH=16>Phone Bill Billing
|
||||
<BR>
|
||||
<P CLASS="compare"><B>Provider Highlights: </B></P>
|
||||
<P CLASS="comparesmall">
|
||||
<IMG SRC="metadata/images/feature1.gif" HEIGHT=16 WIDTH=16><B>Free Account Time! </B>
|
||||
<IMG SRC="metadata/images/feature2.gif" HEIGHT=16 WIDTH=16>Phone Bill Billing
|
||||
<IMG SRC="metadata/images/feature3.gif" HEIGHT=16 WIDTH=16>Web Page Hosting
|
||||
</P>
|
||||
</BODY>
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<TITLE>Account Setup</TITLE>
|
||||
<SCRIPT LANGUAGE="JavaScript" ARCHIVE="asw.jar" SRC="compwrap.js"></SCRIPT>
|
||||
<SCRIPT LANGUAGE = "JavaScript" ARCHIVE="asw.jar" SRC="compwrap.js"></SCRIPT>
|
||||
</HEAD>
|
||||
|
||||
<FRAMESET rows="140,*" BORDER=0 FRAMEBORDER="no">
|
||||
<FRAMESET rows="120,*" BORDER=0 FRAMEBORDER="no">
|
||||
<FRAME NAME="compareheader" SRC="cmprehd.htm" NORESIZE SCROLLING="no">
|
||||
<FRAME NAME="compare" SRC="compare.htm" NORESIZE>
|
||||
</FRAMESET>
|
||||
|
||||
@@ -20,10 +20,10 @@
|
||||
function go( msg )
|
||||
{
|
||||
parent.parent.globals.debug( "compwrap go" );
|
||||
parent.parent.globals.debug( compare.ispRadio );
|
||||
|
||||
if ( compare.ispRadio != null && compare.ispRadio != "" )
|
||||
{
|
||||
parent.parent.globals.debug( compare.ispRadio );
|
||||
parent.parent.globals.selectedISP = compare.ispRadio;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ Description=Netscape Internet Account Server
|
||||
SiteName=Netscape Internet Account Server
|
||||
|
||||
[IP]
|
||||
RegCGI=https://reggie.netscape.com/IAS5/docs/reg.cgi
|
||||
RegCGI=http://206.217.225.10/IAS5/docs/reg.cgi
|
||||
DNSAddress2=205.217.225.20
|
||||
DNSAddress=205.217.225.10
|
||||
DomainName=netscape.com
|
||||
@@ -33,7 +33,7 @@ Enabled=Yes
|
||||
|
||||
[Configuration]
|
||||
REG_SCRIPTING=
|
||||
RegRoot=https://reggie.netscape.com/IAS5/docs/
|
||||
RegRoot=http://206.217.225.10/IAS5/docs/
|
||||
|
||||
[Security]
|
||||
SecurityDevice=No
|
||||
|
||||
@@ -36,9 +36,7 @@
|
||||
<!-- The layer below contains the headline and text of this screen -->
|
||||
<FORM>
|
||||
<P CLASS="title"><B>Phone Number of Your Location</B></P>
|
||||
<P>Please enter the phone number of the line that you are currently using--
|
||||
the line that is now connected to your computer or modem. Account Setup will use this
|
||||
information to set up your connection software to access the Internet.</P>
|
||||
<P>Please enter the phone number of the line that you are using to connect--the line that is now connected to your computer or modem. Account Setup uses this information to set up your connection software to access the Internet.</P>
|
||||
<SPACER TYPE=HORIZONTAL SIZE=72>
|
||||
<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0">
|
||||
<TR>
|
||||
@@ -69,8 +67,8 @@ information to set up your connection software to access the Internet.</P>
|
||||
</TD>
|
||||
</TR>
|
||||
</TABLE>
|
||||
<P>Optional: If an ISP is not available in your area, Account Setup will check up to 3
|
||||
additional area codes to find an Internet service provider you can access.</P>
|
||||
<P>Please enter optional alternate area codes that you can call from your location to access and Internet service
|
||||
provider.</P>
|
||||
<SPACER TYPE=HORIZONTAL SIZE=72>
|
||||
<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0">
|
||||
<TR>
|
||||
|
||||
@@ -51,24 +51,22 @@
|
||||
|
||||
|
||||
|
||||
<P CLASS="title"><B>Connect to Netscape</B></P>
|
||||
<P CLASS="title"><B>Download</B></P>
|
||||
|
||||
<P>Account Setup will now connect you to the Internet account server,
|
||||
to download information about available Internet Service Providers (ISPs)
|
||||
and their account plans. (Note: It may take as long as two minutes
|
||||
for the information to be retrieved.)</P>
|
||||
<P>Account Setup will now connect you to the Internet account server, to download information about available account plans.
|
||||
It may take as long as two minutes for the information to be retrieved.</P>
|
||||
|
||||
<P>When evaluating account plans, think about these questions:</P>
|
||||
|
||||
<UL>
|
||||
<LI>How much time do you think you'll spend on the Internet each month?</LI>
|
||||
<LI>What are the monthly or hourly rates?</LI>
|
||||
<LI>What services are offered?</LI>
|
||||
<LI>What technical support is offered?</LI>
|
||||
</UL>
|
||||
|
||||
|
||||
|
||||
<P ID="nospace">Make sure your modem is properly connected and turned on, then click "Connect to Netscape" to begin.</P>
|
||||
<P ID="nospace">Make sure your modem is properly connected and turned on, then click Download to begin.</P>
|
||||
|
||||
<CENTER>
|
||||
<SCRIPT LANGUAGE = "JavaScript" ID="connect101">
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
function go( msg )
|
||||
{
|
||||
// parent.parent.globals.debug( "download go" );
|
||||
parent.parent.globals.debug( "download go" );
|
||||
|
||||
netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
|
||||
|
||||
|
||||
@@ -17,64 +17,62 @@
|
||||
*/
|
||||
<!-- to hide script contents from old browsers
|
||||
|
||||
function go( msg )
|
||||
|
||||
|
||||
function go(msg)
|
||||
{
|
||||
if ( parent.parent.globals.document.vars.editMode.value != "yes" )
|
||||
{
|
||||
if ( msg == "firstDial" )
|
||||
{
|
||||
if ( parent.parent.globals.document.vars.oneStepMode.value != "yes" )
|
||||
{
|
||||
parent.parent.globals.document.vars.tryAgain.value = "yes";
|
||||
return checkData();
|
||||
}
|
||||
}
|
||||
if ( msg == parent.parent.globals.document.vars.path.value )
|
||||
if (parent.parent.globals.document.vars.editMode.value != "yes")
|
||||
{
|
||||
if (msg == parent.parent.globals.document.vars.path.value) {
|
||||
parent.parent.globals.document.vars.tryAgain.value = "yes";
|
||||
return checkData();
|
||||
return(checkData());
|
||||
}
|
||||
return(false);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( msg == parent.parent.globals.document.vars.path.value )
|
||||
alert( "Sorry, you cannot connect while in using the Account Setup Editor." );
|
||||
return false;
|
||||
}
|
||||
else {
|
||||
if (msg == parent.parent.globals.document.vars.path.value)
|
||||
alert("Sorry, you cannot connect while in using the Account Setup Editor.");
|
||||
return(false);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
function checkData()
|
||||
{
|
||||
return true;
|
||||
return(true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
function showErrorLayer()
|
||||
{
|
||||
if ( document.layers[ "IAS Mode" ] && document.layers[ "NCI Mode" ] )
|
||||
{
|
||||
if ( parent.parent.globals.document.vars.path.value == "Existing Path" )
|
||||
{
|
||||
document.layers[ "IAS Mode" ].visibility = "hide";
|
||||
document.layers[ "NCI Mode" ].visibility = "show";
|
||||
if (document.layers["IAS Mode"] && document.layers["NCI Mode"]) {
|
||||
if (parent.parent.globals.document.vars.path.value == "Existing Path") {
|
||||
document.layers["IAS Mode"].visibility = "hide";
|
||||
document.layers["NCI Mode"].visibility = "show";
|
||||
}
|
||||
else {
|
||||
document.layers["IAS Mode"].visibility = "show";
|
||||
document.layers["NCI Mode"].visibility = "hide";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
document.layers[ "IAS Mode" ].visibility = "show";
|
||||
document.layers[ "NCI Mode" ].visibility = "hide";
|
||||
else {
|
||||
setTimeout("showErrorLayer()",1000);
|
||||
}
|
||||
}
|
||||
else
|
||||
setTimeout( "showErrorLayer()", 1000 );
|
||||
}
|
||||
|
||||
|
||||
|
||||
function loadData()
|
||||
{
|
||||
setTimeout( "showErrorLayer()", 1000 );
|
||||
if ( parent.controls.generateControls )
|
||||
parent.controls.generateControls();
|
||||
setTimeout("showErrorLayer()",1000);
|
||||
if (parent.controls.generateControls) parent.controls.generateControls();
|
||||
}
|
||||
|
||||
|
||||
|
||||
function saveData()
|
||||
{
|
||||
}
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
Debug Mode: <INPUT NAME="debugMode" TYPE="Text" VALUE="yes"><BR>
|
||||
Edit Mode: <INPUT NAME="editMode" TYPE="Text" VALUE="no"><BR>
|
||||
QA Mode: <INPUT NAME="qaMode" TYPE="Text" VALUE="no"><BR>
|
||||
1Step Mode: <INPUT NAME="oneStepMode" TYPE="Text" VALUE="no"><BR>
|
||||
International Mode: <INPUT NAME="intlMode" TYPE="Text"><BR>
|
||||
Startup File: <INPUT NAME="startupFile" TYPE="Text"><BR>
|
||||
Registration server: <INPUT NAME="regServer" TYPE="text"><BR>
|
||||
|
||||
@@ -164,14 +164,7 @@ function remove_message()
|
||||
window.status = "";
|
||||
}
|
||||
|
||||
function getSelectedISPName()
|
||||
{
|
||||
netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
|
||||
|
||||
var ispDisplayName = document.setupPlugin.GetISPDisplayName( selectedISP );
|
||||
|
||||
return ispDisplayName;
|
||||
}
|
||||
|
||||
function checkPluginExists( name, generateOutputFlag )
|
||||
{
|
||||
@@ -366,34 +359,28 @@ function loadUserInput()
|
||||
document.vars.altAreaCode3.value = GetNameValuePair( userInputFile, theSection, "altAreaCode3" );
|
||||
|
||||
document.vars.cwData.value = GetNameValuePair(userInputFile,theSection,"cwData");
|
||||
if (document.vars.cwData.value != null && document.vars.cwData.value != "")
|
||||
{
|
||||
if (document.vars.cwData.value != null && document.vars.cwData.value != "") {
|
||||
// document.vars.prefix.cwOFF=1;
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
else {
|
||||
// document.vars.prefix.cwOFF=0;
|
||||
}
|
||||
}
|
||||
document.vars.prefixData.value = GetNameValuePair(userInputFile,theSection,"prefixData");
|
||||
if (document.vars.prefixData.value != null && document.vars.prefixData.value != "")
|
||||
{
|
||||
if (document.vars.prefixData.value != null && document.vars.prefixData.value != "") {
|
||||
// document.vars.prefix.checked=1;
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
else {
|
||||
// document.vars.prefix.checked=0;
|
||||
}
|
||||
}
|
||||
document.vars.dialMethod.value = GetNameValuePair(userInputFile,theSection,"dialMethod");
|
||||
|
||||
document.vars.providername.value = GetNameValuePair(userInputFile,theSection,"providername");
|
||||
if (intlMode=="yes")
|
||||
{
|
||||
if (intlMode=="yes") {
|
||||
document.vars.accountAreaCode.value="";
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
else {
|
||||
document.vars.accountAreaCode.value = GetNameValuePair(userInputFile,theSection,"accountAreaCode");
|
||||
}
|
||||
}
|
||||
document.vars.accountPhoneNumber.value = GetNameValuePair(userInputFile,theSection,"accountPhoneNumber");
|
||||
|
||||
document.vars.accountName.value = GetNameValuePair(userInputFile,theSection,"accountName");
|
||||
@@ -488,13 +475,7 @@ function loadGlobalData()
|
||||
document.vars.path.value = "New Path";
|
||||
else if ( existingPathFlag == "yes" && newPathFlag != "yes" )
|
||||
document.vars.path.value = "Existing Path";
|
||||
|
||||
document.vars.oneStepMode.value = "";
|
||||
var oneStepModeFlag = parent.parent.globals.GetNameValuePair( acctSetupFile, "Mode Selection", "OneStepMode" );
|
||||
oneStepModeFlag = oneStepModeFlag.toLowerCase();
|
||||
if ( oneStepModeFlag == "yes" )
|
||||
document.vars.oneStepMode = "yes";
|
||||
|
||||
|
||||
if ( document.vars.debugMode.value.toLowerCase() != "yes" && ( document.vars.editMode.value.toLowerCase() != "yes" ) )
|
||||
if (checkPluginExists( "application/x-netscape-autoconfigure-dialer", false ) )
|
||||
document.setupPlugin.SetKiosk( true );
|
||||
@@ -562,30 +543,30 @@ function loadGlobalData()
|
||||
setRegisterMode( 1 );
|
||||
}
|
||||
|
||||
|
||||
|
||||
function saveExternalEditor()
|
||||
{
|
||||
// Since we don't do a saveGlobalData in editMode, we need an alternate way to save the externalEditor
|
||||
// as a preference in ACCTSET.DAT. This is it.
|
||||
|
||||
netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
|
||||
netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
|
||||
var userInputFile = document.setupPlugin.GetCurrentProfileDirectory();
|
||||
if ( userInputFile != null && userInputFile != "" )
|
||||
{
|
||||
if (userInputFile != null && userInputFile != "") {
|
||||
userInputFile = userInputFile + "ACCTSET.DAT";
|
||||
var theSection = "Account Setup User Input";
|
||||
SetNameValuePair( userInputFile, theSection, "externalEditor", document.vars.externalEditor.value );
|
||||
}
|
||||
var theSection="Account Setup User Input";
|
||||
SetNameValuePair(userInputFile,theSection,"externalEditor", document.vars.externalEditor.value);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function saveGlobalData()
|
||||
{
|
||||
netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
|
||||
netscape.security.PrivilegeManager.enablePrivilege("AccountSetup");
|
||||
|
||||
if ( document.vars.editMode.value.toLowerCase() == "yes" )
|
||||
return;
|
||||
if (document.vars.editMode.value.toLowerCase() == "yes") return;
|
||||
|
||||
if ( document.setupPlugin == null )
|
||||
return;
|
||||
if (document.setupPlugin == null) return;
|
||||
/*
|
||||
if (document.vars.debugMode.value.toLowerCase() != "yes" && (document.vars.editMode.value.toLowerCase() != "yes")) {
|
||||
if (checkPluginExists("application/x-netscape-autoconfigure-dialer",false)) {
|
||||
@@ -600,25 +581,22 @@ function saveGlobalData()
|
||||
top.personalbar.visible=true; // was directory
|
||||
*/
|
||||
|
||||
if (document.vars.cookieWarning.value == "yes")
|
||||
{
|
||||
if (document.vars.cookieWarning.value == "yes") {
|
||||
navigator.preference("network.cookie.warnAboutCookies", true);
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
else {
|
||||
navigator.preference("network.cookie.warnAboutCookies", false);
|
||||
}
|
||||
}
|
||||
|
||||
if (document.vars.offlineMode.value != "undefined")
|
||||
{
|
||||
if (document.vars.offlineMode.value != "undefined") {
|
||||
navigator.preference("offline.startup_mode", document.vars.offlineMode.value);
|
||||
}
|
||||
|
||||
|
||||
// save user input (if any)
|
||||
|
||||
var userInputFile = document.setupPlugin.GetCurrentProfileDirectory();
|
||||
if (userInputFile != null && userInputFile != "")
|
||||
{
|
||||
if (userInputFile != null && userInputFile != "") {
|
||||
userInputFile = userInputFile + "ACCTSET.DAT";
|
||||
var theSection="Account Setup User Input";
|
||||
|
||||
@@ -664,9 +642,8 @@ function saveGlobalData()
|
||||
SetNameValuePair(userInputFile,theSection,"scriptEnabled", document.vars.scriptEnabled.value);
|
||||
SetNameValuePair(userInputFile,theSection,"scriptFile", document.vars.scriptFile.value);
|
||||
SetNameValuePair(userInputFile,theSection,"lckFilename", document.vars.lckFilename.value);
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
else {
|
||||
SetNameValuePair(userInputFile,theSection,"cardnumber", "");
|
||||
SetNameValuePair(userInputFile,theSection,"path", "");
|
||||
SetNameValuePair(userInputFile,theSection,"pageHistory", "");
|
||||
@@ -677,7 +654,7 @@ function saveGlobalData()
|
||||
SetNameValuePair(userInputFile,theSection,"emailPasswordCheck", "");
|
||||
SetNameValuePair(userInputFile,theSection,"publishPassword", "");
|
||||
SetNameValuePair(userInputFile,theSection,"publishPasswordCheck", "");
|
||||
}
|
||||
}
|
||||
SetNameValuePair(userInputFile,theSection,"month", document.vars.month.value);
|
||||
SetNameValuePair(userInputFile,theSection,"year", document.vars.year.value);
|
||||
|
||||
|
||||
@@ -87,7 +87,13 @@ and Communicator detects exactly one configured user profile. -->
|
||||
|
||||
<LAYER NAME = "Profile_Configured" TOP="0" LEFT="0" VISIBILITY = HIDE>
|
||||
|
||||
<P CLASS="body">You are about to use Account Setup to replace the Internet account you selected with a new account. To continue, click Start Account Setup.</P>
|
||||
<P CLASS="body">You are about to use Account Setup to replace your Internet account with another account. While you can safely use Account Setup in this way, we recommend that you create a new user profile first, then use Account Setup. </P>
|
||||
|
||||
<P CLASS="bodysecondparagraph">
|
||||
<SPACER TYPE= HORIZONTAL SIZE=47>To continue, click Start Account Setup. To create a
|
||||
<BR><SPACER TYPE= HORIZONTAL SIZE=70>new profile, launch the User Profile Manager
|
||||
<BR><SPACER TYPE= HORIZONTAL SIZE=79>from the Netscape Communicator folder
|
||||
<BR><SPACER TYPE= HORIZONTAL SIZE=86>or program group.</P>
|
||||
|
||||
</LAYER>
|
||||
|
||||
@@ -97,10 +103,7 @@ and Communicator detects no existing Communicator user preferences or user profi
|
||||
|
||||
<LAYER NAME = "Profile_Manager_Entrance" TOP="0" LEFT="0" VISIBILITY = HIDE>
|
||||
|
||||
<P CLASS="body">Netscape Communicator is your one solution for getting all that the Internet has to offer. Once you've set up Communicator to access the Internet, you can use it to browse the World Wide Web, send and receive electronic mail, publish your own web pages, and more.</P>
|
||||
|
||||
<P CLASS="bodysecondparagraph">
|
||||
<SPACER TYPE= HORIZONTAL SIZE=55>To set up Communicator, click Start Account Setup.</P>
|
||||
<P CLASS="body">You are about to use Account Setup to create access to an Internet account and associate the account with your new user profile. To begin, click Start Account Setup.</P>
|
||||
|
||||
</LAYER>
|
||||
|
||||
|
||||
@@ -18,17 +18,9 @@
|
||||
<!-- to hide script contents from old browsers
|
||||
|
||||
var ispRadio = null;
|
||||
//var out = java.lang.System.out;
|
||||
var out = java.lang.System.out;
|
||||
|
||||
//window.captureEvents( Event.MOUSEUP| Event.MOUSEDOWN| Event.MOUSEDRAG );
|
||||
function loadData()
|
||||
{
|
||||
radioValue = document.layers[ "allisp" ].layers[ "level1isp" ].
|
||||
layers[ "levelDisplay" ].layers[ 0 ].
|
||||
layers[ "moreInfoButton" ].document.
|
||||
forms[ 0 ].elements[ 0 ].value;
|
||||
radioClick( radioValue );
|
||||
}
|
||||
|
||||
function tabIndex( tab )
|
||||
{
|
||||
@@ -74,7 +66,7 @@ function syncTabs()
|
||||
|
||||
function toggleTab( tab )
|
||||
{
|
||||
// out.println( "toggleTab" );
|
||||
out.println( "toggleTab" );
|
||||
allisp = document.layers[ "allisp" ];
|
||||
|
||||
for ( i = tabIndex( tab ); i < allisp.layers.length; i++ )
|
||||
@@ -85,14 +77,14 @@ function toggleTab( tab )
|
||||
showLayer = controls.layers[ "show" ];
|
||||
hideLayer = controls.layers[ "hide" ];
|
||||
|
||||
// out.println( "pageY: " + levelLayer.pageY );
|
||||
out.println( "pageY: " + levelLayer.pageY );
|
||||
|
||||
if ( tab == levelLayer )
|
||||
{
|
||||
// toggleState == false is closed
|
||||
if ( levelLayer.toggleState == false )
|
||||
{
|
||||
// out.println( "OPENING" );
|
||||
out.println( "OPENING" );
|
||||
// open "tab"
|
||||
showLayer.visibility = "hide";
|
||||
hideLayer.visibility = "show";
|
||||
@@ -103,7 +95,7 @@ function toggleTab( tab )
|
||||
}
|
||||
else
|
||||
{
|
||||
// out.println( "CLOSING" );
|
||||
out.println( "CLOSING" );
|
||||
// close "tab"
|
||||
hideLayer.visibility = "hide";
|
||||
showLayer.visibility = "show";
|
||||
@@ -141,8 +133,6 @@ function toggle( tabName )
|
||||
|
||||
function radioClick( radioValue )
|
||||
{
|
||||
// out.println( "radioClick: " + radioValue );
|
||||
|
||||
if ( radioValue != ispRadio )
|
||||
{
|
||||
allisp = document.layers[ "allisp" ];
|
||||
@@ -157,7 +147,7 @@ function radioClick( radioValue )
|
||||
form = buttonlayer.document.forms[ 0 ];
|
||||
radio = form.elements[ 0 ];
|
||||
if ( radio.value == radioValue )
|
||||
radio.checked=true;
|
||||
radio.check == "1";
|
||||
else
|
||||
form.reset();
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<LINK REL=STYLESHEET TYPE="text/JavaScript" ARCHIVE="asw.jar" HREF="sheet.js"></LINK>
|
||||
</HEAD>
|
||||
|
||||
<BODY BGCOLOR="FFFFFF" ONLOAD="loadData()">
|
||||
<BODY BGCOLOR="FFFFFF">
|
||||
|
||||
<!-- The layer below contains the headline and text of this screen -->
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
<ILAYER LEFT=0 NAME="level1isp">
|
||||
<LAYER NAME="control" HEIGHT=20>
|
||||
<LAYER LEFT=200 NAME="hide"><P CLASS="compare"></P></LAYER>
|
||||
<LAYER LEFT=200 NAME="hide"><P CLASS="compare">Level 1</P></LAYER>
|
||||
<LAYER LEFT=200 NAME="show"></LAYER>
|
||||
</LAYER>
|
||||
<LAYER TOP=20 NAME="levelDisplay">
|
||||
@@ -40,8 +40,8 @@
|
||||
|
||||
<ILAYER LEFT=0 NAME="level2isp">
|
||||
<LAYER NAME="control" HEIGHT=20>
|
||||
<LAYER LEFT=200 NAME="hide"><A HREF="about:blank" onClick="toggle( 'level2isp' ); return false;"><P CLASS="compare">Hide Additional ISPs</P></A></LAYER>
|
||||
<LAYER LEFT=200 NAME="show"><A HREF="about:blank" onClick="toggle( 'level2isp' ); return false;"><P CLASS="compare">Show Additional ISPs</P></A></LAYER>
|
||||
<LAYER LEFT=200 NAME="hide"><A HREF="about:blank" onClick="toggle( 'level2isp' ); return false;"><P CLASS="compare">Hide Level 2</P></A></LAYER>
|
||||
<LAYER LEFT=200 NAME="show"><A HREF="about:blank" onClick="toggle( 'level2isp' ); return false;"><P CLASS="compare">Show Level 2</P></A></LAYER>
|
||||
</LAYER>
|
||||
|
||||
<LAYER TOP=20 NAME="levelDisplay">
|
||||
|
||||
@@ -23,17 +23,18 @@ function loadData()
|
||||
"/client_data/html/sales.html";
|
||||
|
||||
parent.moreinfo.location.replace( fileToLoad );
|
||||
|
||||
if ( parent.parent.controls.generateControls )
|
||||
parent.parent.controls.generateControls();
|
||||
}
|
||||
|
||||
function generateHeader()
|
||||
{
|
||||
// parent.parent.parent.globals.debug( "ispDisplayName" + ispDisplayName );
|
||||
netscape.security.PrivilegeManager.enablePrivilege( "AccountSetup" );
|
||||
|
||||
document.writeln( "More Information about " +
|
||||
parent.parent.parent.globals.getSelectedISPName() );
|
||||
var ispDisplayName = parent.parent.parent.globals.document.setupPlugin.GetISPDisplayName(
|
||||
parent.parent.parent.globals.selectedISP );
|
||||
|
||||
parent.parent.parent.globals.debug( "ispDisplayName" + ispDisplayName );
|
||||
|
||||
document.writeln( "More Information about " + ispDisplayName );
|
||||
}
|
||||
|
||||
// end hiding contents from old browers -->
|
||||
|
||||
@@ -27,8 +27,8 @@ import java.lang.*;
|
||||
|
||||
public class CPGeneratorProgress extends ProgressApplet
|
||||
{
|
||||
final static String DOWNLOAD_STRING = "Downloading...";
|
||||
final static String UNJAR_STRING = "Uncompressing...";
|
||||
final static String DOWNLOAD_STRING = "Downloading:";
|
||||
final static String UNJAR_STRING = "Uncompressing:";
|
||||
final static String DONE_STRING = "Done...";
|
||||
final static String CONTACTING_SERVER = "Contacting registration server...";
|
||||
final static String SENDING = "Sending registration information...";
|
||||
@@ -37,8 +37,14 @@ public class CPGeneratorProgress extends ProgressApplet
|
||||
final static String ABORT = "There were problems with the server connection...";
|
||||
final static String DIALING_STRING = "Calling registration server...";
|
||||
|
||||
final static double PEG_DOWNLOAD = 0.90;
|
||||
|
||||
protected int getState()
|
||||
{
|
||||
if ( ServerDownload.getState() == ServerDownload.IDLE )
|
||||
return CPGenerator.getState();
|
||||
else
|
||||
return ServerDownload.getState();
|
||||
}
|
||||
|
||||
public void init()
|
||||
{
|
||||
super.init();
|
||||
@@ -55,14 +61,14 @@ public class CPGeneratorProgress extends ProgressApplet
|
||||
|
||||
int lastState = CPGenerator.DONE;
|
||||
int thisState = CPGenerator.DONE;
|
||||
//String lastString = "";
|
||||
//String thisString = "";
|
||||
String lastString = "";
|
||||
String thisString = "";
|
||||
|
||||
while ( CPGenerator.done == false )
|
||||
{
|
||||
//Trace.TRACE( "CPGenerator not done" );
|
||||
thisState = CPGenerator.getState();
|
||||
//thisString = new String( CPGenerator.currentFile );
|
||||
thisState = getState();
|
||||
thisString = new String( CPGenerator.currentFile );
|
||||
|
||||
if ( thisState != lastState )
|
||||
{
|
||||
@@ -70,80 +76,56 @@ public class CPGeneratorProgress extends ProgressApplet
|
||||
|
||||
switch ( thisState )
|
||||
{
|
||||
case CPGenerator.IDLE:
|
||||
buffer = "";
|
||||
case ServerDownload.DOWNLOADING:
|
||||
buffer = DOWNLOAD_STRING;
|
||||
break;
|
||||
|
||||
case CPGenerator.DOWNLOADING:
|
||||
buffer = DOWNLOAD_STRING;
|
||||
break;
|
||||
|
||||
case CPGenerator.UNJARRING:
|
||||
buffer = UNJAR_STRING;
|
||||
case ServerDownload.UNJARRING:
|
||||
buffer = UNJAR_STRING;
|
||||
break;
|
||||
|
||||
case CPGenerator.CONTACTING_SERVER:
|
||||
buffer = CONTACTING_SERVER;
|
||||
buffer = CONTACTING_SERVER;
|
||||
break;
|
||||
|
||||
case CPGenerator.SENDING:
|
||||
buffer = SENDING;
|
||||
buffer = SENDING;
|
||||
break;
|
||||
|
||||
case CPGenerator.WAITING:
|
||||
buffer = WAITING;
|
||||
buffer = WAITING;
|
||||
break;
|
||||
|
||||
case CPGenerator.RECEIVING_RESPONSE:
|
||||
buffer = RECEIVING_RESPONSE;
|
||||
buffer = RECEIVING_RESPONSE;
|
||||
break;
|
||||
|
||||
case CPGenerator.DONE:
|
||||
buffer = DONE_STRING;
|
||||
buffer = DONE_STRING;
|
||||
break;
|
||||
|
||||
case CPGenerator.ABORT:
|
||||
buffer = ABORT;
|
||||
buffer = ABORT;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
status.setText( buffer );
|
||||
lastState = thisState;
|
||||
}
|
||||
|
||||
//if ( thisString.compareTo( lastString ) != 0 )
|
||||
//{
|
||||
// progress.setText( thisString );
|
||||
// lastString = thisString;
|
||||
//}
|
||||
if ( thisString.compareTo( lastString ) != 0 )
|
||||
{
|
||||
progress.setText( thisString );
|
||||
lastString = thisString;
|
||||
}
|
||||
|
||||
if ( ServerDownload.getBytesDownloaded() == 0 || CPGenerator.totalBytes == 0 )
|
||||
progressBar.setPercent( 0.0 );
|
||||
else
|
||||
{
|
||||
double percent;
|
||||
|
||||
if ( thisState == CPGenerator.DOWNLOADING )
|
||||
{
|
||||
percent = (double)ServerDownload.getBytesDownloaded() /
|
||||
(double)CPGenerator.totalBytes;
|
||||
|
||||
percent = percent * PEG_DOWNLOAD;
|
||||
}
|
||||
else
|
||||
{
|
||||
percent = (double)ServerDownload.getBytesUnjarred() /
|
||||
(double)CPGenerator.totalBytes;
|
||||
percent = ( 1.0 - PEG_DOWNLOAD ) * percent;
|
||||
percent = percent + PEG_DOWNLOAD;
|
||||
}
|
||||
|
||||
progressBar.setPercent( percent );
|
||||
}
|
||||
progressBar.setPercent( (double)ServerDownload.getBytesDownloaded() / (double)CPGenerator.totalBytes );
|
||||
|
||||
repaint();
|
||||
Thread.yield();
|
||||
//Thread.sleep( 50 );
|
||||
Thread.sleep( 50 );
|
||||
}
|
||||
|
||||
Trace.TRACE( "CPGenerator done" );
|
||||
@@ -152,8 +134,7 @@ public class CPGeneratorProgress extends ProgressApplet
|
||||
status.setText( DONE_STRING );
|
||||
|
||||
repaint();
|
||||
final int FOREVER = 100000;
|
||||
Thread.sleep( FOREVER );
|
||||
Thread.sleep( 1000 );
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
|
||||
@@ -30,9 +30,6 @@ import netscape.security.*;
|
||||
|
||||
public class CPGenerator
|
||||
{
|
||||
public static final int IDLE = 1;
|
||||
public static final int DOWNLOADING = 2;
|
||||
public static final int UNJARRING = 3;
|
||||
public static final int SENDING = 4;
|
||||
public static final int RECEIVING_RESPONSE = 5;
|
||||
public static final int WAITING = 6;
|
||||
@@ -66,7 +63,7 @@ public class CPGenerator
|
||||
|
||||
//static CPGeneratorProgress progress = null;
|
||||
|
||||
// static final String regservMimeData = "http://seaspace.netscape.com:8080/programs/ias5/regserv/docs/reg.cgi";
|
||||
// static final String regservMimeData = "http://seaspace.netscape.com:8080/programs/ias5/regserv/docs/reg.cgi";
|
||||
|
||||
public static int getState()
|
||||
{
|
||||
@@ -607,8 +604,6 @@ public class CPGenerator
|
||||
|
||||
private static void downloadAndUnzipMetadata( String rootURL ) throws Throwable
|
||||
{
|
||||
state = DOWNLOADING;
|
||||
|
||||
String zipFileURL = rootURL + "metadata.jar";
|
||||
String localFileName = getLocalPath() + "metadata.jar";
|
||||
|
||||
@@ -618,8 +613,6 @@ public class CPGenerator
|
||||
|
||||
private static void downloadJarFiles( Vector ispList, String rootURL ) throws Throwable
|
||||
{
|
||||
state = DOWNLOADING;
|
||||
|
||||
// * download the ".jar" for each ISP
|
||||
for ( int i = 0; i < ispList.size(); i++ )
|
||||
{
|
||||
@@ -634,7 +627,7 @@ public class CPGenerator
|
||||
|
||||
String ispLocalFileName = getJarFilePath( ispData );
|
||||
|
||||
currentFile = new String( ispData.getName() );
|
||||
currentFile = new String( ispData.name );
|
||||
|
||||
Trace.TRACE( "downloading: " + zipFileURL );
|
||||
ServerDownload.downloadURL( zipFileURL, ispLocalFileName );
|
||||
@@ -643,8 +636,6 @@ public class CPGenerator
|
||||
|
||||
private static void decompressJarFiles( Vector ispList ) throws Throwable
|
||||
{
|
||||
state = UNJARRING;
|
||||
|
||||
// * decompress the ".jar" for each ISP
|
||||
for ( int i = 0; i < ispList.size(); i++ )
|
||||
{
|
||||
@@ -690,7 +681,7 @@ public class CPGenerator
|
||||
nvSet.setValue( ispDirectorySymbol, new String( ispData.language + "/" + ispData.name + "/client_data" ) );
|
||||
parseFeatureSet( nvSet, featureMappings );
|
||||
returnSets.addElement( nvSet );
|
||||
//nvSet.printNameValueSet();
|
||||
//nvSet.printNameValueSet();
|
||||
}
|
||||
return returnSets;
|
||||
}
|
||||
@@ -699,8 +690,7 @@ public class CPGenerator
|
||||
String sRootURL, String metadataMode, String reggieData[] )
|
||||
{
|
||||
done = false;
|
||||
state = IDLE;
|
||||
|
||||
|
||||
Trace.TRACE( "Hello" );
|
||||
|
||||
NameValueSet featureMappings = null;
|
||||
@@ -708,10 +698,6 @@ public class CPGenerator
|
||||
|
||||
localPath = new String( inLocalPath );
|
||||
|
||||
|
||||
ServerDownload.resetBytesDownloaded();
|
||||
ServerDownload.resetBytesUnjarred();
|
||||
|
||||
try
|
||||
{
|
||||
//if ( progress == null )
|
||||
@@ -727,7 +713,12 @@ public class CPGenerator
|
||||
if ( metadataMode.toLowerCase().compareTo( "no" ) != 0 )
|
||||
downloadAndUnzipMetadata( sRootURL );
|
||||
|
||||
ServerDownload.resetBytesDownloaded();
|
||||
|
||||
downloadJarFiles( ispList, sRootURL );
|
||||
|
||||
ServerDownload.resetBytesDownloaded();
|
||||
|
||||
decompressJarFiles( ispList );
|
||||
|
||||
//Trace.TRACE( "features.cfg settings: " );
|
||||
@@ -763,51 +754,55 @@ public class CPGenerator
|
||||
bufferedReader.close();
|
||||
|
||||
done = true;
|
||||
Thread.yield();
|
||||
result = true;
|
||||
state = IDLE;
|
||||
//System.in.read(); // prevent console window from going away
|
||||
}
|
||||
|
||||
catch ( MalformedURLException e )
|
||||
{
|
||||
done = true;
|
||||
result = false;
|
||||
Trace.TRACE( e.getMessage() );
|
||||
e.printStackTrace();
|
||||
}
|
||||
catch ( ConnectException e )
|
||||
{
|
||||
done = true;
|
||||
result = false;
|
||||
Trace.TRACE( e.getMessage() );
|
||||
e.printStackTrace();
|
||||
}
|
||||
catch ( UnknownHostException e )
|
||||
{
|
||||
done = true;
|
||||
result = false;
|
||||
Trace.TRACE( e.getMessage() );
|
||||
e.printStackTrace();
|
||||
}
|
||||
catch ( FileNotFoundException e )
|
||||
{
|
||||
done = true;
|
||||
result = false;
|
||||
Trace.TRACE( e.getMessage() );
|
||||
e.printStackTrace();
|
||||
}
|
||||
catch ( Exception e )
|
||||
{
|
||||
done = true;
|
||||
result = false;
|
||||
Trace.TRACE( e.getMessage() );
|
||||
e.printStackTrace();
|
||||
}
|
||||
catch ( Throwable e )
|
||||
{
|
||||
done = true;
|
||||
result = false;
|
||||
Trace.TRACE( "caught an exception" );
|
||||
Trace.TRACE( e.getMessage() );
|
||||
e.printStackTrace();
|
||||
}
|
||||
finally
|
||||
{
|
||||
done = true;
|
||||
state = IDLE;
|
||||
}
|
||||
|
||||
|
||||
Trace.TRACE( "returning result: " + result );
|
||||
done = false;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,25 +42,23 @@ class UnjarException extends Exception
|
||||
public class ServerDownload
|
||||
{
|
||||
public static final boolean SLEEP = false;
|
||||
public static final int IDLE = 0;
|
||||
public static final int DOWNLOADING = 1;
|
||||
public static final int UNJARRING = 2;
|
||||
|
||||
static int state = IDLE;
|
||||
static int bytesDownloaded = 0;
|
||||
static int bytesUnjarred = 0;
|
||||
|
||||
|
||||
public static int getState()
|
||||
{
|
||||
return state;
|
||||
}
|
||||
|
||||
public static int getBytesDownloaded()
|
||||
{
|
||||
return bytesDownloaded;
|
||||
}
|
||||
|
||||
public static int getBytesUnjarred()
|
||||
{
|
||||
return bytesUnjarred;
|
||||
}
|
||||
|
||||
public static void resetBytesUnjarred()
|
||||
{
|
||||
bytesUnjarred = 0;
|
||||
}
|
||||
|
||||
|
||||
public static void resetBytesDownloaded()
|
||||
{
|
||||
bytesDownloaded = 0;
|
||||
@@ -108,6 +106,8 @@ public class ServerDownload
|
||||
public static boolean unjarURL( String sURL, String sLocalFolder, boolean bDelTempFile )
|
||||
throws Exception
|
||||
{
|
||||
state = IDLE;
|
||||
|
||||
boolean bResult = false;
|
||||
|
||||
// * downloaded file name: append filename to provided local folder
|
||||
@@ -156,6 +156,8 @@ public class ServerDownload
|
||||
|
||||
//Trace.TRACE( "downloading " + sURL );
|
||||
|
||||
state = ServerDownload.DOWNLOADING;
|
||||
|
||||
urlSrc = new URL( sURL );
|
||||
|
||||
// This is a really gross fix to a stupid little problem:
|
||||
@@ -218,6 +220,7 @@ public class ServerDownload
|
||||
|
||||
bResult = true;
|
||||
|
||||
state = IDLE;
|
||||
return bResult;
|
||||
}
|
||||
|
||||
@@ -231,6 +234,8 @@ public class ServerDownload
|
||||
public static boolean unJarFile( String sCompFile, boolean bDeleteJarFile )
|
||||
throws Exception
|
||||
{
|
||||
state = UNJARRING;
|
||||
|
||||
boolean bResult = false;
|
||||
final int nBuffSize = 500;
|
||||
|
||||
@@ -279,7 +284,7 @@ public class ServerDownload
|
||||
fileout = new FileOutputStream( zEntryFile.getPath() );
|
||||
while ( ( nBytesRead = inflaterin.read( buffer, 0, nBuffSize ) ) != -1 )
|
||||
{
|
||||
bytesUnjarred += nBytesRead;
|
||||
bytesDownloaded += nBytesRead;
|
||||
fileout.write( buffer, 0, nBytesRead );
|
||||
|
||||
if ( SLEEP )
|
||||
@@ -309,6 +314,7 @@ public class ServerDownload
|
||||
inflaterin.close();
|
||||
}
|
||||
|
||||
state = IDLE;
|
||||
return bResult;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
#include "allxpstr.h"
|
||||
#undef WANT_ENUM_STRING_IDS
|
||||
|
||||
#include <LGAPopup.h>
|
||||
//#include <LGAPopup.h>
|
||||
|
||||
#ifdef PROFILE
|
||||
#include <profiler.h>
|
||||
@@ -167,14 +167,12 @@ CComposerAwareURLDragMixin :: ReceiveDragItem ( DragReference inDragRef, DragAtt
|
||||
ItemReference inItemRef, Rect & inItemBounds,
|
||||
SPoint32 & inMouseLoc )
|
||||
{
|
||||
try
|
||||
{
|
||||
try {
|
||||
FlavorType useFlavor;
|
||||
FindBestFlavor ( inDragRef, inItemRef, useFlavor );
|
||||
Size theDataSize = 0;
|
||||
|
||||
switch ( useFlavor )
|
||||
{
|
||||
switch ( useFlavor ) {
|
||||
|
||||
case emComposerNativeDrag:
|
||||
{
|
||||
@@ -202,11 +200,8 @@ CComposerAwareURLDragMixin :: ReceiveDragItem ( DragReference inDragRef, DragAtt
|
||||
|
||||
} // switch on best flavor
|
||||
}
|
||||
catch ( ... )
|
||||
{
|
||||
#ifdef DEBUG
|
||||
catch ( ... ) {
|
||||
DebugStr ( "\pCan't find the flavor we want; g" );
|
||||
#endif
|
||||
}
|
||||
|
||||
} // ReceiveDragItem
|
||||
@@ -266,8 +261,8 @@ void CEditView::FinishCreateSelf(void)
|
||||
while (view->GetSuperView())
|
||||
view = view->GetSuperView();
|
||||
|
||||
mParagraphToolbarPopup = (LGAPopup *)view->FindPaneByID( cmd_Paragraph_Hierarchical_Menu );
|
||||
mSizeToolbarPopup = (LGAPopup *)view->FindPaneByID( cmd_Font_Size_Hierarchical_Menu );
|
||||
mParagraphToolbarPopup = (LControl *)view->FindPaneByID( cmd_Paragraph_Hierarchical_Menu );
|
||||
mSizeToolbarPopup = (LControl *)view->FindPaneByID( cmd_Font_Size_Hierarchical_Menu );
|
||||
mAlignToolbarPopup = (CPatternButtonPopup *)view->FindPaneByID( cmd_Align_Hierarchical_Menu );
|
||||
mFontToolbarPopup = (CFontMenuPopup *)view->FindPaneByID( 'Font' );
|
||||
mColorPopup = (CColorPopup *)view->FindPaneByID( 'Colr' );
|
||||
@@ -465,34 +460,10 @@ Bool CEditView::SaveDocumentAs()
|
||||
if ( pLocalName )
|
||||
{
|
||||
int16 saveCsid = (GetContext())->GetWinCSID();
|
||||
char newName[32];
|
||||
strncpy( newName, (char *)&sfReply.sfFile.name[1], sfReply.sfFile.name[0] );
|
||||
newName[ sfReply.sfFile.name[0] ] = 0; /* null-terminate */
|
||||
|
||||
EDT_PageData *pagedata;
|
||||
pagedata = EDT_GetPageData( *GetContext() );
|
||||
if ( pagedata )
|
||||
{
|
||||
/* this code assumes that EDT_SetPageData is not going to free the title */
|
||||
if ( ( pagedata->pTitle == NULL )
|
||||
|| ( pagedata->pTitle && pagedata->pTitle[0] == 0 ) )
|
||||
{
|
||||
XP_FREEIF( pagedata->pTitle );
|
||||
pagedata->pTitle = newName;
|
||||
|
||||
if ( pagedata->pTitle )
|
||||
{
|
||||
EDT_SetPageData( *GetContext(), pagedata );
|
||||
/* set to NULL since we didn't malloc this data & don't want it freed in EDT_FreePageData */
|
||||
pagedata->pTitle = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
EDT_FreePageData( pagedata );
|
||||
}
|
||||
|
||||
if (hist_ent->title == NULL)
|
||||
{
|
||||
CStr31 newName( sfReply.sfFile.name );
|
||||
StrAllocCopy( ((MWContext *)*GetContext())->title, newName );
|
||||
SHIST_SetTitleOfCurrentDoc( *GetContext() );
|
||||
}
|
||||
|
||||
@@ -27,7 +27,6 @@ Boolean GetCaretPosition(MWContext *context, LO_Element * element, int32 caretPo
|
||||
int32* caretX, int32* caretYLow, int32* caretYHigh );
|
||||
|
||||
|
||||
class LGAPopup;
|
||||
class CPatternButtonPopup;
|
||||
class CColorPopup;
|
||||
class CComposeSession;
|
||||
@@ -179,8 +178,8 @@ public:
|
||||
CEditView &view;
|
||||
};
|
||||
|
||||
LGAPopup * mParagraphToolbarPopup;
|
||||
LGAPopup * mSizeToolbarPopup;
|
||||
LControl * mParagraphToolbarPopup;
|
||||
LControl * mSizeToolbarPopup;
|
||||
CFontMenuPopup * mFontToolbarPopup;
|
||||
CPatternButtonPopup * mAlignToolbarPopup;
|
||||
CColorPopup * mColorPopup;
|
||||
|
||||
@@ -159,11 +159,7 @@ CEditorWindow* CEditorWindow::MakeEditWindow( MWContext* old_context, URL_Struct
|
||||
{
|
||||
url = SHIST_CreateURLStructFromHistoryEntry( old_context, entry );
|
||||
if ( url )
|
||||
{
|
||||
url->force_reload = NET_NORMAL_RELOAD;
|
||||
|
||||
XP_MEMSET( &url->savedData, 0, sizeof( SHIST_SavedData ) );
|
||||
}
|
||||
}
|
||||
// if we don't have a history entry, we're kind of screwed-->just load a blank page
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -23,7 +23,7 @@
|
||||
// You typically won't need to change anything in this file.
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "MacPrefix_debug.h"
|
||||
#include "Moz_DebugConfig.h"
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ¥ When we split out the procompiled headers seperately, we will not
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
//
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "MacPrefix.h"
|
||||
#include "Moz_Config.h"
|
||||
|
||||
#ifdef powerc
|
||||
#pragma precompile_target "Composer_HeadersPPC"
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
//
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "MacPrefix.h"
|
||||
#include "Moz_Config.h"
|
||||
|
||||
#ifdef powerc
|
||||
#pragma precompile_target "Composer_HeadersPPC++"
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// You typically won't need to change anything in this file.
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "MacPrefix.h"
|
||||
#include "Moz_Config.h"
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ¥ When we split out the procompiled headers seperately, we will not
|
||||
|
||||
@@ -930,16 +930,7 @@ Boolean CPublish::CommitChanges( Boolean /* isAllPanes */ )
|
||||
if ( titleField )
|
||||
pageData->pTitle = titleField->GetLongDescriptor();
|
||||
|
||||
if ( pageData->pTitle && pageData->pTitle[0] == 0 )
|
||||
{
|
||||
XP_FREE( pageData->pTitle );
|
||||
pageData->pTitle = NULL;
|
||||
}
|
||||
if ( pageData->pTitle == NULL )
|
||||
pageData->pTitle = strdup( " " );
|
||||
|
||||
EDT_SetPageData( fContext, pageData );
|
||||
|
||||
EDT_FreePageData( pageData );
|
||||
}
|
||||
|
||||
@@ -2487,17 +2478,12 @@ void CEDTableCellContain::PrefsFromControls()
|
||||
if (cellData == NULL)
|
||||
return;
|
||||
|
||||
if ( fRowSpanEditText->IsEnabled() ) /* assume CF_ROWSPAN bit already set properly */
|
||||
if ( fRowSpanEditText->IsEnabled() )
|
||||
cellData->iRowSpan = fRowSpanEditText->GetValue();
|
||||
if ( fColSpanEditText->IsEnabled() ) /* assume CF_COLSPAN bit already set properly */
|
||||
if ( fColSpanEditText->IsEnabled() )
|
||||
cellData->iColSpan = fColSpanEditText->GetValue();
|
||||
|
||||
int curValue;
|
||||
|
||||
curValue = fHorizontalAlignment->GetValue();
|
||||
if ( !(cellData->mask & CF_ALIGN ) && curValue != 4 )
|
||||
cellData->mask |= CF_ALIGN;
|
||||
switch ( curValue )
|
||||
switch ( fHorizontalAlignment->GetValue() )
|
||||
{
|
||||
default:
|
||||
case 1: cellData->align = ED_ALIGN_LEFT; break;
|
||||
@@ -2506,96 +2492,59 @@ void CEDTableCellContain::PrefsFromControls()
|
||||
case 4: break; // mixed state; don't reset
|
||||
}
|
||||
|
||||
curValue = fVerticalAlignment->GetValue();
|
||||
if ( !(cellData->mask & CF_VALIGN ) && curValue != 5 )
|
||||
cellData->mask |= CF_VALIGN;
|
||||
switch ( curValue )
|
||||
switch ( fVerticalAlignment->GetValue() )
|
||||
{
|
||||
default:
|
||||
case 1: cellData->valign = ED_ALIGN_ABSTOP; break;
|
||||
case 2: cellData->valign = ED_ALIGN_ABSCENTER; break;
|
||||
case 3: cellData->valign = ED_ALIGN_BASELINE; break;
|
||||
case 4: cellData->valign = ED_ALIGN_ABSBOTTOM; break;
|
||||
case 1: cellData->valign = ED_ALIGN_ABSTOP;
|
||||
case 2: cellData->valign = ED_ALIGN_ABSCENTER;
|
||||
case 3: cellData->valign = ED_ALIGN_BASELINE;
|
||||
case 4: cellData->valign = ED_ALIGN_ABSBOTTOM;
|
||||
case 5: break; // mixed state; don't reset
|
||||
}
|
||||
|
||||
curValue = fHeaderStyle->GetValue();
|
||||
if ( curValue != 2 )
|
||||
{
|
||||
if ( !(cellData->mask & CF_HEADER ) )
|
||||
cellData->mask |= CF_HEADER;
|
||||
cellData->bHeader = curValue;
|
||||
}
|
||||
|
||||
curValue = fWrapText->GetValue();
|
||||
if ( curValue != 2 )
|
||||
{
|
||||
if ( !(cellData->mask & CF_NOWRAP ) )
|
||||
cellData->mask |= CF_NOWRAP;
|
||||
cellData->bNoWrap = curValue;
|
||||
}
|
||||
|
||||
curValue = fCustomWidth->GetValue();
|
||||
if ( !(cellData->mask & CF_WIDTH ) && curValue != 2 )
|
||||
cellData->mask |= CF_WIDTH;
|
||||
if ( curValue == 1 )
|
||||
cellData->bHeader = fHeaderStyle->GetValue();
|
||||
cellData->bNoWrap = fWrapText->GetValue();
|
||||
|
||||
if ( fCustomWidth->GetValue() )
|
||||
{
|
||||
cellData->bWidthDefined = TRUE;
|
||||
cellData->bWidthPercent = fWidthPopup->GetValue() == kPercentOfWindowItem;
|
||||
cellData->iWidth = fWidthEditText->GetValue();
|
||||
}
|
||||
else if ( curValue == 0 )
|
||||
else
|
||||
cellData->bWidthDefined = FALSE;
|
||||
|
||||
curValue = fCustomHeight->GetValue();
|
||||
if ( !(cellData->mask & CF_HEIGHT ) && curValue != 2 )
|
||||
cellData->mask |= CF_HEIGHT;
|
||||
if ( curValue == 1 )
|
||||
if (fCustomHeight->GetValue())
|
||||
{
|
||||
cellData->bHeightDefined = TRUE;
|
||||
cellData->bHeightPercent = fHeightPopup->GetValue() == kPercentOfWindowItem;
|
||||
cellData->iHeight = fHeightEditText->GetValue();
|
||||
}
|
||||
else if ( curValue == 0 )
|
||||
else
|
||||
cellData->bHeightDefined = FALSE;
|
||||
|
||||
XP_FREEIF( cellData->pColorBackground ); // we'll replace it with our own if we use it at all.
|
||||
cellData->pColorBackground = NULL;
|
||||
|
||||
LO_Color pColor;
|
||||
curValue = fCustomColor->GetValue();
|
||||
if ( curValue != 2 && !(cellData->mask & CF_BACK_COLOR ) )
|
||||
cellData->mask |= CF_BACK_COLOR;
|
||||
if ( curValue == 1 )
|
||||
if ( fCustomColor->GetValue() )
|
||||
{
|
||||
pColor = UGraphics::MakeLOColor(fColorCustomColor->GetColor());
|
||||
cellData->pColorBackground = &pColor;
|
||||
}
|
||||
else if ( curValue == 0 )
|
||||
else
|
||||
cellData->pColorBackground = NULL;
|
||||
|
||||
XP_FREEIF( cellData->pBackgroundImage );
|
||||
cellData->pBackgroundImage = NULL;
|
||||
|
||||
curValue = mUseImage->GetValue();
|
||||
if ( !(cellData->mask & CF_BACK_IMAGE ) && curValue != 2 )
|
||||
cellData->mask |= CF_BACK_IMAGE;
|
||||
if ( curValue == 1 )
|
||||
if ( mUseImage->GetValue() )
|
||||
cellData->pBackgroundImage = mImageFileName->GetLongDescriptor();
|
||||
|
||||
curValue = mLeaveImage->GetValue();
|
||||
if ( curValue != 2 )
|
||||
{
|
||||
if ( !(cellData->mask & CF_BACK_NOSAVE ) )
|
||||
cellData->mask |= CF_BACK_NOSAVE;
|
||||
cellData->bBackgroundNoSave = curValue;
|
||||
}
|
||||
cellData->bBackgroundNoSave = mLeaveImage->GetValue();
|
||||
|
||||
LView* extrahtmlbutton = (LView *)FindPaneByID( 'Xtra' );
|
||||
XP_ASSERT( extrahtmlbutton != NULL );
|
||||
if ( !(cellData->mask & CF_EXTRA_HTML ) )
|
||||
XP_ASSERT( 1 );
|
||||
if ( extrahtmlbutton && extrahtmlbutton->IsEnabled() )
|
||||
if ( extrahtmlbutton->IsEnabled() )
|
||||
{
|
||||
XP_FREEIF( cellData->pExtra );
|
||||
cellData->pExtra = pExtra;
|
||||
@@ -2611,6 +2560,32 @@ void CEDTableCellContain::PrefsFromControls()
|
||||
EDT_FreeTableCellData( cellData );
|
||||
}
|
||||
|
||||
#if FIRST_PASS_AT_MASK
|
||||
typedef enum {
|
||||
ED_ALIGN_LEFT_MASK = 0x0001,
|
||||
ED_ALIGN_CENTER_MASK = 0x0002,
|
||||
ED_ALIGN_RIGHT_MASK = 0x0004,
|
||||
ED_ALIGN_ABSTOP_MASK = 0x0010,
|
||||
ED_ALIGN_ABSCENTER_MASK = 0x0020,
|
||||
ED_ALIGN_BASELINE_MASK = 0x0040,
|
||||
ED_ALIGN_ABSBOTTOM_MASK = 0x0080
|
||||
} ED_AlignmentMask;
|
||||
|
||||
/* ED_AlignmentMask: add the values which are set */
|
||||
/* Boolean: true means all agree; false means selection has different values */
|
||||
struct _EDT_TableCellMask {
|
||||
ED_AlignmentMask bHalign;
|
||||
ED_AlignmentMask bValign;
|
||||
Boolean bColAndRowSpan;
|
||||
Boolean bHeader;
|
||||
Boolean bNoWrap;
|
||||
Boolean bWidth;
|
||||
Boolean bHeight;
|
||||
Boolean bColor;
|
||||
Boolean bBackgroundImage;
|
||||
Boolean bExtraHTML;
|
||||
};
|
||||
#endif
|
||||
|
||||
// Initialize from preferences
|
||||
void CEDTableCellContain::ControlsFromPref()
|
||||
@@ -2619,10 +2594,21 @@ void CEDTableCellContain::ControlsFromPref()
|
||||
if (cellData == NULL)
|
||||
return;
|
||||
|
||||
#if FIRST_PASS_AT_MASK
|
||||
_EDT_TableCellMask cellDataMask;
|
||||
cellDataMask.bHalign = ED_ALIGN_LEFT_MASK;
|
||||
cellDataMask.bValign = ED_ALIGN_BASELINE_MASK;
|
||||
cellDataMask.bColAndRowSpan = true;
|
||||
cellDataMask.bHeader = cellDataMask.bNoWrap = true;
|
||||
cellDataMask.bWidth = cellDataMask.bHeight = true;
|
||||
cellDataMask.bColor = cellDataMask.bBackgroundImage = true;
|
||||
cellDataMask.bExtraHTML = true;
|
||||
#endif
|
||||
|
||||
// set popup menus depending if nested in another table or just in window
|
||||
short resID;
|
||||
CStr255 title;
|
||||
StringHandle titleH;
|
||||
|
||||
if (EDT_IsInsertPointInNestedTable(fContext))
|
||||
resID = EDITOR_PERCENT_PARENT_CELL;
|
||||
else
|
||||
@@ -2633,7 +2619,7 @@ void CEDTableCellContain::ControlsFromPref()
|
||||
{
|
||||
SInt8 hstate = HGetState( (Handle)titleH );
|
||||
HLock( (Handle)titleH );
|
||||
CStr255 title = *titleH;
|
||||
title = *titleH;
|
||||
HSetState( (Handle)titleH, hstate );
|
||||
|
||||
MenuHandle menuh = ((LGAPopup *)fWidthPopup)->GetMacMenuH();
|
||||
@@ -2651,57 +2637,56 @@ void CEDTableCellContain::ControlsFromPref()
|
||||
}
|
||||
}
|
||||
|
||||
/* col span */
|
||||
if ( (cellData->mask & CF_COLSPAN) )
|
||||
{
|
||||
fColSpanEditText->SetValue( cellData->iColSpan );
|
||||
fColSpanEditText->Enable();
|
||||
}
|
||||
else
|
||||
fColSpanEditText->Disable();
|
||||
|
||||
/* row span */
|
||||
if ( (cellData->mask & CF_ROWSPAN) )
|
||||
/* col and row span */
|
||||
#if FIRST_PASS_AT_MASK
|
||||
if ( cellDataMask.bColAndRowSpan )
|
||||
#endif
|
||||
{
|
||||
fRowSpanEditText->SetValue( cellData->iRowSpan );
|
||||
fRowSpanEditText->Enable();
|
||||
fColSpanEditText->SetValue( cellData->iColSpan );
|
||||
}
|
||||
#if FIRST_PASS_AT_MASK
|
||||
else
|
||||
{
|
||||
fRowSpanEditText->Disable();
|
||||
fColSpanEditText->Disable();
|
||||
// should disable the rest of this too...
|
||||
}
|
||||
#endif
|
||||
|
||||
/* horizontal alignment */
|
||||
if ( (cellData->mask & CF_ALIGN) )
|
||||
switch ( cellData->align )
|
||||
{
|
||||
switch ( cellData->align )
|
||||
{
|
||||
case ED_ALIGN_DEFAULT:
|
||||
case ED_ALIGN_LEFT: fHorizontalAlignment->SetValue( 1 ); break;
|
||||
case ED_ALIGN_ABSCENTER: fHorizontalAlignment->SetValue( 2 ); break;
|
||||
case ED_ALIGN_RIGHT: fHorizontalAlignment->SetValue( 3 ); break;
|
||||
}
|
||||
case ED_ALIGN_LEFT: fHorizontalAlignment->SetValue( 1 ); break;
|
||||
case ED_ALIGN_ABSCENTER: fHorizontalAlignment->SetValue( 2 ); break;
|
||||
case ED_ALIGN_RIGHT: fHorizontalAlignment->SetValue( 3 ); break;
|
||||
default: /* mixed */ fHorizontalAlignment->SetValue( 4 ); break;
|
||||
}
|
||||
else
|
||||
fHorizontalAlignment->SetValue( 4 );
|
||||
|
||||
/* vertical alignment */
|
||||
if ( (cellData->mask & CF_VALIGN) )
|
||||
switch ( cellData->valign )
|
||||
{
|
||||
switch ( cellData->valign )
|
||||
{
|
||||
case ED_ALIGN_ABSTOP: fVerticalAlignment->SetValue( 1 ); break;
|
||||
case ED_ALIGN_ABSCENTER: fVerticalAlignment->SetValue( 2 ); break;
|
||||
case ED_ALIGN_BASELINE: fVerticalAlignment->SetValue( 3 ); break;
|
||||
case ED_ALIGN_ABSBOTTOM: fVerticalAlignment->SetValue( 4 ); break;
|
||||
}
|
||||
case ED_ALIGN_ABSTOP: fVerticalAlignment->SetValue( 1 ); break;
|
||||
case ED_ALIGN_ABSCENTER: fVerticalAlignment->SetValue( 2 ); break;
|
||||
case ED_ALIGN_BASELINE: fVerticalAlignment->SetValue( 3 ); break;
|
||||
case ED_ALIGN_ABSBOTTOM: fVerticalAlignment->SetValue( 4 ); break;
|
||||
default: /* mixed */ fVerticalAlignment->SetValue( 5 ); break;
|
||||
}
|
||||
else
|
||||
fVerticalAlignment->SetValue( 5 );
|
||||
|
||||
/* text */
|
||||
fHeaderStyle->SetValue( (cellData->mask & CF_HEADER) ? cellData->bHeader : 2 );
|
||||
fWrapText->SetValue( (cellData->mask & CF_NOWRAP) ? cellData->bNoWrap : 2 );
|
||||
#if FIRST_PASS_AT_MASK
|
||||
fHeaderStyle->SetValue( cellDataMask.bHeader ? cellData->bHeader : 2 );
|
||||
fWrapText->SetValue( cellDataMask.bNoWrap ? cellData->bNoWrap : 2 );
|
||||
#else
|
||||
fHeaderStyle->SetValue( cellData->bHeader );
|
||||
fWrapText->SetValue( cellData->bNoWrap );
|
||||
#endif
|
||||
|
||||
fCustomWidth->SetValue( (cellData->mask & CF_WIDTH) ? cellData->bWidthDefined : 2 );
|
||||
#if FIRST_PASS_AT_MASK
|
||||
fCustomWidth->SetValue( cellDataMask.bWidth ? cellData->bWidthDefined : 2 );
|
||||
#else
|
||||
fCustomWidth->SetValue( cellData->bWidthDefined );
|
||||
#endif
|
||||
if ( cellData->bWidthDefined )
|
||||
{
|
||||
fWidthEditText->SetValue( cellData->iWidth );
|
||||
@@ -2713,7 +2698,11 @@ void CEDTableCellContain::ControlsFromPref()
|
||||
fWidthPopup->SetValue( kPercentOfWindowItem );
|
||||
}
|
||||
|
||||
fCustomHeight->SetValue( (cellData->mask & CF_HEIGHT) ? cellData->bHeightDefined : 2 );
|
||||
#if FIRST_PASS_AT_MASK
|
||||
fCustomHeight->SetValue( cellDataMask.bHeight ? cellData->bHeightDefined : 2 );
|
||||
#else
|
||||
fCustomHeight->SetValue( cellData->bHeightDefined );
|
||||
#endif
|
||||
if ( cellData->bHeightDefined )
|
||||
{
|
||||
fHeightEditText->SetValue(cellData->iHeight);
|
||||
@@ -2725,7 +2714,7 @@ void CEDTableCellContain::ControlsFromPref()
|
||||
fHeightPopup->SetValue( kPercentOfWindowItem );
|
||||
}
|
||||
|
||||
fCustomColor->SetValue( (cellData->mask & CF_BACK_COLOR) ? cellData->pColorBackground != NULL : 2 );
|
||||
fCustomColor->SetValue( cellData->pColorBackground != NULL );
|
||||
RGBColor rgb;
|
||||
if ( cellData->pColorBackground )
|
||||
rgb = UGraphics::MakeRGBColor( *cellData->pColorBackground );
|
||||
@@ -2733,24 +2722,32 @@ void CEDTableCellContain::ControlsFromPref()
|
||||
rgb = UGraphics::MakeRGBColor( 0xFF, 0xFF, 0xFF ); // something pretty... (or, better yet, get the default color - yeah, right!)
|
||||
fColorCustomColor->SetColor( rgb );
|
||||
|
||||
mImageFileName->SetLongDescriptor( cellData->pBackgroundImage ? cellData->pBackgroundImage : "" );
|
||||
mUseImage->SetValue( (cellData->mask & CF_BACK_IMAGE) ? cellData->pBackgroundImage != NULL : 2 );
|
||||
mLeaveImage->SetValue( (cellData->mask & CF_BACK_NOSAVE) ? cellData->bBackgroundNoSave : 2 );
|
||||
if ( cellData->pBackgroundImage )
|
||||
{
|
||||
mImageFileName->SetLongDescriptor( cellData->pBackgroundImage );
|
||||
// turn on after we set the descriptor so we don't handle as click when msg is broadcast
|
||||
TurnOn( mUseImage );
|
||||
}
|
||||
mLeaveImage->SetValue( cellData->bBackgroundNoSave );
|
||||
|
||||
LView* extrahtmlbutton = (LView *)FindPaneByID( 'Xtra' );
|
||||
XP_ASSERT( extrahtmlbutton != NULL );
|
||||
if ( (cellData->mask & CF_EXTRA_HTML) )
|
||||
#if FIRST_PASS_AT_MASK
|
||||
if ( cellDataMask.bExtraHTML )
|
||||
#endif
|
||||
{
|
||||
extrahtmlbutton->Enable();
|
||||
pExtra = cellData->pExtra;
|
||||
cellData->pExtra = NULL; // don't let backend free!
|
||||
}
|
||||
#if FIRST_PASS_AT_MASK
|
||||
else
|
||||
{
|
||||
/* don't agree; disable for now */
|
||||
extrahtmlbutton->Disable();
|
||||
pExtra = NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
EDT_FreeTableCellData(cellData);
|
||||
AdjustEnable();
|
||||
@@ -2815,47 +2812,30 @@ void CEDTableCellContain::ListenToMessage( MessageT inMessage, void* /* ioParam
|
||||
{
|
||||
switch ( inMessage )
|
||||
{
|
||||
case 'TsPU': /* popup menu item was changed */
|
||||
case 'PREV':
|
||||
case 'NEXT':
|
||||
/* AllFieldsOK?, Cancel->Close, Apply */
|
||||
// CEditDialog::ListenToMessage( msg_Apply, NULL );
|
||||
|
||||
/* approprate selection */
|
||||
ED_HitType moveType = ED_HIT_SEL_CELL;
|
||||
LGAPopup * tableSelectionPopup = (LGAPopup*)FindPaneByID( 'TsPU' );
|
||||
if ( tableSelectionPopup )
|
||||
{
|
||||
switch ( tableSelectionPopup->GetValue() )
|
||||
{
|
||||
case 1: /* cell */
|
||||
moveType = ED_HIT_SEL_CELL;
|
||||
break;
|
||||
|
||||
case 2: /* row */
|
||||
moveType = ED_HIT_SEL_ROW;
|
||||
break;
|
||||
|
||||
case 3: /* column */
|
||||
moveType = ED_HIT_SEL_COL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ED_MoveSelType moveDirection;
|
||||
if (inMessage == 'PREV')
|
||||
moveDirection = ED_MOVE_PREV;
|
||||
else if (inMessage == 'NEXT')
|
||||
moveDirection = ED_MOVE_NEXT;
|
||||
else if (inMessage == 'TsPU')
|
||||
moveDirection = ED_MOVE_NONE;
|
||||
|
||||
EDT_ChangeTableSelection( fContext, moveType, moveDirection, NULL );
|
||||
/* select next */
|
||||
/* HACK ALERT!!!!!!! For now, let's just tab to the next cell */
|
||||
EDT_TabKey( fContext, true, false );
|
||||
|
||||
/* fill in new data */
|
||||
ControlsFromPref();
|
||||
break;
|
||||
|
||||
case 'PREV':
|
||||
/* AllFieldsOK */
|
||||
/* Apply */
|
||||
|
||||
/* select next */
|
||||
/* HACK ALERT!!!!!!! For now, let's just tab to the previous cell */
|
||||
EDT_TabKey( fContext, false, false );
|
||||
|
||||
/* fill in new data */
|
||||
SysBeep(0);
|
||||
break;
|
||||
|
||||
case 'cwth':
|
||||
case 'chgt':
|
||||
case 'cclr':
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
utility/MacBinSupport.h
|
||||
@@ -1406,10 +1406,10 @@ void CPluginView::EmbedSize(LO_EmbedStruct* embed_struct, SDimension16 hyperSize
|
||||
// If the plug-in is hidden, set the width and height to zero and
|
||||
// set a flag indicating that we are hidden.
|
||||
//
|
||||
if (embed_struct->objTag.ele_attrmask & LO_ELE_HIDDEN)
|
||||
if (embed_struct->ele_attrmask & LO_ELE_HIDDEN)
|
||||
{
|
||||
embed_struct->objTag.width = 0;
|
||||
embed_struct->objTag.height = 0;
|
||||
embed_struct->width = 0;
|
||||
embed_struct->height = 0;
|
||||
fHidden = true;
|
||||
Hide();
|
||||
StartIdling(); // Visible plug-ins start idling in EmbedDisplay
|
||||
@@ -1438,8 +1438,8 @@ void CPluginView::EmbedSize(LO_EmbedStruct* embed_struct, SDimension16 hyperSize
|
||||
SBooleanRect binding = {true, true, true, true};
|
||||
SetFrameBinding(binding);
|
||||
|
||||
embed_struct->objTag.width = hyperSize.width;
|
||||
embed_struct->objTag.height = hyperSize.height;
|
||||
embed_struct->width = hyperSize.width;
|
||||
embed_struct->height = hyperSize.height;
|
||||
|
||||
//
|
||||
// Remember an offset for the view to
|
||||
@@ -1456,8 +1456,8 @@ void CPluginView::EmbedSize(LO_EmbedStruct* embed_struct, SDimension16 hyperSize
|
||||
fVerticalOffset = 0;
|
||||
}
|
||||
|
||||
ResizeImageTo(embed_struct->objTag.width, embed_struct->objTag.height, false);
|
||||
ResizeFrameTo(embed_struct->objTag.width, embed_struct->objTag.height, false);
|
||||
ResizeImageTo(embed_struct->width, embed_struct->height, false);
|
||||
ResizeFrameTo(embed_struct->width, embed_struct->height, false);
|
||||
|
||||
//
|
||||
// NOTE: The position set here is not really valid because the x and y in
|
||||
@@ -1466,8 +1466,8 @@ void CPluginView::EmbedSize(LO_EmbedStruct* embed_struct, SDimension16 hyperSize
|
||||
// We go ahead and position ourselves anyway just so we have a superview
|
||||
// and location initially.
|
||||
//
|
||||
Int32 x = embed_struct->objTag.x + embed_struct->objTag.x_offset + fHorizontalOffset;
|
||||
Int32 y = embed_struct->objTag.y + embed_struct->objTag.y_offset + fVerticalOffset;
|
||||
Int32 x = embed_struct->x + embed_struct->x_offset + fHorizontalOffset;
|
||||
Int32 y = embed_struct->y + embed_struct->y_offset + fVerticalOffset;
|
||||
PlaceInSuperImageAt(x, y, false);
|
||||
|
||||
//
|
||||
@@ -1490,8 +1490,8 @@ void CPluginView::EmbedDisplay(LO_EmbedStruct* embed_struct, Boolean isPrinting)
|
||||
//
|
||||
if (fPositioned == false)
|
||||
{
|
||||
Int32 x = embed_struct->objTag.x + embed_struct->objTag.x_offset + fHorizontalOffset;
|
||||
Int32 y = embed_struct->objTag.y + embed_struct->objTag.y_offset + fVerticalOffset;
|
||||
Int32 x = embed_struct->x + embed_struct->x_offset + fHorizontalOffset;
|
||||
Int32 y = embed_struct->y + embed_struct->y_offset + fVerticalOffset;
|
||||
PlaceInSuperImageAt(x, y, false);
|
||||
if (fWindowed)
|
||||
Show();
|
||||
@@ -1517,19 +1517,19 @@ void CPluginView::EmbedDisplay(LO_EmbedStruct* embed_struct, Boolean isPrinting)
|
||||
SPoint32 imagePoint;
|
||||
Int32 x, y;
|
||||
|
||||
if (IsVisible() && (embed_struct->objTag.ele_attrmask & LO_ELE_INVISIBLE))
|
||||
if (IsVisible() && (embed_struct->ele_attrmask & LO_ELE_INVISIBLE))
|
||||
Hide();
|
||||
|
||||
CalcPortFrameRect(frameRect);
|
||||
GetSuperView()->PortToLocalPoint(topLeft(frameRect));
|
||||
GetSuperView()->LocalToImagePoint(topLeft(frameRect), imagePoint);
|
||||
|
||||
x = embed_struct->objTag.x + embed_struct->objTag.x_offset + fHorizontalOffset;
|
||||
y = embed_struct->objTag.y + embed_struct->objTag.y_offset + fVerticalOffset;
|
||||
x = embed_struct->x + embed_struct->x_offset + fHorizontalOffset;
|
||||
y = embed_struct->y + embed_struct->y_offset + fVerticalOffset;
|
||||
if ((imagePoint.h != x) || (imagePoint.v != y))
|
||||
PlaceInSuperImageAt(x, y, true);
|
||||
|
||||
if (!IsVisible() && !(embed_struct->objTag.ele_attrmask & LO_ELE_INVISIBLE))
|
||||
if (!IsVisible() && !(embed_struct->ele_attrmask & LO_ELE_INVISIBLE))
|
||||
Show();
|
||||
}
|
||||
// For a windowless plug-in, this is where the plug-in actually draws.
|
||||
@@ -1551,7 +1551,7 @@ void CPluginView::EmbedDisplay(LO_EmbedStruct* embed_struct, Boolean isPrinting)
|
||||
void CPluginView::EmbedCreate(MWContext* context, LO_EmbedStruct* embed_struct)
|
||||
{
|
||||
fEmbedStruct = embed_struct;
|
||||
fApp = (NPEmbeddedApp*) embed_struct->objTag.FE_Data;
|
||||
fApp = (NPEmbeddedApp*) embed_struct->FE_Data;
|
||||
Boolean printing = (context->type == MWContextPrint);
|
||||
|
||||
//
|
||||
@@ -1569,7 +1569,7 @@ void CPluginView::EmbedCreate(MWContext* context, LO_EmbedStruct* embed_struct)
|
||||
if (printing)
|
||||
fOriginalView = (CPluginView*) fApp->fe_data;
|
||||
fApp->fe_data = this;
|
||||
embed_struct->objTag.FE_Data = fApp;
|
||||
embed_struct->FE_Data = fApp;
|
||||
if (!printing)
|
||||
fApp->wdata = GetNPWindow();
|
||||
NPError err = NPL_EmbedStart(context, embed_struct, fApp);
|
||||
@@ -1585,7 +1585,7 @@ void CPluginView::EmbedCreate(MWContext* context, LO_EmbedStruct* embed_struct)
|
||||
if (fApp == NULL)
|
||||
{
|
||||
delete this;
|
||||
embed_struct->objTag.FE_Data = NULL;
|
||||
embed_struct->FE_Data = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1934,8 +1934,8 @@ void CPluginView::ResetDrawRect()
|
||||
parentView->CalcElementPosition((LO_Element *)fEmbedStruct, frame);
|
||||
|
||||
// Convert it into image coordinates
|
||||
localPoint.h = frame.left - (fEmbedStruct->objTag.x + fEmbedStruct->objTag.x_offset);
|
||||
localPoint.v = frame.top - (fEmbedStruct->objTag.y + fEmbedStruct->objTag.y_offset);
|
||||
localPoint.h = frame.left - (fEmbedStruct->x + fEmbedStruct->x_offset);
|
||||
localPoint.v = frame.top - (fEmbedStruct->y + fEmbedStruct->y_offset);
|
||||
portPoint = localPoint;
|
||||
localPoint.h -= portOrigin.h;
|
||||
localPoint.v -= portOrigin.v;
|
||||
|
||||
@@ -45,14 +45,25 @@
|
||||
#include <LTextColumn.h>
|
||||
#include <LSubOverlapView.h>
|
||||
|
||||
// ¥¥¥ AM wrappers classes and their AM implementations
|
||||
#include <LStaticText.h>
|
||||
#include <LAMStaticTextImp.h>
|
||||
#include <LIconControl.h>
|
||||
#include <LProgressBar.h>
|
||||
#include <LPushButton.h>
|
||||
#include <LAMPushButtonImp.h>
|
||||
|
||||
// ¥¥¥ Things that will go away after appearance conversion complete
|
||||
#include "CProgressBar.h"
|
||||
#include "CPatternBevelView.h"
|
||||
|
||||
// ¥¥¥ PowerPlant Grayscale Classes
|
||||
#include <UGALibRegistry.h>
|
||||
|
||||
// ¥¥¥ General Purpose UI Classes
|
||||
#include "CBevelButton.h"
|
||||
#include "CPatternButton.h"
|
||||
#include "CGrayBevelView.h"
|
||||
#include "CPatternBevelView.h"
|
||||
#include "CAMSavvyBevelView.h"
|
||||
#include "CPatternButtonPopup.h"
|
||||
#include "CGuidePopupMenu.h"
|
||||
#include "CNavigationButtonPopup.h"
|
||||
@@ -67,8 +78,6 @@
|
||||
#include "CClusterView.h"
|
||||
#include "CTabSwitcher.h"
|
||||
#include "CPatternTabControl.h"
|
||||
#include "CProgressBar.h"
|
||||
// #include "CProgressCaption.h"
|
||||
#include "CTaskBarView.h"
|
||||
#include "LTableHeader.h"
|
||||
#include "LTableViewHeader.h"
|
||||
@@ -193,7 +202,6 @@ void RegisterAllBrowserClasses(void)
|
||||
RegisterClass_(LTabGroup);
|
||||
RegisterClass_(LActiveScroller);
|
||||
|
||||
//LRegistrar::RegisterClass('prto', (ClassCreatorFunc);LPrintout::CreateOldPrintoutStream);
|
||||
|
||||
#ifdef PP_NewClasses
|
||||
#include <LCicnButton.h>
|
||||
@@ -214,13 +222,28 @@ void RegisterAllBrowserClasses(void)
|
||||
// ¥¥¥ PowerPlant Grayscale Classes
|
||||
RegisterGALibraryClasses();
|
||||
|
||||
// ¥¥¥ PowerPlant appearance manager classes and their implementations
|
||||
RegisterClass_(LStaticText);
|
||||
RegisterClassID_(LAMStaticTextImp, LStaticText::imp_class_ID);
|
||||
RegisterClass_(LIconControl);
|
||||
RegisterClassID_(LAMControlImp, LIconControl::imp_class_ID);
|
||||
RegisterClass_(LProgressBar);
|
||||
RegisterClassID_(LAMControlImp, LProgressBar::imp_class_ID);
|
||||
RegisterClass_(LPushButton);
|
||||
RegisterClassID_(LAMPushButtonImp, LPushButton::imp_class_ID);
|
||||
// RegisterClass_(LBevelButton);
|
||||
// RegisterClassID_(LAMControlImp, LBevelButton::imp_class_ID);
|
||||
|
||||
// ¥¥¥ Things that will go away after appearance port complete
|
||||
RegisterClass_(CProgressBar);
|
||||
RegisterClass_(CPatternBevelView);
|
||||
|
||||
// ¥¥¥ General Purpose UI Classes
|
||||
RegisterClass_(CBevelButton);
|
||||
RegisterClass_(CDeluxeBevelButton);
|
||||
RegisterClass_(CPatternButton);
|
||||
RegisterClass_(CPatternButtonPopup);
|
||||
RegisterClass_(CGrayBevelView);
|
||||
RegisterClass_(CPatternBevelView);
|
||||
RegisterClass_(CAMSavvyBevelView);
|
||||
|
||||
|
||||
RegisterClass_(CIncludeView);
|
||||
@@ -229,7 +252,6 @@ void RegisterAllBrowserClasses(void)
|
||||
RegisterClass_(CClusterView);
|
||||
RegisterClass_(CPatternTabControl);
|
||||
RegisterClass_(CTabSwitcher);
|
||||
RegisterClass_(CProgressBar);
|
||||
RegisterClass_(CKeyScrollAttachment);
|
||||
RegisterClass_(CToolTipAttachment);
|
||||
RegisterClass_(CDynamicTooltipPane);
|
||||
@@ -238,7 +260,6 @@ void RegisterAllBrowserClasses(void)
|
||||
RegisterClass_(CPaneEnabler);
|
||||
RegisterClass_(CSlaveEnabler);
|
||||
RegisterClass_(CScrollerWithArrows);
|
||||
RegisterClass_(CScrollArrowControl);
|
||||
|
||||
#ifdef MOZ_MAIL_NEWS
|
||||
RegisterClass_(CSingleLineEditField);
|
||||
|
||||
@@ -51,10 +51,6 @@
|
||||
#include "intl_csi.h"
|
||||
#include "uintl.h"
|
||||
|
||||
extern "C" {
|
||||
#include "httpurl.h" // for NET_getInternetKeyword
|
||||
}
|
||||
|
||||
// FIX ME -- write a CopyAlloc like function that takes a CString
|
||||
#include "macutil.h"
|
||||
#include "CAutoPtrXP.h"
|
||||
@@ -112,8 +108,6 @@ CBrowserContext::CBrowserContext()
|
||||
, mMochaImagesLooping(false)
|
||||
, mMochaImagesDelayed(false)
|
||||
, mInNoMoreUsers(false)
|
||||
, mCloseCallback(nil)
|
||||
, mCloseCallbackArg(nil)
|
||||
{
|
||||
mLoadImagesOverride = false;
|
||||
mDelayImages = CPrefs::GetBoolean( CPrefs::DelayImages );
|
||||
@@ -149,8 +143,6 @@ CBrowserContext::CBrowserContext(MWContextType inType)
|
||||
, mMochaImagesLooping(false)
|
||||
, mMochaImagesDelayed(false)
|
||||
, mInNoMoreUsers(false)
|
||||
, mCloseCallback(nil)
|
||||
, mCloseCallbackArg(nil)
|
||||
{
|
||||
mLoadImagesOverride = false;
|
||||
mDelayImages = CPrefs::GetBoolean( CPrefs::DelayImages );
|
||||
@@ -187,8 +179,6 @@ CBrowserContext::CBrowserContext(const CBrowserContext& inOriginal)
|
||||
, mMochaImagesLooping(false)
|
||||
, mMochaImagesDelayed(false)
|
||||
, mInNoMoreUsers(false)
|
||||
, mCloseCallback(nil)
|
||||
, mCloseCallbackArg(nil)
|
||||
{
|
||||
mLoadImagesOverride = inOriginal.IsLoadImagesOverride();
|
||||
mDelayImages = inOriginal.IsImageLoadingDelayed();
|
||||
@@ -224,27 +214,8 @@ CBrowserContext::~CBrowserContext()
|
||||
XP_FREE(mContext.name);
|
||||
mContext.name = NULL;
|
||||
}
|
||||
|
||||
// 98-05-27 pinkerton - call close callback
|
||||
if ( mCloseCallback )
|
||||
(*mCloseCallback)(mCloseCallbackArg);
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// SetCloseCallback
|
||||
//
|
||||
// Set a callback (from the chrome structure) to be called when this window/context goes
|
||||
// away.
|
||||
//
|
||||
void
|
||||
CBrowserContext :: SetCloseCallback ( void (* close_callback)(void *close_arg), void* close_arg )
|
||||
{
|
||||
mCloseCallback = close_callback;
|
||||
mCloseCallbackArg = close_arg;
|
||||
}
|
||||
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ¥
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
@@ -1107,21 +1078,6 @@ void CBrowserContext::AllConnectionsComplete(void)
|
||||
|
||||
}
|
||||
|
||||
|
||||
void CBrowserContext :: CompleteLoad ( URL_Struct* inURL, int inStatus )
|
||||
{
|
||||
CNSContext :: CompleteLoad ( inURL, inStatus );
|
||||
|
||||
const short kKeywordLength = 50;
|
||||
char keyword[kKeywordLength + 1];
|
||||
NET_getInternetKeyword(inURL, keyword, kKeywordLength);
|
||||
// we are guaranteed |keyword| will at least be a 0-length string
|
||||
|
||||
BroadcastMessage(msg_NSCInternetKeywordChanged, (void*)keyword);
|
||||
|
||||
}
|
||||
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ¥
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
@@ -88,10 +88,6 @@ class CBrowserContext : public CNSContext
|
||||
|
||||
virtual Boolean SupportsPageServices();
|
||||
|
||||
virtual void SetCloseCallback ( void (* close_callback)(void *close_arg), void* close_arg );
|
||||
|
||||
virtual void CompleteLoad ( URL_Struct* inURL, int inStatus ) ;
|
||||
|
||||
// FIX ME!!! ACCESSOR for unique ID
|
||||
|
||||
// LAYERS / COMPOSITOR
|
||||
@@ -111,7 +107,6 @@ class CBrowserContext : public CNSContext
|
||||
LO_EmbedStruct* inEmbed,
|
||||
CL_Event* inEvent);
|
||||
|
||||
|
||||
// HISTORY
|
||||
virtual void RememberHistoryPosition(
|
||||
Int32 inX,
|
||||
@@ -469,9 +464,6 @@ class CBrowserContext : public CNSContext
|
||||
|
||||
Boolean mInNoMoreUsers;
|
||||
|
||||
void (* mCloseCallback)(void *); // called on window close
|
||||
void* mCloseCallbackArg;
|
||||
|
||||
}; // class CBrowserContext
|
||||
|
||||
inline CBrowserContext::operator MWContext*()
|
||||
|
||||
@@ -50,7 +50,6 @@ inline CHTMLView* ExtractHyperView(const MWContext* inContext)
|
||||
enum {
|
||||
// These messages notify thge clients about the layout state.
|
||||
msg_NSCDocTitleChanged = 'DTCG', // cstring* theNewTitle
|
||||
msg_NSCInternetKeywordChanged = 'IKEY', // char* keyword
|
||||
msg_NSCLayoutNewDocument = 'LOND', // URL_Struct* theURL
|
||||
msg_NSCFinishedLayout = 'FNLO', // < none >
|
||||
|
||||
|
||||
@@ -404,11 +404,6 @@ MWContext* FE_MakeNewWindow(MWContext* old_context,
|
||||
/* jpm changes: get Shift_JIS & MacRoman 8bit to display correctly in security dialogs */
|
||||
if ((chrome != nil) && (theContext != nil))
|
||||
{
|
||||
// pinkerton - 98-05-27
|
||||
// save the close callback so that we can run it when the context goes away. Make sure
|
||||
// we are setting this on the _new_ context, not the old one.
|
||||
theBrowserContext->SetCloseCallback ( chrome->close_callback, chrome->close_arg );
|
||||
|
||||
if (chrome->type == MWContextDialog)
|
||||
{
|
||||
CNSContext* theNSContext = ExtractNSContext(theContext);
|
||||
@@ -442,18 +437,11 @@ MWContext* FE_MakeNewWindow(MWContext* old_context,
|
||||
|
||||
void FE_UpdateChrome(MWContext *inContext, Chrome *inChrome)
|
||||
{
|
||||
CBrowserContext* brContext = ExtractBrowserContext(inContext);
|
||||
CBrowserWindow* theWindow = CBrowserWindow::WindowForContext(brContext);
|
||||
CBrowserWindow* theWindow = CBrowserWindow::WindowForContext(ExtractBrowserContext(inContext));
|
||||
|
||||
if (theWindow != nil)
|
||||
{
|
||||
theWindow->SetChromeInfo(inChrome);
|
||||
|
||||
if ( inChrome ) {
|
||||
// 98-05-27 pinkerton
|
||||
// Set the callback info so we do the right thing when the window goes away
|
||||
brContext->SetCloseCallback ( inChrome->close_callback, inChrome->close_arg );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ int EarlManagerNetTicklerCallback(void);
|
||||
EarlManager::EarlManager ()
|
||||
{
|
||||
fInterruptContext = NULL;
|
||||
#ifdef JAVA
|
||||
#if JAVA
|
||||
nsn_InstallTickleHookProc(&EarlManagerNetTicklerCallback);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -2824,15 +2824,10 @@ FE_SubmitInputElement( MWContext * window,
|
||||
submitData = LO_SubmitForm(window, formElement);
|
||||
if (submitData == NULL)
|
||||
return;
|
||||
|
||||
#ifdef SingleSignon
|
||||
// Check for a password submission and remember the data if so
|
||||
SI_RememberSignonData(window, submitData);
|
||||
#endif
|
||||
|
||||
url = NET_CreateURLStruct((char *)submitData->action, NET_DONT_RELOAD);
|
||||
currentHistoryPosition = SHIST_GetCurrent( &window->hist );
|
||||
|
||||
|
||||
if (currentHistoryPosition && currentHistoryPosition->address)
|
||||
url->referer = XP_STRDUP(currentHistoryPosition->address);
|
||||
|
||||
|
||||
@@ -388,7 +388,7 @@ _IMGCB_DestroyPixmap(struct IMGCB* /*self*/, jint /*op*/, void* a, IL_Pixmap* pi
|
||||
|
||||
JMC_PUBLIC_API(void)
|
||||
_IMGCB_DisplayPixmap(struct IMGCB* /*self*/, jint /*op*/, void* a, IL_Pixmap* image, IL_Pixmap* mask,
|
||||
jint x, jint y, jint x_offset, jint y_offset, jint width, jint height, jint req_w, jint req_h)
|
||||
jint x, jint y, jint x_offset, jint y_offset, jint width, jint height)
|
||||
{
|
||||
MWContext * context = (MWContext *) a;
|
||||
NS_PixMap * fe_pixmap;
|
||||
|
||||
@@ -590,7 +590,7 @@ void CPrintHTMLView::DisplayEmbed(
|
||||
case epmDisplay:
|
||||
if (FocusDraw() && BelongsOnPage (inEmbedStruct))
|
||||
{
|
||||
NPEmbeddedApp* app = (NPEmbeddedApp*) inEmbedStruct->objTag.FE_Data;
|
||||
NPEmbeddedApp* app = (NPEmbeddedApp*) inEmbedStruct->FE_Data;
|
||||
CPluginView* view = (CPluginView*) app->fe_data;
|
||||
view->EmbedDisplay(inEmbedStruct, true);
|
||||
}
|
||||
|
||||
@@ -42,7 +42,6 @@
|
||||
#include "glhist.h"
|
||||
#include "xlate.h"
|
||||
#include "prefapi.h"
|
||||
#include "cstream.h"
|
||||
|
||||
#include "BufferStream.h"
|
||||
#include "PascalString.h"
|
||||
|
||||
@@ -29,14 +29,13 @@
|
||||
#include "resgui.h"
|
||||
#include "xp_file_mac.h"
|
||||
#include "DirectoryCopy.h"
|
||||
#include <LGARadioButton.h>
|
||||
#include <LGAPushButton.h>
|
||||
#include <LGAEditField.h>
|
||||
|
||||
// for multi-user profile support in PE
|
||||
#include "MUC.h"
|
||||
#include <CodeFragments.h>
|
||||
#include <LString.h>
|
||||
#include <LPushButton.h>
|
||||
|
||||
|
||||
#define updateWizardDialog 9800
|
||||
|
||||
@@ -305,11 +304,11 @@ CUserProfile::GetUserProfile( const FSSpec& usersFolder, FSSpec& profileFolder,
|
||||
return result;
|
||||
}
|
||||
|
||||
static void PrefToEditField(const char * prefName, LGAEditField * field);
|
||||
static void EditFieldToPref(LGAEditField * field, const char * prefName);
|
||||
static void PrefToEditField(const char * prefName, LEditField * field);
|
||||
static void EditFieldToPref(LEditField * field, const char * prefName);
|
||||
|
||||
#define PREF_STRING_LEN 255
|
||||
void PrefToEditField(const char * prefName, LGAEditField * field)
|
||||
const Uint32 PREF_STRING_LEN = 255;
|
||||
void PrefToEditField(const char * prefName, LEditField * field)
|
||||
{
|
||||
int prefStringLen;
|
||||
char prefString[PREF_STRING_LEN];
|
||||
@@ -321,7 +320,7 @@ void PrefToEditField(const char * prefName, LGAEditField * field)
|
||||
}
|
||||
}
|
||||
|
||||
void EditFieldToPref(LGAEditField * field, const char * prefName)
|
||||
void EditFieldToPref(LEditField * field, const char * prefName)
|
||||
{
|
||||
Str255 s;
|
||||
field->GetDescriptor(s);
|
||||
@@ -337,11 +336,11 @@ CUserProfile::DoNetExtendedProfileDialog(LCommander * super)
|
||||
StDialogHandler theHandler(9911, super);
|
||||
LWindow *theDialog = theHandler.GetDialog();
|
||||
|
||||
LGAEditField *ldapAddressField = (LGAEditField*)theDialog->FindPaneByID('addr');
|
||||
LGAEditField *searchBaseField = (LGAEditField*)theDialog->FindPaneByID('sbas');
|
||||
LGAEditField *httpAddressField = (LGAEditField*)theDialog->FindPaneByID('hurl');
|
||||
LGARadioButton * ldapRadio = (LGARadioButton *)theDialog->FindPaneByID('ldap');
|
||||
LGARadioButton * httpRadio = (LGARadioButton *)theDialog->FindPaneByID('http');
|
||||
LEditField *ldapAddressField = dynamic_cast<LEditField*>(theDialog->FindPaneByID('addr'));
|
||||
LEditField *searchBaseField = dynamic_cast<LEditField*>(theDialog->FindPaneByID('sbas'));
|
||||
LEditField *httpAddressField = dynamic_cast<LEditField*>(theDialog->FindPaneByID('hurl'));
|
||||
LControl * ldapRadio = dynamic_cast<LControl*>(theDialog->FindPaneByID('ldap'));
|
||||
LControl * httpRadio = dynamic_cast<LControl*>(theDialog->FindPaneByID('http'));
|
||||
|
||||
ThrowIfNil_(ldapAddressField);
|
||||
ThrowIfNil_(searchBaseField);
|
||||
@@ -405,8 +404,8 @@ CUserProfile::DoNetProfileDialog()
|
||||
StDialogHandler theHandler(9910, CFrontApp::GetApplication());
|
||||
LWindow *theDialog = theHandler.GetDialog();
|
||||
|
||||
LGAEditField *usernameField = (LGAEditField*)theDialog->FindPaneByID('user');
|
||||
LGAEditField *passwordField = (LGAEditField*)theDialog->FindPaneByID('pass');
|
||||
LEditField *usernameField = dynamic_cast<LEditField*>(theDialog->FindPaneByID('user'));
|
||||
LEditField *passwordField = dynamic_cast<LEditField*>(theDialog->FindPaneByID('pass'));
|
||||
|
||||
ThrowIfNil_(usernameField);
|
||||
ThrowIfNil_(passwordField);
|
||||
@@ -565,7 +564,7 @@ ProfileErr CUserProfile::HandleProfileDialog(
|
||||
profileManagerDialog : profileSelectDialog;
|
||||
Boolean success = false;
|
||||
LListBox* listBox;
|
||||
LGAPushButton* okButton;
|
||||
LPushButton* okButton;
|
||||
LPane* newButton;
|
||||
LPane* deleteButton;
|
||||
LPane* renameButton;
|
||||
@@ -588,12 +587,15 @@ ProfileErr CUserProfile::HandleProfileDialog(
|
||||
listBox->AddListener( &dialog );
|
||||
listBox->SwitchTarget( listBox );
|
||||
|
||||
okButton = (LGAPushButton*)dialog.GetDialog()->FindPaneByID( 'ok ' );
|
||||
okButton = dynamic_cast<LPushButton*>(dialog.GetDialog()->FindPaneByID( 'ok ' ));
|
||||
deleteButton = dialog.GetDialog()->FindPaneByID( 2 );
|
||||
renameButton = dialog.GetDialog()->FindPaneByID( 3 );
|
||||
newButton = dialog.GetDialog()->FindPaneByID( 1 );
|
||||
optionsButton = dialog.GetDialog()->FindPaneByID( 'Ebut' );
|
||||
|
||||
if ( okButton )
|
||||
okButton->SetDefaultButton(true);
|
||||
|
||||
if ( wantsProfileManager )
|
||||
ThrowIfNil_( okButton && deleteButton && renameButton && newButton );
|
||||
else
|
||||
|
||||
@@ -26,6 +26,11 @@
|
||||
|
||||
#include "fullsoft.h"
|
||||
|
||||
//#define USE_NAV_SERVICES
|
||||
#ifdef USE_NAV_SERVICES
|
||||
#include "UNavServices.h"
|
||||
#endif
|
||||
|
||||
#include "uapp.h"
|
||||
|
||||
#include "CAppleEventHandler.h"
|
||||
@@ -36,7 +41,6 @@
|
||||
#include <LGACheckbox.h>
|
||||
|
||||
// macfe
|
||||
//#include "NavigationServicesSupport.h"
|
||||
#include "earlmgr.h"
|
||||
#include "macutil.h"
|
||||
#include "macgui.h" // HyperStyle
|
||||
@@ -165,9 +169,7 @@ PREventQueue *mozilla_event_queue = NULL;
|
||||
#include "m_cvstrm.h"
|
||||
#include "prefapi.h"
|
||||
#include "NSReg.h"
|
||||
#ifdef MOZ_SMARTUPDATE
|
||||
#include "softupdt.h"
|
||||
#endif
|
||||
|
||||
#include <Balloons.h>
|
||||
|
||||
// HERE ONLY UNTIL NAV SERVICES CODE MERGED INTO TIP
|
||||
@@ -795,7 +797,7 @@ CFrontApp::CFrontApp()
|
||||
// Performance
|
||||
// We really should be adjusting this dynamically
|
||||
{
|
||||
// Set environment features
|
||||
// Set environment features as well as register for Appearance Manager
|
||||
|
||||
CEnvironment::SetAllFeatures();
|
||||
|
||||
@@ -838,9 +840,6 @@ CFrontApp::CFrontApp()
|
||||
|
||||
UHTMLPrinting::InitCustomPageSetup();
|
||||
|
||||
#ifdef MOZ_SMARTUPDATE
|
||||
SU_Startup();
|
||||
#endif
|
||||
NR_StartupRegistry();
|
||||
|
||||
// ¥ PowerPlant initialization
|
||||
@@ -1036,9 +1035,6 @@ CFrontApp::~CFrontApp()
|
||||
SetCursor( &qd.arrow );
|
||||
|
||||
NR_ShutdownRegistry();
|
||||
#ifdef MOZ_SMARTUPDATE
|
||||
SU_Shutdown();
|
||||
#endif
|
||||
|
||||
ET_FinishMocha();
|
||||
|
||||
@@ -2235,18 +2231,27 @@ LModelObject* CFrontApp::MakeNewDocument()
|
||||
//
|
||||
void CFrontApp::ChooseDocument()
|
||||
{
|
||||
static const OSType myTypes[] = { 'TEXT', 'JPEG', 'GIFf'};
|
||||
|
||||
static const OSType myTypes[] = { 'TEXT', 'JPEG', 'GIFf' };
|
||||
|
||||
#ifdef USE_NAV_SERVICES
|
||||
|
||||
if ( UNavServices::GetFile("\pChoose a file to open", fileSpec) )
|
||||
OpenDocument(&fileSpec);
|
||||
|
||||
#else
|
||||
|
||||
UDesktop::Deactivate(); // Always bracket this
|
||||
|
||||
FSSpec fileSpec;
|
||||
Boolean fileSelected = SimpleOpenDlog ( 3, myTypes, &fileSpec );
|
||||
|
||||
|
||||
if ( fileSelected )
|
||||
OpenDocument(&fileSpec);
|
||||
|
||||
|
||||
UDesktop::Activate();
|
||||
|
||||
#endif
|
||||
|
||||
} // ChooseDocument
|
||||
|
||||
|
||||
@@ -2591,16 +2596,23 @@ Boolean CFrontApp::ObeyCommand(CommandT inCommand, void* ioParam)
|
||||
// StandardFileReply myReply;
|
||||
|
||||
static const OSType myTypes[] = { 'TEXT'};
|
||||
FSSpec fileSpec;
|
||||
|
||||
#ifdef USE_NAV_SERVICES
|
||||
|
||||
if ( UNavServices::GetFile("\pChoose a file to open", fileSpec) )
|
||||
OpenDocument(&fileSpec);
|
||||
|
||||
#else
|
||||
UDesktop::Deactivate(); // Always bracket this
|
||||
|
||||
FSSpec fileSpec;
|
||||
Boolean fileSelected = SimpleOpenDlog ( 1, myTypes, &fileSpec );
|
||||
|
||||
UDesktop::Activate();
|
||||
|
||||
if (!fileSelected) return TRUE; // we handled it... we just didn't do anything!
|
||||
|
||||
#endif
|
||||
|
||||
char* localURL = CFileMgr::GetURLFromFileSpec(fileSpec);
|
||||
if (localURL == NULL) return TRUE;
|
||||
|
||||
|
||||
@@ -550,6 +550,4 @@ enum pref_Strings { prefFolderName = 1
|
||||
, profileTemplateDir = 49
|
||||
, cryptoPolicy = 50
|
||||
, signedAppletDb = 51
|
||||
, cookiePermissions = 52
|
||||
, singleSignons = 53
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,229 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Files.h>
|
||||
#include "PascalString.h"
|
||||
#include "StBlockingDialogHandler.h"
|
||||
|
||||
const MessageT cmd_SelectProfile = 4000;
|
||||
const MessageT cmd_NewProfile = 4001;
|
||||
const MessageT cmd_DeleteProfile = 4002;
|
||||
const MessageT cmd_RenameProfile = 4003;
|
||||
const MessageT cmd_QuitProfile = 4004;
|
||||
const MessageT cmd_EditDialSettings = 4010;
|
||||
const MessageT cmd_LocationPopup = 4011;
|
||||
|
||||
enum ProfileErr {
|
||||
eUserCancelled = -2,
|
||||
eUnknownError = -1,
|
||||
eNeedUpgrade = 0,
|
||||
eOK = 1,
|
||||
eRunAccountSetup = 2,
|
||||
eRunMUC = 3,
|
||||
eSkipMUC = 4
|
||||
};
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* class CUserProfileDB
|
||||
*
|
||||
* Wrapper for multi-user profile database file.
|
||||
*
|
||||
*****************************************************************************/
|
||||
class CUserProfileDB
|
||||
{
|
||||
|
||||
public:
|
||||
|
||||
CUserProfileDB(FSSpec& spec, Boolean createIt = false);
|
||||
|
||||
short CountProfiles();
|
||||
short GetNextProfileID();
|
||||
|
||||
short GetProfileIDByUsername(const CString& userName);
|
||||
short GetProfileIDByEmail(const CString& emailAddr);
|
||||
|
||||
short GetLastProfileID();
|
||||
void SetLastProfileID(short newUserID);
|
||||
|
||||
void AddNewProfile(short id, const CStr31& profileName,
|
||||
const FSSpec& profileFolder);
|
||||
|
||||
Boolean GetProfileName(short id, CStr31& name);
|
||||
void SetProfileName(short id, const CStr31& name);
|
||||
|
||||
void SetProfileData(short id);
|
||||
|
||||
Boolean GetProfileAlias(short id, FSSpec& profileFolder, Boolean allowUserInteraction = true);
|
||||
void DeleteProfile(short selectedID);
|
||||
|
||||
LFile * GetFile() {return &fFile;}
|
||||
|
||||
|
||||
private:
|
||||
LFile fFile;
|
||||
Handle GetDBResource(ResType theType, short theID);
|
||||
|
||||
enum { kFirstProfileID = 128 };
|
||||
|
||||
};
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* class CDialogWizardHandler
|
||||
*
|
||||
* A generic dialog wizard handler.
|
||||
*
|
||||
*****************************************************************************/
|
||||
class CDialogWizardHandler
|
||||
{
|
||||
public:
|
||||
CDialogWizardHandler( ResIDT dlogID, LArray& paneList );
|
||||
void AddListener(LListener* st);
|
||||
|
||||
Boolean DoWizard();
|
||||
LWindow* GetDialog();
|
||||
|
||||
void GetEditText( PaneIDT paneID, CString& text );
|
||||
void SetEditText( PaneIDT paneID, const CString& text );
|
||||
|
||||
void SetCheckboxValue(PaneIDT paneID, const Boolean value);
|
||||
Boolean GetCheckboxValue(PaneIDT paneID);
|
||||
|
||||
PaneIDT CurrentPane();
|
||||
ArrayIndexT CurrentPaneNumber();
|
||||
ArrayIndexT TotalPanes();
|
||||
void EnableNextButton();
|
||||
void DisableNextButton();
|
||||
|
||||
protected:
|
||||
Boolean ShowPane( ArrayIndexT paneNum, LWindow* window );
|
||||
|
||||
StBlockingDialogHandler fDialog;
|
||||
LArray fPaneList;
|
||||
ArrayIndexT fCurrentPane;
|
||||
LListener* fListener;
|
||||
};
|
||||
|
||||
/*****************************************************************************
|
||||
* class CUserProfile
|
||||
*
|
||||
* Launches wizards and file operations for multi-user profile support.
|
||||
*
|
||||
*****************************************************************************/
|
||||
class CUserProfile
|
||||
{
|
||||
|
||||
public:
|
||||
static void InitUserProfiles();
|
||||
|
||||
// Opens the User Profiles registry and puts up a profile-selection
|
||||
// dialog if there is more than one profile (or showDialog is true).
|
||||
// Returns kNeedUpgrade if User Profiles does not exist (i.e. we need
|
||||
// to call HandleUpgrade); else returns path of selected profile.
|
||||
|
||||
static ProfileErr GetUserProfile( const FSSpec& usersFolder,
|
||||
FSSpec& profileFolder, Boolean showDialog, short fileType );
|
||||
|
||||
// Creates a new network profile in the user's folder
|
||||
static ProfileErr CreateNetProfile( FSSpec usersFolder, FSSpec& profileFolder );
|
||||
|
||||
private:
|
||||
static ProfileErr DoNetProfileDialog();
|
||||
static void DoNetExtendedProfileDialog(LCommander * super);
|
||||
|
||||
public:
|
||||
// Launches upgrade wizard for users who have not run 4.0 before.
|
||||
// Creates an initial profile folder and User Profiles file.
|
||||
// If oldNetscapeF is non-null, it points to the user's 3.0
|
||||
// Netscape Ä folder and the profile "folder" is an alias to it.
|
||||
// Returns error code if user cancelled; else returns profile path.
|
||||
|
||||
static ProfileErr HandleUpgrade( FSSpec& profileFolder,
|
||||
const FSSpec* oldNetscapeF = nil );
|
||||
|
||||
// Creates a unique profile folder name if necessary
|
||||
static void GetUniqueFolderName(FSSpec& folder);
|
||||
|
||||
static short sCurrentProfileID;
|
||||
|
||||
enum { kRenamePrompt = 1,
|
||||
kDeletePrompt,
|
||||
kReadError,
|
||||
kCreateError,
|
||||
kDefaultName,
|
||||
kBadAliasError,
|
||||
kQuitLabel,
|
||||
kDoneLabel,
|
||||
kNextLabel,
|
||||
kConfigFileError,
|
||||
kInvalidConfigFile,
|
||||
kRunASLabel,
|
||||
kCreateProfileLabel,
|
||||
kConfigurationFileName };
|
||||
enum { kProfileStrings = 900 };
|
||||
|
||||
private:
|
||||
static ProfileErr HandleProfileDialog( FSSpec& profileSpec, CUserProfileDB& profileDB,
|
||||
FSSpec& profileFolder, short& newUserID, short lastUserID,
|
||||
Boolean wantsProfileManager );
|
||||
static void PopulateListBox( ListHandle& listHand, CUserProfileDB& profileDB,
|
||||
short defaultID );
|
||||
|
||||
enum UpgradeEnum { eNoUpgrade, // an additional profile is being created
|
||||
eExistingPrefs, // first profile, existing Netscape Prefs file
|
||||
eNewInstall }; // first profile, fresh install
|
||||
|
||||
static ProfileErr NewUserProfile( const FSSpec& profileSpec, FSSpec& profileFolder,
|
||||
CStr31& profileName, UpgradeEnum upgrading = eNoUpgrade,
|
||||
const FSSpec* oldNetscapeF = nil );
|
||||
static ProfileErr NewProfileWizard( UpgradeEnum upgrading, CStr31& profileName,
|
||||
const FSSpec& profileFolder, FSSpec& newProfileFolder,
|
||||
Boolean& userChoseFolder );
|
||||
|
||||
static void RenameProfile( short selectedID, CUserProfileDB& profileDB,
|
||||
Cell& cell, ListHandle& listHand );
|
||||
static void DeleteProfile( short selectedID, CUserProfileDB& profileDB,
|
||||
ListHandle& listHand );
|
||||
|
||||
static void ReflectToPreferences(const CStr31& profileName,
|
||||
const FSSpec& profileFolder, short numProfiles = 1);
|
||||
static void CreateDefaultProfileFolder(const FSSpec& profileFolder);
|
||||
|
||||
static OSErr MakeDesktopIcons(const CStr31& profileName,
|
||||
const Boolean wantsNavigator, const Boolean wantsInbox);
|
||||
|
||||
enum { kInvalidProfileID = -1 };
|
||||
|
||||
protected:
|
||||
// ¥ÊinPrefsFolder is the FSSpec of the users Preferences
|
||||
// folderÉ we read a file directly below that
|
||||
static long SendMessageToPlugin( long inMessage, void* pb = NULL );
|
||||
|
||||
static void* LoadConfigPlugin(); // really returns PE_PluginFuncType
|
||||
static OSErr CloseConfigPlugin();
|
||||
|
||||
static Boolean DeleteMagicProfile( FSSpec& inSpec );
|
||||
|
||||
static CFragConnectionID mConfigPluginID;
|
||||
static Boolean mHasConfigPlugin;
|
||||
static Boolean mPluginLoaded;
|
||||
};
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
#
|
||||
# This is a list of local files which get copied to the mozilla:dist directory
|
||||
#
|
||||
|
||||
utility:MacBinSupport.h
|
||||
@@ -850,10 +850,6 @@ void CBrowserWindow::ListenToMessage(MessageT inMessage, void* ioParam)
|
||||
NoteDocTitleChanged((const char*)ioParam);
|
||||
break;
|
||||
|
||||
case msg_NSCInternetKeywordChanged:
|
||||
NoteInternetKeywordChanged((const char*)ioParam);
|
||||
break;
|
||||
|
||||
case msg_NSCLayoutNewDocument:
|
||||
NoteBeginLayout();
|
||||
break;
|
||||
@@ -1638,17 +1634,6 @@ void CBrowserWindow::NoteDocTitleChanged(const char* inNewTitle)
|
||||
SetDescriptor( netscapeTitle );
|
||||
}
|
||||
|
||||
|
||||
void CBrowserWindow :: NoteInternetKeywordChanged(const char* inTitle)
|
||||
{
|
||||
if ( inTitle )
|
||||
mCurrentKeyword = inTitle;
|
||||
else
|
||||
mCurrentKeyword = "\p";
|
||||
|
||||
} // NoteInternetKeywordChanged
|
||||
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ¥
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
@@ -97,10 +97,7 @@ class CBrowserWindow : public CNetscapeWindow, public CSaveWindowStatus, public
|
||||
// This allows some parameters to be set once and locked (eg. size of non-resizable window).
|
||||
virtual void SetChromeInfo(Chrome* theChrome, Boolean inNotifyMenuBarModeChanged = false, Boolean inFirstTime = false);
|
||||
virtual void GetChromeInfo(Chrome* theChrome);
|
||||
|
||||
// pinkerton 98-06-04 for internet keywords
|
||||
const LStr255 & GetInternetKeyword ( ) const { return mCurrentKeyword; }
|
||||
|
||||
|
||||
static CBrowserWindow* MakeNewBrowserWindow(Boolean inShow = kShow, Boolean inSelect = kSelect);
|
||||
|
||||
// FindAndShow returns an empty new CBrowserWindow without putting
|
||||
@@ -197,7 +194,6 @@ class CBrowserWindow : public CNetscapeWindow, public CSaveWindowStatus, public
|
||||
virtual void HandleNetSearchCommand();
|
||||
|
||||
virtual void NoteDocTitleChanged(const char* inTitle);
|
||||
virtual void NoteInternetKeywordChanged(const char* inTitle);
|
||||
virtual void NoteBeginLayout(void);
|
||||
virtual void NoteFinishedLayout(void);
|
||||
virtual void NoteAllConnectionsComplete(void);
|
||||
@@ -238,6 +234,4 @@ class CBrowserWindow : public CNetscapeWindow, public CSaveWindowStatus, public
|
||||
private:
|
||||
CRDFCoordinator* mNavCenterParent; // top level of navcenter hierarchy
|
||||
CHTMLView* mHTMLView;
|
||||
|
||||
LStr255 mCurrentKeyword; // holds current internet keyword string
|
||||
};
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
|
||||
#include "CDownloadProgressWindow.h"
|
||||
#include "CNSContext.h"
|
||||
#include "CProgressBar.h"
|
||||
#include "COffscreenCaption.h"
|
||||
#include "Netscape_Constants.h"
|
||||
#include "PascalString.h"
|
||||
@@ -31,6 +30,7 @@
|
||||
#include "resgui.h"
|
||||
|
||||
#include <PP_Messages.h>
|
||||
#include <LProgressBar.h>
|
||||
|
||||
#define MIN_TICKS (60/4) // Don't refresh the progress bar more than 4x /sec.
|
||||
|
||||
@@ -99,7 +99,7 @@ void CDownloadProgressWindow::FinishCreateSelf(void)
|
||||
{
|
||||
CMediatedWindow::FinishCreateSelf();
|
||||
|
||||
mBar = dynamic_cast<CProgressBar*>(FindPaneByID(PaneID_ProgressBar));
|
||||
mBar = dynamic_cast<LProgressBar*>(FindPaneByID(PaneID_ProgressBar));
|
||||
Assert_(mBar != NULL);
|
||||
|
||||
mMessage = dynamic_cast<COffscreenCaption*>(FindPaneByID(PaneID_ProgressMessage));
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "CSaveWindowStatus.h"
|
||||
#include <LListener.h>
|
||||
|
||||
class CProgressBar;
|
||||
class LProgressBar;
|
||||
class COffscreenCaption;
|
||||
|
||||
const ResIDT WIND_DownloadProgress = 1011;
|
||||
@@ -80,7 +80,7 @@ class CDownloadProgressWindow :
|
||||
virtual void NoteProgressEnd(const CContextProgress& inProgress);
|
||||
|
||||
CNSContext* mContext;
|
||||
CProgressBar* mBar;
|
||||
LProgressBar* mBar;
|
||||
COffscreenCaption* mMessage;
|
||||
COffscreenCaption* mComment;
|
||||
Boolean mClosing;
|
||||
|
||||
@@ -688,12 +688,6 @@ void MochaFormSubmitCallback(MWContext* pContext,
|
||||
LO_FormSubmitData* submit = LO_SubmitForm(pContext, (LO_FormElementStruct*)lo_element);
|
||||
if (submit == NULL)
|
||||
return;
|
||||
|
||||
#ifdef SingleSignon
|
||||
// Check for a password submission and remember the data if so
|
||||
SI_RememberSignonData(pContext, submit);
|
||||
#endif
|
||||
|
||||
URL_Struct* url = NET_CreateURLStruct((char *)submit->action, NET_DONT_RELOAD);
|
||||
CBrowserContext* context = ExtractBrowserContext(pContext);
|
||||
if (context)
|
||||
@@ -738,11 +732,7 @@ void MochaImageFormSubmitCallback(MWContext* pContext,
|
||||
try
|
||||
{
|
||||
theSubmit = LO_SubmitImageForm(pContext, data->lo_image, data->x, data->y);
|
||||
|
||||
#ifdef SingleSignon
|
||||
// Check for a password submission and remember the data if so
|
||||
SI_RememberSignonData(pContext, theSubmit);
|
||||
#endif
|
||||
// ThrowIfNULL_(theSubmit);
|
||||
|
||||
// 97-06-07 pkc -- NULL is a valid return value from LO_SubmitImageForm
|
||||
if (theSubmit)
|
||||
@@ -1816,7 +1806,7 @@ PRBool CHTMLView::HandleEmbedEvent(
|
||||
LO_EmbedStruct* inEmbed,
|
||||
CL_Event* inEvent)
|
||||
{
|
||||
NPEmbeddedApp* app = (NPEmbeddedApp*) inEmbed->objTag.FE_Data;
|
||||
NPEmbeddedApp* app = (NPEmbeddedApp*) inEmbed->FE_Data;
|
||||
if (app && app->fe_data)
|
||||
{
|
||||
CPluginView* view = (CPluginView*) app->fe_data;
|
||||
@@ -5558,7 +5548,7 @@ void CHTMLView::GetEmbedSize(
|
||||
LO_EmbedStruct* inEmbedStruct,
|
||||
NET_ReloadMethod /* inReloadMethod */)
|
||||
{
|
||||
if (inEmbedStruct->objTag.FE_Data == NULL) // Creating plugin from scratch
|
||||
if (inEmbedStruct->FE_Data == NULL) // Creating plugin from scratch
|
||||
{
|
||||
Try_
|
||||
{
|
||||
@@ -5572,19 +5562,19 @@ void CHTMLView::GetEmbedSize(
|
||||
}
|
||||
Catch_(inErr)
|
||||
{
|
||||
inEmbedStruct->objTag.FE_Data = NULL;
|
||||
inEmbedStruct->FE_Data = NULL;
|
||||
}
|
||||
EndCatch_
|
||||
}
|
||||
else
|
||||
NPL_EmbedSize((NPEmbeddedApp*) inEmbedStruct->objTag.FE_Data);
|
||||
NPL_EmbedSize((NPEmbeddedApp*) inEmbedStruct->FE_Data);
|
||||
}
|
||||
|
||||
void CHTMLView::FreeEmbedElement(
|
||||
LO_EmbedStruct* inEmbedStruct)
|
||||
{
|
||||
NPL_EmbedDelete(*mContext, inEmbedStruct);
|
||||
inEmbedStruct->objTag.FE_Data = NULL;
|
||||
inEmbedStruct->FE_Data = NULL;
|
||||
}
|
||||
|
||||
void CHTMLView::CreateEmbedWindow(
|
||||
@@ -5675,9 +5665,9 @@ void CHTMLView::RestoreEmbedWindow(
|
||||
if (XP_OK_ASSERT(inEmbeddedApp->np_data)) {
|
||||
LO_EmbedStruct* embed_struct = ((np_data*) inEmbeddedApp->np_data)->lo_struct;
|
||||
if (XP_OK_ASSERT(embed_struct)) {
|
||||
xp = embed_struct->objTag.x + embed_struct->objTag.x_offset
|
||||
xp = embed_struct->x + embed_struct->x_offset
|
||||
/* - CONTEXT_DATA(*mContext)->document_x */;
|
||||
yp = embed_struct->objTag.y + embed_struct->objTag.y_offset
|
||||
yp = embed_struct->y + embed_struct->y_offset
|
||||
/* - CONTEXT_DATA(*mContext)->document_y */;
|
||||
}
|
||||
}
|
||||
@@ -5712,7 +5702,7 @@ void CHTMLView::DisplayEmbed(
|
||||
int /* inLocation */,
|
||||
LO_EmbedStruct* inEmbedStruct)
|
||||
{
|
||||
NPEmbeddedApp* app = (NPEmbeddedApp*) inEmbedStruct->objTag.FE_Data;
|
||||
NPEmbeddedApp* app = (NPEmbeddedApp*) inEmbedStruct->FE_Data;
|
||||
if (app && app->fe_data)
|
||||
{
|
||||
if ( !FocusDraw() )
|
||||
|
||||
@@ -68,8 +68,6 @@ void CHistoryMenu::Update(void)
|
||||
UMenuUtils::PurgeMenuItems(GetMacMenuH(), GetLastNonDynamicItem());
|
||||
}
|
||||
|
||||
#define Min(a,b) (((a) < (b)) ? (a) : (b))
|
||||
|
||||
// Rebuild history menu
|
||||
void CHistoryMenu::SyncMenuToHistory(CNSContext* inNSContext)
|
||||
{
|
||||
@@ -82,7 +80,7 @@ void CHistoryMenu::SyncMenuToHistory(CNSContext* inNSContext)
|
||||
|
||||
// this is total number of history menu items we want in menu
|
||||
// add one because we loop from 1 -> num instead of from 0 -> (num - 1)
|
||||
numHistoryMenuEntries = Min(historyLength, cMaxHistoryMenuItems) + 1;
|
||||
numHistoryMenuEntries = MIN(historyLength, cMaxHistoryMenuItems) + 1;
|
||||
|
||||
Int16 count = 1,
|
||||
// since we want most recent history entries, grab entries from end
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
//
|
||||
// CInternetKeywordTooltipPane.h
|
||||
// Mike Pinkerton
|
||||
// Netscape Communications
|
||||
//
|
||||
// A new kind of tooltip pane which gets its text from the browser window. It
|
||||
// displays the "internet keyword" of the current url, specified in the html.
|
||||
//
|
||||
|
||||
#include "CInternetKeywordTooltipPane.h"
|
||||
|
||||
#include "CBrowserWindow.h"
|
||||
|
||||
|
||||
CInternetKeywordTooltipPane*
|
||||
CInternetKeywordTooltipPane :: CreateInternetKeywordTooltipPaneStream ( LStream* inStream )
|
||||
{
|
||||
return new CInternetKeywordTooltipPane ( inStream );
|
||||
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// CalcTipText
|
||||
//
|
||||
// The current internet keyword has nicely been stashed in the browser window for us. Go look
|
||||
// it up and make it the text of the tooltip.
|
||||
//
|
||||
void
|
||||
CInternetKeywordTooltipPane :: CalcTipText( LWindow* inOwningWindow, LPane* /*inOwningPane*/,
|
||||
const EventRecord& /*inMacEvent*/, StringPtr outTipText)
|
||||
{
|
||||
CBrowserWindow* browserWindow = dynamic_cast<CBrowserWindow*>(inOwningWindow);
|
||||
const LStr255 & keyword = browserWindow->GetInternetKeyword();
|
||||
LStr255::CopyPStr ( keyword, outTipText );
|
||||
|
||||
} // CInternetKeywordTooltipPane :: CalcTipText
|
||||
|
||||
|
||||
//
|
||||
// CalcFrameWithRespectTo
|
||||
//
|
||||
// Use the inherited version to size the tooltip, etc, but after all is said and done,
|
||||
// move it just below the bottom left corner of the parent.
|
||||
//
|
||||
void
|
||||
CInternetKeywordTooltipPane :: CalcFrameWithRespectTo ( LWindow* inOwningWindow,
|
||||
LPane* inOwningPane,
|
||||
const EventRecord& inMacEvent,
|
||||
Rect& outPortFrame )
|
||||
{
|
||||
// calc pane size with it centered under the location bar
|
||||
CToolTipPane::CalcFrameWithRespectTo ( inOwningWindow, inOwningPane, inMacEvent, outPortFrame );
|
||||
|
||||
Rect theOwningPortFrame;
|
||||
inOwningPane->CalcPortFrameRect(theOwningPortFrame);
|
||||
|
||||
// move it to just below the bottom left corner
|
||||
const short width = outPortFrame.right - outPortFrame.left;
|
||||
outPortFrame.left = theOwningPortFrame.left;
|
||||
outPortFrame.right = theOwningPortFrame.left + width;
|
||||
|
||||
} // CalcFrameWithRespectTo
|
||||
@@ -1,49 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
//
|
||||
// CInternetKeywordTooltipPane.h
|
||||
// Mike Pinkerton
|
||||
// Netscape Communications
|
||||
//
|
||||
// A new kind of tooltip pane which gets its text from the browser window. It
|
||||
// displays the "internet keyword" of the current url, specified in the html.
|
||||
//
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "CTooltipAttachment.h"
|
||||
|
||||
|
||||
class CInternetKeywordTooltipPane : public CToolTipPane
|
||||
{
|
||||
public:
|
||||
enum { class_ID = 'IKTT' } ;
|
||||
|
||||
static CInternetKeywordTooltipPane*
|
||||
CreateInternetKeywordTooltipPaneStream ( LStream* inStream ) ;
|
||||
|
||||
CInternetKeywordTooltipPane ( LStream* inStream ) : CToolTipPane(inStream) { };
|
||||
virtual ~CInternetKeywordTooltipPane ( ) { } ;
|
||||
|
||||
void CalcFrameWithRespectTo ( LWindow* inOwningWindow, LPane* inOwningPane,
|
||||
const EventRecord& inMacEvent, Rect& outPortFrame ) ;
|
||||
virtual void CalcTipText( LWindow* inOwningWindow, LPane* inOwningPane,
|
||||
const EventRecord& inMacEvent, StringPtr outTipText) ;
|
||||
|
||||
}; // CDynamicTooltipPane
|
||||
@@ -25,7 +25,8 @@
|
||||
#include "CContextMenuAttachment.h"
|
||||
#include "Netscape_constants.h"
|
||||
|
||||
#include "UGAColorRamp.h"
|
||||
//#include "UGAColorRamp.h"
|
||||
#include <Appearance.h>
|
||||
|
||||
|
||||
#pragma mark -- CNavCenterSelectorPane methods --
|
||||
@@ -79,9 +80,12 @@ CNavCenterSelectorPane::DrawSelf()
|
||||
CalcLocalFrameRect(cellBounds);
|
||||
|
||||
// erase the background
|
||||
StColorState saved;
|
||||
::RGBBackColor(&UGAColorRamp::GetColor(colorRamp_Gray2));
|
||||
::EraseRect(&cellBounds);
|
||||
StColorPenState saved;
|
||||
// ::SetThemeBackground( kThemeActiveWindowHeaderTextColor, 8, false );
|
||||
Rect bevelRect = cellBounds;
|
||||
InsetRect ( &bevelRect, -3, -3 );
|
||||
::DrawThemeWindowListViewHeader ( &bevelRect, kThemeStateActive );
|
||||
// ::EraseRect(&cellBounds);
|
||||
|
||||
// find the bounds of the first cell
|
||||
cellBounds.top = 0;
|
||||
@@ -766,10 +770,7 @@ TitleImage :: TitleImage ( const LStr255 & inTitle, ResIDT inIconID )
|
||||
void
|
||||
TitleImage :: DrawInCurrentView( const Rect& inBounds, unsigned long inMode ) const
|
||||
{
|
||||
StColorState saved;
|
||||
|
||||
::RGBBackColor(&UGAColorRamp::GetColor(colorRamp_Gray2));
|
||||
::EraseRect(&inBounds);
|
||||
StColorPenState saved;
|
||||
|
||||
Rect iconRect = inBounds;
|
||||
Rect textbg = { 0, 0, 0, 0 };
|
||||
|
||||
@@ -30,12 +30,14 @@
|
||||
#include "CSharedPatternWorld.h"
|
||||
#include "UGraphicGizmos.h"
|
||||
|
||||
#include <Appearance.h>
|
||||
|
||||
|
||||
CPatternedGrippyPane::CPatternedGrippyPane(LStream* inStream)
|
||||
: LPane(inStream)
|
||||
{
|
||||
ResIDT theBackgroundID;
|
||||
*inStream >> theBackgroundID;
|
||||
ResIDT ignoredEntry;
|
||||
*inStream >> ignoredEntry; // read in but ignore (used to be background pattern id)
|
||||
ResIDT theBackgroundHiliteID;
|
||||
*inStream >> theBackgroundHiliteID;
|
||||
|
||||
@@ -47,9 +49,6 @@ CPatternedGrippyPane::CPatternedGrippyPane(LStream* inStream)
|
||||
ResIDT theTriangleID;
|
||||
*inStream >> theTriangleID;
|
||||
|
||||
mBackPattern = CSharedPatternWorld::CreateSharedPatternWorld(theBackgroundID);
|
||||
ThrowIfNULL_(mBackPattern);
|
||||
mBackPattern->AddUser(this);
|
||||
mBackPatternHilite = CSharedPatternWorld::CreateSharedPatternWorld(theBackgroundHiliteID);
|
||||
ThrowIfNULL_(mBackPatternHilite);
|
||||
mBackPatternHilite->AddUser(this);
|
||||
@@ -75,7 +74,6 @@ CPatternedGrippyPane::~CPatternedGrippyPane()
|
||||
{
|
||||
mGrippy->RemoveUser(this);
|
||||
mGrippyHilite->RemoveUser(this);
|
||||
mBackPattern->RemoveUser(this);
|
||||
mBackPatternHilite->RemoveUser(this);
|
||||
::DisposeCIcon(mTriangle);
|
||||
}
|
||||
@@ -97,13 +95,18 @@ void CPatternedGrippyPane::DrawSelf(void)
|
||||
// because we may be being drawn offscreen.
|
||||
CGrafPtr thePort;
|
||||
::GetPort(&(GrafPtr)thePort);
|
||||
|
||||
if ( mMouseInside )
|
||||
mBackPatternHilite->Fill(thePort, theFrame, theAlignment);
|
||||
else
|
||||
mBackPattern->Fill(thePort, theFrame, theAlignment);
|
||||
|
||||
UGraphicGizmos::BevelTintRect(theFrame, 1, 0x4000, 0x4000);
|
||||
|
||||
else {
|
||||
// fill and bevel with appearance manager look
|
||||
Rect bevelFrame = theFrame;
|
||||
--bevelFrame.top; // get rid of thick bevels on top/left/right
|
||||
--bevelFrame.left;
|
||||
++bevelFrame.right;
|
||||
::DrawThemeWindowListViewHeader ( &bevelFrame, kThemeStateActive );
|
||||
}
|
||||
|
||||
Rect theTriangleFrame = (**mTriangle).iconPMap.bounds;
|
||||
Rect theTriangleDest = theFrame;
|
||||
theTriangleDest.bottom = theTriangleDest.top + RectWidth(theFrame);
|
||||
@@ -118,14 +121,13 @@ void CPatternedGrippyPane::DrawSelf(void)
|
||||
|
||||
// hack to make it look centered for both drag bars and expand/collapse widget
|
||||
if ( thePatternDest.right - thePatternDest.left > 5 )
|
||||
theAlignment.h++;
|
||||
++theAlignment.h;
|
||||
|
||||
if ( mMouseInside )
|
||||
mGrippyHilite->Fill(thePort, thePatternDest, theAlignment);
|
||||
else
|
||||
mGrippy->Fill(thePort, thePatternDest, theAlignment);
|
||||
|
||||
// UGraphicGizmos::DrawArithPattern(theFrame, mBottomShadePat, 0x6000, false);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
// Interface for class that draws a "grippy" pattern in the pane rectangle so users know
|
||||
// they can drag/click in this area. Also hilights when mouse enters (roll-over feedback).
|
||||
//
|
||||
// I didn't actually write this class, just moved it out of DragBar.h.
|
||||
//
|
||||
// It is fully Apperance Manager savvy.
|
||||
//
|
||||
|
||||
#pragma once
|
||||
|
||||
@@ -50,11 +50,10 @@ class CPatternedGrippyPane : public LPane
|
||||
virtual void DrawSelf(void);
|
||||
|
||||
CIconHandle mTriangle;
|
||||
CSharedPatternWorld* mBackPattern; // back pattern when mouse outside
|
||||
CSharedPatternWorld* mBackPatternHilite; // back pattern when mouse inside
|
||||
CSharedPatternWorld* mBackPatternHilite; // back pattern when mouse inside
|
||||
Boolean mMouseInside;
|
||||
|
||||
CSharedPatternWorld* mGrippy; // grippy pattern (gray bg)
|
||||
CSharedPatternWorld* mGrippyHilite; // grippy pattern hilite (purple bg)
|
||||
CSharedPatternWorld* mGrippyHilite; // grippy pattern hilite (blue bg)
|
||||
|
||||
}; // CPatternedGrippyPane
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
#include <vector.h>
|
||||
#include <algorithm>
|
||||
|
||||
#include <Appearance.h>
|
||||
|
||||
#include "CPersonalToolbarTable.h"
|
||||
#include "uapp.h"
|
||||
#include "LTableMultiGeometry.h"
|
||||
@@ -254,11 +256,9 @@ CPersonalToolbarTable :: AddButton ( HT_Resource inBookmark, Uint32 inIndex )
|
||||
// (using the correct index) and add the new bookmark AFTER instead of before or just add
|
||||
// it to the parent for the case of an empty toolbar
|
||||
PRBool before = PR_TRUE;
|
||||
HT_Resource dropOn = NULL;
|
||||
if ( inIndex <= mButtonList->size() )
|
||||
dropOn = GetInfoForPPColumn(inIndex).GetHTResource();
|
||||
else {
|
||||
dropOn = (*mButtonList)[mButtonList->size() - 1].GetHTResource();
|
||||
HT_Resource dropOn = GetInfoForPPColumn(inIndex).GetHTResource();
|
||||
if ( ! dropOn ) {
|
||||
dropOn = (*mButtonList)[URDFUtilities::PPRowToHTRow(inIndex) - 1].GetHTResource();
|
||||
before = PR_FALSE;
|
||||
}
|
||||
HT_DropHTRAtPos ( dropOn, inBookmark, before );
|
||||
@@ -289,11 +289,9 @@ CPersonalToolbarTable :: AddButton ( const string & inURL, const string & inTitl
|
||||
// (using the correct index) and add the new bookmark AFTER instead of before or just add
|
||||
// it to the parent for the case of an empty toolbar
|
||||
PRBool before = PR_TRUE;
|
||||
HT_Resource dropOn = NULL;
|
||||
if ( inIndex <= mButtonList->size() )
|
||||
dropOn = GetInfoForPPColumn(inIndex).GetHTResource();
|
||||
else {
|
||||
dropOn = (*mButtonList)[mButtonList->size() - 1].GetHTResource();
|
||||
HT_Resource dropOn = GetInfoForPPColumn(inIndex).GetHTResource();
|
||||
if ( ! dropOn ) {
|
||||
dropOn = (*mButtonList)[URDFUtilities::PPRowToHTRow(inIndex) - 1].GetHTResource();
|
||||
before = PR_FALSE;
|
||||
}
|
||||
HT_DropURLAndTitleAtPos ( dropOn, const_cast<char*>(inURL.c_str()),
|
||||
@@ -646,8 +644,9 @@ CPersonalToolbarTable :: DrawCell ( const STableCell &inCell, const Rect &inLoca
|
||||
|
||||
if ( mDropOn ) { // handle drop on folder
|
||||
mTextHiliteRect = ComputeTextRect ( iconAndName, inLocalRect );
|
||||
StColorState savedColorForTextDrawing;
|
||||
::RGBBackColor(&black);
|
||||
StColorPenState savedColorForTextDrawing;
|
||||
|
||||
::SetThemeBackground ( kThemeDragHiliteBrush, 8, false );
|
||||
::EraseRect(&mTextHiliteRect);
|
||||
::TextMode(srcXor);
|
||||
}
|
||||
@@ -655,6 +654,11 @@ CPersonalToolbarTable :: DrawCell ( const STableCell &inCell, const Rect &inLoca
|
||||
TextFace(underline);
|
||||
RGBForeColor( &blue );
|
||||
}
|
||||
else {
|
||||
// it should be the window header text color, but that's not right for some reason
|
||||
// ::SetThemePen ( kThemeActiveWindowHeaderTextColor, 8, false );
|
||||
::SetThemePen ( kThemeListViewTextColor, 8, false );
|
||||
}
|
||||
::MoveTo(inLocalRect.left + 22, inLocalRect.bottom - 4);
|
||||
::DrawString(iconAndName.name);
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
// Bug #79175
|
||||
// Change the update command status so that the "Show/Hide Component Bar" works
|
||||
CToolbarPatternBevelView::CToolbarPatternBevelView(LStream* inStream)
|
||||
: CPatternBevelView(inStream)
|
||||
: CAMSavvyBevelView(inStream)
|
||||
{
|
||||
LCommander::SetUpdateCommandStatus(true);
|
||||
}
|
||||
@@ -110,7 +110,8 @@ void CToolbarPatternBevelView::CalcArrangement( Boolean inRotateArrangement, Int
|
||||
|
||||
if ( !inRotateArrangement )
|
||||
{
|
||||
button->ChangeMode(inNewMode, SDimension16());
|
||||
SDimension16 unused;
|
||||
button->ChangeMode(inNewMode, unused);
|
||||
|
||||
// ...and the post-ChangeMode size for |new_cell_size|
|
||||
button->GetFrameSize(button_size);
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "CPatternBevelView.h"
|
||||
#include "CAMSavvyBevelView.h"
|
||||
#include "CToolbarModeManager.h"
|
||||
|
||||
class CToolbarPatternBevelView
|
||||
: public CPatternBevelView,
|
||||
: public CAMSavvyBevelView,
|
||||
public CToolbarButtonContainer
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -682,47 +682,29 @@ void TurnOn( LControl* control )
|
||||
control->BroadcastMessage( msg_ControlClicked, (void*)control );
|
||||
}
|
||||
|
||||
Boolean SetPopupToNamedItem( LStdPopupMenu* whichMenu, const CStr255& itemText )
|
||||
|
||||
//
|
||||
// Why pass both the control _and_ the menu when one will do? This is an artifact of
|
||||
// trying to get rid of the LGA* stuff from all files that don't need it. Once we can do
|
||||
// that, we can return this routine to it's old glory of only taking the control (pinkerton).
|
||||
//
|
||||
Boolean SetMenuToNamedItem( LControl* inControl, MenuHandle inMenu, const CStr255& itemText )
|
||||
{
|
||||
MenuHandle menuH;
|
||||
short menuSize;
|
||||
Str255 fontName;
|
||||
|
||||
menuH = whichMenu->GetMacMenuH();
|
||||
menuSize = CountMItems( menuH );
|
||||
short menuSize = CountMItems( inMenu );
|
||||
|
||||
for ( short i = 1; i <= menuSize; i++ )
|
||||
{
|
||||
::GetMenuItemText( menuH, i, fontName );
|
||||
if ( itemText == (CStr255)fontName )
|
||||
CStr255 currItemName;
|
||||
::GetMenuItemText( inMenu, i, currItemName );
|
||||
if ( itemText == currItemName )
|
||||
{
|
||||
whichMenu->SetValue( i );
|
||||
inControl->SetValue( i );
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
Boolean SetLGAPopupToNamedItem( LGAPopup* whichMenu, const CStr255& itemText )
|
||||
{
|
||||
MenuHandle menuH;
|
||||
short menuSize;
|
||||
Str255 fontName;
|
||||
|
||||
menuH = whichMenu->GetMacMenuH();
|
||||
menuSize = CountMItems( menuH );
|
||||
|
||||
for ( short i = 1; i <= menuSize; i++ )
|
||||
{
|
||||
::GetMenuItemText( menuH, i, fontName );
|
||||
if ( itemText == (CStr255)fontName )
|
||||
{
|
||||
whichMenu->SetValue( i );
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
unsigned long GetFreeSpaceInBytes( short vRefNum )
|
||||
{
|
||||
|
||||
@@ -185,9 +185,8 @@ void * StructCopy(const void * struc, UInt32 size);
|
||||
// ¥ return the free space available on the volume referenced by vRefNum in bytes
|
||||
unsigned long GetFreeSpaceInBytes( short vRefNum );
|
||||
|
||||
// ¥Êsets the std poup to the named item
|
||||
Boolean SetPopupToNamedItem( LStdPopupMenu* whichMenu, const CStr255& itemText );
|
||||
Boolean SetLGAPopupToNamedItem( LGAPopup* whichMenu, const CStr255& itemText );
|
||||
// ¥Êsets the std popup to the named item
|
||||
Boolean SetMenuToNamedItem( LControl* inControl, MenuHandle inMenu, const CStr255& itemText ) ;
|
||||
|
||||
// ¥
|
||||
void TurnOn( LControl* control );
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ClientDebugHeaders.pch
|
||||
//
|
||||
// NOTE:
|
||||
//
|
||||
// You will typically not need to edit this file. If you want to add
|
||||
// a file to the C/C++ precompiled header, do it in Comm_Headers.c
|
||||
// or Borwser_Headers.cp respectively.
|
||||
//
|
||||
// If you're doing a non-debug build, use the non-debug project which
|
||||
// will has pch files that generate non-debug dumps.
|
||||
//
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "MacPrefix_debug.h"
|
||||
|
||||
#ifdef powerc
|
||||
#pragma precompile_target "ClientDebugHeadersPPC"
|
||||
#else
|
||||
#pragma precompile_target "ClientDebugHeaders68K"
|
||||
#endif
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ¥ Include the list of headers.
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "Comm_Headers.c"
|
||||
@@ -1,50 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ClientDebugHeaders.pch++
|
||||
//
|
||||
// NOTE:
|
||||
//
|
||||
// You will typically not need to edit this file. If you want to add
|
||||
// a file to the C/C++ precompiled header, do it in Comm_Headers.c
|
||||
// or Borwser_Headers.cp respectively.
|
||||
//
|
||||
// If you're doing a non-debug build, use the non-debug project which
|
||||
// will has pch files that generate non-debug dumps.
|
||||
//
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "MacPrefix_debug.h"
|
||||
|
||||
#ifdef powerc
|
||||
#pragma precompile_target "ClientDebugHeadersPPC++"
|
||||
#else
|
||||
#pragma precompile_target "ClientDebugHeaders68K++"
|
||||
#endif
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ¥ Include the headers.
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
extern "C" {
|
||||
#include "Comm_Headers.c"
|
||||
}
|
||||
|
||||
#include "Comm_Headers.cp"
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// Nav_DebugPrefix.h
|
||||
//
|
||||
// NOTE:
|
||||
// You typically won't need to change anything in this file.
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "MacPrefix_debug.h"
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ¥ When we split out the procompiled headers seperately, we will not
|
||||
// be including them here. We will instead define things like
|
||||
// PowerPlant_PCH and include them at the top of the applicable source
|
||||
// modules
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#ifdef __powerc
|
||||
#ifdef __cplusplus
|
||||
#include "ClientDebugHeadersPPC++"
|
||||
#else
|
||||
#include "ClientDebugHeadersPPC"
|
||||
#endif
|
||||
#else
|
||||
#ifdef __cplusplus
|
||||
#include "ClientDebugHeaders68K++"
|
||||
#else
|
||||
#include "ClientDebugHeaders68K"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ClientHeaders.pch
|
||||
//
|
||||
// NOTE:
|
||||
//
|
||||
// You will typically not need to edit this file. If you want to add
|
||||
// a file to the C/C++ precompiled header, do it in Comm_Headers.c
|
||||
// or Borwser_Headers.cp respectively.
|
||||
//
|
||||
// If you're doing a non-debug build, use the non-debug project which
|
||||
// will has pch files that generate non-debug dumps.
|
||||
//
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "MacPrefix.h"
|
||||
|
||||
#ifdef powerc
|
||||
#pragma precompile_target "ClientHeadersPPC"
|
||||
#else
|
||||
#pragma precompile_target "ClientHeaders68K"
|
||||
#endif
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ¥ Include the list of headers.
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "Comm_Headers.c"
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
//
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ClientHeaders.pch++
|
||||
//
|
||||
// NOTE:
|
||||
//
|
||||
// You will typically not need to edit this file. If you want to add
|
||||
// a file to the C/C++ precompiled header, do it in Comm_Headers.c
|
||||
// or Borwser_Headers.cp respectively.
|
||||
//
|
||||
// If you're doing a non-debug build, use the non-debug project which
|
||||
// will has pch files that generate non-debug dumps.
|
||||
//
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "MacPrefix.h"
|
||||
|
||||
#ifdef powerc
|
||||
#pragma precompile_target "ClientHeadersPPC++"
|
||||
#else
|
||||
#pragma precompile_target "ClientHeaders68K++"
|
||||
#endif
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ¥ Include the headers.
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
extern "C" {
|
||||
#include "Comm_Headers.c"
|
||||
}
|
||||
|
||||
#include "Comm_Headers.cp"
|
||||
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// Nav_Prefix.h
|
||||
//
|
||||
// NOTE:
|
||||
// You typically won't need to change anything in this file.
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#include "MacPrefix.h"
|
||||
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
// ¥ When we split out the procompiled headers seperately, we will not
|
||||
// be including them here. We will instead define things like
|
||||
// PowerPlant_PCH and include them at the top of the applicable source
|
||||
// modules
|
||||
// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
|
||||
|
||||
#ifdef __powerc
|
||||
#ifdef __cplusplus
|
||||
#include "ClientHeadersPPC++"
|
||||
#else
|
||||
#include "ClientHeadersPPC"
|
||||
#endif
|
||||
#else
|
||||
#ifdef __cplusplus
|
||||
#include "ClientHeaders68K++"
|
||||
#else
|
||||
#include "ClientHeaders68K"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user