b1054b5e5f
Next step is to fix this: D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\java\webclient\build-tests.xml:152: Test org.mozilla.webclient.DocumentLoadListenerTest failed M build.properties.sample - Add hint for msdev arguments. M dom/build.xml M util/build.xml M webclient/build.xml - compile.source to 1.3 M dom/jni/Makefile.in M webclient/src_ie/Makefile.in M webclient/src_moz/Makefile.in M webclient/src_moz/gtk/Makefile.in M webclient/src_share/Makefile.in - +DEFINES += -DMOZILLA_INTERNAL_API M dom/jni/nativeDOMProxyListener.cpp M dom/src/nsJavaDOMImpl.cpp - remove cast to (void **) in AttachCurrentThread M dom/src/Makefile.in - depend on layout - +DEFINES += -DMOZILLA_INTERNAL_API M webclient/build-tests.xml - comment out ProfileManagerTest - compile with compile.source M webclient/src_moz/NativeBrowserControl.cpp - nsIFocusController,nsIChromeEventHandler,nsIDomWindowInternal no longer needs nsCOMPtr M webclient/src_moz/NativeEventThread.cpp - remove IID defs for webShell, sHistory. M webclient/src_moz/NavigationActionEvents.cpp - remove nsIPresContext include M webclient/src_moz/NavigationImpl.cpp -#include "nsIServiceManagerUtils.h" // PENDING(edburns): when moving - // past 1.7, this changes to - // nsServiceManagerUtils.h +#include "nsServiceManagerUtils.h" M webclient/src_moz/ProfileManagerImpl.cpp - This is currently totally broken. Next step is to fix it. M webclient/src_moz/WrapperFactoryImpl.cpp - comment out profileManager accesses M webclient/src_moz/ns_globals.h M webclient/src_moz/ns_util.h - take out nsIWebShell M webclient/test/automated/src/classes/org/mozilla/webclient/BrowserControlFactoryTest.java - comment out goldenFile assertion until ProfileManager works. git-svn-id: svn://10.0.0.236/trunk@191790 18797224-902f-48f8-a5cc-f745e15eee43
113 lines
2.6 KiB
Makefile
113 lines
2.6 KiB
Makefile
# 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.org code.
|
|
#
|
|
# The Initial Developer of the Original Code is Sun Microsystems,
|
|
# Inc. Portions created by Sun are
|
|
# Copyright (C) 1999 Sun Microsystems, Inc. All
|
|
# Rights Reserved.
|
|
#
|
|
# Contributor(s):
|
|
|
|
DEPTH = ../../..
|
|
topsrcdir = $(DEPTH)
|
|
srcdir = .
|
|
|
|
include $(DEPTH)/config/autoconf.mk
|
|
|
|
JAVAHOME = $(MOZ_JDKHOME)
|
|
MODULE = javadom
|
|
LIBRARY_NAME = javadom
|
|
IS_COMPONENT = 1
|
|
|
|
REQUIRES = xpcom \
|
|
string \
|
|
embed_base \
|
|
webBrowser_core \
|
|
webshell \
|
|
windowwatcher \
|
|
profile \
|
|
necko \
|
|
docshell \
|
|
dom \
|
|
layout \
|
|
widget \
|
|
uriloader \
|
|
shistory \
|
|
webbrowserpersist \
|
|
content \
|
|
gfx \
|
|
$(NULL)
|
|
|
|
|
|
CPPSRCS = \
|
|
nsJavaDOMImpl.cpp
|
|
|
|
EXTRA_LIBS += \
|
|
$(XPCOM_LIBS) \
|
|
$(NSPR_LIBS) \
|
|
$(NULL)
|
|
|
|
|
|
include $(topsrcdir)/config/config.mk
|
|
|
|
ifeq ($(OS_ARCH),Darwin)
|
|
INCLUDES += -I$(MOZ_JDKHOME)/include -I.
|
|
DSO_LDOPTS += -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljvm_compat
|
|
DLL_SUFFIX = .jnilib
|
|
endif #DARWIN
|
|
|
|
ifeq ($(OS_ARCH),Linux)
|
|
INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux
|
|
DSO_LDOPTS += \
|
|
-L$(JAVAHOME)/jre/lib/i386 \
|
|
-L$(JAVAHOME)/jre/lib/i386/client \
|
|
-L$(JAVAHOME)/jre/lib/i386/native_threads \
|
|
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386 \
|
|
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386/client \
|
|
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386/native_threads \
|
|
-ljvm -lhpi
|
|
DEFINES += -DDISABLE_JIT
|
|
endif # LINUX
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/win32
|
|
EXTRA_LIBS += \
|
|
$(JAVAHOME)/lib/jvm.lib \
|
|
$(NULL)
|
|
endif # WINNT
|
|
ifeq (($OS_ARCH),SunOS)
|
|
INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/solaris
|
|
DSO_LDOPTS += \
|
|
-L$(JAVAHOME)/jre/lib/sparc \
|
|
-L$(JAVAHOME)/jre/lib/sparc/classic \
|
|
-L$(JAVAHOME)/jre/lib/sparc/native_threads \
|
|
-R$(JAVAHOME)/jre/lib/sparc \
|
|
-R$(JAVAHOME)/jre/lib/sparc/classic \
|
|
-R$(JAVAHOME)/jre/lib/sparc/native_threads \
|
|
-ljvm -lhpi
|
|
endif
|
|
|
|
#
|
|
|
|
EXPORTS = \
|
|
nsIJavaDOM.h
|
|
|
|
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
DEFINES += -DMOZILLA_INTERNAL_API
|
|
|
|
edburns:
|
|
@echo $(XPCOM_LIBS)
|
|
@echo libs: $(EXTRA_LIBS)
|
|
|