af2702d036
a=edburns
r=ashuk
This change creates a new directory, java/webclient/src_share, that
contains the code that will be used in both src_moz and src_ie, and any
other native browser wrapping implementations.
Here are the steps I followed to implement this change.
1. Create a new directory java/webclient/src_share
2. Move all jni_util*.* files from src_moz into src_share
3. Make it so src_share compiles into a new .lib
src_share has no netscape dependencies. Any functionality that
depended on ns dependencies was kept in src_moz. In this case, we
have a function prototype only in src_share, with the implementation
in src_moz. We did this for nsHashtable. The other trick was for
things in WebShellInitContext that had nothing to do with Netscape.
This case was accomodated by creating a new struct, ShareInitContext,
that contains all WebShellInitContext members that have nothing to do
with Netscape. Currently this is just jobject propertiesClass. I
modified the WebShellInitContext struct to contain a ShareContext
struct as its last member. There are two new methods in jni_util.h
that allow for the initialization and deallocation of the members of
the ShareContext struct.
4. Make it so src_moz uses the new .lib to provide the jni_util behavior
a. Create ns_util* files that include ../src_share/jni_util* files
appropriately.
The only tricky part was for things in jni_util.h that
Here's the list of files in this change.
cvs -z3 -n update (in directory D:\Projects\mozilla\java\webclient)
cvs server: Updating .
M Makefile.win // added src_share to DIRS
M src_moz/BookmarksImpl.cpp // include ns_util instead of jni_util
M src_moz/CBrowserContainer.cpp // include ns_util instead of jni_util
M src_moz/CBrowserContainer.h // include ns_util instead of jni_util
M src_moz/CurrentPageImpl.cpp // include ns_util instead of jni_util
M src_moz/HistoryImpl.cpp // include ns_util instead of jni_util
M src_moz/Makefile.win // include ns_util instead of jni_util
M src_moz/NativeEventThread.cpp // include ns_util instead of jni_util
M src_moz/NavigationImpl.cpp // include ns_util instead of jni_util
M src_moz/RDFEnumeration.cpp // include ns_util instead of jni_util
M src_moz/RDFTreeNode.cpp // include ns_util instead of jni_util
M src_moz/WindowControlImpl.cpp // include ns_util instead of jni_util
// also use new util_InitShareContext
// function
M src_moz/WrapperFactoryImpl.cpp // include ns_util instead of jni_util
R src_moz/jni_util.cpp // moved to ../src_share
R src_moz/jni_util.h // moved to ../src_share
R src_moz/jni_util_export.cpp // moved to ../src_share
R src_moz/jni_util_export.h // moved to ../src_share
M src_moz/nsActions.cpp // include ns_util instead of jni_util
// also use new
util_DeallocateShareContext
M src_moz/nsActions.h // include ns_util instead of jni_util
A src_moz/ns_util.cpp // include jni_util.h
A src_moz/ns_util.h // include jni_util.h, changes to
// WebshellInitContext struct
A src_moz/ns_util_export.cpp // provide impls for methods in
// jni_util_export.h
A src_share/Makefile.win
A src_share/bal_util.cpp
A src_share/bal_util.h
A src_share/jni_util.cpp
A src_share/jni_util.h
A src_share/jni_util_export.cpp
A src_share/jni_util_export.h
*****CVS exited normally with code 0*****
git-svn-id: svn://10.0.0.236/trunk@75504 18797224-902f-48f8-a5cc-f745e15eee43
129 lines
3.7 KiB
Makefile
129 lines
3.7 KiB
Makefile
# 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 = ../../..
|
|
topsrcdir = $(DEPTH)
|
|
srcdir = $(topsrcdir)/java/webclient/src_moz
|
|
VPATH = $(topsrcdir)/java/webclient/src_moz
|
|
|
|
DIRS = motif
|
|
|
|
JAVAHOME = $(JDKHOME)
|
|
|
|
include $(DEPTH)/config/autoconf.mk
|
|
|
|
LIBRARY_NAME = webclient
|
|
|
|
CPPSRCS = \
|
|
ns_util.cpp \
|
|
ns_util_export.cpp \
|
|
dom_util.cpp \
|
|
nsActions.cpp \
|
|
rdf_util.cpp \
|
|
BookmarksImpl.cpp \
|
|
CBrowserContainer.cpp \
|
|
CurrentPageImpl.cpp \
|
|
HistoryImpl.cpp \
|
|
ISupportsPeer.cpp \
|
|
NativeEventThread.cpp \
|
|
NavigationImpl.cpp \
|
|
RDFEnumeration.cpp \
|
|
RDFTreeNode.cpp \
|
|
WindowControlImpl.cpp \
|
|
WrapperFactoryImpl.cpp \
|
|
nsSetupRegistry.cpp \
|
|
motif/MotifBrowserControlCanvas.cpp \
|
|
motif/gtkmozilla.cpp \
|
|
$(NULL)
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
ifdef MOZ_ENABLE_GTK
|
|
ifndef MOZ_MONOLITHIC_TOOLKIT
|
|
CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
|
CFLAGS += $(MOZ_GTK_CFLAGS)
|
|
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt
|
|
else
|
|
CXXFLAGS += $(TK_CFLAGS)
|
|
CFLAGS += $(TK_CFLAGS)
|
|
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt
|
|
endif
|
|
endif
|
|
|
|
EXTRA_DSO_LDOPTS += -L$(DEPTH)/dist/bin/components -lwidget_gtk -lwc_share
|
|
|
|
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES) \
|
|
-I$(DEPTH)/widget/src/gtk -I../src_share
|
|
|
|
JAVAH_CLS= \
|
|
"-o BookmarksImpl.h org.mozilla.webclient.wrapper_native.BookmarksImpl" \
|
|
"-o CurrentPageImpl.h org.mozilla.webclient.wrapper_native.CurrentPageImpl" \
|
|
"-o HistoryImpl.h org.mozilla.webclient.wrapper_native.HistoryImpl" \
|
|
"-o WrapperFactoryImpl.h org.mozilla.webclient.wrapper_native.WrapperFactoryImpl" \
|
|
"-o NavigationImpl.h org.mozilla.webclient.wrapper_native.NavigationImpl" \
|
|
"-o RDFEnumeration.h org.mozilla.webclient.wrapper_native.RDFEnumeration" \
|
|
"-o RDFTreeNode.h org.mozilla.webclient.wrapper_native.RDFTreeNode" \
|
|
"-o ISupportsPeer.h org.mozilla.webclient.wrapper_native.ISupportsPeer" \
|
|
"-o WindowControlImpl.h org.mozilla.webclient.wrapper_native.WindowControlImpl" \
|
|
"-o NativeEventThread.h org.mozilla.webclient.wrapper_native.NativeEventThread" \
|
|
$(NULL)
|
|
|
|
JAVAH_FILES=\
|
|
BookmarksImpl.h \
|
|
CurrentPageImpl.h \
|
|
HistoryImpl.h \
|
|
WrapperFactoryImpl.h \
|
|
NavigationImpl.h \
|
|
RDFEnumeration.h \
|
|
RDFTreeNode.h \
|
|
ISupportsPeer.h \
|
|
WindowControlImpl.h \
|
|
NativeEventThread.h \
|
|
$(NULL)
|
|
|
|
JAVAH_PROG=$(JDKHOME)/bin/javah
|
|
JAVAH_FLAGS=-jni -classpath $(CLASSPATH):$(JAVA_DESTPATH)
|
|
|
|
export:: $(JAVAH_FILES) linkSetupRegistry
|
|
|
|
linkSetupRegistry:
|
|
rm -f nsSetupRegistry.cpp
|
|
ln -s $(DEPTH)/xpfe/bootstrap/nsSetupRegistry.cpp .
|
|
|
|
$(JAVAH_FILES):
|
|
@for c in $(JAVAH_CLS); do \
|
|
echo $(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
|
|
$(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
|
|
done
|
|
|
|
clobber_all::
|
|
rm -f $(JAVAH_FILES)
|
|
rm -f nsSetupRegistry.cpp
|
|
|
|
buildRunems:
|
|
ifeq ($(BAL_INTERFACE),)
|
|
@echo +++ Creating runem. Use this to run the test browser.
|
|
rm -f runem
|
|
@echo #!/bin/sh > runem
|
|
@echo $(PERL) runem.pl $(DIST)/bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) "$$"1 "$$"2 "$$"3 "$$"4 "$$"4 "$$"6 >> runem
|
|
chmod 755 runem
|
|
endif
|
|
|
|
install:: buildRunems
|