mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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.
This commit is contained in:
edburns%acm.org 2007-01-30 01:51:54 +00:00
Родитель 0d87098f62
Коммит 99936462a0
12 изменённых файлов: 184 добавлений и 141 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
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=<your junit 3.8.1 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

33
java/dom/build.xml
Просмотреть файл

@ -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
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

2
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;

5
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

22
java/webclient/build-tests.xml
Просмотреть файл

@ -193,6 +193,28 @@
</target>
<target name="run.cardemo" depends="compile.test">
<junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
<jvmarg value="-Djava.library.path=${myenv.MOZILLA_FIVE_HOME}${PATH_SEP}${myenv.MOZILLA_FIVE_HOME}/components"/>
<jvmarg value="-DNSPR_LOG_MODULES=${myenv.NSPR_LOG_MODULES}"/>
<jvmarg value="-DNSPR_LOG_FILE=${myenv.NSPR_LOG_FILE}"/>
<jvmarg value="-DMOZ_SRC=${myenv.MOZ_SRC}"/>
<jvmarg value="-DBROWSER_BIN_DIR=${myenv.MOZILLA_FIVE_HOME}"/>
<sysproperty key="native.waitForDebugger"
value="${native.waitForDebugger}"/>
<jvmarg line="${debug.jvm.args}"/>
<jvmarg line="-Djava.util.logging.config.file=${basedir}${FILE_PATH_SEP}..${FILE_PATH_SEP}logging.properties"/>
<classpath refid="test.classpath"/>
<formatter type="plain" usefile="false"/>
<test name="org.mozilla.webclient.CarDemoTest"/>
</junit>
</target>
<target name="run.test.browser" depends="compile.test">
<java classname="org.mozilla.webclient.test.TestBrowser" fork="true">

73
java/webclient/build.xml
Просмотреть файл

@ -39,6 +39,9 @@
<property file="../build.properties"/> <!-- java-supplement local -->
<property environment="myenv" />
<property name="objdir.native.path" value="${objdir}/java/webclient" />
<!-- ************ Compiler Defaults *************************************** -->
<!-- Should Java compilations set the 'debug' compiler option? -->
@ -134,18 +137,18 @@
<target name="compile.src_share" depends="compile.javah.headers">
<exec os="SunOS" dir="${basedir}/src_share" failonerror="yes"
<exec os="SunOS" dir="${objdir.native.path}/src_share" failonerror="yes"
executable="gmake"/>
<exec os="Linux" dir="${basedir}/src_share" failonerror="yes"
<exec os="Linux" dir="${objdir.native.path}/src_share" failonerror="yes"
executable="make"/>
<exec os="Windows 2000" dir="${basedir}/src_share" executable="make"
<exec os="Windows 2000" dir="${objdir.native.path}/src_share" executable="make"
failonerror="yes"/>
</target>
<target name="compile.javah.headers" depends="compile.classes_spec,compile.javah.canvas.headers">
<javah destdir="${basedir}/src_share"
<javah destdir="${objdir.native.path}/src_share"
class="org.mozilla.webclient.impl.wrapper_native.BookmarksImpl,org.mozilla.webclient.impl.wrapper_native.ProfileManagerImpl,org.mozilla.webclient.impl.wrapper_native.PreferencesImpl,org.mozilla.webclient.impl.wrapper_native.CurrentPageImpl,org.mozilla.webclient.impl.wrapper_native.HistoryImpl,org.mozilla.webclient.impl.wrapper_native.WrapperFactoryImpl,org.mozilla.webclient.impl.wrapper_native.NavigationImpl,org.mozilla.webclient.impl.wrapper_native.RDFEnumeration,org.mozilla.webclient.impl.wrapper_native.RDFTreeNode,org.mozilla.webclient.impl.wrapper_native.ISupportsPeer,org.mozilla.webclient.impl.wrapper_native.WindowControlImpl,org.mozilla.webclient.impl.wrapper_native.NativeEventThread,org.mozilla.webclient.impl.wrapper_native.EventRegistrationImpl,org.mozilla.webclient.impl.wrapper_native.NativeInputStream">
<classpath refid="compile.classpath"/>
</javah>
@ -156,7 +159,9 @@
<target name="compile.unix.canvas.headers" if="build.unix.classes">
<javah destdir="${basedir}/src_moz/gtk"
<mkdir dir="${objdir.native.path}/src_moz/gtk" />
<javah destdir="${objdir.native.path}/src_moz/gtk"
class="org.mozilla.webclient.impl.wrapper_native.GtkBrowserControlCanvas">
<classpath refid="compile.classpath"/>
</javah>
@ -165,7 +170,9 @@
<target name="compile.win32.canvas.headers" if="build.win32.classes">
<javah destdir="${basedir}/src_moz/win32"
<mkdir dir="${objdir.native.path}/src_moz/win32" />
<javah destdir="${objdir.native.path}/src_moz/win32"
class="org.mozilla.webclient.impl.wrapper_native.Win32BrowserControlCanvas">
<classpath refid="compile.classpath"/>
</javah>
@ -174,7 +181,9 @@
<target name="compile.mac.canvas.headers" if="build.mac.classes">
<javah destdir="${basedir}/src_moz/cocoa"
<mkdir dir="${objdir.native.path}/src_moz/cocoa" />
<javah destdir="${objdir.native.path}/src_moz/cocoa"
class="org.mozilla.webclient.impl.wrapper_native.CocoaBrowserControlCanvas">
<classpath refid="compile.classpath"/>
</javah>
@ -184,16 +193,16 @@
<target name="compile.src_moz" depends="compile.src_share">
<exec os="SunOS" dir="${basedir}/src_moz" executable="gmake"
<exec os="SunOS" dir="${objdir.native.path}/src_moz" executable="gmake"
failonerror="yes">
</exec>
<exec os="Linux" dir="${basedir}/src_moz" executable="make"
<exec os="Linux" dir="${objdir.native.path}/src_moz" executable="make"
failonerror="yes">
</exec>
<exec os="Mac OS X" dir="${basedir}/src_moz" executable="make"
<exec os="Mac OS X" dir="${objdir.native.path}/src_moz" executable="make"
failonerror="yes">
</exec>
<exec os="Windows 2000" dir="${basedir}/src_moz" executable="make"
<exec os="Windows 2000" dir="${objdir.native.path}/src_moz" executable="make"
failonerror="yes"/>
</target>
@ -201,7 +210,7 @@
<target name="compile.src_ie" depends="compile.src_share">
<!-- PENDING(edburns): re-enable IE support
<exec os="Windows 2000" dir="${basedir}/src_ie" executable="make"
<exec os="Windows 2000" dir="${objdir.native.path}/src_ie" executable="make"
failonerror="yes"/>
-->
@ -222,7 +231,7 @@ if="build.win32.classes">
</not>
</condition>
<echo file="${basedir}/src_moz/runem.bat">set CLASSPATH=${build.home};%CLASSPATH%
<echo file="${objdir.native.path}/src_moz/runem.bat">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%
</echo>
@ -240,11 +249,11 @@ if="build.unix.classes">
</not>
</condition>
<echo file="${basedir}/src_moz/runem">export CLASSPATH=${build.home}:$CLASSPATH
<echo file="${objdir.native.path}/src_moz/runem">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 $*
</echo>
<chmod perm="755" file="${basedir}/src_moz/runem"/>
<chmod perm="755" file="${objdir.native.path}/src_moz/runem"/>
</target>
@ -260,11 +269,11 @@ if="build.mac.classes">
</not>
</condition>
<echo file="${basedir}/src_moz/runem">export CLASSPATH=${build.home}:$CLASSPATH
<echo file="${objdir.native.path}/src_moz/runem">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 $*
</echo>
<chmod perm="755" file="${basedir}/src_moz/runem"/>
<chmod perm="755" file="${objdir.native.path}/src_moz/runem"/>
</target>
@ -280,14 +289,14 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd
<ant antfile="build-tests.xml" target="clean"/>
<delete>
<fileset dir="${basedir}/src_moz">
<fileset dir="${objdir.native.path}/src_moz">
<include name="**/*BrowserControlCanvas.h"/>
<exclude name="motif/MotifBrowserControlCanvas.h"/>
</fileset>
</delete>
<delete >
<fileset dir="${basedir}/src_share">
<fileset dir="${objdir.native.path}/src_share">
<include name="*.h"/>
<exclude name="bal_util.h"/>
<exclude name="jni_util_export.h"/>
@ -296,52 +305,52 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd
</delete>
<delete >
<fileset dir="${basedir}/src_moz">
<fileset dir="${objdir.native.path}/src_moz">
<include name="*.ilk"/>
</fileset>
</delete>
<delete >
<fileset dir="${basedir}/src_ie">
<fileset dir="${objdir.native.path}/src_ie">
<include name="*.ilk"/>
</fileset>
</delete>
<exec os="SunOS" dir="${basedir}/src_moz" executable="gmake"
<exec os="SunOS" dir="${objdir.native.path}/src_moz" executable="gmake"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
<exec os="Linux" dir="${basedir}/src_moz" executable="make"
<exec os="Linux" dir="${objdir.native.path}/src_moz" executable="make"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
<exec os="Windows 2000" dir="${basedir}/src_moz" executable="make"
<exec os="Windows 2000" dir="${objdir.native.path}/src_moz" executable="make"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
<exec os="Windows 2000" dir="${basedir}/src_ie" executable="make"
<exec os="Windows 2000" dir="${objdir.native.path}/src_ie" executable="make"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
<exec os="SunOS" dir="${basedir}/src_share" executable="gmake"
<exec os="SunOS" dir="${objdir.native.path}/src_share" executable="gmake"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
<exec os="Linux" dir="${basedir}/src_share" executable="make"
<exec os="Linux" dir="${objdir.native.path}/src_share" executable="make"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
<exec os="Windows 2000" dir="${basedir}/src_share" executable="make"
<exec os="Windows 2000" dir="${objdir.native.path}/src_share" executable="make"
failonerror="yes">
<arg line="clobber_all"/>
</exec>
@ -361,6 +370,13 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd
</target>
<target name="run.cardemo" depends="prepare" description="Run unit tests">
<ant antfile="build-tests.xml" target="run.cardemo"/>
</target>
<target name="run.test.browser" depends="prepare" description="Run the test browser">
<ant antfile="build-tests.xml" target="run.test.browser"/>
@ -375,3 +391,4 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd
</project>

6
java/webclient/src_ie/Makefile.in
Просмотреть файл

@ -18,9 +18,9 @@
# Contributor(s): Ron Capelli <capelli@us.ibm.com>
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

11
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

6
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)

128
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 <gtk/gtklayout.h>
#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 <gtk/gtklayout.h>
#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 */

6
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