Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M dom/build.xml

Browse Source 
M dom/jni/Makefile.in
M dom/jni/javaDOMGlobals.cpp
M dom/src/Makefile.in
M webclient/build-tests.xml
M webclient/build.xml
M webclient/src_ie/Makefile.in
M webclient/src_moz/Makefile.in
M webclient/src_moz/gtk/Makefile.in
M webclient/src_moz/motif/gtkmozilla.h
M webclient/src_share/Makefile.in

- Enable building with an objdir.  Much more civilized.  Thanks very
  much to Bradley Smedberg.


git-svn-id: svn://10.0.0.236/trunk@219157 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2007-01-30 01:51:54 +00:00
parent 14137191b8
commit e72cf3994c
12 changed files with 184 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/java/dom/build.xml
View File

@@ -39,6 +39,9 @@
<property file="../build.properties"/> <!-- java-supplement local -->
<property environment="myenv" />
<property name="objdir.native.path" value="${objdir}/java/dom" />
<!-- ************ Compiler Defaults *************************************** -->
<!-- Should Java compilations set the 'debug' compiler option? -->
@@ -85,30 +88,30 @@
<target name="compile.src">
<exec os="SunOS" dir="${basedir}/src" failonerror="yes"
<exec os="SunOS" dir="${objdir.native.path}/src" failonerror="yes"
executable="gmake"/>
<exec os="Linux" dir="${basedir}/src" failonerror="yes"
<exec os="Linux" dir="${objdir.native.path}/src" failonerror="yes"
executable="make"/>
<exec os="Mac OS X" dir="${basedir}/src" failonerror="yes"
<exec os="Mac OS X" dir="${objdir.native.path}/src" failonerror="yes"
executable="make"/>
<exec os="Windows 2000" dir="${basedir}/src" executable="make"
<exec os="Windows 2000" dir="${objdir.native.path}/src" executable="make"
failonerror="yes"/>
</target>
<target name="compile.jni" depends="compile.javah.headers">
<exec os="SunOS" dir="${basedir}/jni" failonerror="yes"
<exec os="SunOS" dir="${objdir.native.path}/jni" failonerror="yes"
executable="gmake"/>
<exec os="Linux" dir="${basedir}/jni" failonerror="yes"
<exec os="Linux" dir="${objdir.native.path}/jni" failonerror="yes"
executable="make"/>
<exec os="Windows 2000" dir="${basedir}/jni" executable="make"
<exec os="Windows 2000" dir="${objdir.native.path}/jni" executable="make"
failonerror="yes"/>
</target>
<target name="compile.javah.headers" depends="compile.classes">
<javah destdir="jni" classpath="compile.classpath">
<javah destdir="${objdir.native.path}/jni" classpath="compile.classpath">
<class name="org.mozilla.dom.DOMAccessor"/>
<class name="org.mozilla.dom.AttrImpl"/>
<class name="org.mozilla.dom.CharacterDataImpl"/>
@@ -132,36 +135,36 @@
<target name="clean" depends="clean.jni">
<exec os="SunOS" dir="${basedir}/src" executable="gmake"
<exec os="SunOS" dir="${objdir.native.path}/src" executable="gmake"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
<exec os="Linux" dir="${basedir}/src" executable="make"
<exec os="Linux" dir="${objdir.native.path}/src" executable="make"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
<exec os="Windows 2000" dir="${basedir}/src" executable="make"
<exec os="Windows 2000" dir="${objdir.native.path}/src" executable="make"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
<exec os="SunOS" dir="${basedir}/jni" executable="gmake"
<exec os="SunOS" dir="${objdir.native.path}/jni" executable="gmake"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
<exec os="Linux" dir="${basedir}/jni" executable="make"
<exec os="Linux" dir="${objdir.native.path}/jni" executable="make"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
<exec os="Windows 2000" dir="${basedir}/jni" executable="make"
<exec os="Windows 2000" dir="${objdir.native.path}/jni" executable="make"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
@@ -175,7 +178,7 @@
<target name="clean.jni">
<delete dir="${build.home}/org/mozilla/dom"/>
<delete>
<fileset dir="jni" includes="org_mozilla_dom_*.h"/>
<fileset dir="${objdir.native.path}/jni" includes="org_mozilla_dom_*.h"/>
</delete>
</target>

11
mozilla/java/dom/jni/Makefile.in
View File

@@ -18,9 +18,9 @@
# Contributor(s):
DEPTH = ../../..
topsrcdir = $(DEPTH)
srcdir = $(topsrcdir)/java/dom/jni
VPATH = $(topsrcdir)/java/dom/jni
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
JAVAHOME = $(MOZ_JDKHOME)
@@ -44,7 +44,6 @@ REQUIRES = xpcom \
$(NULL)
include $(DEPTH)/config/autoconf.mk
MODULE = javadomjni
LIBRARY_NAME = javadomjni
@@ -80,7 +79,7 @@ include $(topsrcdir)/config/config.mk
DEFINES += -DMOZILLA_INTERNAL_API
ifeq ($(OS_ARCH),Darwin)
INCLUDES += -I$(MOZ_JDKHOME)/include -I.
INCLUDES += -I$(MOZ_JDKHOME)/include
DSO_LDOPTS += -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljvm_compat
DLL_SUFFIX = .jnilib
else
@@ -95,5 +94,7 @@ endif
endif
endif
INCLUDES += -I.
include $(topsrcdir)/config/rules.mk

2
mozilla/java/dom/jni/javaDOMGlobals.cpp
View File

@@ -169,7 +169,7 @@ void JavaDOMGlobals::Initialize(JNIEnv *env)
namedNodeMapClass = env->FindClass("org/mozilla/dom/NamedNodeMapImpl");
if (!namedNodeMapClass) return;
namedNodeMapPtrFID =
env->GetFieldID(namedNodeMapClass, "p_nsIDOMNamedNodeMap", "J");
env->GetFieldID(namedNodeMapClass, "p_nsIDOMNamedNodeMap", "J");
if (!namedNodeMapPtrFID) return;
namedNodeMapClass = (jclass) env->NewGlobalRef(namedNodeMapClass);
if (!namedNodeMapClass) return;

5
mozilla/java/dom/src/Makefile.in
View File

@@ -18,8 +18,9 @@
# Contributor(s):
DEPTH = ../../..
topsrcdir = $(DEPTH)
srcdir = .
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk