From 7b929df0cf31379c64843c58f4b8d9c7d569ae10 Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Thu, 24 May 2001 22:38:40 +0000 Subject: [PATCH] Necessary changes to get webclient running on Win32 with new nsIProfile stuff. git-svn-id: svn://10.0.0.236/trunk@95883 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/java/Makefile.in | 5 +++-- mozilla/java/Makefile.win | 5 +++-- mozilla/java/webclient/import/Makefile.win | 4 ++-- mozilla/java/webclient/import/chPackage.pl | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mozilla/java/Makefile.in b/mozilla/java/Makefile.in index f3aba6ac18b..ea6a8fc3442 100644 --- a/mozilla/java/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/java/Makefile.win b/mozilla/java/Makefile.win index 57b7690e2ff..5ae1364491c 100644 --- a/mozilla/java/Makefile.win +++ b/mozilla/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 diff --git a/mozilla/java/webclient/import/Makefile.win b/mozilla/java/webclient/import/Makefile.win index 4f5e5216bce..faea1254824 100644 --- a/mozilla/java/webclient/import/Makefile.win +++ b/mozilla/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" diff --git a/mozilla/java/webclient/import/chPackage.pl b/mozilla/java/webclient/import/chPackage.pl index 7e41f8f3e8b..1500857c9d3 100755 --- a/mozilla/java/webclient/import/chPackage.pl +++ b/mozilla/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;