pjs/java/webclient/Makefile.in

#//------------------------------------------------------------------------
#//
#// Makefile to build the java/webclient tree
#//
#//------------------------------------------------------------------------

#//------------------------------------------------------------------------
#//
#// Specify the depth of the current directory relative to the
#// root of NS
#//
#//------------------------------------------------------------------------
DEPTH=../..
topsrcdir	= @top_srcdir@
srcdir		= @srcdir@
VPATH		= @srcdir@

include $(DEPTH)/config/autoconf.mk

#//------------------------------------------------------------------------
#//
#// Specify any "command" targets. (ie. DIRS, INSTALL_FILES, ...)
#// (these must come before the common makefiles are included)
#// 
#// DIRS          - There are subdirectories to process
#//
#//------------------------------------------------------------------------
DIRS= classes_spec src_share src_moz

#//------------------------------------------------------------------------
#//
#// Include the common makefile rules
#//
#//------------------------------------------------------------------------
include $(topsrcdir)/config/rules.mk
Bug #28281, r=leaf, a=leaf, Add an option for building Java-supplement and fix the Java building problem about JDIRS. 2000-03-09 04:14:22 +03:00			`#//------------------------------------------------------------------------`
			`#//`
			`#// Makefile to build the java/webclient tree`
			`#//`
			`#//------------------------------------------------------------------------`

			`#//------------------------------------------------------------------------`
			`#//`
			`#// Specify the depth of the current directory relative to the`
			`#// root of NS`
			`#//`
			`#//------------------------------------------------------------------------`
			`DEPTH=../..`
			`topsrcdir = @top_srcdir@`
			`srcdir = @srcdir@`
			`VPATH = @srcdir@`

			`include $(DEPTH)/config/autoconf.mk`

			`#//------------------------------------------------------------------------`
			`#//`
			`#// Specify any "command" targets. (ie. DIRS, INSTALL_FILES, ...)`
			`#// (these must come before the common makefiles are included)`
			`#//`
			`#// DIRS - There are subdirectories to process`
			`#//`
			`#//------------------------------------------------------------------------`
bug=47357 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*** 2000-08-04 01:32:54 +04:00			`DIRS= classes_spec src_share src_moz`
Bug #28281, r=leaf, a=leaf, Add an option for building Java-supplement and fix the Java building problem about JDIRS. 2000-03-09 04:14:22 +03:00
			`#//------------------------------------------------------------------------`
			`#//`
			`#// Include the common makefile rules`
			`#//`
			`#//------------------------------------------------------------------------`
			`include $(topsrcdir)/config/rules.mk`