diff --git a/camino/Makefile.in b/camino/Makefile.in new file mode 100644 --- /dev/null +++ b/camino/Makefile.in @@ -0,0 +1,53 @@ +# vim:set ts=8 sw=8 sts=8 et: +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is the Mozilla Browser code. +# +# The Initial Developer of the Original Code is +# Netscape Communications Corporation. +# Portions created by the Initial Developer are Copyright (C) 2002 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Brian Ryner +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = .. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +# DIRS = \ +# setup \ +# stub \ +# app \ +# examples \ +# $(NULL) + +include $(topsrcdir)/config/rules.mk diff --git a/camino/build.mk b/camino/build.mk new file mode 100644 --- /dev/null +++ b/camino/build.mk @@ -0,0 +1,70 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is the Mozilla build system. +# +# The Initial Developer of the Original Code is +# the Mozilla Foundation . +# Portions created by the Initial Developer are Copyright (C) 2006 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Benjamin Smedberg (Initial Code) +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +include $(topsrcdir)/toolkit/toolkit-tiers.mk + +TIERS += app + +ifdef MOZ_EXTENSIONS +tier_app_dirs += extensions +endif + +ifdef MOZ_JAVAXPCOM +tier_app_dirs += extensions/java +endif + +tier_app_dirs += \ + camino \ + $(NULL) + +installer: + @echo "Camino doesn't have an installer yet." + +# package: +# @$(MAKE) -C camino/installer +# +# install: +# @$(MAKE) -C camino/installer install +# +# sdk: +# @$(MAKE) -C camino/installer make-sdk +# +# distclean:: +# @$(MAKE) -C camino/installer distclean +# +# upload:: +# @$(MAKE) -C camino/installer upload diff --git a/camino/config/mozconfig b/camino/config/mozconfig new file mode 100644 --- /dev/null +++ b/camino/config/mozconfig @@ -0,0 +1,5 @@ +# This file specifies the build flags for Camino. You can use it by adding: +# . $topsrcdir/camino/config/mozconfig +# to the top of your mozconfig file. + +ac_add_options --enable-application=camino diff --git a/camino/confvars.sh b/camino/confvars.sh new file mode 100755 --- /dev/null +++ b/camino/confvars.sh @@ -0,0 +1,47 @@ +#! /bin/sh +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is Mozilla Build System +# +# The Initial Developer of the Original Code is +# Ben Turner +# +# Portions created by the Initial Developer are Copyright (C) 2007 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +MOZ_APP_NAME=camino +MOZ_APP_DISPLAYNAME=Camino +MOZ_STATIC_BUILD_UNSUPPORTED=1 +MOZ_APP_VERSION=$MOZILLA_VERSION +MOZ_PLACES=1 +MOZ_NO_XPCOM_OBSOLETE=1 +MOZ_URL_CLASSIFIER=1 +MOZ_MORKREADER=1 +MOZ_CAMINO=1 diff --git a/camino/makefiles.sh b/camino/makefiles.sh new file mode 100644 --- /dev/null +++ b/camino/makefiles.sh @@ -0,0 +1,47 @@ +#! /bin/sh +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is the the Mozilla build system +# +# The Initial Developer of the Original Code is +# Ben Turner +# +# Portions created by the Initial Developer are Copyright (C) 2007 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +# add_makefiles " +# xulrunner/Makefile +# xulrunner/app/Makefile +# xulrunner/app/profile/Makefile +# xulrunner/app/profile/chrome/Makefile +# xulrunner/app/profile/extensions/Makefile +# xulrunner/installer/Makefile +# xulrunner/installer/mac/Makefile +# " diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -4554,16 +4554,17 @@ case "$target_os" in ;; esac MOZ_ARG_ENABLE_STRING(application, [ --enable-application=APP Options include: browser (Firefox) xulrunner + camino content/xslt (Standalone Transformiix XSLT) netwerk (Standalone Necko) tools/update-packaging (AUS-related packaging tools) standalone (use this for standalone xpcom/xpconnect or to manually drive a build)], [ MOZ_BUILD_APP=$enableval ] ) MOZ_EMBEDDING_PROFILE=default @@ -4731,31 +4732,36 @@ case "$MOZ_BUILD_APP" in browser) AC_DEFINE(MOZ_PHOENIX) ;; xulrunner) AC_DEFINE(MOZ_XULRUNNER) ;; +camino) + AC_DEFINE(MOZ_CAMINO) + ;; + content/xslt) AC_DEFINE(TX_EXE) ;; standalone) MOZ_APP_NAME=mozilla MOZ_APP_DISPLAYNAME=Mozilla MOZ_APP_VERSION=$MOZILLA_VERSION ;; esac AC_SUBST(MOZ_BUILD_APP) AC_SUBST(MOZ_PHOENIX) AC_SUBST(MOZ_XULRUNNER) +AC_SUBST(MOZ_CAMINO) AC_DEFINE_UNQUOTED(MOZ_BUILD_APP,$MOZ_BUILD_APP) dnl ======================================================== dnl = dnl = Toolkit Options dnl = dnl ======================================================== diff --git a/embedding/config/Makefile.in b/embedding/config/Makefile.in --- a/embedding/config/Makefile.in +++ b/embedding/config/Makefile.in @@ -91,17 +91,16 @@ embed_copy:: $(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(BASEBROWSER) -o $(_PLATFORM) -v ifeq ($(OS_ARCH),WINNT) $(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(BASEBROWSER_SUPP) -o $(_PLATFORM) -v endif if test -f "$(srcdir)/$(CLIENTMANIFEST)"; then \ $(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(CLIENTMANIFEST) -o $(_PLATFORM) -v; \ fi $(NSINSTALL) -t $(srcdir)/installed-chrome.txt $(DIST)/Embed/chrome - $(NSINSTALL) -t $(srcdir)/readme.html $(DIST)/Embed -$(NSINSTALL) -t $(DEPTH)/embedding/lite/$(LIB_PREFIX)embed_lite$(DLL_SUFFIX) $(DIST)/Embed/components ifeq ($(OS_ARCH),WINNT) ifeq ($(WINAPP),mfcembed) $(NSINSTALL) -t $(DIST)/bin/mfcembed.exe $(DIST)/Embed $(NSINSTALL) -t $(DIST)/bin/mfcEmbedComponents.dll $(DIST)/Embed else ifeq ($(WINAPP),winembed) $(NSINSTALL) -t $(DIST)/bin/winembed.exe $(DIST)/Embed diff --git a/extensions/spellcheck/src/mozSpellCheckerFactory.cpp b/extensions/spellcheck/src/mozSpellCheckerFactory.cpp --- a/extensions/spellcheck/src/mozSpellCheckerFactory.cpp +++ b/extensions/spellcheck/src/mozSpellCheckerFactory.cpp @@ -32,17 +32,17 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ #include "nsIGenericFactory.h" -#ifdef MOZ_MACBROWSER +#ifdef MOZ_CAMINO #include "mozOSXSpell.h" #else #include "mozHunspell.h" #include "mozHunspellDirProvider.h" #endif #include "mozSpellChecker.h" #include "mozInlineSpellChecker.h" @@ -61,17 +61,17 @@ 0x9fe5d975, 0x9bd, 0x44aa, { 0xa0, 0x1a, 0x66, 0x40, 0x2e, 0xa2, 0x86, 0x57} } //////////////////////////////////////////////////////////////////////// // Define the constructor function for the objects // // NOTE: This creates an instance of objects by using the default constructor // -#ifdef MOZ_MACBROWSER +#ifdef MOZ_CAMINO NS_GENERIC_FACTORY_CONSTRUCTOR(mozOSXSpell) #else NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozHunspell, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(mozHunspellDirProvider) #endif NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozSpellChecker, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozPersonalDictionary, Init) @@ -113,17 +113,17 @@ mozInlineSpellCheckerConstructor(nsISupp } //////////////////////////////////////////////////////////////////////// // Define a table of CIDs implemented by this module along with other // information like the function to create an instance, contractid, and // class name. // static const nsModuleComponentInfo components[] = { -#ifdef MOZ_MACBROWSER +#ifdef MOZ_CAMINO { "OSX Spell check service", MOZ_OSXSPELL_CID, MOZ_OSXSPELL_CONTRACTID, mozOSXSpellConstructor }, #else { @@ -135,17 +135,17 @@ static const nsModuleComponentInfo compo { "mozHunspellDirProvider", HUNSPELLDIRPROVIDER_CID, mozHunspellDirProvider::kContractID, mozHunspellDirProviderConstructor, mozHunspellDirProvider::Register, mozHunspellDirProvider::Unregister }, -#endif // MOZ_MACBROWSER +#endif // MOZ_CAMINO { NULL, NS_SPELLCHECKER_CID, NS_SPELLCHECKER_CONTRACTID, mozSpellCheckerConstructor }, { NULL,