69234 - makefile.win is missing a dependency

Status: VERIFIED FIXED

(Core Graveyard :: Java to XPCOM Bridge, defect)

Description

[Jon Smirl]

The classes line in makefile.win does not include bcBlackConnectInit.class

should be:
CLASSES=bcIBlackConnectInit.class bcBlackConnectInit.class

nmake clobber does not work right either, there is some problem with back and 
forward slash issues. The rm doesn't remove in the right directory because of 
this.

Comment 1

[Igor Kushnirskiy]

Here is a fix:
--
Index: connect/src/makefile.win
===================================================================
RCS file: /cvsroot/mozilla/java/xpcom/connect/src/makefile.win,v
retrieving revision 1.1
diff -u -r1.1 makefile.win
--- makefile.win	2000/07/13 03:35:52	1.1
+++ makefile.win	2001/02/21 09:05:41
@@ -59,4 +59,4 @@
 install:: $(LIB)
 	$(MAKE_INSTALL)  $(LIB) $(DIST)\lib
 clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
\ No newline at end of file
+	rm -f "$(DIST)\lib\$(LIBRARY_NAME).lib"
Index: connect/xpcom/makefile.win
===================================================================
RCS file: /cvsroot/mozilla/java/xpcom/connect/xpcom/makefile.win,v
retrieving revision 1.1
diff -u -r1.1 makefile.win
--- makefile.win	2000/07/13 03:35:54	1.1
+++ makefile.win	2001/02/21 09:05:41
@@ -44,4 +44,4 @@
 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"
Index: java/components/makefile.win
===================================================================
RCS file: /cvsroot/mozilla/java/xpcom/java/components/makefile.win,v
retrieving revision 1.2
diff -u -r1.2 makefile.win
--- makefile.win	2001/01/18 22:55:48	1.2
+++ makefile.win	2001/02/21 09:05:42
@@ -43,7 +43,7 @@
 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 @@
 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
Index: java/loader/makefile.win
===================================================================
RCS file: /cvsroot/mozilla/java/xpcom/java/loader/makefile.win,v
retrieving revision 1.2
diff -u -r1.2 makefile.win
--- makefile.win	2000/09/12 10:10:16	1.2
+++ makefile.win	2001/02/21 09:05:42
@@ -45,4 +45,4 @@
 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"
Index: java/src/makefile.win
===================================================================
RCS file: /cvsroot/mozilla/java/xpcom/java/src/makefile.win,v
retrieving revision 1.3
diff -u -r1.3 makefile.win
--- makefile.win	2000/12/21 01:34:47	1.3
+++ makefile.win	2001/02/21 09:05:42
@@ -52,4 +52,4 @@
 install:: $(DLL)
 	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
 clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"
Index: java/test/makefile.win
===================================================================
RCS file: /cvsroot/mozilla/java/xpcom/java/test/makefile.win,v
retrieving revision 1.2
diff -u -r1.2 makefile.win
--- makefile.win	2000/09/12 10:10:19	1.2
+++ makefile.win	2001/02/21 09:05:42
@@ -57,7 +57,7 @@
 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
Index: java/xpidl/makefile.win
===================================================================
RCS file: /cvsroot/mozilla/java/xpcom/java/xpidl/makefile.win,v
retrieving revision 1.2
diff -u -r1.2 makefile.win
--- makefile.win	2000/10/06 14:17:53	1.2
+++ makefile.win	2001/02/21 09:05:42
@@ -63,6 +63,6 @@
 	$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
 
 clobber::
-	rm -f $(DIST)\bin\xpidl.exe
+	rm -f "$(DIST)\bin\xpidl.exe"
 
 $(PROGRAM):: $(OBJS) $(MYLIBS)
Index: xpcom/makefile.win
===================================================================
RCS file: /cvsroot/mozilla/java/xpcom/xpcom/makefile.win,v
retrieving revision 1.4
diff -u -r1.4 makefile.win
--- makefile.win	2001/01/18 22:36:55	1.4
+++ makefile.win	2001/02/21 09:05:42
@@ -52,4 +52,4 @@
 install:: $(DLL)
 	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
 clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
+	rm -f "$(DIST)\bin\components\$(DLLNAME).dll"

--
Fix integreated into the trunk.
I am closing this bug as fixed

Comment 2

[Alexei V. Mokeev]

Mark VERIFIED