diff --git a/mozilla/java/README b/mozilla/java/README index 74f5b9eebf2..23466a9009e 100644 --- a/mozilla/java/README +++ b/mozilla/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 diff --git a/mozilla/java/changelo b/mozilla/java/changelo new file mode 100644 index 00000000000..c354e5a9966 --- /dev/null +++ b/mozilla/java/changelo @@ -0,0 +1,5 @@ +Fri Jul 30 14:57:28 1999 Ed Burns > + + * Made necessary changes to build files to build with jdk1.1.7 or + jdk1.2.2. + diff --git a/mozilla/java/webclient/config/buildpkg.bat b/mozilla/java/config/buildpkg.bat similarity index 100% rename from mozilla/java/webclient/config/buildpkg.bat rename to mozilla/java/config/buildpkg.bat diff --git a/mozilla/java/config/localdefs.mak b/mozilla/java/config/localdefs.mak new file mode 100644 index 00000000000..e0f7162b3ec --- /dev/null +++ b/mozilla/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 + diff --git a/mozilla/java/webclient/config/outofdate.pl b/mozilla/java/config/outofdate.pl similarity index 100% rename from mozilla/java/webclient/config/outofdate.pl rename to mozilla/java/config/outofdate.pl diff --git a/mozilla/java/util/README b/mozilla/java/util/README index ce76da7c3d7..4e3a3dabc72 100644 --- a/mozilla/java/util/README +++ b/mozilla/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 diff --git a/mozilla/java/util/changelo b/mozilla/java/util/changelo index b8a97b3da10..080c90cdc2e 100644 --- a/mozilla/java/util/changelo +++ b/mozilla/java/util/changelo @@ -1,3 +1,7 @@ +Fri Jul 30 14:40:32 1999 Ed Burns > + + * Modified makefile to reference new location for localdefs.mak: + Wed Jul 28 12:18:34 1999 * Created initial distribution and README diff --git a/mozilla/java/util/classes/Makefile.win b/mozilla/java/util/classes/Makefile.win index adc7ae8979e..76f50339c34 100644 --- a/mozilla/java/util/classes/Makefile.win +++ b/mozilla/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 diff --git a/mozilla/java/webclient/README b/mozilla/java/webclient/README index 0bdf1e362a8..5163d236381 100644 --- a/mozilla/java/webclient/README +++ b/mozilla/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 diff --git a/mozilla/java/webclient/changelo b/mozilla/java/webclient/changelo index 8dc656e6693..f49bbd0db8f 100644 --- a/mozilla/java/webclient/changelo +++ b/mozilla/java/webclient/changelo @@ -1,3 +1,7 @@ +Fri Jul 30 14:40:32 1999 Ed Burns > + + * Modified makefile to reference new location for localdefs.mak: + Wed Jul 28 12:17:30 1999 * Renamed MozWebShell to webclient.BrowserControl diff --git a/mozilla/java/webclient/classes/Makefile.win b/mozilla/java/webclient/classes/Makefile.win index 35128e21da4..3d951274f3d 100644 --- a/mozilla/java/webclient/classes/Makefile.win +++ b/mozilla/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 diff --git a/mozilla/java/webclient/config/localdefs.mak b/mozilla/java/webclient/config/localdefs.mak deleted file mode 100644 index aa968f95c6a..00000000000 --- a/mozilla/java/webclient/config/localdefs.mak +++ /dev/null @@ -1,4 +0,0 @@ -JAVA=$(JDKHOME)\bin\java -JAVAH=$(JDKHOME)\bin\JAVAH -JAVAHFLAGS=-jni -classpath $(JAVAC_CLASSPATH) -d . - diff --git a/mozilla/java/webclient/src/Makefile.win b/mozilla/java/webclient/src/Makefile.win index bcb685b566a..4776b02891e 100644 --- a/mozilla/java/webclient/src/Makefile.win +++ b/mozilla/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