зеркало из https://github.com/mozilla/pjs.git
Changes to build with MOZ_OJI, and optionally build NSJVM. Changes to regenerate jar files. Changed version number to 50.
This commit is contained in:
Родитель
4df5b70b97
Коммит
93ccc7040b
|
@ -1629,6 +1629,7 @@ $(GENDIR)\config.rc: $(DEPTH)\modules\libpref\src\init\config.js
|
|||
JAVAPARENT_DIR = $(OUTDIR)\plugins
|
||||
JAVABIN_DIR = $(OUTDIR)\plugins\nsjvm
|
||||
JAVACLS_DIR = $(OUTDIR)\plugins\nsjvm
|
||||
XJAVACLS_DIR = $(OUTDIR)\java\classes
|
||||
!elseif defined(MOZ_JAVA)
|
||||
JAVAPARENT_DIR = $(OUTDIR)\java
|
||||
JAVABIN_DIR = $(OUTDIR)\java\bin
|
||||
|
@ -1899,9 +1900,7 @@ install: \
|
|||
!ENDIF
|
||||
!endif
|
||||
!ENDIF # MOZ_BITS==32 (end of "else" clause)
|
||||
!if defined(JAVA_OR_NSJVM)
|
||||
$(JAVACLS_DIR)\$(JAR_NAME) \
|
||||
!endif
|
||||
$(OUTDIR)\java\classes\ifc11.jar \
|
||||
$(OUTDIR)\netscape.cfg \
|
||||
!if defined(DEATH_TO_POLICY_FILES)
|
||||
$(OUTDIR)\$(POLICY) \
|
||||
|
@ -2256,11 +2255,11 @@ $(OUTDIR)\nscnv3230.dll: $(DIST)\bin\nscnv3230.dll
|
|||
@IF EXIST $(DIST)\bin\nscnv3230.dll copy $(DIST)\bin\nscnv3230.dll $(OUTDIR)\nscnv3230.dll
|
||||
!endif
|
||||
|
||||
# XXX this will copy them all, we really only want the ones that changed
|
||||
$(JAVACLS_DIR)\$(JAR_NAME): $(JAVA_DESTPATH)\$(JAR_NAME)
|
||||
@IF NOT EXIST "$(JAVAPARENT_DIR)/$(NULL)" mkdir "$(JAVAPARENT_DIR)"
|
||||
@IF NOT EXIST "$(JAVACLS_DIR)/$(NULL)" mkdir "$(JAVACLS_DIR)"
|
||||
!if defined(JAVA_OR_NSJVM)
|
||||
$(OUTDIR)\java\classes\ifc11.jar:
|
||||
@IF NOT EXIST "$(JAVAPARENT_DIR)\$(NULL)" mkdir "$(JAVAPARENT_DIR)"
|
||||
@IF NOT EXIST "$(JAVACLS_DIR)\$(NULL)" mkdir "$(JAVACLS_DIR)"
|
||||
@IF NOT EXIST "$(XJAVACLS_DIR)\$(NULL)" mkdir "$(XJAVACLS_DIR)"
|
||||
!if defined(MOZ_JAVA)
|
||||
!ifdef MOZ_COPY_ALL_JARS
|
||||
@copy $(JAVA_DESTPATH)\*.jar "$(JAVACLS_DIR)\"
|
||||
!else
|
||||
|
@ -2268,6 +2267,20 @@ $(JAVACLS_DIR)\$(JAR_NAME): $(JAVA_DESTPATH)\$(JAR_NAME)
|
|||
@copy $(JAVA_DESTPATH)\ifc*.jar "$(JAVACLS_DIR)\"
|
||||
@copy $(JAVA_DESTPATH)\jsj*.jar "$(JAVACLS_DIR)\"
|
||||
!endif
|
||||
!elseif defined(MOZ_OJI)
|
||||
@copy $(JAVA_DESTPATH)\ifc*.jar "$(XJAVACLS_DIR)\"
|
||||
@copy $(JAVA_DESTPATH)\jsj*.jar "$(XJAVACLS_DIR)\"
|
||||
@copy $(JAVA_DESTPATH)\nsplug*.jar "$(XJAVACLS_DIR)\"
|
||||
@copy $(JAVA_DESTPATH)\nssec*.jar "$(XJAVACLS_DIR)\"
|
||||
@copy $(JAVA_DESTPATH)\ldap*.jar "$(XJAVACLS_DIR)\"
|
||||
!ifdef NSJVM
|
||||
@copy $(JAVA_DESTPATH)\java*.jar "$(JAVACLS_DIR)\"
|
||||
@copy $(JAVA_DESTPATH)\jae*.jar "$(JAVACLS_DIR)\"
|
||||
@copy $(JAVA_DESTPATH)\jio*.jar "$(JAVACLS_DIR)\"
|
||||
@copy $(JAVA_DESTPATH)\jsj*.jar "$(JAVACLS_DIR)\"
|
||||
@copy $(JAVA_DESTPATH)\scd*.jar "$(JAVACLS_DIR)\"
|
||||
@copy $(JAVA_DESTPATH)\nav*.jar "$(JAVACLS_DIR)\"
|
||||
!endif
|
||||
!endif
|
||||
|
||||
$(OUTDIR)\netscape.cfg: $(DIST)\bin\netscape.cfg
|
||||
|
|
|
@ -78,6 +78,17 @@ NPError wfe_GetPluginsDirectory(CString& csDirname)
|
|||
return NPERR_NO_ERROR;
|
||||
}
|
||||
|
||||
NPError wfe_GetJavaDirectory(CString& csDirname)
|
||||
{
|
||||
char ca_default[_MAX_PATH];
|
||||
::GetModuleFileName(AfxGetApp()->m_hInstance, ca_default, _MAX_PATH);
|
||||
char *cp_lastslash = ::strrchr(ca_default, '\\');
|
||||
*cp_lastslash = NULL;
|
||||
csDirname = ca_default;
|
||||
csDirname += "\\java\\classes";
|
||||
return NPERR_NO_ERROR;
|
||||
}
|
||||
|
||||
// Fetches the "MIME type" string from the DLL VERSIONINFO structure.
|
||||
// "pVersionInfo" is ptr to the VERSIONINFO data, and "pNPMgtBlk" is a handle
|
||||
// to a plugin management data structure created during fe_RegisterPlugin().
|
||||
|
@ -565,6 +576,9 @@ void FE_RegisterPlugins()
|
|||
// get the main plugins directory and start the process
|
||||
wfe_GetPluginsDirectory(csPluginDir);
|
||||
fe_RegisterPlugins((LPSTR)(LPCSTR)csPluginDir);
|
||||
CString csJavaDir;
|
||||
wfe_GetJavaDirectory(csJavaDir);
|
||||
JVM_AddToClassPath(csJavaDir);
|
||||
}
|
||||
|
||||
// saves the current path in the variable passed. ppPathSave is the
|
||||
|
|
|
@ -33,16 +33,13 @@
|
|||
# sun-java/classsrc/sun/audio/AudioDevice.java
|
||||
# sun-java/classsrc/sun/awt/windows/WToolkit.java
|
||||
#
|
||||
VERSION_NUMBER = 40
|
||||
VERSION_NUMBER = 50
|
||||
|
||||
ZIP_NAME = java_$(VERSION_NUMBER)
|
||||
# jar for core java classes:
|
||||
JAR_NAME = java$(VERSION_NUMBER).jar
|
||||
|
||||
# XXX obsolete
|
||||
WIN_ZIP_NAME = $(ZIP_NAME).win
|
||||
MAC_ZIP_NAME = $(ZIP_NAME).mac
|
||||
UNIX_ZIP_NAME = $(ZIP_NAME).x
|
||||
STAND_ALONE_ZIP_NAME = java_sa.zip
|
||||
# jar for navigator-specific java code:
|
||||
NAV_JAR_NAME = nav$(VERSION_NUMBER).jar
|
||||
|
||||
######################################################################
|
||||
# Cross-Platform Java Stuff
|
||||
|
|
|
@ -51,6 +51,10 @@ WINOS=$(WINOS: =)^
|
|||
LCFLAGS=$(LCFLAGS) -DSTAND_ALONE_JAVA
|
||||
!endif
|
||||
|
||||
!ifndef MOZ_JAVA
|
||||
MOZ_OJI = 1 # on by default now
|
||||
!endif
|
||||
|
||||
!ifdef MOZ_JAVA
|
||||
MOZ_JAVA_FLAG=-DJAVA
|
||||
!ifdef MOZ_OJI
|
||||
|
@ -317,7 +321,8 @@ JAVAC_ZIP=$(MOZ_TOOLS)/lib/javac.zip
|
|||
|
||||
ZIP_PROG = $(MOZ_TOOLS)\bin\zip
|
||||
UNZIP_PROG = $(MOZ_TOOLS)\bin\unzip
|
||||
ZIP_FLAGS = -0 -r -q
|
||||
ZIP_COMPR = 9
|
||||
ZIP_FLAGS = -$(ZIP_COMPR)r
|
||||
|
||||
CFLAGS = $(CFLAGS) -DOS_HAS_DLL
|
||||
|
||||
|
|
|
@ -155,7 +155,8 @@ RANLIB = /bin/true
|
|||
SDKINSTALL = $(NSINSTALL) -t
|
||||
UNZIP_PROG = $(LOCAL_BIN)/unzip
|
||||
ZIP_PROG = $(LOCAL_BIN)/zip
|
||||
ZIP_FLAGS = -0rq
|
||||
ZIP_COMPR = 9
|
||||
ZIP_FLAGS = -$(ZIP_COMPR)r
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
EMPTY :=
|
||||
|
@ -493,6 +494,10 @@ ifndef NO_NSPR
|
|||
DEFINES += -DNSPR
|
||||
endif
|
||||
|
||||
ifndef MOZ_JAVA
|
||||
MOZ_OJI = 1 # on by default now
|
||||
endif
|
||||
|
||||
ifdef MOZ_JAVA
|
||||
DEFINES += -DJAVA
|
||||
ifdef MOZ_OJI
|
||||
|
|
|
@ -611,5 +611,4 @@ MANIFEST_LEVEL=RULES
|
|||
CFLAGS = $(CFLAGS) -DNO_JNI_STUBS
|
||||
!endif
|
||||
|
||||
|
||||
!endif # CONFIG_RULES_MAK
|
||||
|
|
46
js/Makefile
46
js/Makefile
|
@ -1,46 +0,0 @@
|
|||
#! gmake
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
DEPTH = ..
|
||||
|
||||
# Normally DIRS should contain all sub-dirs, but this
|
||||
# directory was built to organize code rather than to
|
||||
# reflect build order.
|
||||
#
|
||||
# Thus on the first pass we build the core classes and the
|
||||
# top-level Makefile will control the order of subsequent
|
||||
# directories by going directly into the specific directories
|
||||
#
|
||||
# The proper way to do this would be to introduce different
|
||||
# stages into the java code build cycle, but that has the
|
||||
# potential to introduce too many changes
|
||||
#
|
||||
# This is necessary to break circular dependencies the logical
|
||||
# tree directory structure would otherwise introduce.
|
||||
#
|
||||
# See top-level makefile for details
|
||||
#
|
||||
|
||||
ifndef MOZ_OJI
|
||||
DIRS = src \
|
||||
jsj \
|
||||
tests
|
||||
else
|
||||
DIRS = src \
|
||||
tests
|
||||
endif
|
||||
|
||||
include $(DEPTH)/config/rules.mk
|
|
@ -93,10 +93,3 @@ else
|
|||
$(OBJDIR)/stubs.o:
|
||||
endif
|
||||
|
||||
ifndef REGENERATE
|
||||
|
||||
export:: jsj10.jar
|
||||
$(INSTALL) -m 444 jsj10.jar $(JAVA_DESTPATH)
|
||||
set tmpwd=`pwd`; cd $(JAVA_DESTPATH) ; unzip -o jsj10.jar ; cd $$tempwd
|
||||
|
||||
endif
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
/* DO NOT EDIT THIS FILE - it is machine generated */
|
||||
#include "jni.h"
|
||||
|
||||
/* Header for class netscape_javascript_JSException */
|
||||
|
||||
#ifndef _Included_netscape_javascript_JSException
|
||||
#define _Included_netscape_javascript_JSException
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
|
@ -1,102 +0,0 @@
|
|||
/* DO NOT EDIT THIS FILE - it is machine generated */
|
||||
#include "jni.h"
|
||||
|
||||
/* Header for class netscape_javascript_JSObject */
|
||||
|
||||
#ifndef _Included_netscape_javascript_JSObject
|
||||
#define _Included_netscape_javascript_JSObject
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
/*
|
||||
* Class: netscape_javascript_JSObject
|
||||
* Method: initClass
|
||||
* Signature: ()V
|
||||
*/
|
||||
JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_initClass
|
||||
(JNIEnv *, jclass);
|
||||
|
||||
/*
|
||||
* Class: netscape_javascript_JSObject
|
||||
* Method: getMember
|
||||
* Signature: (Ljava/lang/String;)Ljava/lang/Object;
|
||||
*/
|
||||
JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getMember
|
||||
(JNIEnv *, jobject, jstring);
|
||||
|
||||
/*
|
||||
* Class: netscape_javascript_JSObject
|
||||
* Method: getSlot
|
||||
* Signature: (I)Ljava/lang/Object;
|
||||
*/
|
||||
JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getSlot
|
||||
(JNIEnv *, jobject, jint);
|
||||
|
||||
/*
|
||||
* Class: netscape_javascript_JSObject
|
||||
* Method: setMember
|
||||
* Signature: (Ljava/lang/String;Ljava/lang/Object;)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_setMember
|
||||
(JNIEnv *, jobject, jstring, jobject);
|
||||
|
||||
/*
|
||||
* Class: netscape_javascript_JSObject
|
||||
* Method: setSlot
|
||||
* Signature: (ILjava/lang/Object;)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_setSlot
|
||||
(JNIEnv *, jobject, jint, jobject);
|
||||
|
||||
/*
|
||||
* Class: netscape_javascript_JSObject
|
||||
* Method: removeMember
|
||||
* Signature: (Ljava/lang/String;)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_removeMember
|
||||
(JNIEnv *, jobject, jstring);
|
||||
|
||||
/*
|
||||
* Class: netscape_javascript_JSObject
|
||||
* Method: call
|
||||
* Signature: (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
|
||||
*/
|
||||
JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_call
|
||||
(JNIEnv *, jobject, jstring, jobjectArray);
|
||||
|
||||
/*
|
||||
* Class: netscape_javascript_JSObject
|
||||
* Method: eval
|
||||
* Signature: (Ljava/lang/String;)Ljava/lang/Object;
|
||||
*/
|
||||
JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_eval
|
||||
(JNIEnv *, jobject, jstring);
|
||||
|
||||
/*
|
||||
* Class: netscape_javascript_JSObject
|
||||
* Method: toString
|
||||
* Signature: ()Ljava/lang/String;
|
||||
*/
|
||||
JNIEXPORT jstring JNICALL Java_netscape_javascript_JSObject_toString
|
||||
(JNIEnv *, jobject);
|
||||
|
||||
/*
|
||||
* Class: netscape_javascript_JSObject
|
||||
* Method: getWindow
|
||||
* Signature: (Ljava/applet/Applet;)Lnetscape/javascript/JSObject;
|
||||
*/
|
||||
JNIEXPORT jobject JNICALL Java_netscape_javascript_JSObject_getWindow
|
||||
(JNIEnv *, jclass, jobject);
|
||||
|
||||
/*
|
||||
* Class: netscape_javascript_JSObject
|
||||
* Method: finalize
|
||||
* Signature: ()V
|
||||
*/
|
||||
JNIEXPORT void JNICALL Java_netscape_javascript_JSObject_finalize
|
||||
(JNIEnv *, jobject);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
|
@ -46,25 +46,24 @@ MODULE=java
|
|||
JMODS=netscape/javascript
|
||||
!ifdef MOZ_JAVA
|
||||
JDIRS=$(JMODS)
|
||||
!endif
|
||||
JAR_JSJ=jsj10.jar
|
||||
JAR_JSJ_CLASSES=$(JMODS)
|
||||
JARS=$(JAR_JSJ)
|
||||
|
||||
JAR_NAME = jsj10.jar
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
$(JAR_JSJ):
|
||||
install::
|
||||
cd $(JAVA_DESTPATH)
|
||||
@echo +++ building/updating $@
|
||||
$(ZIP_PROG) -$(COMP_LEVEL)qu $@ META-INF\build
|
||||
-for %i in ($(JAR_JSJ_CLASSES:/=\)) do @$(ZIP_PROG) -$(COMP_LEVEL)qu $@ %i\*.class
|
||||
@echo +++ building/updating $(JAR_NAME)
|
||||
-for %i in ($(JAR_JSJ_CLASSES:/=\)) do @$(ZIP_PROG) $(ZIP_FLAGS) $(JAR_NAME) %i\*.class
|
||||
cd $(MAKEDIR)
|
||||
|
||||
jars: $(JARS)
|
||||
|
||||
install:: jars
|
||||
|
||||
!ifdef REGENERATE
|
||||
install::
|
||||
cd $(JAVA_DESTPATH)
|
||||
@echo +++ updating $(DEPTH)\nav-java\stubs\classes\$(JAR_NAME) for checkin
|
||||
-for %i in ($(JAR_JSJ_CLASSES:/=\)) do @$(ZIP_PROG) $(ZIP_FLAGS) ..\..\nav-java\stubs\classes\$(JAR_NAME) %i\*.class
|
||||
cd $(MAKEDIR)
|
||||
!endif
|
||||
|
||||
javadoc:
|
||||
-mkdir $(XPDIST)\javadoc 2> NUL
|
||||
|
|
|
@ -117,8 +117,8 @@ JNI_GEN= \
|
|||
!ifdef JAVA_OR_OJI
|
||||
MODULE = java
|
||||
EXPORTS = \
|
||||
_jni/netscape_javascript_JSObject.h \
|
||||
_jni/netscape_javascript_JSException.h \
|
||||
$(JRI_GEN_DIR)\netscape_javascript_JSObject.h \
|
||||
$(JRI_GEN_DIR)\netscape_javascript_JSException.h \
|
||||
$(NULL)
|
||||
!endif
|
||||
|
||||
|
@ -130,7 +130,7 @@ EXPORTS = \
|
|||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
LINCS=$(LINCS) -I_jni \
|
||||
LINCS=$(LINCS) -I$(JRI_GEN_DIR) \
|
||||
-I$(PUBLIC)\js \
|
||||
-I$(PUBLIC)\java \
|
||||
$(NULL)
|
||||
|
@ -148,16 +148,6 @@ include <$(DEPTH)/config/rules.mak>
|
|||
|
||||
export:: INSTALL_FILES
|
||||
|
||||
!ifndef REGENERATE
|
||||
|
||||
export:: jsj10.jar
|
||||
$(MAKE_INSTALL) jsj10.jar $(JAVA_DESTPATH)
|
||||
# cd $(JAVA_DESTPATH)
|
||||
# unzip -o jsj10.jar
|
||||
# cd ..\..\js\src\liveconnect
|
||||
|
||||
!endif
|
||||
|
||||
!ifdef JAVA_OR_OJI
|
||||
libs:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
|
||||
|
@ -167,7 +157,7 @@ libs:: $(DLL)
|
|||
!ifdef REGENERATE
|
||||
|
||||
clobber::
|
||||
$(RM_R) _jni
|
||||
$(RM_R) $(JRI_GEN_DIR)
|
||||
|
||||
!endif
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ DLLNAME = js$(MOZ_BITS)$(VERSION_NUMBER)
|
|||
DLL1NAME = js1$(MOZ_BITS)$(VERSION_NUMBER)
|
||||
PDBFILE = $(DLLNAME).pdb
|
||||
MAPFILE = $(DLLNAME).map
|
||||
RESFILE = $(DLLNAME).res
|
||||
RESFILE = js$(MOZ_BITS)40.res
|
||||
DLL =.\$(OBJDIR)\$(DLLNAME).dll
|
||||
MAKE_OBJ_TYPE = DLL
|
||||
|
||||
|
|
|
@ -14,6 +14,8 @@ IGNORE_MANIFEST=1
|
|||
#//------------------------------------------------------------------------
|
||||
DEPTH= ..\..\..
|
||||
|
||||
include <$(DEPTH)/config/config.mak>
|
||||
|
||||
!ifdef MOZ_OJI
|
||||
|
||||
!ifndef MAKE_OBJ_TYPE
|
||||
|
|
|
@ -55,3 +55,10 @@ JSRCS=FolderSpec.java \
|
|||
CLASSROOT=$(DEPTH)\modules\softupdt\classes
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install::
|
||||
cd $(JAVA_DESTPATH)
|
||||
@echo +++ building/updating $(NAV_JAR_NAME)
|
||||
-for %i in ($(JSRCS:.java=.class)) do @$(ZIP_PROG) $(ZIP_FLAGS) $(NAV_JAR_NAME) $(PACKAGE:\=/)/%i
|
||||
cd $(MAKEDIR)
|
||||
|
||||
|
|
|
@ -26,6 +26,6 @@ build_classes:
|
|||
cd $(DEPTH)\modules\softupdt
|
||||
$(NMAKE) -f makefile.win
|
||||
cd $(DEPTH)\sun-java\classsrc
|
||||
$(NMAKE) -f makefile.win java40.jar
|
||||
$(NMAKE) -f makefile.win java$(VERSION_NUMBER).jar
|
||||
cd $(DEPTH)\cmd\winfe\mkfiles32
|
||||
$(NMAKE) -f mozilla.mak
|
||||
|
|
Двоичные данные
nav-java/stubs/classes/jsj10.jar
Двоичные данные
nav-java/stubs/classes/jsj10.jar
Двоичный файл не отображается.
Двоичные данные
nav-java/stubs/classes/nsplug50.jar
Двоичные данные
nav-java/stubs/classes/nsplug50.jar
Двоичный файл не отображается.
|
@ -31,7 +31,8 @@ IGNORE_MANIFEST=1
|
|||
#//------------------------------------------------------------------------
|
||||
DEPTH = ..\..
|
||||
|
||||
DIRS = jri \
|
||||
DIRS = classes \
|
||||
jri \
|
||||
include \
|
||||
src
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче