From 99936462a002c35b2bbbc1698b608e5ec868f2e2 Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Tue, 30 Jan 2007 01:51:54 +0000 Subject: [PATCH] M dom/build.xml 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. --- java/build.properties.sample | 22 ++-- java/dom/build.xml | 33 +++--- java/dom/jni/Makefile.in | 11 +- java/dom/jni/javaDOMGlobals.cpp | 2 +- java/dom/src/Makefile.in | 5 +- java/webclient/build-tests.xml | 22 ++++ java/webclient/build.xml | 73 +++++++----- java/webclient/src_ie/Makefile.in | 6 +- java/webclient/src_moz/Makefile.in | 11 +- java/webclient/src_moz/gtk/Makefile.in | 6 +- java/webclient/src_moz/motif/gtkmozilla.h | 128 +++++++++++----------- java/webclient/src_share/Makefile.in | 6 +- 12 files changed, 184 insertions(+), 141 deletions(-) diff --git a/java/build.properties.sample b/java/build.properties.sample index 3ed8660ffb3d..17fb3fb8ad79 100644 --- a/java/build.properties.sample +++ b/java/build.properties.sample @@ -1,20 +1,18 @@ -# Uncomment the following to enable attaching the debugger on win32 -#debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=n -# Uncomment the following to enable attaching the debugger on Unix -#debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n - -# Uncomment the right one for your system -build.unix.classes=true build.win32.classes=true -# On win32, make sure to use \\ for \ -build.home=/home/edburns/Projects/mozilla/NETSCAPE_7_0_RTM_RELEASE/mozilla/dist/classes +objdir=C:\\Projects\\mozilla\\MOZILLA_NIH\\XULRUNNER_1_8_0_4\\mozilla\\win32_d.obj +build.home=${objdir}/dist/classes -# dependent jars -junit.jar= +compile.debug=true +#native.waitForDebugger=true -# When running under MSDev, program arguments are -Djava.library.path=D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\dist\bin;D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\dist\bin/components -DNSPR_LOG_MODULES=webclient:4,webclientstub:4 -DNSPR_LOG_FILE=logfile.txt -DBROWSER_BIN_DIR=D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\dist\bin -DMOZ_SRC=D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1 -Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y -classpath D:\Files_2k\netbeans-5.0\ide6\modules\ext\junit-3.8.1.jar;D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\dist\classes;D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\dist\classes\test\classes;D:\Files_2k\netbeans-5.0\ide6\ant\lib\junit.jar;D:\Files_2k\netbeans-5.0\ide6\ant\lib\ant-launcher.jar;D:\Files_2k\netbeans-5.0\ide6\ant\lib\ant.jar;D:\Files_2k\netbeans-5.0\ide6\ant\lib\ant-junit.jar org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner org.mozilla.webclient.BrowserControlFactoryTest filtertrace=true haltOnError=true haltOnFailure=true formatter=org.apache.tools.ant.taskdefs.optional.junit.SummaryJUnitResultFormatter showoutput=false formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter propsfile=D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\java\webclient\junit.properties +#debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y + +nbide.home=C:\\PROGRA~1\\netbeans-5.5 +junit.jar=${nbide.home}/ide7/modules/ext/junit-3.8.1.jar + +moz.install.dir= # source level for compilation compile.source=1.5 diff --git a/java/dom/build.xml b/java/dom/build.xml index 3402541677ad..1b5248e87e14 100644 --- a/java/dom/build.xml +++ b/java/dom/build.xml @@ -39,6 +39,9 @@ + + + @@ -85,30 +88,30 @@ - - - - - - - - + @@ -132,36 +135,36 @@ - - - - - - @@ -175,7 +178,7 @@ - + diff --git a/java/dom/jni/Makefile.in b/java/dom/jni/Makefile.in index a066c4f069d9..8ef80c6a0eab 100644 --- a/java/dom/jni/Makefile.in +++ b/java/dom/jni/Makefile.in @@ -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 diff --git a/java/dom/jni/javaDOMGlobals.cpp b/java/dom/jni/javaDOMGlobals.cpp index f6210faa7ac0..4749195192d0 100644 --- a/java/dom/jni/javaDOMGlobals.cpp +++ b/java/dom/jni/javaDOMGlobals.cpp @@ -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; diff --git a/java/dom/src/Makefile.in b/java/dom/src/Makefile.in index 39214dc25278..67be1095174d 100644 --- a/java/dom/src/Makefile.in +++ b/java/dom/src/Makefile.in @@ -18,8 +18,9 @@ # Contributor(s): DEPTH = ../../.. -topsrcdir = $(DEPTH) -srcdir = . +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk diff --git a/java/webclient/build-tests.xml b/java/webclient/build-tests.xml index 697a0667c422..4d75c0db4a83 100644 --- a/java/webclient/build-tests.xml +++ b/java/webclient/build-tests.xml @@ -193,6 +193,28 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/java/webclient/build.xml b/java/webclient/build.xml index 357519ca2cbe..8c45c478bd1d 100644 --- a/java/webclient/build.xml +++ b/java/webclient/build.xml @@ -39,6 +39,9 @@ + + + @@ -134,18 +137,18 @@ - - - - @@ -156,7 +159,9 @@ - + + @@ -165,7 +170,9 @@ - + + @@ -174,7 +181,9 @@ - + + @@ -184,16 +193,16 @@ - - - - @@ -201,7 +210,7 @@ @@ -222,7 +231,7 @@ if="build.win32.classes"> - set CLASSPATH=${build.home};%CLASSPATH% + set CLASSPATH=${build.home};%CLASSPATH% set PATH=%PATH%;${build.home}\..\bin;${build.home}\..\bin\components;${myenv.MOZ_JDKHOME}\jre\bin ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.EmbeddedMozillaImpl ${build.home}\..\bin %1% @@ -240,11 +249,11 @@ if="build.unix.classes"> - export CLASSPATH=${build.home}:$CLASSPATH + export CLASSPATH=${build.home}:$CLASSPATH export LD_LIBRARY_PATH=${build.home}/../bin:${build.home}/../bin/components:$LD_LIBRARY_PATH:;${myenv.MOZ_JDKHOME}/jre/bin ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.EmbeddedMozillaImpl ${build.home}/../bin $* - + @@ -260,11 +269,11 @@ if="build.mac.classes"> - export CLASSPATH=${build.home}:$CLASSPATH + export CLASSPATH=${build.home}:$CLASSPATH export LD_LIBRARY_PATH=${build.home}/../bin:${build.home}/../bin/components:$LD_LIBRARY_PATH:;${myenv.MOZ_JDKHOME}/jre/bin ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.EmbeddedMozillaImpl ${build.home}/../bin $* - + @@ -280,14 +289,14 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd - + - + @@ -296,52 +305,52 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd - + - + - - - - - - - @@ -361,6 +370,13 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd + + + + + + + @@ -375,3 +391,4 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd + diff --git a/java/webclient/src_ie/Makefile.in b/java/webclient/src_ie/Makefile.in index b19c4b04eeca..6e88a7575816 100644 --- a/java/webclient/src_ie/Makefile.in +++ b/java/webclient/src_ie/Makefile.in @@ -18,9 +18,9 @@ # Contributor(s): Ron Capelli DEPTH = ../../.. -topsrcdir = $(DEPTH) -srcdir = $(topsrcdir)/java/webclient/src_ie -VPATH = $(topsrcdir)/java/webclient/src_ie +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk diff --git a/java/webclient/src_moz/Makefile.in b/java/webclient/src_moz/Makefile.in index 9bfcef2af88d..20cd717b0886 100644 --- a/java/webclient/src_moz/Makefile.in +++ b/java/webclient/src_moz/Makefile.in @@ -137,7 +137,7 @@ CMMSRCS = cocoa/CocoaBrowserControlCanvas.mm CPPSRCS += cocoa/CocoaBrowserControlCanvasImpl.cpp DLL_SUFFIX = .jnilib #DSO_LDOPTS += -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljawt -DSO_LDOPTS += -framework JavaVM -framework AppKit -lobjc -L../src_share +DSO_LDOPTS += -framework JavaVM -framework AppKit -lobjc -L$(srcdir)/../src_share else ifeq ($(OS_ARCH),WINNT) CPPSRCS += \ @@ -148,6 +148,7 @@ CPPSRCS += \ gtk/GtkBrowserControlCanvas.cpp \ $(NULL) DIRS = gtk +INCLUDES += -I./gtk endif endif endif @@ -197,17 +198,17 @@ endif ifeq ($(OS_ARCH),Linux) INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/linux $(INCLUDES) \ - -I$(DEPTH)/widget/src/gtk -I../src_share + -I$(DEPTH)/widget/src/gtk -I$(srcdir)/../src_share -I../src_share else ifeq ($(OS_ARCH),WINNT) INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/win32 $(INCLUDES) \ - -I../src_share -I. + -I$(srcdir)/../src_share -I../src_share -I. -I./win32 else ifeq ($(OS_ARCH),Darwin) -INCLUDES := -I$(MOZ_JDKHOME)/include $(INCLUDES) -I../src_share -I. +INCLUDES := -I$(MOZ_JDKHOME)/include $(INCLUDES) -I$(srcdir)/../src_share -I../src_share -I. else INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/solaris $(INCLUDES) \ - -I$(DEPTH)/widget/src/gtk -I../src_share + -I$(DEPTH)/widget/src/gtk -I$(srcdir)/../src_share -I../src_share endif endif endif diff --git a/java/webclient/src_moz/gtk/Makefile.in b/java/webclient/src_moz/gtk/Makefile.in index 2302e5071b55..8fa22fb245ab 100644 --- a/java/webclient/src_moz/gtk/Makefile.in +++ b/java/webclient/src_moz/gtk/Makefile.in @@ -18,9 +18,9 @@ # Contributor(s): DEPTH = ../../../.. -topsrcdir = $(DEPTH) -srcdir = $(topsrcdir)/java/webclient/src_moz/gtk -VPATH = $(topsrcdir)/java/webclient/src_moz/gtk +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ JAVAHOME = $(JDKHOME) diff --git a/java/webclient/src_moz/motif/gtkmozilla.h b/java/webclient/src_moz/motif/gtkmozilla.h index 9f4df35314bc..c9d1688008e2 100644 --- a/java/webclient/src_moz/motif/gtkmozilla.h +++ b/java/webclient/src_moz/motif/gtkmozilla.h @@ -1,64 +1,64 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * 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 Alexander - * Larsson. Portions created by Alexander Larsson are - * Copyright (C) 1999 Alexander Larsson. All - * Rights Reserved. - * - * Contributor(s): - */ - -/* - * gtkmozilla.h - */ - -#ifndef GTKMOZILLA_H -#define GTKMOZILLA_H - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include - -#define GTK_TYPE_MOZILLA (gtk_mozilla_get_type ()) -#define GTK_MOZILLA(obj) GTK_CHECK_CAST ((obj), GTK_TYPE_MOZILLA, GtkMozilla) -#define GTK_MOZILLA_CLASS(klass) GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MOZILLA, GtkMozillaClass) -#define GTK_IS_MOZILLA(obj) GTK_CHECK_TYPE ((obj), GTK_TYPE_MOZILLA) -#define GTK_IS_MOZILLA_CLASS(klass) GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MOZILLA) - - -typedef struct _GtkMozilla GtkMozilla; -typedef struct _GtkMozillaClass GtkMozillaClass; - -struct _GtkMozilla -{ - GtkLayout layout; -}; - -struct _GtkMozillaClass -{ - GtkLayoutClass parent_class; -}; - -extern GtkType gtk_mozilla_get_type(void); -extern GtkWidget* gtk_mozilla_new(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* GTKMOZILLA_H */ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape 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/NPL/ + * + * 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 Alexander + * Larsson. Portions created by Alexander Larsson are + * Copyright (C) 1999 Alexander Larsson. All + * Rights Reserved. + * + * Contributor(s): + */ + +/* + * gtkmozilla.h + */ + +#ifndef GTKMOZILLA_H +#define GTKMOZILLA_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#include + +#define GTK_TYPE_MOZILLA (gtk_mozilla_get_type ()) +#define GTK_MOZILLA(obj) GTK_CHECK_CAST ((obj), GTK_TYPE_MOZILLA, GtkMozilla) +#define GTK_MOZILLA_CLASS(klass) GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MOZILLA, GtkMozillaClass) +#define GTK_IS_MOZILLA(obj) GTK_CHECK_TYPE ((obj), GTK_TYPE_MOZILLA) +#define GTK_IS_MOZILLA_CLASS(klass) GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MOZILLA) + + +typedef struct _GtkMozilla GtkMozilla; +typedef struct _GtkMozillaClass GtkMozillaClass; + +struct _GtkMozilla +{ + GtkLayout layout; +}; + +struct _GtkMozillaClass +{ + GtkLayoutClass parent_class; +}; + +extern GtkType gtk_mozilla_get_type(void); +extern GtkWidget* gtk_mozilla_new(void); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + +#endif /* GTKMOZILLA_H */ diff --git a/java/webclient/src_share/Makefile.in b/java/webclient/src_share/Makefile.in index 17c1c2002dfc..1b8e0840b215 100644 --- a/java/webclient/src_share/Makefile.in +++ b/java/webclient/src_share/Makefile.in @@ -18,9 +18,9 @@ # Contributor(s): DEPTH = ../../.. -topsrcdir = $(DEPTH) -srcdir = $(topsrcdir)/java/webclient/src_share -VPATH = $(topsrcdir)/java/webclient/src_share +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk