19583 r=akhil.arora@sun.com fix=Igor Nekrestyanov <nis@sparc.spb.su>
A top-level make now builds everything, including linux
This commit is contained in:
akhil.arora%sun.com
Родитель
73c776acd1
Коммит
705b9d7627
|
|
@ -1,4 +1,3 @@
|
|||
#
|
||||
# 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
|
||||
|
|
@ -21,22 +20,35 @@
|
|||
DEPTH = ../..
|
||||
topsrcdir = $(DEPTH)
|
||||
srcdir = .
|
||||
VPATH = .
|
||||
DIRS = jni
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
JAVAHOME = $(JDKHOME)
|
||||
MODULE = javadom
|
||||
LIBRARY_NAME = javadom
|
||||
IS_COMPONENT = 1
|
||||
|
||||
CPPSRCS = \
|
||||
nsJavaDOMImpl.cpp \
|
||||
nsJavaDOMModule.cpp
|
||||
nsJavaDOMModule.cpp
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/solaris
|
||||
DSO_LDOPTS += \
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux
|
||||
DSO_LDOPTS += \
|
||||
-L$(JAVAHOME)/jre/lib/i386 \
|
||||
-L$(JAVAHOME)/jre/lib/i386/classic \
|
||||
-L$(JAVAHOME)/jre/lib/i386/native_threads \
|
||||
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386 \
|
||||
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386/classic \
|
||||
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386/native_threads \
|
||||
-ljvm -lhpi
|
||||
DEFINES += -DDISABLE_JIT
|
||||
else
|
||||
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 \
|
||||
|
|
@ -44,8 +56,10 @@ DSO_LDOPTS += \
|
|||
-R$(JAVAHOME)/jre/lib/sparc/classic \
|
||||
-R$(JAVAHOME)/jre/lib/sparc/native_threads \
|
||||
-ljvm -lhpi
|
||||
endif
|
||||
|
||||
EXPORTS = \
|
||||
nsJavaDOMCID.h \
|
||||
nsIJavaDOM.h
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
#
|
||||
# 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
|
||||
|
|
@ -19,33 +18,48 @@
|
|||
# Contributor(s):
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
topsrcdir = $(DEPTH)
|
||||
srcdir = .
|
||||
DIRS = jni
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
JAVAHOME = $(JDKHOME)
|
||||
MODULE = javadom
|
||||
LIBRARY_NAME = javadom
|
||||
IS_COMPONENT = 1
|
||||
|
||||
CPPSRCS = \
|
||||
nsJavaDOMImpl.cpp \
|
||||
nsJavaDOMModule.cpp
|
||||
nsJavaDOMModule.cpp
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/solaris
|
||||
DSO_LDOPTS += \
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux
|
||||
DSO_LDOPTS += \
|
||||
-L$(JAVAHOME)/jre/lib/i386 \
|
||||
-L$(JAVAHOME)/jre/lib/i386/classic \
|
||||
-L$(JAVAHOME)/jre/lib/i386/native_threads \
|
||||
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386 \
|
||||
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386/classic \
|
||||
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386/native_threads \
|
||||
-ljvm -lhpi
|
||||
DEFINES += -DDISABLE_JIT
|
||||
else
|
||||
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 -lsunwjit
|
||||
-ljvm -lhpi
|
||||
endif
|
||||
|
||||
EXPORTS = \
|
||||
nsJavaDOMCID.h \
|
||||
nsIJavaDOM.h
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
|
|
|||
|
|
@ -49,14 +49,10 @@ gmake in this directory.
|
|||
Similarly apply the DocumetnImpl.java patch. Then recompile the
|
||||
DocumentImpl class. No changes in makefiles needed.
|
||||
|
||||
Currently, you will have to make the Java class files yourself, which
|
||||
is pretty straight-forward. Just do a javac -d
|
||||
$MOZILLA_FIVE_HOME/classes *.java in the java/dom/jni directory. I
|
||||
chose to put my class files in $MOZILLA_FIVE_HOME/classes, you can put
|
||||
them elsewhere, just make sure it is in the CLASSPATH.
|
||||
Define JDKHOME so that $JDKHOME/bin points to javac.
|
||||
|
||||
You will also need to get the w3c DOM level 2 interfaces from
|
||||
http://www.w3.org/TR/1999/WD-DOM-Level-2-19990923/java-binding.zip
|
||||
http://www.w3.org/TR/WD-DOM-Level-2/java-binding.zip
|
||||
and put the class files in your CLASSPATH.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
#
|
||||
# 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
|
||||
|
|
@ -23,6 +22,8 @@ topsrcdir = $(DEPTH)
|
|||
srcdir = $(topsrcdir)/java/dom/jni
|
||||
VPATH = $(topsrcdir)/java/dom/jni
|
||||
|
||||
JAVAHOME = $(JDKHOME)
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = javadomjni
|
||||
|
|
@ -55,5 +56,10 @@ include $(topsrcdir)/config/config.mk
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
classes:
|
||||
javac -d $(topsrcdir)/dist/classes *.java
|
||||
libs:: classes
|
||||
|
||||
#XXX - assume that DOM2 java-bindings are in CLASSPATH
|
||||
classes: $(JAVA_DESTPATH)
|
||||
@echo "Making java classes ..."
|
||||
$(JAVAHOME)/bin/javac -d $(JAVA_DESTPATH) *.java
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
#
|
||||
# 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
|
||||
|
|
@ -19,9 +18,11 @@
|
|||
# Contributor(s):
|
||||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
topsrcdir = $(DEPTH)
|
||||
srcdir = $(topsrcdir)/java/dom/jni
|
||||
VPATH = $(topsrcdir)/java/dom/jni
|
||||
|
||||
JAVAHOME = $(JDKHOME)
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
|
@ -29,6 +30,8 @@ LIBRARY_NAME = javadomjni
|
|||
|
||||
CPPSRCS = \
|
||||
javaDOMGlobals.cpp \
|
||||
javaDOMEventsGlobals.cpp \
|
||||
nativeDOMProxyListener.cpp \
|
||||
org_mozilla_dom_DOMGarbageCollector.cpp \
|
||||
org_mozilla_dom_DOMAccessorImpl.cpp \
|
||||
org_mozilla_dom_AttrImpl.cpp \
|
||||
|
|
@ -43,8 +46,20 @@ CPPSRCS = \
|
|||
org_mozilla_dom_NodeListImpl.cpp \
|
||||
org_mozilla_dom_NotationImpl.cpp \
|
||||
org_mozilla_dom_ProcessingInstructionImpl.cpp \
|
||||
org_mozilla_dom_TextImpl.cpp
|
||||
org_mozilla_dom_TextImpl.cpp \
|
||||
org_mozilla_dom_events_EventImpl.cpp \
|
||||
org_mozilla_dom_events_UIEventImpl.cpp \
|
||||
org_mozilla_dom_events_MouseEventImpl.cpp \
|
||||
org_mozilla_dom_events_KeyEventImpl.cpp
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
libs:: classes
|
||||
|
||||
#XXX - assume that DOM2 java-bindings are in CLASSPATH
|
||||
classes: $(JAVA_DESTPATH)
|
||||
@echo "Making java classes ..."
|
||||
$(JAVAHOME)/bin/javac -d $(JAVA_DESTPATH) *.java
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче