From ff727cf746bd76b31679d84044270c659ecadea3 Mon Sep 17 00:00:00 2001
From: "idk%eng.sun.com" <idk%eng.sun.com>
Date: Wed, 21 Feb 2001 09:09:55 +0000
Subject: [PATCH] (not part of TBOX builds) Fix for 69234

---
 java/xpcom/connect/src/makefile.win     | 62 -------------------------
 java/xpcom/connect/xpcom/makefile.win   |  2 +-
 java/xpcom/env.bat                      |  0
 java/xpcom/java/components/makefile.win |  6 +--
 java/xpcom/java/loader/makefile.win     | 48 -------------------
 java/xpcom/java/src/makefile.win        |  2 +-
 java/xpcom/java/test/makefile.win       |  4 +-
 java/xpcom/java/xpidl/makefile.win      |  2 +-
 java/xpcom/xpcom/makefile.win           |  2 +-
 9 files changed, 9 insertions(+), 119 deletions(-)
 create mode 100755 java/xpcom/env.bat

diff --git a/java/xpcom/connect/src/makefile.win b/java/xpcom/connect/src/makefile.win
index 7e3931cafc3..e69de29bb2d 100644
--- a/java/xpcom/connect/src/makefile.win
+++ b/java/xpcom/connect/src/makefile.win
@@ -1,62 +0,0 @@
-#!nmake
-#
-# 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): 
-# Igor Kushnirskiy <idk@eng.sun.com>
-#
-
-DEPTH=..\..\..\..
-
-MAKE_OBJ_TYPE	= lib
-LIBRARY_NAME = bcorbcore
-LIB=.\$(OBJDIR)\bcorbcore.lib
-
-OBJS= 			\
-	.\$(OBJDIR)\Allocator.obj \
-	.\$(OBJDIR)\Call.obj \
-	.\$(OBJDIR)\Marshaler.obj \
-	.\$(OBJDIR)\ORB.obj \
-	.\$(OBJDIR)\UnMarshaler.obj \
-	.\$(OBJDIR)\util.obj \
-	$(NULL)
-
-EXPORTS = \
-	  ..\public\bcIORB.h \
-	  ..\public\bcDefs.h \
-	  ..\public\bcICall.h \
-	  ..\public\bcIUnMarshaler.h \
-	  ..\public\bcIAllocator.h \
-	  ..\public\bcIMarshaler.h \
-	  ..\public\bcIStub.h \
-	  ..\public\bcIThread.h
-
-LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
-
-INCS = \
-	-I..\public -I..\src \
-	$(INCS) \
-	$(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(LIB)
-	$(MAKE_INSTALL)  $(LIB) $(DIST)\lib
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
\ No newline at end of file
diff --git a/java/xpcom/connect/xpcom/makefile.win b/java/xpcom/connect/xpcom/makefile.win
index 45a7e7c02aa..79a1f813a34 100644
--- a/java/xpcom/connect/xpcom/makefile.win
+++ b/java/xpcom/connect/xpcom/makefile.win
@@ -44,4 +44,4 @@ include <$(DEPTH)\config\rules.mak>
 install:: $(DLL) 
 	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
 clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
\ No newline at end of file
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"
diff --git a/java/xpcom/env.bat b/java/xpcom/env.bat
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/java/xpcom/java/components/makefile.win b/java/xpcom/java/components/makefile.win
index 2d6ef23073c..ba383b7dbfe 100644
--- a/java/xpcom/java/components/makefile.win
+++ b/java/xpcom/java/components/makefile.win
@@ -43,7 +43,7 @@ LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
 include <$(DEPTH)\config\rules.mak>
 
 COMPONENT=bcBlackConnectInit
-CLASSES=bcIBlackConnectInit.class
+CLASSES=bcIBlackConnectInit.class bcBlackConnectInit.class
 
 $(COMPONENT).jar.comp: manifest $(CLASSES)
 	$(JDKHOME)\bin\jar cvfm $(COMPONENT).jar.comp  manifest *.class
@@ -60,7 +60,7 @@ install-component: $(COMPONENT).jar.comp $(COMPONENT).jar.info $(DLL)
 clobber-java:
 	-del *.class *.jar.comp
 clobber:: clobber-java
-	rm $(DIST)\bin\components\$(DLLNAME).dll
-	rm $(DIST)\bin\components\$(COMPONENT).jar.*
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"
+	rm -f "$(DIST)\bin\components\$(COMPONENT).jar.*"
 clobber_all:: clobber-java
 install:: install-component
diff --git a/java/xpcom/java/loader/makefile.win b/java/xpcom/java/loader/makefile.win
index b23a1e19ead..e69de29bb2d 100644
--- a/java/xpcom/java/loader/makefile.win
+++ b/java/xpcom/java/loader/makefile.win
@@ -1,48 +0,0 @@
-#!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=bcjavaloader
-COMPONENT    = 1
-DLLNAME = bcjavaloader
-
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
-
-OBJS= \
-	.\$(OBJDIR)\bcJavaComponentLoader.obj \
-	.\$(OBJDIR)\bcJavaModule.obj \
-	.\$(OBJDIR)\bcJavaComponentFactory.obj \
-	$(NULL)
-
-LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
-
-LINCS=-I$(JDKHOME)\include -I$(JDKHOME)\include\win32
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)	
-	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
-clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
\ No newline at end of file
diff --git a/java/xpcom/java/src/makefile.win b/java/xpcom/java/src/makefile.win
index d37ea944f37..0844597b3f2 100644
--- a/java/xpcom/java/src/makefile.win
+++ b/java/xpcom/java/src/makefile.win
@@ -52,4 +52,4 @@ include <$(DEPTH)\config\rules.mak>
 install:: $(DLL)
 	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
 clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"
diff --git a/java/xpcom/java/test/makefile.win b/java/xpcom/java/test/makefile.win
index 6b916a56450..650d93edd28 100644
--- a/java/xpcom/java/test/makefile.win
+++ b/java/xpcom/java/test/makefile.win
@@ -57,7 +57,7 @@ install-component: bcJavaSample.jar.comp bcJavaSample.jar.info $(DLL)
 clobber-java:
 	-del *.class *.jar.comp
 clobber:: clobber-java
-	rm $(DIST)\bin\components\$(DLLNAME).dll
-	rm $(DIST)\bin\components\bcJavaSample.jar.*
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"
+	rm -f "$(DIST)\bin\components\bcJavaSample.jar.*"
 clobber_all:: clobber-java
 install:: install-component
\ No newline at end of file
diff --git a/java/xpcom/java/xpidl/makefile.win b/java/xpcom/java/xpidl/makefile.win
index 82b3e0a3330..23b842dee0d 100644
--- a/java/xpcom/java/xpidl/makefile.win
+++ b/java/xpcom/java/xpidl/makefile.win
@@ -63,6 +63,6 @@ export:: $(PROGRAM)
 	$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
 
 clobber::
-	rm -f $(DIST)\bin\xpidl.exe
+	rm -f "$(DIST)\bin\xpidl.exe"
 
 $(PROGRAM):: $(OBJS) $(MYLIBS)
diff --git a/java/xpcom/xpcom/makefile.win b/java/xpcom/xpcom/makefile.win
index 459d856a695..1cad9d25127 100644
--- a/java/xpcom/xpcom/makefile.win
+++ b/java/xpcom/xpcom/makefile.win
@@ -52,4 +52,4 @@ include <$(DEPTH)\config\rules.mak>
 install:: $(DLL)
 	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
 clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"