diff --git a/mozilla/java/dom/Makefile b/mozilla/java/dom/Makefile index 4e02fc4cf14..f7e970f4819 100644 --- a/mozilla/java/dom/Makefile +++ b/mozilla/java/dom/Makefile @@ -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)) diff --git a/mozilla/java/dom/Makefile.in b/mozilla/java/dom/Makefile.in index 6840e7545a2..f7e970f4819 100644 --- a/mozilla/java/dom/Makefile.in +++ b/mozilla/java/dom/Makefile.in @@ -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)) diff --git a/mozilla/java/dom/Makefile.linux b/mozilla/java/dom/Makefile.linux deleted file mode 100644 index a2afccf7867..00000000000 --- a/mozilla/java/dom/Makefile.linux +++ /dev/null @@ -1,54 +0,0 @@ -# -# 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 = /opt/mozilla -topsrcdir = $(DEPTH) -srcdir = . -VPATH = . - -include $(DEPTH)/config/autoconf.mk - -MODULE = javadom -LIBRARY_NAME = javadom -IS_COMPONENT = 1 - -CPPSRCS = \ - nsJavaDOMImpl.cpp \ - nsJavaDOMModule.cpp - -include $(topsrcdir)/config/config.mk - -JAVA_HOME = /opt/jdk -INCLUDES += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/solaris -DSO_LDOPTS += \ - -L$(JAVA_HOME)/jre/lib/i386 \ - -L$(JAVA_HOME)/jre/lib/i386/classic \ - -L$(JAVA_HOME)/jre/lib/i386/native_threads \ - -Xlinker -rpath $(JAVA_HOME)/jre/lib/i386 \ - -Xlinker -rpath $(JAVA_HOME)/jre/lib/i386/classic \ - -Xlinker -rpath $(JAVA_HOME)/jre/lib/i386/native_threads \ - -ljvm -lhpi -lsunwjit - -EXPORTS = \ - nsIJavaDOM.h - -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) - -include $(topsrcdir)/config/rules.mk diff --git a/mozilla/java/dom/README b/mozilla/java/dom/README index c0f8530583e..6be53bccdf3 100644 --- a/mozilla/java/dom/README +++ b/mozilla/java/dom/README @@ -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. diff --git a/mozilla/java/dom/jni/Makefile b/mozilla/java/dom/jni/Makefile index 7e5eee144de..9734aeca201 100644 --- a/mozilla/java/dom/jni/Makefile +++ b/mozilla/java/dom/jni/Makefile @@ -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 + diff --git a/mozilla/java/dom/jni/Makefile.in b/mozilla/java/dom/jni/Makefile.in index 9848abea4a8..9734aeca201 100644 --- a/mozilla/java/dom/jni/Makefile.in +++ b/mozilla/java/dom/jni/Makefile.in @@ -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 +