72717 - die Blue, die!, r=dveditz, sr=hyatt
This commit is contained in:
hewitt%netscape.com
Родитель
65da6be6c1
Коммит
cd9295d4f9
|
|
@ -332,7 +332,6 @@ sub ProcessJarManifests()
|
|||
CreateJarFromManifest(":mozilla:netwerk:resources:jar.mn", $chrome_dir, \%jars);
|
||||
CreateJarFromManifest(":mozilla:profile:pref-migrator:resources:jar.mn", $chrome_dir, \%jars);
|
||||
CreateJarFromManifest(":mozilla:profile:resources:jar.mn", $chrome_dir, \%jars);
|
||||
CreateJarFromManifest(":mozilla:themes:blue:jar.mn", $chrome_dir, \%jars);
|
||||
CreateJarFromManifest(":mozilla:themes:classic:communicator:mac:jar.mn", $chrome_dir, \%jars);
|
||||
CreateJarFromManifest(":mozilla:themes:classic:communicator:search:mac:jar.mn", $chrome_dir, \%jars);
|
||||
CreateJarFromManifest(":mozilla:themes:classic:communicator:sidebar:mac:jar.mn", $chrome_dir, \%jars);
|
||||
|
|
@ -842,6 +841,8 @@ sub BuildClientDist()
|
|||
if ($main::options{inspector})
|
||||
{
|
||||
InstallFromManifest(":mozilla:extensions:inspector:base:public:MANIFEST_IDL", "$distdirectory:idl:");
|
||||
InstallFromManifest(":mozilla:extensions:inspector:resources:content:prefs:MANIFEST", "$distdirectory:defaults:pref");
|
||||
InstallFromManifest(":mozilla:extensions:inspector:resources:content:res:MANIFEST", "$distdirectory:res:inspector");
|
||||
}
|
||||
|
||||
print("--- Client Dist export complete ----\n");
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@ embed_chrome: embed-jar.mn
|
|||
!else
|
||||
nsinstall -D $(DIST)\Embed\tmpchrome\US
|
||||
unzip -d $(DIST)\Embed\tmpchrome\US $(DIST)\bin\chrome\US.jar
|
||||
nsinstall -D $(DIST)\Embed\tmpchrome\blue
|
||||
unzip -d $(DIST)\Embed\tmpchrome\blue $(DIST)\bin\chrome\blue.jar
|
||||
nsinstall -D $(DIST)\Embed\tmpchrome\chatzilla
|
||||
unzip -d $(DIST)\Embed\tmpchrome\chatzilla $(DIST)\bin\chrome\chatzilla.jar
|
||||
nsinstall -D $(DIST)\Embed\tmpchrome\classic
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
comm.jar:
|
||||
content/communicator/pref/pref-P3P.xul (content/pref-P3P.xul)
|
||||
content/communicator/pref/pref-P3P.js (content/pref-P3P.js)
|
||||
content/communicator/pref/pref-P3Pcust.xul (content/pref-P3Pcust.xul)
|
||||
content/communicator/pref/pref-P3Pcust.js (content/pref-P3Pcust.js)
|
||||
content/communicator/privacyOverlay.xul (content/privacyOverlay.xul)
|
||||
content/communicator/privacyUI.js (content/privacyUI.js)
|
||||
content/communicator/P3PPrivacyMetInfo.xul (content/P3PPrivacyMetInfo.xul)
|
||||
content/communicator/P3PPrivacyMetInfo.js (content/P3PPrivacyMetInfo.js)
|
||||
content/communicator/P3PPrivacyNotMetInfo.xul (content/P3PPrivacyNotMetInfo.xul)
|
||||
content/communicator/P3PPrivacyNotMetInfo.js (content/P3PPrivacyNotMetInfo.js)
|
||||
content/communicator/P3PNoPrivacyInfo.xul (content/P3PNoPrivacyInfo.xul)
|
||||
content/communicator/P3PNoPrivacyInfo.js (content/P3PNoPrivacyInfo.js))
|
||||
content/communicator/P3PPartialPrivacyInfo.xul (content/P3PPartialPrivacyInfo.xul)
|
||||
content/communicator/P3PPartialPrivacyInfo.js (content/P3PPartialPrivacyInfo.js))
|
||||
content/communicator/P3PBadPrivacyInfo.xul (content/P3PBadPrivacyInfo.xul)
|
||||
content/communicator/P3PBadPrivacyInfo.js (content/P3PBadPrivacyInfo.js))
|
||||
content/communicator/P3PInProgressInfo.xul (content/P3PInProgressInfo.xul)
|
||||
content/communicator/P3PInProgressInfo.js (content/P3PInProgressInfo.js)
|
||||
|
||||
en-US.jar:
|
||||
locale/en-US/communicator/pref/pref-P3P.dtd (locale/en-US/pref-P3P.dtd)
|
||||
locale/en-US/communicator/P3PPrivacyInfo.dtd (locale/en-US/P3PPrivacyInfo.dtd)
|
||||
locale/en-US/communicator/P3P.properties (locale/en-US/P3P.properties)
|
||||
|
||||
classic.jar:
|
||||
skin/classic/communicator/P3PDefault.gif (skin/classic/P3PDefault.gif)
|
||||
skin/classic/communicator/P3PNoPrivacy.gif (skin/classic/P3PNoPrivacy.gif)
|
||||
skin/classic/communicator/P3PPrivate.gif (skin/classic/P3PPrivate.gif)
|
||||
skin/classic/communicator/P3PNotPrivate.gif (skin/classic/P3PNotPrivate.gif)
|
||||
skin/classic/communicator/P3PPartialPrivacy.gif (skin/classic/P3PPartialPrivacy.gif)
|
||||
skin/classic/communicator/P3PPrivacyBroken.gif (skin/classic/P3PPrivacyBroken.gif)
|
||||
skin/classic/communicator/P3PPrivacyInProgress.gif (skin/classic/P3PPrivacyInProgress.gif)
|
||||
skin/classic/communicator/privacyOverlay.css (skin/classic/privacyOverlay.css)
|
||||
|
||||
blue.jar:
|
||||
skin/blue/communicator/P3PDefault.gif (skin/blue/P3PDefault.gif)
|
||||
skin/blue/communicator/P3PNoPrivacy.gif (skin/blue/P3PNoPrivacy.gif)
|
||||
skin/blue/communicator/P3PPrivate.gif (skin/blue/P3PPrivate.gif)
|
||||
skin/blue/communicator/P3PNotPrivate.gif (skin/blue/P3PNotPrivate.gif)
|
||||
skin/blue/communicator/P3PPartialPrivacy.gif (skin/blue/P3PPartialPrivacy.gif)
|
||||
skin/blue/communicator/P3PPrivacyBroken.gif (skin/blue/P3PPrivacyBroken.gif)
|
||||
skin/blue/communicator/P3PPrivacyInProgress.gif (skin/blue/P3PPrivacyInProgress.gif)
|
||||
skin/blue/communicator/privacyOverlay.css (skin/blue/privacyOverlay.css)
|
||||
|
||||
modern.jar:
|
||||
skin/modern/communicator/P3PDefault.gif (skin/modern/P3PDefault.gif)
|
||||
skin/modern/communicator/P3PNoPrivacy.gif (skin/modern/P3PNoPrivacy.gif)
|
||||
skin/modern/communicator/P3PPrivate.gif (skin/modern/P3PPrivate.gif)
|
||||
skin/modern/communicator/P3PNotPrivate.gif (skin/modern/P3PNotPrivate.gif)
|
||||
skin/modern/communicator/P3PPartialPrivacy.gif (skin/modern/P3PPartialPrivacy.gif)
|
||||
skin/modern/communicator/P3PPrivacyBroken.gif (skin/modern/P3PPrivacyBroken.gif)
|
||||
skin/modern/communicator/P3PPrivacyInProgress.gif (skin/modern/P3PPrivacyInProgress.gif)
|
||||
skin/modern/communicator/privacyOverlay.css (skin/modern/privacyOverlay.css)
|
||||
|
|
@ -37,17 +37,6 @@ CLASSIC_EXPORT_RESOURCE_CONTENT = \
|
|||
$(srcdir)/classic/privacyOverlay.css \
|
||||
$(NULL)
|
||||
|
||||
BLUE_EXPORT_RESOURCE_CONTENT = \
|
||||
$(srcdir)/blue/P3PDefault.gif \
|
||||
$(srcdir)/blue/P3PNoPrivacy.gif \
|
||||
$(srcdir)/blue/P3PPrivate.gif \
|
||||
$(srcdir)/blue/P3PNotPrivate.gif \
|
||||
$(srcdir)/blue/P3PPartialPrivacy.gif \
|
||||
$(srcdir)/blue/P3PPrivacyBroken.gif \
|
||||
$(srcdir)/blue/P3PPrivacyInProgress.gif \
|
||||
$(srcdir)/blue/privacyOverlay.css \
|
||||
$(NULL)
|
||||
|
||||
MODERN_EXPORT_RESOURCE_CONTENT = \
|
||||
$(srcdir)/modern/P3PDefault.gif \
|
||||
$(srcdir)/modern/P3PNoPrivacy.gif \
|
||||
|
|
@ -63,5 +52,4 @@ include $(topsrcdir)/config/rules.mk
|
|||
|
||||
install::
|
||||
$(INSTALL) $(CLASSIC_EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/classic/skin/classic/communicator
|
||||
$(INSTALL) $(BLUE_EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/blue/skin/blue/communicator
|
||||
$(INSTALL) $(MODERN_EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/modern/skin/modern/communicator
|
||||
|
|
|
|||
|
|
@ -32,14 +32,6 @@ install::
|
|||
$(MAKE_INSTALL) classic\P3PPrivacyBroken.gif $(DIST)\bin\chrome\classic\skin\classic\communicator
|
||||
$(MAKE_INSTALL) classic\P3PPrivacyInProgress.gif $(DIST)\bin\chrome\classic\skin\classic\communicator
|
||||
$(MAKE_INSTALL) classic\privacyOverlay.css $(DIST)\bin\chrome\classic\skin\classic\communicator
|
||||
$(MAKE_INSTALL) blue\P3PDefault.gif $(DIST)\bin\chrome\blue\skin\blue\communicator
|
||||
$(MAKE_INSTALL) blue\P3PNoPrivacy.gif $(DIST)\bin\chrome\blue\skin\blue\communicator
|
||||
$(MAKE_INSTALL) blue\P3PPrivate.gif $(DIST)\bin\chrome\blue\skin\blue\communicator
|
||||
$(MAKE_INSTALL) blue\P3PNotPrivate.gif $(DIST)\bin\chrome\blue\skin\blue\communicator
|
||||
$(MAKE_INSTALL) blue\P3PPartialPrivacy.gif $(DIST)\bin\chrome\blue\skin\blue\communicator
|
||||
$(MAKE_INSTALL) blue\P3PPrivacyBroken.gif $(DIST)\bin\chrome\blue\skin\blue\communicator
|
||||
$(MAKE_INSTALL) blue\P3PPrivacyInProgress.gif $(DIST)\bin\chrome\blue\skin\blue\communicator
|
||||
$(MAKE_INSTALL) blue\privacyOverlay.css $(DIST)\bin\chrome\blue\skin\blue\communicator
|
||||
$(MAKE_INSTALL) modern\P3PDefault.gif $(DIST)\bin\chrome\modern\skin\modern\communicator
|
||||
$(MAKE_INSTALL) modern\P3PNoPrivacy.gif $(DIST)\bin\chrome\modern\skin\modern\communicator
|
||||
$(MAKE_INSTALL) modern\P3PPrivate.gif $(DIST)\bin\chrome\modern\skin\modern\communicator
|
||||
|
|
|
|||
|
|
@ -48,8 +48,7 @@ clobber::
|
|||
|
||||
$(PROG1): $(OBJDIR) TestJarCache.cpp
|
||||
|
||||
ZIPS= $(MOZ_SRC)\$(MOZ_TOP)mozilla\dist\$(OBJDIR)\bin\chrome\blue.jar \
|
||||
$(MOZ_SRC)\$(MOZ_TOP)mozilla\dist\$(OBJDIR)\bin\chrome\chatzilla.jar \
|
||||
ZIPS= $(MOZ_SRC)\$(MOZ_TOP)mozilla\dist\$(OBJDIR)\bin\chrome\chatzilla.jar \
|
||||
$(MOZ_SRC)\$(MOZ_TOP)mozilla\dist\$(OBJDIR)\bin\chrome\classic.jar \
|
||||
$(MOZ_SRC)\$(MOZ_TOP)mozilla\dist\$(OBJDIR)\bin\chrome\comm.jar \
|
||||
$(MOZ_SRC)\$(MOZ_TOP)mozilla\dist\$(OBJDIR)\bin\chrome\en-US.jar \
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = classic blue modern
|
||||
DIRS = classic modern
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
#!nmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
|
||||
DEPTH=..
|
||||
|
||||
DIRS= classic blue modern
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
# choose Classic skin as default
|
||||
chrome::
|
||||
echo skin,install,select,classic/1.0 >>$(DIST)\bin\chrome\installed-chrome.txt
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
themes/Makefile
|
||||
themes/blue/Makefile
|
||||
themes/modern/Makefile
|
||||
themes/classic/communicator/win/Makefile
|
||||
themes/classic/communicator/sidebar/Makefile
|
||||
|
|
|
|||
|
|
@ -38,11 +38,6 @@ if (verifyDiskSpace(fProgram, srDest))
|
|||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/global/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/messenger/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/navigator/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/communicator/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/editor/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/global/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/messenger/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/navigator/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/communicator/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/editor/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/global/");
|
||||
|
|
|
|||
|
|
@ -228,7 +228,6 @@ bin\chrome\comm\*
|
|||
bin\chrome\toolkit\*
|
||||
bin\chrome\modern\*
|
||||
bin\chrome\classic\*
|
||||
;bin\chrome\blue\*
|
||||
;-bin\chrome\comm\content\editor\EditorInitPage.html
|
||||
;-bin\chrome\comm\editor\content\EditorInitPagePlain.html
|
||||
;Include this for "debug" testing - remove for actual beta release:
|
||||
|
|
|
|||
|
|
@ -44,11 +44,6 @@ if (verifyDiskSpace(communicatorFolder, srDest))
|
|||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/global/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/messenger/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/navigator/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/communicator/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/editor/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/global/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/messenger/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/navigator/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/communicator/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/editor/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/global/");
|
||||
|
|
|
|||
|
|
@ -279,11 +279,6 @@ if(verifyDiskSpace(fProgram, srDest))
|
|||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/global/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/messenger/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/navigator/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","blue.jar"),"skin/blue/communicator/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","blue.jar"),"skin/blue/editor/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","blue.jar"),"skin/blue/global/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","blue.jar"),"skin/blue/messenger/");
|
||||
// registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","blue.jar"),"skin/blue/navigator/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/communicator/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/editor/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/global/");
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче