Made changes to allow building on jdk1.1.7 or jdk1.2. Basically, accounted

for the presence or absence of a classes.zip file.

java/README

@@ -15,8 +15,8 @@ How To Build:
 * make it so the directory in which this file resides is a child of your
   top level mozilla directory
 
-* Copy the files .\webclient\config\buildpkg.bat and
-  .\webclient\config\outofdate.pl to mozilla\config.  These file were
+* Copy the files .\config\buildpkg.bat and
+  .\config\outofdate.pl to mozilla\config.  These file were
   modified after M8 and the modifications are required to build java.
 
 * make sure the environment var JDKHOME is set to your jdk installation

java/changelo

@@ -0,0 +1,5 @@
+Fri Jul 30 14:57:28 1999  Ed Burns  <Ed Burns <ed.burns@sun.com>>
+
+	* Made necessary changes to build files to build with jdk1.1.7 or
+ 	jdk1.2.2.
+	

java/config/localdefs.mak

@@ -0,0 +1,17 @@
+# this file contains defs that should be in the top level mozilla/config
+# directory, but may not be there due to tree update issues.
+
+JAVA=$(JDKHOME)\bin\java
+JAVAH=$(JDKHOME)\bin\JAVAH
+JAVAH_FLAGS=-jni -classpath $(JAVAC_CLASSPATH)
+
+
+!ifndef JAVA_HOME
+JAVA_HOME=$(JDKHOME)
+!endif
+
+JAVA_DESTPATH = $(MOZ_SRC)\mozilla\dist\classes
+DEFAULT_JAVA_SOURCEPATH = $(MOZ_SRC)\mozilla\sun-java\classsrc
+JAVA_SOURCEPATH = $(MOZ_SRC)\mozilla\sun-java\classsrc11;$(DEFAULT_JAVA_SOURCEPATH)
+JAVAC_ZIP=$(JAVA_HOME)\lib\classes.zip
+

java/util/README

@@ -14,15 +14,7 @@ Requirements:
 
 How To Build:
 
-* make it so the directory in which this file resides is a child of your
-  top level mozilla\java directory
-
-* Copy the files ..\webclient\config\buildpkg.bat and
-  ..\webclient\config\outofdate.pl to mozilla\config.  These file were
-  modified after M8 and the modifications are required to build java.
-
-* make sure the environment var JDKHOME is set to your jdk installation
-  directory, ie SET JDKHOME=C:\jdk1.1.8
+* Follow the directions in ..\README
 
 * type "nmake /f makefile.win all" and hope for the best
 

java/util/changelo

@@ -1,3 +1,7 @@
+Fri Jul 30 14:40:32 1999  Ed Burns  <Ed Burns <ed.burns@sun.com>>
+
+	* Modified makefile to reference new location for localdefs.mak: 
+	
 Wed Jul 28 12:18:34 1999    <edburns@acm.org>
 
 	* Created initial distribution and README

java/util/classes/Makefile.win

@@ -38,6 +38,9 @@ NO_CAFE=1
 
 include <$(DEPTH)\config\config.mak>
 
+# for compatibility
+include <$(DEPTH)\java\config\localdefs.mak>
+
 JAR_MJUTIL_CLASSES = org\mozilla\util 
 
 !ifdef JAVA_OR_NSJVM

java/webclient/README

@@ -17,15 +17,7 @@ Requirements:
 
 How To Build:
 
-* make it so the directory in which this file resides is a child of your
-  top level mozilla\java directory
-
-* Copy the files .\config\buildpkg.bat and .\config\outofdate.pl to
-  mozilla\config.  These file were modified after M8 and the
-  modifications are required to build java.
-
-* make sure the environment var JDKHOME is set to your jdk installation
-  directory, ie SET JDKHOME=C:\jdk1.1.8
+* Follow the directions in ..\README
 
 * type "nmake /f makefile.win all" and hope for the best
 

java/webclient/changelo

@@ -1,3 +1,7 @@
+Fri Jul 30 14:40:32 1999  Ed Burns  <Ed Burns <ed.burns@sun.com>>
+
+	* Modified makefile to reference new location for localdefs.mak: 
+	
 Wed Jul 28 12:17:30 1999    <edbuns@acm.org>
 
 	* Renamed MozWebShell to webclient.BrowserControl

java/webclient/classes/Makefile.win

@@ -36,6 +36,9 @@ NO_CAFE=1
 
 include <$(DEPTH)\config\config.mak>
 
+# for compatibility
+include <$(DEPTH)\java\config\localdefs.mak>
+
 JAR_WEBCLIENT_CLASSES = org\mozilla\webclient \
 	org\mozilla\webclient\test 
 

java/webclient/config/localdefs.mak

@@ -1,4 +0,0 @@
-JAVA=$(JDKHOME)\bin\java
-JAVAH=$(JDKHOME)\bin\JAVAH
-JAVAHFLAGS=-jni -classpath $(JAVAC_CLASSPATH) -d .
-

java/webclient/src/Makefile.win

@@ -57,7 +57,7 @@ WIN_LIBS = \
 
 include <$(DEPTH)\config\rules.mak>
 
-include <..\config\localdefs.mak>
+include <$(DEPTH)\java\config\localdefs.mak>
 
 !CMDSWITCHES -S