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
189 lines
5.4 KiB
Makefile
189 lines
5.4 KiB
Makefile
#!nmake
|
|
#
|
|
# 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=..\..\..
|
|
IGNORE_MANIFEST=1
|
|
|
|
MAKE_OBJ_TYPE = DLL
|
|
|
|
MODULE=webclient
|
|
|
|
|
|
OBJS = \
|
|
.\$(OBJDIR)\ns_util.obj \
|
|
.\$(OBJDIR)\ns_util_export.obj \
|
|
.\$(OBJDIR)\rdf_util.obj \
|
|
.\$(OBJDIR)\dom_util.obj \
|
|
.\$(OBJDIR)\nsActions.obj \
|
|
.\$(OBJDIR)\CurrentPageImpl.obj \
|
|
.\$(OBJDIR)\HistoryImpl.obj \
|
|
.\$(OBJDIR)\BookmarksImpl.obj \
|
|
.\$(OBJDIR)\WrapperFactoryImpl.obj \
|
|
.\$(OBJDIR)\WindowControlImpl.obj \
|
|
.\$(OBJDIR)\NavigationImpl.obj \
|
|
.\$(OBJDIR)\CBrowserContainer.obj \
|
|
.\$(OBJDIR)\NativeEventThread.obj \
|
|
.\$(OBJDIR)\RDFEnumeration.obj \
|
|
.\$(OBJDIR)\RDFTreeNode.obj \
|
|
.\$(OBJDIR)\ISupportsPeer.obj \
|
|
.\$(OBJDIR)\nsSetupRegistry.obj \
|
|
$(NULL)
|
|
|
|
|
|
LCFLAGS = \
|
|
-DDEBUG_RAPTOR_CANVAS \
|
|
$(NULL)
|
|
|
|
!ifdef BAL_INTERFACE
|
|
LCFLAGS = \
|
|
$(LCFLAGS) \
|
|
-DBAL_INTERFACE \
|
|
$(NULL)
|
|
|
|
DLLNAME = webclient_bal
|
|
!else
|
|
DLLNAME = webclient
|
|
!endif
|
|
|
|
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
|
|
|
LLIBS = \
|
|
$(DIST)\lib\gkweb.lib \
|
|
$(DIST)\lib\raptorbasewidget_s.lib \
|
|
$(DIST)\lib\gkwidget.lib \
|
|
$(DIST)\lib\xpcom.lib \
|
|
$(DIST)\lib\gkgfxwin.lib \
|
|
$(DIST)\lib\nsreg.lib \
|
|
$(DIST)\lib\nspr4.lib \
|
|
$(DIST)\lib\plc4.lib \
|
|
$(DIST)\lib\plds4.lib \
|
|
$(DIST)\lib\wc_share.lib \
|
|
# $(DEPTH)\xpfe\bootstrap\$(OBJDIR)\nsSetupRegistry.obj \
|
|
$(NULL)
|
|
|
|
WIN_LIBS = \
|
|
version.lib
|
|
|
|
include <$(DEPTH)\config\rules.mak>
|
|
|
|
include <$(DEPTH)\java\config\localdefs.mak>
|
|
|
|
!ifdef CLASSPATH
|
|
JAVAC_CLASSPATH=$(JAVAC_CLASSPATH);$(CLASSPATH)
|
|
!endif
|
|
|
|
!ifdef BAL_INTERFACE
|
|
INCS = \
|
|
-I..\bal\ \
|
|
-I..\bal\win32 \
|
|
$(INCS) \
|
|
$(NULL)
|
|
!else
|
|
INCS = \
|
|
-I$(JDKHOME)\include \
|
|
-I$(JDKHOME)\include\win32 \
|
|
$(INCS) \
|
|
$(NULL)
|
|
!endif
|
|
|
|
INCS = \
|
|
-I..\src_share \
|
|
$(INCS) \
|
|
$(NULL)
|
|
|
|
!CMDSWITCHES -S
|
|
|
|
# generate the jni header
|
|
export:: BookmarksImpl.h CurrentPageImpl.h HistoryImpl.h WrapperFactoryImpl.h WindowControlImpl.h NavigationImpl.h NativeEventThread.h RDFEnumeration.h RDFTreeNode.h ISupportsPeer.h nsSetupRegistry.cpp
|
|
|
|
BookmarksImpl.h:
|
|
@echo Assuming class org.mozilla.webclient.wrapper_native.BookmarksImpl is in $(JAVAH_FLAGS)
|
|
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.BookmarksImpl
|
|
|
|
CurrentPageImpl.h:
|
|
@echo Assuming class org.mozilla.webclient.wrapper_native.CurrentPageImpl is in $(JAVAH_FLAGS)
|
|
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.CurrentPageImpl
|
|
|
|
HistoryImpl.h:
|
|
@echo Assuming class org.mozilla.webclient.wrapper_native.HistoryImpl is in $(JAVAH_FLAGS)
|
|
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.HistoryImpl
|
|
|
|
WrapperFactoryImpl.h:
|
|
@echo Assuming class org.mozilla.webclient.wrapper_native.WrapperFactoryImpl is in $(JAVAH_FLAGS)
|
|
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.WrapperFactoryImpl
|
|
|
|
NavigationImpl.h:
|
|
@echo Assuming class org.mozilla.webclient.wrapper_native.NavigationImpl is in $(JAVAH_FLAGS)
|
|
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.NavigationImpl
|
|
|
|
RDFEnumeration.h:
|
|
@echo Assuming class org.mozilla.webclient.wrapper_native.RDFEnumeration is in $(JAVAH_FLAGS)
|
|
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.RDFEnumeration
|
|
|
|
RDFTreeNode.h:
|
|
@echo Assuming class org.mozilla.webclient.wrapper_native.RDFTreeNode is in $(JAVAH_FLAGS)
|
|
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.RDFTreeNode
|
|
|
|
ISupportsPeer.h:
|
|
@echo Assuming class org.mozilla.webclient.wrapper_native.ISupportsPeer is in $(JAVAH_FLAGS)
|
|
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.ISupportsPeer
|
|
|
|
WindowControlImpl.h:
|
|
@echo Assuming class org.mozilla.webclient.wrapper_native.WindowControlImpl is in $(JAVAH_FLAGS)
|
|
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.WindowControlImpl
|
|
|
|
NativeEventThread.h:
|
|
@echo Assuming class org.mozilla.webclient.wrapper_native.NativeEventThread is in $(JAVAH_FLAGS)
|
|
$(JAVAH) $(JAVAH_FLAGS) -o $@ org.mozilla.webclient.wrapper_native.NativeEventThread
|
|
|
|
nsSetupRegistry.cpp:
|
|
copy $(MOZ_SRC)\mozilla\xpfe\bootstrap\nsSetupRegistry.cpp
|
|
|
|
buildRunems:
|
|
!ifdef BAL_INTERFACE
|
|
!else
|
|
@echo +++ Creating runem.bat. Use this to run the test browser.
|
|
rm -f runem.bat
|
|
@echo $(PERL) runem.pl $(DIST)\bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem.bat
|
|
!endif
|
|
|
|
install:: $(DLL) buildRunems
|
|
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
|
|
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
|
|
|
clobber_all:: clobber
|
|
|
|
clobber::
|
|
rm -f $(DIST)\bin\$(DLLNAME).dll
|
|
rm -f BookmarksImpl.h
|
|
rm -f CurrentPageImpl.h
|
|
rm -f HistoryImpl.h
|
|
rm -f WrapperFactoryImpl.h
|
|
rm -f NavigationImpl.h
|
|
rm -f WindowControlImpl.h
|
|
rm -f NativeEventThread.h
|
|
rm -f RDFEnumeration.h
|
|
rm -f RDFTreeNode.h
|
|
rm -f ISupportsPeer.h
|
|
rm -f nsSetupRegistry.cpp
|
|
rm -f runem.bat
|
|
|