aboutsummaryrefslogtreecommitdiffstats
path: root/embed/xulrunner
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2007-09-13 03:35:36 +0800
committerChristian Persch <chpe@src.gnome.org>2007-09-13 03:35:36 +0800
commit7e0056c88d3377e2fe1086ed4c3f54b6d41c57fe (patch)
tree538010193ecef1eb6aef7f7589d31099eac7b51d /embed/xulrunner
parent4cc435aa4cb1d683f03ad529d9d4891c8886771b (diff)
downloadgsoc2013-epiphany-7e0056c88d3377e2fe1086ed4c3f54b6d41c57fe.tar
gsoc2013-epiphany-7e0056c88d3377e2fe1086ed4c3f54b6d41c57fe.tar.gz
gsoc2013-epiphany-7e0056c88d3377e2fe1086ed4c3f54b6d41c57fe.tar.bz2
gsoc2013-epiphany-7e0056c88d3377e2fe1086ed4c3f54b6d41c57fe.tar.lz
gsoc2013-epiphany-7e0056c88d3377e2fe1086ed4c3f54b6d41c57fe.tar.xz
gsoc2013-epiphany-7e0056c88d3377e2fe1086ed4c3f54b6d41c57fe.tar.zst
gsoc2013-epiphany-7e0056c88d3377e2fe1086ed4c3f54b6d41c57fe.zip
Make the xulrunner backend build: change C/CXX/LDFLAGS, comment out
some code that isn't ported to gecko 1.9 yet. Doesn't link yet! svn path=/trunk/; revision=7402
Diffstat (limited to 'embed/xulrunner')
-rw-r--r--embed/xulrunner/bindings/Makefile.am8
-rw-r--r--embed/xulrunner/bindings/python/Makefile.am13
-rw-r--r--embed/xulrunner/data/Makefile.am1
-rw-r--r--embed/xulrunner/embed/ContentHandler.cpp3
-rw-r--r--embed/xulrunner/embed/EphyDirectoryProvider.cpp7
-rw-r--r--embed/xulrunner/embed/EphyFind.cpp10
-rw-r--r--embed/xulrunner/embed/EphySidebar.cpp5
-rw-r--r--embed/xulrunner/embed/GeckoPrintService.cpp1
-rw-r--r--embed/xulrunner/embed/GtkNSSDialogs.cpp1
-rw-r--r--embed/xulrunner/embed/Makefile.am77
-rw-r--r--embed/xulrunner/embed/MozDownload.cpp3
-rw-r--r--embed/xulrunner/embed/MozRegisterComponents.cpp5
-rw-r--r--embed/xulrunner/embed/mozilla-embed-single.cpp17
-rw-r--r--embed/xulrunner/src/Makefile.am42
-rw-r--r--embed/xulrunner/tests/Makefile.am39
15 files changed, 68 insertions, 164 deletions
diff --git a/embed/xulrunner/bindings/Makefile.am b/embed/xulrunner/bindings/Makefile.am
index 0f4745056..4a6744246 100644
--- a/embed/xulrunner/bindings/Makefile.am
+++ b/embed/xulrunner/bindings/Makefile.am
@@ -1,5 +1,7 @@
SUBDIRS =
-if ENABLE_PYTHON
-SUBDIRS += python
-endif
+# if ENABLE_PYTHON
+# SUBDIRS += python
+# endif
+
+DIST_SUBDIRS = python
diff --git a/embed/xulrunner/bindings/python/Makefile.am b/embed/xulrunner/bindings/python/Makefile.am
index 68ed1efe9..5343696e0 100644
--- a/embed/xulrunner/bindings/python/Makefile.am
+++ b/embed/xulrunner/bindings/python/Makefile.am
@@ -8,22 +8,21 @@ pkgpyexecdir = $(pyexecdir)/gtk-2.0
pkgpyexec_LTLIBRARIES = gnomegeckoembed.la
gnomegeckoembed_la_CPPFLAGS = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/embed/gecko/src \
- -I$(top_builddir)/embed/gecko/src \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/embed/xulrunner/src \
+ -I$(top_builddir)/embed/xulrunner/src \
$(AM_CPPFLAGS)
gnomegeckoembed_la_CFLAGS = \
- $(GGE_DEPENDENCY_CFLAGS) \
- $(GECKO_CFLAGS) \
+ $(GTK_CFLAGS) \
$(NO_STRICT_ALIASING_CFLAGS) \
$(PYGTK_CFLAGS) \
$(PYTHON_CFLAGS) \
$(AM_CFLAGS)
gnomegeckoembed_la_LIBADD = \
- $(top_builddir)/embed/gecko/src/libgnomegeckoembed-0.0.la \
- $(GECKO_LIBS) \
+ $(top_builddir)/embed/xulrunner/src/libgnomegeckoembed-0.0.la \
+ $(GTK_LIBS) \
$(PYTHON_LIBS) \
$(PYTHON_EXTRA_LIBS) \
$(PYGTK_LIBS)
diff --git a/embed/xulrunner/data/Makefile.am b/embed/xulrunner/data/Makefile.am
index 3363f76b4..4c6763b2c 100644
--- a/embed/xulrunner/data/Makefile.am
+++ b/embed/xulrunner/data/Makefile.am
@@ -1,3 +1,2 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnome-gecko-embed-$(GGE_API_VERSION).pc
-
diff --git a/embed/xulrunner/embed/ContentHandler.cpp b/embed/xulrunner/embed/ContentHandler.cpp
index 0510aa3f1..85c9ad650 100644
--- a/embed/xulrunner/embed/ContentHandler.cpp
+++ b/embed/xulrunner/embed/ContentHandler.cpp
@@ -439,7 +439,8 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
}
/* See http://bugzilla.gnome.org/show_bug.cgi?id=456945 */
-#ifndef HAVE_GECKO_1_9
+ // FIXME convert this properly to 1.9
+#ifdef HAVE_GECKO_1_9
if (info != NULL)
{
nsString desc;
diff --git a/embed/xulrunner/embed/EphyDirectoryProvider.cpp b/embed/xulrunner/embed/EphyDirectoryProvider.cpp
index f8ec21042..0dade7bd2 100644
--- a/embed/xulrunner/embed/EphyDirectoryProvider.cpp
+++ b/embed/xulrunner/embed/EphyDirectoryProvider.cpp
@@ -23,12 +23,7 @@
#include <string.h>
-#ifndef HAVE_GECKO_1_9
-// for nsNetUtil.h
-#define MOZILLA_INTERNAL_API 1
-#endif
-
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsAppDirectoryServiceDefs.h>
#include <nsCOMPtr.h>
diff --git a/embed/xulrunner/embed/EphyFind.cpp b/embed/xulrunner/embed/EphyFind.cpp
index 344d4251e..fa5ebfe94 100644
--- a/embed/xulrunner/embed/EphyFind.cpp
+++ b/embed/xulrunner/embed/EphyFind.cpp
@@ -102,7 +102,7 @@ EphyFind::SetEmbed (EphyEmbed *aEmbed)
#ifdef HAVE_GECKO_1_9
// mFinder->SetSelectionModeAndRepaint (nsISelectionController::SELECTION_ON);
#else
- mFinder->SetFocusLinks (PR_TRUE);
+// mFinder->SetFocusLinks (PR_TRUE);
#endif
} else {
rv = mFinder->SetDocShell (docShell);
@@ -202,15 +202,7 @@ EphyFind::FindAgain (PRBool aForward,
nsresult rv;
PRUint16 found = nsITypeAheadFind::FIND_NOTFOUND;
-#ifdef HAVE_GECKO_1_9
rv = mFinder->FindAgain (!aForward, aLinksOnly, &found);
-#else
- if (aForward) {
- rv = mFinder->FindNext (&found);
- } else {
- rv = mFinder->FindPrevious (&found);
- }
-#endif
return (EphyEmbedFindResult) found;
}
diff --git a/embed/xulrunner/embed/EphySidebar.cpp b/embed/xulrunner/embed/EphySidebar.cpp
index 94bd52b8a..92e0823c2 100644
--- a/embed/xulrunner/embed/EphySidebar.cpp
+++ b/embed/xulrunner/embed/EphySidebar.cpp
@@ -25,15 +25,12 @@
#include <nsStringAPI.h>
#include <nsICategoryManager.h>
+#include <nsIClassInfoImpl.h>
#include <nsIScriptNameSpaceManager.h>
#include <nsMemory.h>
#include <nsServiceManagerUtils.h>
#include <nsXPCOMCID.h>
-#ifdef HAVE_GECKO_1_9
-#include <nsIClassInfoImpl.h>
-#endif
-
#include "ephy-debug.h"
#include "ephy-embed-shell.h"
#include "ephy-embed-single.h"
diff --git a/embed/xulrunner/embed/GeckoPrintService.cpp b/embed/xulrunner/embed/GeckoPrintService.cpp
index 8be8263b9..e0d589ef8 100644
--- a/embed/xulrunner/embed/GeckoPrintService.cpp
+++ b/embed/xulrunner/embed/GeckoPrintService.cpp
@@ -664,7 +664,6 @@ GeckoPrintService::TranslateSettings (GtkPrintSettings *aGtkSettings,
aSettings->SetPrintInColor (gtk_print_settings_get_use_color (aGtkSettings));
aSettings->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters);
- aSettings->SetPaperSize (nsIPrintSettings::kPaperSizeDefined);
GtkPaperSize *paperSize = gtk_page_setup_get_paper_size (aPageSetup);
if (!paperSize) {
diff --git a/embed/xulrunner/embed/GtkNSSDialogs.cpp b/embed/xulrunner/embed/GtkNSSDialogs.cpp
index 25b99d141..1004c1a9b 100644
--- a/embed/xulrunner/embed/GtkNSSDialogs.cpp
+++ b/embed/xulrunner/embed/GtkNSSDialogs.cpp
@@ -67,6 +67,7 @@
#include <nsIDOMWindow.h>
#include <nsIInterfaceRequestor.h>
#include <nsIInterfaceRequestorUtils.h>
+#include <nsIMutableArray.h>
#include <nsIPKCS11ModuleDB.h>
#include <nsIPKCS11Slot.h>
#include <nsIPK11Token.h>
diff --git a/embed/xulrunner/embed/Makefile.am b/embed/xulrunner/embed/Makefile.am
index ded6802e7..f72419326 100644
--- a/embed/xulrunner/embed/Makefile.am
+++ b/embed/xulrunner/embed/Makefile.am
@@ -64,13 +64,13 @@ libephyxulrunnerembed_la_SOURCES = \
mozilla-notifiers.cpp \
mozilla-notifiers.h
-if ENABLE_FILEPICKER
-libephyxulrunnerembed_la_SOURCES += \
- FilePicker.cpp \
- FilePicker.h
-endif
+# if ENABLE_FILEPICKER
+# libephyxulrunnerembed_la_SOURCES += \
+# FilePicker.cpp \
+# FilePicker.h
+# endif
-if HAVE_MOZILLA_PSM
+# if HAVE_MOZILLA_PSM
libephyxulrunnerembed_la_SOURCES += \
GtkNSSClientAuthDialogs.cpp \
GtkNSSClientAuthDialogs.h \
@@ -80,67 +80,26 @@ libephyxulrunnerembed_la_SOURCES += \
GtkNSSKeyPairDialogs.h \
GtkNSSSecurityWarningDialogs.cpp\
GtkNSSSecurityWarningDialogs.h
-endif
+# endif
-if ENABLE_CERTIFICATE_MANAGER
-libephyxulrunnerembed_la_SOURCES += \
- mozilla-x509-cert.cpp \
- mozilla-x509-cert.h
-endif
+# if ENABLE_CERTIFICATE_MANAGER
+# libephyxulrunnerembed_la_SOURCES += \
+# mozilla-x509-cert.cpp \
+# mozilla-x509-cert.h
+# endif
-if ENABLE_SPELLCHECKER
+# if ENABLE_SPELLCHECKER
libephyxulrunnerembed_la_SOURCES += \
GeckoSpellCheckEngine.cpp \
GeckoSpellCheckEngine.h
-endif
-
-mozilla_include_subdirs = \
- . \
- caps \
- chardet \
- chrome \
- commandhandler \
- content \
- cookie \
- docshell \
- dom \
- exthandler \
- fastfind \
- helperAppDlg \
- find \
- gfx \
- gtkembedmoz \
- history \
- js \
- layout \
- locale \
- mimetype \
- necko \
- nkcache \
- passwordmgr \
- pipboot \
- pipnss \
- pref \
- shistory \
- sidebar \
- spellchecker \
- uriloader \
- uconv \
- wallet \
- webbrowserpersist \
- webbrwsr \
- widget \
- windowwatcher \
- xmlextras \
- xpcom \
- xpconnect
+# endif
libephyxulrunnerembed_la_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/embed \
-I$(top_srcdir) \
- -I$(top_srcdir)/embed/gecko/src \
- -I$(top_builddir)/embed/gecko/src \
+ -I$(top_srcdir)/embed/xulrunner/src \
+ -I$(top_builddir)/embed/xulrunner/src \
-DSHARE_DIR=\"$(pkgdatadir)\" \
-DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
-DMOZILLA_HOME=\"$(LIBXUL_LIBDIR)\" \
@@ -148,10 +107,12 @@ libephyxulrunnerembed_la_CPPFLAGS = \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \
-DALLOW_PRIVATE_API \
+ $(LIBXUL_CXXCPPFLAGS) \
+ $(LIBXUL_INCLUDES) \
$(AM_CPPFLAGS)
libephyxulrunnerembed_la_CXXFLAGS = \
- $(LIBXUL_CFLAGS) \
+ $(LIBXUL_CXXFLAGS) \
$(DEPENDENCIES_CFLAGS) \
$(AM_CXXFLAGS)
diff --git a/embed/xulrunner/embed/MozDownload.cpp b/embed/xulrunner/embed/MozDownload.cpp
index cb7f32a2f..0853d60e3 100644
--- a/embed/xulrunner/embed/MozDownload.cpp
+++ b/embed/xulrunner/embed/MozDownload.cpp
@@ -343,7 +343,8 @@ MozDownload::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest,
else if (NS_SUCCEEDED (aStatus))
{
/* see http://bugzilla.gnome.org/show_bug.cgi?id=456945 */
-#ifdef HAVE_GECKO_1_9
+#if 1 //def HAVE_GECKO_1_9
+ // FIXMEchpe fix this!
return NS_OK;
#else
GnomeVFSMimeApplication *helperApp;
diff --git a/embed/xulrunner/embed/MozRegisterComponents.cpp b/embed/xulrunner/embed/MozRegisterComponents.cpp
index e712bbc5d..4780b71de 100644
--- a/embed/xulrunner/embed/MozRegisterComponents.cpp
+++ b/embed/xulrunner/embed/MozRegisterComponents.cpp
@@ -32,6 +32,7 @@
#include <nsCURILoader.h>
#include <nsDocShellCID.h>
#include <nsICategoryManager.h>
+#include <nsIClassInfoImpl.h>
#include <nsIComponentManager.h>
#include <nsIComponentRegistrar.h>
#include <nsIGenericFactory.h>
@@ -42,10 +43,6 @@
#include <nsNetCID.h>
#include <nsServiceManagerUtils.h>
-#ifdef HAVE_GECKO_1_9
-#include <nsIClassInfoImpl.h>
-#endif
-
#ifdef HAVE_MOZILLA_PSM
#include <nsISecureBrowserUI.h>
#endif
diff --git a/embed/xulrunner/embed/mozilla-embed-single.cpp b/embed/xulrunner/embed/mozilla-embed-single.cpp
index 1ebc2252c..9c97b7d3b 100644
--- a/embed/xulrunner/embed/mozilla-embed-single.cpp
+++ b/embed/xulrunner/embed/mozilla-embed-single.cpp
@@ -65,7 +65,7 @@
#include <nsNetCID.h>
#endif /* ALLOW_PRIVATE_API */
-#ifndef HAVE_GECKO_1_9
+#if 0 // FIXME ndef HAVE_GECKO_1_9
#include <nsIPassword.h>
#include <nsIPasswordManager.h>
#endif /* !HAVE_GECKO_1_9 */
@@ -838,16 +838,9 @@ static const char*
impl_get_backend_name (EphyEmbedSingle *esingle)
{
/* If you alter the return values here, remember to update
- * the docs in ephy-embed-single.c */
-#if defined (HAVE_GECKO_1_10)
-# error "Need to add version string for gecko 1.10"
-#elif defined(HAVE_GECKO_1_9)
+ * the docs in ephy-embed-single.c
+ */
return "gecko-1.9";
-#elif defined(HAVE_GECKO_1_8)
- return "gecko-1.8";
-#else
-# error "Undefined/unsupported gecko version!"
-#endif
}
static GList *
@@ -954,7 +947,7 @@ impl_list_passwords (EphyPasswordManager *manager)
{
GList *passwords = NULL;
-#ifndef HAVE_GECKO_1_9
+#if 0 // FIXME ndef HAVE_GECKO_1_9
nsresult rv;
nsCOMPtr<nsIPasswordManager> passwordManager =
do_GetService (NS_PASSWORDMANAGER_CONTRACTID);
@@ -1016,7 +1009,7 @@ static void
impl_remove_password (EphyPasswordManager *manager,
EphyPasswordInfo *info)
{
-#ifndef HAVE_GECKO_1_9
+#if 0 // FIXME ndef HAVE_GECKO_1_9
nsCOMPtr<nsIPasswordManager> pm =
do_GetService (NS_PASSWORDMANAGER_CONTRACTID);
if (!pm) return;
diff --git a/embed/xulrunner/src/Makefile.am b/embed/xulrunner/src/Makefile.am
index a3afed257..2d4ac9ed3 100644
--- a/embed/xulrunner/src/Makefile.am
+++ b/embed/xulrunner/src/Makefile.am
@@ -1,31 +1,5 @@
NULL =
-required = \
- . \
- accessibility \
- content \
- embedcomponents \
- docshell \
- dom \
- embed_base \
- gfx \
- intl \
- js \
- layout \
- necko \
- profdirserviceprovider \
- shistory \
- string \
- uriloader \
- webbrwsr \
- webshell \
- widget \
- windowwatcher \
- xpcom \
- xpconnect \
- xulapp \
- $(NULL)
-
MARSHALERS = gecko-embed-marshal.h gecko-embed-marshal.cpp
TYPES_SOURCES = gecko-embed-type-builtins.h gecko-embed-type-builtins.cpp
@@ -130,7 +104,8 @@ libgnomegeckoembed_0_0_la_SOURCES = \
$(NULL)
libgnomegeckoembed_0_0_la_CPPFLAGS = \
- $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(required)) \
+ $(LIBXUL_CXXCPPFLAGS) \
+ $(LIBXUL_INCLUDES) \
$(AM_CPPFLAGS)
# -DDEBUG \
@@ -138,19 +113,16 @@ libgnomegeckoembed_0_0_la_CPPFLAGS = \
#-DMOZILLA_STRICT_API
libgnomegeckoembed_0_0_la_CXXFLAGS = \
- $(GGE_DEPENDENCY_CFLAGS) \
- $(GECKO_CFLAGS) \
+ $(LIBXUL_CXXFLAGS) \
+ $(GTK_CFLAGS) \
$(AM_CXXFLAGS)
-libgnomegeckoembed_0_0_la_LIBADD = \
- $(GGE_DEPENDENCY_LIBS) \
- $(GECKO_LIBS) \
- $(GECKO_EXTRA_LIBS) \
- $(GECKO_GLUE_LIBS)
-
libgnomegeckoembed_0_0_la_LDFLAGS = \
$(AM_LDFLAGS)
+libgnomegeckoembed_0_0_la_LIBADD = \
+ $(LIBXUL_LIBS)
+
gnomegeckoembedincludedir = $(includedir)/gnome-gecko-embed-0.0
gnomegeckoembedinclude_HEADERS =
diff --git a/embed/xulrunner/tests/Makefile.am b/embed/xulrunner/tests/Makefile.am
index 22a2cf93a..cee264947 100644
--- a/embed/xulrunner/tests/Makefile.am
+++ b/embed/xulrunner/tests/Makefile.am
@@ -1,35 +1,30 @@
-required = \
- xpcom \
- string \
- dom
-
bin_PROGRAMS = testgeckoembed
+NULL =
+
testgeckoembed_SOURCES = \
testgeckoembed.cpp
testgeckoembed_CPPFLAGS = \
-I$(top_srcdir) \
- -I$(top_srcdir)/embed/gecko/src \
- -I$(top_builddir)/embed/gecko/src \
- $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(required)) \
- -I$(GECKO_INCLUDE_ROOT) \
- -DGECKO_HOME=\"$(GECKO_HOME)\" \
+ -I$(top_srcdir)/embed/xulrunner/src \
+ -I$(top_builddir)/embed/xulrunner/src \
+ $(LIBXUL_CXXCPPFLAGS) \
+ $(LIBXUL_INCLUDES) \
+ -DGECKO_HOME=\"$(LIBXUL_PREFIX)\" \
$(AM_CPPFLAGS)
testgeckoembed_CXXFLAGS = \
- $(GGE_DEPENDENCY_CFLAGS) \
- $(GECKO_CFLAGS) \
+ $(LIBXUL_CXXFLAGS) \
+ $(GTK_CFLAGS) \
$(AM_CXXFLAGS)
-testgeckoembed_LDADD = \
- $(top_builddir)/embed/gecko/src/libgnomegeckoembed-0.0.la \
- $(GGE_DEPENDENCY_LIBS) \
- $(GECKO_LIBS) \
- $(GECKO_EXTRA_LIBS) \
- $(GECKO_GLUE_LIBS) \
- -lxpcomglue
-
testgeckoembed_LDFLAGS = \
- -R$(GECKO_HOME)
-# `$(MOZILLA_CONFIG) --libs $(required)`
+ -R$(LIBXUL_LIBDIR) \
+ $(AM_LDFLAGS)
+
+testgeckoembed_LDADD = \
+ $(top_builddir)/embed/xulrunner/src/libgnomegeckoembed-0.0.la \
+ $(LIBXUL_LIBS) \
+ $(GTK_LIBS) \
+ $(NULL)