Necessary changes to get webclient running on Win32 with new nsIProfile stuff.

java/Makefile.in

@@ -40,6 +40,7 @@ ifneq ($(BUILD_WEBCLIENT_ONLY),)
 DIRS = 	external \
 	util \
 	dom \
+	xpcom \
 	webclient
 else
 ifneq ($(BUILD_BLACKCONNECT_ONLY),)
@@ -51,9 +52,9 @@ ifneq ($(BUILD_BLACKWOOD),)
 DIRS =	external \
 	util \
 	dom \
+	xpcom \
 	webclient \
-	plugins \
-	xpcom
+	plugins 
 endif
 endif
 endif

java/Makefile.win

@@ -50,6 +50,7 @@ DIRS =	external \
 DIRS = 	external \
 	util \
 	dom \
+	xpcom \
 	webclient
 !else
 !ifdef BUILD_BLACKCONNECT_ONLY
@@ -61,9 +62,9 @@ DIRS =	external \
 DIRS  = external \
 	util \
 	dom \
+	xpcom \
 	webclient \
-	plugins \
-	xpcom
+	plugins 
 !endif
 !endif
 !endif

java/webclient/import/Makefile.win

@@ -37,10 +37,10 @@ include ..\config\rules.mak
 import: $(JAVAXPIDLSRCS)
 
 $(JAVAXPIDLSRCS) :
-	cp $(DEPTH)\dist\idl\$(@F) .
+	copy $(DEPTH)\dist\idl\$(@F) .
 
 mvjava2stubs:
-	move *.java ..\classes_spec\org\mozilla\webclient\stubs
+	copy *.java ..\classes_spec\org\mozilla\webclient\stubs
 
 chPackageinStubs:
 	perl.exe chPackage.pl win nsIProfile.java "org.mozilla.webclient.stubs"

java/webclient/import/chPackage.pl

@@ -61,7 +61,7 @@ if ($ARGV[0] eq "unix") {
   exec $cmd;
 }
 else {
-  $cmd = "move tmp.tmp $ARGV[1]";
+  $cmd = "copy tmp.tmp $ARGV[1]";
   exec $cmd;
   $cmd = "del tmp.tmp";
   exec $cmd;