зеркало из https://github.com/mozilla/pjs.git
Splitting liveconnect off from the java module, new module is called liveconnect, similar to what was done for xpconnect (145347). r=blythe, sr=alecf, a=asa
This commit is contained in:
mcafee%netscape.com
Родитель
4a201ae149
Коммит
15974838f5
|
|
@ -81,7 +81,7 @@ my %map = (
|
|||
'intl', 'intl',
|
||||
'intlcmpt', 'intl/compatibility',
|
||||
'jar', 'modules/libjar',
|
||||
'java', 'sun-java/stubs js/jsd/classes js/src/liveconnect',
|
||||
'java', 'sun-java/stubs js/jsd/classes',
|
||||
'jpeg', 'jpeg',
|
||||
'jprof', 'tools/jprof',
|
||||
'js', 'js/src/fdlibm js/src',
|
||||
|
|
@ -91,6 +91,7 @@ my %map = (
|
|||
'jsloader', 'js/src/xpconnect/loader',
|
||||
'layout', 'layout',
|
||||
'libreg', 'modules/libreg',
|
||||
'liveconnect', 'js/src/liveconnect',
|
||||
'locale', 'intl/locale',
|
||||
'lwbrk', 'intl/lwbrk',
|
||||
'mai', 'widget/src/gtk2/mai',
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = java
|
||||
MODULE = liveconnect
|
||||
LIBRARY_NAME = jsj
|
||||
EXPORT_LIBRARY = 1
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
|
|
@ -48,6 +48,7 @@ endif
|
|||
REQUIRES = js \
|
||||
xpcom \
|
||||
xpconnect \
|
||||
java \
|
||||
$(NULL)
|
||||
|
||||
CSRCS = \
|
||||
|
|
|
|||
|
|
@ -1,194 +0,0 @@
|
|||
# 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 Communicator client code, released
|
||||
# March 31, 1998.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the
|
||||
# terms of the GNU Public License (the "GPL"), in which case the
|
||||
# provisions of the GPL are applicable instead of those above.
|
||||
# If you wish to allow use of your version of this file only
|
||||
# under the terms of the GPL and not to allow others to use your
|
||||
# version of this file under the NPL, indicate your decision by
|
||||
# deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this
|
||||
# file under either the NPL or the GPL.
|
||||
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Makefile to build the Java reflections of JavaScript objects
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Specify the depth of the current directory relative to the
|
||||
#// root of NS
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
DEPTH= ..\..\..
|
||||
MODULE = java
|
||||
REQUIRES = xpcom \
|
||||
string\
|
||||
js \
|
||||
xpconnect \
|
||||
$(NULL)
|
||||
include <$(DEPTH)/config/config.mak>
|
||||
|
||||
!ifdef NSJVM
|
||||
DIRS = classes
|
||||
!endif
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
EXPORT_LIBRARY=1
|
||||
LIBRARY_NAME=jsj$(MOZ_BITS)$(VERSION_NUMBER)
|
||||
PDBFILE=$(LIBRARY_NAME).pdb
|
||||
MAPFILE=$(LIBRARY_NAME).map
|
||||
|
||||
!if "$(MOZ_BITS)" == "16"
|
||||
DEFFILE = $(LIBRARY_NAME).def
|
||||
!endif
|
||||
|
||||
LLIBS=$(LIBNSPR) $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \
|
||||
!ifdef MOZ_OJI
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
!endif
|
||||
$(NULL)
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define the files necessary to build the target (ie. OBJS)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
OBJS= \
|
||||
.\$(OBJDIR)\jsj.obj \
|
||||
.\$(OBJDIR)\jsj_JSObject.obj \
|
||||
.\$(OBJDIR)\jsj_JavaArray.obj \
|
||||
.\$(OBJDIR)\jsj_JavaClass.obj \
|
||||
.\$(OBJDIR)\jsj_JavaMember.obj \
|
||||
.\$(OBJDIR)\jsj_JavaObject.obj \
|
||||
.\$(OBJDIR)\jsj_JavaPackage.obj \
|
||||
.\$(OBJDIR)\jsj_array.obj \
|
||||
.\$(OBJDIR)\jsj_class.obj \
|
||||
.\$(OBJDIR)\jsj_convert.obj \
|
||||
.\$(OBJDIR)\jsj_field.obj \
|
||||
.\$(OBJDIR)\jsj_hash.obj \
|
||||
.\$(OBJDIR)\jsj_method.obj \
|
||||
.\$(OBJDIR)\jsj_utils.obj \
|
||||
!ifdef MOZ_OJI
|
||||
.\$(OBJDIR)\nsCLiveconnect.obj \
|
||||
.\$(OBJDIR)\nsCLiveconnectFactory.obj \
|
||||
!endif
|
||||
!if "$(MOZ_BITS)" == "16"
|
||||
.\$(OBJDIR)\jsj_nodl.obj \
|
||||
!endif
|
||||
$(NULL)
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// install headers
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
EXPORTS = \
|
||||
jsjava.h \
|
||||
!ifdef MOZ_OJI
|
||||
nsILiveconnect.h \
|
||||
nsISecureLiveconnect.h \
|
||||
nsISecurityContext.h \
|
||||
!endif
|
||||
$(NULL)
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
|
||||
#// (these must be defined before the common makefiles are included)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
!ifdef NSJVM
|
||||
JNI_GEN= \
|
||||
netscape.javascript.JSObject \
|
||||
netscape.javascript.JSException \
|
||||
$(NULL)
|
||||
|
||||
!endif
|
||||
|
||||
EXPORTS = $(EXPORTS) \
|
||||
$(JNI_GEN_DIR)\netscape_javascript_JSObject.h \
|
||||
$(NULL)
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any local options for the make tools
|
||||
#// (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
LINCS=$(LINCS) -I$(JNI_GEN_DIR) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
#!ifdef SERVER_BUILD
|
||||
#LLIBS=$(DIST)/lib/httpdlw.lib $(DIST)/lib/libsjboot.lib
|
||||
#!endif
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Include the common makefile rules
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
include <$(DEPTH)/config/rules.mak>
|
||||
|
||||
####
|
||||
# this bit of extreme scariness came from the js/src makefile
|
||||
# reproduced here since that's where jsjava.c lives now...
|
||||
|
||||
!if ("$(MOZ_BITS)" == "16")
|
||||
#//
|
||||
#// Win16 Hoovers SO BAD!!!
|
||||
#//
|
||||
|
||||
!if !defined(MOZ_DEBUG)
|
||||
#//
|
||||
#// We must turn off codeview debug info so jni.c can build.
|
||||
#// Otherwise the linker gives errors about data in the $SYMBOLS
|
||||
#// segment being beyond a segment boundary.
|
||||
#//
|
||||
$(OBJDIR)\jsjava.obj: jsjava.c
|
||||
@$(CC) @<<$(CFGFILE)
|
||||
-c
|
||||
-Od
|
||||
$(CFLAGS)
|
||||
$(LCFLAGS)
|
||||
$(LINCS)
|
||||
$(LINCS_1)
|
||||
$(INCS)
|
||||
-Fd$(PDBFILE)
|
||||
-Fo.\$(OBJDIR)\
|
||||
$(*B).c
|
||||
<<KEEP
|
||||
!endif
|
||||
!endif
|
||||
|
|
@ -31,6 +31,7 @@ IS_COMPONENT = 1
|
|||
MODULE_NAME = nsCJVMManagerModule
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
liveconnect \
|
||||
java \
|
||||
js \
|
||||
plugin \
|
||||
|
|
|
|||
|
|
@ -1,121 +0,0 @@
|
|||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Makefile to build
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Specify the depth of the current directory relative to the
|
||||
#// root of NS
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
DEPTH= ..\..\..
|
||||
|
||||
|
||||
MODULE=oji
|
||||
LIBRARY_NAME=oji
|
||||
MODULE_NAME=nsCJVMManagerModule
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
java \
|
||||
js \
|
||||
plugin \
|
||||
caps \
|
||||
pref \
|
||||
js \
|
||||
jar \
|
||||
necko \
|
||||
dom \
|
||||
widget \
|
||||
xpconnect \
|
||||
windowwatcher \
|
||||
layout \
|
||||
docshell \
|
||||
webBrowser_core \
|
||||
intl \
|
||||
gfx \
|
||||
$(NULL)
|
||||
include <$(DEPTH)/config/config.mak>
|
||||
|
||||
!ifdef MOZ_OJI
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define the files necessary to build the target (ie. OBJS)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
OBJS = .\$(OBJDIR)\jvmmgr.obj \
|
||||
.\$(OBJDIR)\nsJVMManager.obj \
|
||||
.\$(OBJDIR)\nsJVMPluginTagInfo.obj \
|
||||
.\$(OBJDIR)\ProxyJNI.obj \
|
||||
.\$(OBJDIR)\lcglue.obj \
|
||||
.\$(OBJDIR)\nsCSecurityContext.obj \
|
||||
.\$(OBJDIR)\nsCJVMManagerFactory.obj \
|
||||
.\$(OBJDIR)\nsCNullSecurityContext.obj \
|
||||
.\$(OBJDIR)\ProxyClassLoader.obj \
|
||||
.\$(OBJDIR)\scd.obj
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
|
||||
#// (these must be defined before the common makefiles are included)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any local options for the make tools
|
||||
#// (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
LINCS= -I_jri
|
||||
#
|
||||
# For Win16 the following include directories are copied into
|
||||
# ns/dist/public/win16
|
||||
#
|
||||
|
||||
|
||||
!endif # MOZ_OJI
|
||||
|
||||
EXPORTS = jvmmgr.h \
|
||||
nsJVMManager.h \
|
||||
nsJVMPluginTagInfo.h
|
||||
|
||||
LLIBS = \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\js3250.lib \
|
||||
$(DIST)\lib\jsj3250.lib \
|
||||
$(NULL)
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Include the common makefile rules
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
include <$(DEPTH)/config/rules.mak>
|
||||
|
||||
LCFLAGS=$(LCFLAGS) ^
|
||||
$(JAVA_DEFINES)
|
||||
|
||||
PUBLIC_HEADER_DIR=$(PUBLIC)\ojiimpl
|
||||
|
||||
#export::
|
||||
# $(MAKE_INSTALL) $(EXPORTS) $(PUBLIC_HEADER_DIR)
|
||||
|
||||
!ifdef MOZ_OJI
|
||||
clobber::
|
||||
$(RM_R) _jri
|
||||
!endif # MOZ_OJI
|
||||
|
|
@ -219,10 +219,11 @@ digraph G {
|
|||
unicharutil -> xpcom;
|
||||
unicharutil -> necko;
|
||||
unicharutil -> uconv;
|
||||
java -> string;
|
||||
java -> xpconnect;
|
||||
java -> xpcom;
|
||||
java -> js;
|
||||
liveconnect -> string;
|
||||
liveconnect -> xpconnect;
|
||||
liveconnect -> xpcom;
|
||||
liveconnect -> js;
|
||||
liveconnect -> java;
|
||||
jar -> string;
|
||||
jar -> zlib;
|
||||
jar -> xpcom;
|
||||
|
|
@ -847,6 +848,7 @@ digraph G {
|
|||
oji -> dom;
|
||||
oji -> gfx;
|
||||
oji -> java;
|
||||
oji -> liveconnect;
|
||||
oji -> docshell;
|
||||
oji -> xpconnect;
|
||||
oji -> js;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче