** NOT PART OF TBOX BUILDS**

Upgraded blackConnect for M16.
Added make files for win


git-svn-id: svn://10.0.0.236/trunk@74148 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/xpcom/java/src/bcJavaGlobal.cpp

@@ -25,7 +25,12 @@
 
 JavaVM *bcJavaGlobal::jvm = NULL;
 
+#ifdef XP_PC
+#define PATH_SEPARATOR ';'
+#else
 #define PATH_SEPARATOR ':'
+#endif
+
 JNIEnv * bcJavaGlobal::GetJNIEnv(void) {
     JNIEnv * res;
     if (!jvm) {
@@ -53,6 +58,7 @@ void bcJavaGlobal::StartJVM() {
     /* Append USER_CLASSPATH to the default system class path */
     sprintf(classpath, "%s%c%s",
             vm_args.classpath, PATH_SEPARATOR, PR_GetEnv("CLASSPATH"));
+    printf("--[c++] classpath %s\n",classpath);
     char **props = new char*[2];
     props[0]="java.compiler=NONE";
     props[1]=0;

mozilla/java/xpcom/java/src/bcJavaGlobal.h

@@ -21,6 +21,7 @@
  */
 #ifndef __bcJavaGlobal_h_
 #define __bcJavaGlobal_h_
+#include "nscore.h"
 #include "jni.h"
 
 class bcJavaGlobal {

mozilla/java/xpcom/java/src/bcJavaMarshalToolkit.cpp

@@ -116,7 +116,7 @@ nsresult bcJavaMarshalToolkit::UnMarshal(bcIUnMarshaler *um) {
     PRUint32 paramCount = info->GetParamCount();
     jobject value;
     void * data = allocator->Alloc(sizeof(nsXPTCMiniVariant)); // sizeof(nsXPTCMiniVariant) is ok
-    for (int i = 0; i < paramCount; i++) {
+    for (unsigned int i = 0; i < paramCount; i++) {
         nsXPTParamInfo param = info->GetParam(i);
         PRBool isOut = param.IsOut();
         nsXPTType type = param.GetType();
@@ -230,6 +230,8 @@ bcXPType bcJavaMarshalToolkit::XPTType2bcXPType(uint8 type) {
 	    return bc_T_INTERFACE;
 	case nsXPTType::T_ARRAY:
 	    return bc_T_ARRAY;
+	default:
+	    return bc_T_UNDEFINED;
 	    
     }
 }

mozilla/java/xpcom/java/src/bcJavaMarshalToolkit.h

@@ -23,9 +23,10 @@
 #ifndef _bcJavaMarshalToolkit_h
 #define _bcJavaMarshalToolkit_h
 
-#include "jni.h"
-#include "nsISupports.h"
+#include "nscore.h"
 #include "xptcall.h"
+#include "nsISupports.h"
+#include "jni.h"
 #include "bcIMarshaler.h"
 #include "bcIUnMarshaler.h"
 #include "bcIORB.h"

mozilla/java/xpcom/java/src/bcJavaStub.cpp

@@ -20,15 +20,15 @@
  * Igor Kushnirskiy <idk@eng.sun.com>
  */
 
+
+#include "nscore.h"
+#include "xptcall.h"
 #include "bcJavaStub.h"
 #include "nsIInterfaceInfo.h"
 #include "nsIInterfaceInfoManager.h"
-#include "xptcall.h"
 #include "bcJavaMarshalToolkit.h"
 #include "bcJavaGlobal.h"
 #include "bcIIDJava.h"
-#include "unistd.h"
-#include "signal.h"
 
 jclass bcJavaStub::objectClass = NULL;
 jclass bcJavaStub::utilitiesClass = NULL;

mozilla/java/xpcom/java/src/bcJavaStubsAndProxies.cpp

@@ -87,7 +87,8 @@ NS_IMETHODIMP bcJavaStubsAndProxies::GetOID(char *location, bcOID *oid) {
     if (!componentLoader) {
 	Init();
     }
-    location[strlen(location)-5] = 0; //nb dirty hack. location is xyz.jar.info
+    //location[strlen(location)-5] = 0; //nb dirty hack. location is xyz.jar.info
+    strcpy(location + strlen(location)-4,"comp");
     jstring jstr = env->NewStringUTF(location);
     jobject object = env->CallStaticObjectMethod(componentLoader, loadComponentID, jstr);
     bcIStub *stub = new bcJavaStub(object);

mozilla/java/xpcom/java/src/makefile.win

@@ -0,0 +1,52 @@
+#!nmake
+#
+# 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.org code.
+#
+# 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): 
+# Igor Kushnirskiy <idk@eng.sun.com>
+#
+
+DEPTH=..\..\..\..
+
+
+MAKE_OBJ_TYPE = DLL
+MODULE=bcjavastubs
+COMPONENT = 1
+DLLNAME = bcjavastubs
+DLL=.\$(OBJDIR)\$(DLLNAME).dll
+
+EXPORTS = \
+       bcJavaStubsAndProxies.h
+
+OBJS= \
+	.\$(OBJDIR)\bcJavaMarshalToolkit.obj \
+	.\$(OBJDIR)\bcJavaStub.obj \
+	.\$(OBJDIR)\bcJavaGlobal.obj \
+	.\$(OBJDIR)\bcJavaStubsAndProxies.obj \
+	.\$(OBJDIR)\bcIIDJava.obj \
+	.\$(OBJDIR)\org_mozilla_xpcom_Utilities.obj \
+	$(NULL)
+
+LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib $(JDKHOME)\lib\jvm.lib
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
+clobber::
+	rm -f $(DIST)\bin\components\$(DLLNAME).dll