Commit 668cddb2 authored by warren%netscape.com's avatar warren%netscape.com
Browse files

Changes to build with MOZ_OJI, and optionally build NSJVM. Changes to... 

Changes to build with MOZ_OJI, and optionally build NSJVM. Changes to regenerate jar files. Changed version number to 50.
parent e81f4651

cmd/winfe/mkfiles32/mozilla.mak

+21 −8
Original line number Diff line number Diff line
@@ -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

cmd/winfe/npwplat.cpp

+14 −0
Original line number Diff line number Diff line
@@ -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

config/common.mk

+4 −7
Original line number Diff line number Diff line
@@ -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

config/config.mak

+6 −1
Original line number Diff line number Diff line
@@ -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

config/config.mk

+6 −1
Original line number Diff line number Diff line
@@ -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