From 70965a8fc142f59f30a240c9251b11b3e0343265 Mon Sep 17 00:00:00 2001 From: "oeschger%netscape.com" Date: Thu, 12 Apr 2001 01:06:01 +0000 Subject: [PATCH] adding help build piece, bug=74132, r=samir, r=ssu (for win32), sr=alecf git-svn-id: svn://10.0.0.236/trunk@92042 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/allmakefiles.sh | 4 + mozilla/configure | 2 +- mozilla/configure.in | 2 +- mozilla/extensions/help/Makefile.in | 31 ++++++++ mozilla/extensions/help/makefile.win | 29 ++++++++ mozilla/extensions/help/resources/Makefile.in | 33 +++++++++ .../help/resources/content/help.xul | 2 +- mozilla/extensions/help/resources/jar.mn | 74 +++++++++++++++++++ .../extensions/help/resources/makefile.win | 30 ++++++++ mozilla/extensions/makefile.win | 1 + mozilla/xpinstall/packager/mac/browser.jst | 2 + mozilla/xpinstall/packager/packages-mac | 1 + mozilla/xpinstall/packager/packages-unix | 1 + mozilla/xpinstall/packager/packages-win | 1 + mozilla/xpinstall/packager/unix/browser.jst | 2 + .../xpinstall/packager/windows/browser.jst | 3 +- 16 files changed, 214 insertions(+), 4 deletions(-) create mode 100644 mozilla/extensions/help/Makefile.in create mode 100644 mozilla/extensions/help/makefile.win create mode 100644 mozilla/extensions/help/resources/Makefile.in create mode 100644 mozilla/extensions/help/resources/jar.mn create mode 100644 mozilla/extensions/help/resources/makefile.win diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh index caf9eda40de..b90a526d045 100755 --- a/mozilla/allmakefiles.sh +++ b/mozilla/allmakefiles.sh @@ -1073,6 +1073,10 @@ for extension in $MOZ_EXTENSIONS; do inspector ) MAKEFILES_extensions="$MAKEFILES_extensions $MAKEFILES_inspector" ;; + help ) MAKEFILES_extensions="$MAKEFILES_extensions + extensions/help/resources/Makefile + " ;; + esac done diff --git a/mozilla/configure b/mozilla/configure index bbb60f86dd0..6efd7241031 100755 --- a/mozilla/configure +++ b/mozilla/configure @@ -11356,7 +11356,7 @@ fi -MOZ_EXTENSIONS_DEFAULT="cookie wallet xml-rpc xmlextras" +MOZ_EXTENSIONS_DEFAULT="cookie wallet xml-rpc xmlextras help" # Check whether --with-extensions or --without-extensions was given. if test "${with_extensions+set}" = set; then diff --git a/mozilla/configure.in b/mozilla/configure.in index 9a84b18dafb..f5dc8db27f1 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -3390,7 +3390,7 @@ dnl ======================================================== dnl Need cookie and wallet to build mozilla, this should dnl not be the case, 18352 has been filed. dnl http://bugzilla.mozilla.org/show_bug.cgi?id=18352 -MOZ_EXTENSIONS_DEFAULT="cookie wallet xml-rpc xmlextras" +MOZ_EXTENSIONS_DEFAULT="cookie wallet xml-rpc xmlextras help" MOZ_ARG_WITH_STRING(extensions, [ --with-extensions Enable extensions (dirs in extensions/)], diff --git a/mozilla/extensions/help/Makefile.in b/mozilla/extensions/help/Makefile.in new file mode 100644 index 00000000000..3129ceec69e --- /dev/null +++ b/mozilla/extensions/help/Makefile.in @@ -0,0 +1,31 @@ +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +include $(topsrcdir)/config/rules.mk + +DIRS = resources diff --git a/mozilla/extensions/help/makefile.win b/mozilla/extensions/help/makefile.win new file mode 100644 index 00000000000..cdcdce12935 --- /dev/null +++ b/mozilla/extensions/help/makefile.win @@ -0,0 +1,29 @@ +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH = ..\.. + +include <$(DEPTH)/config/config.mak> + +DIRS = resources + +include <$(DEPTH)\config\rules.mak> + diff --git a/mozilla/extensions/help/resources/Makefile.in b/mozilla/extensions/help/resources/Makefile.in new file mode 100644 index 00000000000..d0ac1b89ef2 --- /dev/null +++ b/mozilla/extensions/help/resources/Makefile.in @@ -0,0 +1,33 @@ +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +include $(topsrcdir)/config/rules.mk + +chrome:: + $(REGCHROME) content help help.jar + $(REGCHROME) locale en-US/help help.jar diff --git a/mozilla/extensions/help/resources/content/help.xul b/mozilla/extensions/help/resources/content/help.xul index 88de6ff8795..2a60792fd17 100644 --- a/mozilla/extensions/help/resources/content/help.xul +++ b/mozilla/extensions/help/resources/content/help.xul @@ -1,6 +1,6 @@ - + diff --git a/mozilla/extensions/help/resources/jar.mn b/mozilla/extensions/help/resources/jar.mn new file mode 100644 index 00000000000..d3370e56f86 --- /dev/null +++ b/mozilla/extensions/help/resources/jar.mn @@ -0,0 +1,74 @@ +help.jar: + content/help/help.xul (content/help.xul) + content/help/help.js (content/help.js) + content/help/contents.rdf (content/contents.rdf) + content/help/helpMenuOverlay.xul (content/helpMenuOverlay.xul) + locale/en-US/help/contents.rdf (locale/en-US/contents.rdf) + locale/en-US/help/welcome_help.html (locale/en-US/welcome_help.html) + locale/en-US/help/help-toc.rdf (locale/en-US/help-toc.rdf) + locale/en-US/help/help_index.html (locale/en-US/help_index.html) + locale/en-US/help/im_help.html (locale/en-US/im_help.html) + locale/en-US/help/nav_help.html (locale/en-US/nav_help.html) + locale/en-US/help/mail_help.html (locale/en-US/mail_help.html) + locale/en-US/help/composer_help.html (locale/en-US/composer_help.html) + locale/en-US/help/customize_help.html (locale/en-US/customize_help.html) + locale/en-US/help/certs_help.html (locale/en-US/certs_help.html) + locale/en-US/help/cert_concepts_help.html (locale/en-US/cert_concepts_help.html) + locale/en-US/help/cert_dialog_help.html (locale/en-US/cert_dialog_help.html) + locale/en-US/help/glossary.html (locale/en-US/glossary.html) + locale/en-US/help/passwords_help.html (locale/en-US/passwords_help.html) + locale/en-US/help/privacy_help.html (locale/en-US/privacy_help.html) + locale/en-US/help/privsec_help.html (locale/en-US/privsec_help.html) + locale/en-US/help/ssl_help.html (locale/en-US/ssl_help.html) + locale/en-US/help/sll_page_info_help.html (locale/en-US/ssl_page_info_help.html) + locale/en-US/help/using_certs_help.html (locale/en-US/using_certs_help.html) + locale/en-US/help/validation_help.html (locale/en-US/validation_help.html) + locale/en-US/help/content_style.css (locale/en-US/content_style.css) + locale/en-US/help/help.dtd (locale/en-US/help.dtd) + locale/en-US/help/images/anchor.gif (locale/en-US/images/anchor.gif) + locale/en-US/help/images/banner.gif (locale/en-US/images/banner.gif) + locale/en-US/help/images/biActive.gif (locale/en-US/images/biActive.gif) + locale/en-US/help/images/bkmkmenu.gif (locale/en-US/images/bkmkmenu.gif) + locale/en-US/help/images/bullets.gif (locale/en-US/images/bullets.gif) + locale/en-US/help/images/frown.gif (locale/en-US/images/frown.gif) + locale/en-US/help/images/hrule.gif (locale/en-US/images/hrule.gif) + locale/en-US/help/images/image.gif (locale/en-US/images/image.gif) + locale/en-US/help/images/image5.gif (locale/en-US/images/image5.gif) + locale/en-US/help/images/image6.gif (locale/en-US/images/image6.gif) + locale/en-US/help/images/image7.gif (locale/en-US/images/image7.gif) + locale/en-US/help/images/image8.gif (locale/en-US/images/image8.gif) + locale/en-US/help/images/image9.gif (locale/en-US/images/image9.gif) + locale/en-US/help/images/imtaskbar.gif (locale/en-US/images/imtaskbar.gif) + locale/en-US/help/images/locationbar.gif (locale/en-US/images/locationbar.gif) + locale/en-US/help/images/mailicon.gif (locale/en-US/images/mailicon.gif) + locale/en-US/help/images/navbar.gif (locale/en-US/images/navbar.gif) + locale/en-US/help/images/navbuttons.gif (locale/en-US/images/navbuttons.gif) + locale/en-US/help/images/newmail.gif (locale/en-US/images/newmail.gif) + locale/en-US/help/images/numbers.gif (locale/en-US/images/numbers.gif) + locale/en-US/help/images/paperclip.gif (locale/en-US/images/paperclip.gif) + locale/en-US/help/images/personalbar.gif (locale/en-US/images/personalbar.gif) + locale/en-US/help/images/reload.gif (locale/en-US/images/reload.gif) + locale/en-US/help/images/search.gif (locale/en-US/images/search.gif) + locale/en-US/help/images/searchmusic.gif (locale/en-US/images/searchmusic.gif) + locale/en-US/help/images/sick.gif (locale/en-US/images/sick.gif) + locale/en-US/help/images/sidebarclosed_small.gif (locale/en-US/images/sidebarclosed_small.gif) + locale/en-US/help/images/smile.gif (locale/en-US/images/smile.gif) + locale/en-US/help/images/table.gif (locale/en-US/images/table.gif) + locale/en-US/help/images/tagicon2.gif (locale/en-US/images/tagicon2.gif) + locale/en-US/help/images/taskbar-ab.gif (locale/en-US/images/taskbar-ab.gif) + locale/en-US/help/images/taskbar-aim-online.gif (locale/en-US/images/taskbar-aim-online.gif) + locale/en-US/help/images/taskbar-mail.gif (locale/en-US/images/taskbar-mail.gif) + locale/en-US/help/images/taskbar.gif (locale/en-US/images/taskbar.gif) + locale/en-US/help/images/taskbar_menus.gif (locale/en-US/images/taskbar_menus.gif) + locale/en-US/help/images/thread.gif (locale/en-US/images/thread.gif) + locale/en-US/help/images/threadbutton.gif (locale/en-US/images/threadbutton.gif) + locale/en-US/help/images/wink.gif (locale/en-US/images/wink.gif) + + +modern.jar: + skin/modern/communicator/help.css (skin/help.css) + +classic.jar: + skin/classic/communicator/help.css (skin/help.css) + + diff --git a/mozilla/extensions/help/resources/makefile.win b/mozilla/extensions/help/resources/makefile.win new file mode 100644 index 00000000000..ac8372d42fa --- /dev/null +++ b/mozilla/extensions/help/resources/makefile.win @@ -0,0 +1,30 @@ +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH = ..\..\.. + +include <$(DEPTH)/config/config.mak> + +include <$(DEPTH)\config\rules.mak> + +chrome:: + $(REGCHROME) content help help.jar + $(REGCHROME) locale en-US/help help.jar diff --git a/mozilla/extensions/makefile.win b/mozilla/extensions/makefile.win index cfdcfd73131..016f669381a 100644 --- a/mozilla/extensions/makefile.win +++ b/mozilla/extensions/makefile.win @@ -25,6 +25,7 @@ include <$(DEPTH)/config/config.mak> DIRS = wallet \ cookie \ irc \ + help \ !if defined(BUILD_PSM) psm-glue \ !endif diff --git a/mozilla/xpinstall/packager/mac/browser.jst b/mozilla/xpinstall/packager/mac/browser.jst index 9fee748959c..e43c0506e2d 100644 --- a/mozilla/xpinstall/packager/mac/browser.jst +++ b/mozilla/xpinstall/packager/mac/browser.jst @@ -43,6 +43,8 @@ if (verifyDiskSpace(fProgram, srDest)) registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/global/"); registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/messenger/"); registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/navigator/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"help.jar"),"content/help/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf,"help.jar"),"locale/en-US/help/"); // make an alias to the browser on the desktop var desktopFolder = getFolder("Mac Desktop"); diff --git a/mozilla/xpinstall/packager/packages-mac b/mozilla/xpinstall/packager/packages-mac index ac6c7a4c34c..55cbde512c8 100644 --- a/mozilla/xpinstall/packager/packages-mac +++ b/mozilla/xpinstall/packager/packages-mac @@ -196,6 +196,7 @@ viewer:Components:necko.xpt viewer:Components:Cache.shlb viewer:Components:cache.xpt +viewer:chrome:help.jar viewer:chrome:comm.jar viewer:chrome:toolkit.jar viewer:chrome:modern.jar diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix index 4c694460f6c..ad8fdb0a9a6 100644 --- a/mozilla/xpinstall/packager/packages-unix +++ b/mozilla/xpinstall/packager/packages-unix @@ -216,6 +216,7 @@ bin/components/windowwatcher.xpt bin/components/xmlextras.xpt bin/components/libxmlextras.so +bin/chrome/help.jar bin/chrome/toolkit.jar bin/chrome/comm.jar bin/chrome/modern.jar diff --git a/mozilla/xpinstall/packager/packages-win b/mozilla/xpinstall/packager/packages-win index 30543bc56a9..33df19c16be 100644 --- a/mozilla/xpinstall/packager/packages-win +++ b/mozilla/xpinstall/packager/packages-win @@ -220,6 +220,7 @@ bin\components\xmlextras.xpt bin\components\xmlextras.dll ; chrome stuff +bin\chrome\help.jar bin\chrome\comm.jar bin\chrome\toolkit.jar bin\chrome\modern.jar diff --git a/mozilla/xpinstall/packager/unix/browser.jst b/mozilla/xpinstall/packager/unix/browser.jst index 6a61b5c4bbc..3d8caf64747 100644 --- a/mozilla/xpinstall/packager/unix/browser.jst +++ b/mozilla/xpinstall/packager/unix/browser.jst @@ -49,6 +49,8 @@ if (verifyDiskSpace(communicatorFolder, srDest)) registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/global/"); registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/messenger/"); registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/navigator/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"help.jar"),"content/help/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf,"help.jar"),"locale/en-US/help/"); if (err==SUCCESS) { diff --git a/mozilla/xpinstall/packager/windows/browser.jst b/mozilla/xpinstall/packager/windows/browser.jst index 1bcd1d555ba..b758a45bfcb 100644 --- a/mozilla/xpinstall/packager/windows/browser.jst +++ b/mozilla/xpinstall/packager/windows/browser.jst @@ -284,7 +284,8 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/global/"); registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/messenger/"); registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/navigator/"); - + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"help.jar"),"content/help/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf,"help.jar"),"locale/en-US/help/"); /* Log files that are created after the installer is done, so they can be uninstalled */ logComment("Installing: " + fProgram + "Xpcs Registry.dat");