зеркало из https://github.com/mozilla/gecko-dev.git
Make plugletjni.lib and .dll build.
M makefiles - remove plugins/Makefile, this'll be replaced by ant - add jni Makefile R plugins/makefile.win R plugins/jni/makefile.win R plugins/src/makefile.win - obsolete. M plugins/jni/Makefile.in - new includes and such M plugins/jni/org_mozilla_pluglet_mozilla_PlugletOutputStream.cpp - cast to const char *.
This commit is contained in:
edburns%acm.org
Родитель
19bccfbfca
Коммит
d688e376c1
|
|
@ -4,5 +4,5 @@ java/webclient/src_moz/gtk/Makefile
|
|||
java/webclient/src_moz/Makefile
|
||||
java/webclient/src_ie/Makefile
|
||||
java/webclient/src_share/Makefile
|
||||
java/plugins/Makefile
|
||||
java/plugins/src/Makefile
|
||||
java/plugins/jni/Makefile
|
||||
|
|
|
|||
|
|
@ -45,6 +45,16 @@ CPPSRCS = \
|
|||
org_mozilla_util_DebugPluglet.cpp \
|
||||
$(NULL)
|
||||
|
||||
INCLUDES += -I$(MOZILLA_FIVE_HOME)/../include/xpcom \
|
||||
-I$(MOZILLA_FIVE_HOME)/../include/plugin \
|
||||
-I$(MOZILLA_FIVE_HOME)/../include/string \
|
||||
-I$(MOZILLA_FIVE_HOME)/../include/xpcom_obsolete \
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,75 +0,0 @@
|
|||
#
|
||||
# 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):
|
||||
|
||||
IGNORE_MANIFEST=1
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Makefile to build
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
MODULE = plugletjni
|
||||
|
||||
LIBRARY_NAME = plugletjni
|
||||
|
||||
DEPTH= ..\..\..
|
||||
|
||||
OBJS = \
|
||||
.\$(OBJDIR)\org_mozilla_util_DebugPluglet.obj \
|
||||
.\$(OBJDIR)\org_mozilla_pluglet_mozilla_PlugletStreamInfoImpl.obj \
|
||||
.\$(OBJDIR)\org_mozilla_pluglet_mozilla_PlugletInputStream.obj \
|
||||
.\$(OBJDIR)\org_mozilla_pluglet_mozilla_PlugletOutputStream.obj \
|
||||
.\$(OBJDIR)\org_mozilla_pluglet_mozilla_PlugletPeerImpl.obj \
|
||||
.\$(OBJDIR)\org_mozilla_pluglet_mozilla_PlugletManagerImpl.obj \
|
||||
.\$(OBJDIR)\org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl.obj \
|
||||
.\$(OBJDIR)\PlugletTagInfo2.obj \
|
||||
.\$(OBJDIR)\PlugletOutputStream.obj \
|
||||
.\$(OBJDIR)\ByteRanges.obj
|
||||
|
||||
MAKE_OBJ_TYPE = DLL
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
|
||||
#// (these must be defined before the common makefiles are included)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
DLLNAME=plugletjni
|
||||
|
||||
DLL = .\$(OBJDIR)\$(DLLNAME).dll
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any local options for the make tools
|
||||
#// (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Include the common makefile rules
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
include <$(DEPTH)/config/rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\
|
||||
|
||||
|
||||
|
||||
|
|
@ -62,7 +62,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletOutputStream_nati
|
|||
("PlugletOutputStream.nativeWrite: stream = %p, off = %i, len = %i\n", output, off, len));
|
||||
env->GetByteArrayRegion(b,off,len,buf);
|
||||
PRUint32 tmp;
|
||||
output->Write(buf,len,&tmp);
|
||||
output->Write((const char *)buf,len,&tmp);
|
||||
PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
|
||||
("PlugletOutputStream.nativeWrite: %i bytes written\n", tmp));
|
||||
free(buf);
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
#
|
||||
# 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):
|
||||
|
||||
IGNORE_MANIFEST=1
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Specify the depth of the current directory relative to the
|
||||
#// root of NS
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
DEPTH = ..\..
|
||||
|
||||
DIRS = src jni classes
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
#
|
||||
# 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):
|
||||
IGNORE_MANIFEST=1
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Makefile to build
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
MAKE_OBJ_TYPE = DLL
|
||||
DLLNAME = pluglet
|
||||
DLL=.\$(OBJDIR)\$(DLLNAME).dll
|
||||
MODULE = pluglet
|
||||
COMPONENT = 1
|
||||
|
||||
DEPTH= ..\..\..\
|
||||
|
||||
REQUIRES = \
|
||||
!ifndef OJI_DISABLE
|
||||
oji \
|
||||
!endif
|
||||
java plug xpcom raptor
|
||||
|
||||
OBJS = \
|
||||
.\$(OBJDIR)\Pluglet.obj \
|
||||
.\$(OBJDIR)\PlugletEngine.obj \
|
||||
.\$(OBJDIR)\List.obj \
|
||||
.\$(OBJDIR)\PlugletLoader.obj \
|
||||
.\$(OBJDIR)\PlugletsDir.obj \
|
||||
.\$(OBJDIR)\PlugletFactory.obj \
|
||||
.\$(OBJDIR)\PlugletStreamListener.obj \
|
||||
.\$(OBJDIR)\PlugletStreamInfo.obj \
|
||||
.\$(OBJDIR)\PlugletPeer.obj \
|
||||
.\$(OBJDIR)\PlugletManager.obj \
|
||||
.\$(OBJDIR)\PlugletInputStream.obj \
|
||||
.\$(OBJDIR)\PlugletViewFactory.obj \
|
||||
.\$(OBJDIR)\PlugletViewWindows.obj \
|
||||
!ifndef OJI_DISABLE
|
||||
.\$(OBJDIR)\PlugletSecurityContext.obj \
|
||||
!endif
|
||||
.\$(OBJDIR)\Registry.obj
|
||||
|
||||
MAKE_OBJ_TYPE = DLL
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// 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$(JDKHOME)\include -I$(JDKHOME)\include\win32
|
||||
|
||||
LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib \
|
||||
!ifdef OJI_DISABLE
|
||||
$(JDKHOME)\lib\jvm.lib
|
||||
!else
|
||||
$(DIST)\lib\oji.lib
|
||||
!endif
|
||||
|
||||
!ifdef OJI_DISABLE
|
||||
LCFLAGS=$(LCFLAGS) -DOJI_DISABLE
|
||||
!endif
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Include the common makefile rules
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
include <$(DEPTH)/config/rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
|
||||
|
||||
|
||||
Загрузка…
Ссылка в новой задаче