diff --git a/mozilla/java/Makefile.in b/mozilla/java/Makefile.in deleted file mode 100644 index dbb378e7e6b..00000000000 --- a/mozilla/java/Makefile.in +++ /dev/null @@ -1,71 +0,0 @@ -#!gmake -# The contents of this file are subject to the Netscape Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/NPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): - -DEPTH = .. -topsrcdir = @top_srcdir@ -VPATH = @srcdir@ -srcdir = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -ifneq ($(BUILD_DOM_ONLY),) -DIRS = external \ - util \ - dom -else -ifneq ($(BUILD_PLUGLETS_ONLY),) -DIRS = external \ - util \ - dom \ - plugins -else -ifneq ($(BUILD_WEBCLIENT_ONLY),) -DIRS = external \ - util \ - dom \ - webclient \ - build -else -ifneq ($(BUILD_BLACKCONNECT_ONLY),) -DIRS = external \ - util \ - xpcom -else -ifneq ($(BUILD_BLACKWOOD),) -DIRS = external \ - util \ - dom \ - xpcom \ - webclient \ - plugins -endif -endif -endif -endif -endif - - -ifneq ($(PACKAGE_BUILD),) -DIRS += build -endif - - -include $(topsrcdir)/config/rules.mk - diff --git a/mozilla/java/Makefile.win b/mozilla/java/Makefile.win deleted file mode 100644 index 6d64331aad0..00000000000 --- a/mozilla/java/Makefile.win +++ /dev/null @@ -1,81 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Sun Microsystems, -# Inc. Portions created by Sun are -# Copyright (C) 1999 Sun Microsystems, Inc. All -# Rights Reserved. -# -# Contributor(s): - -IGNORE_MANIFEST=1 -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java enhancers to mozilla -#// -#//------------------------------------------------------------------------ - - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH = .. - -!ifdef BUILD_DOM_ONLY -DIRS = external \ - util \ - dom -!else -!ifdef BUILD_PLUGLETS_ONLY -DIRS = external \ - util \ - dom \ - plugins -!else -!ifdef BUILD_WEBCLIENT_ONLY -DIRS = external \ - util \ - dom \ - webclient \ - build -!else -!ifdef BUILD_BLACKCONNECT_ONLY -DIRS = external \ - util \ - xpcom -!else -!ifdef BUILD_BLACKWOOD -DIRS = external \ - util \ - dom \ - xpcom \ - webclient \ - plugins -!endif -!endif -!endif -!endif -!endif - -!ifdef PACKAGE_BUILD -DIRS = $(DIRS) build -!endif - -include <$(DEPTH)\config\rules.mak> - -edburns: - echo $(DIRS) diff --git a/mozilla/java/build.properties.sample b/mozilla/java/build.properties.sample index 70929bbabf9..d04c49c82e8 100644 --- a/mozilla/java/build.properties.sample +++ b/mozilla/java/build.properties.sample @@ -1,2 +1,3 @@ debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n build.unix.classes=true +build.home=/home/edburns/Projects/mozilla/NETSCAPE_7_0_RTM_RELEASE/mozilla/dist/classes diff --git a/mozilla/java/build.xml b/mozilla/java/build.xml index 6954b31300f..63c9d78641d 100644 --- a/mozilla/java/build.xml +++ b/mozilla/java/build.xml @@ -49,16 +49,10 @@ - - - - - - + depends="external,util,dom,webclient"/> @@ -75,12 +69,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mozilla/java/build/build.xml b/mozilla/java/build/build.xml new file mode 100644 index 00000000000..40a18181555 --- /dev/null +++ b/mozilla/java/build/build.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mozilla/java/external/Makefile.in b/mozilla/java/external/Makefile.in deleted file mode 100644 index 158c0b65acd..00000000000 --- a/mozilla/java/external/Makefile.in +++ /dev/null @@ -1,49 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Sun Microsystems, -# Inc. Portions created by Sun are -# Copyright (C) 1999 Sun Microsystems, Inc. All -# Rights Reserved. -# -# Contributor(s): - -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java enhancers to mozilla -#// -#//------------------------------------------------------------------------ - - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH = ../.. -topsrcdir = $(DEPTH) - - -export:: - if test ! -d $(DEPTH)/dist/classes ; then mkdir $(DEPTH)/dist/classes ; else true ; fi ; - cd $(DEPTH)/dist/classes ; \ - $(JDKHOME)/bin/jar -xf ../../java/external/dom2.jar ; - - -clobber_all:: - if test -d $(DEPTH)/dist/classes/org/w3c ; then rm -Rf $(DEPTH)/dist/classes/org/w3c ; else true ; fi ; - - -include $(topsrcdir)/config/rules.mk diff --git a/mozilla/java/external/Makefile.win b/mozilla/java/external/Makefile.win deleted file mode 100644 index bf31690b0f2..00000000000 --- a/mozilla/java/external/Makefile.win +++ /dev/null @@ -1,46 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Sun Microsystems, -# Inc. Portions created by Sun are -# Copyright (C) 1999 Sun Microsystems, Inc. All -# Rights Reserved. -# -# Contributor(s): - -IGNORE_MANIFEST=1 -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java enhancers to mozilla -#// -#//------------------------------------------------------------------------ - - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH = ..\.. - -include <$(DEPTH)\config\rules.mak> - -export:: - if not exist $(DEPTH)\dist\classes $(MKDIR) $(DEPTH)\dist\classes - cd $(DEPTH)\dist\classes - $(JDKHOME)\bin\jar -xf ..\..\java\external\dom2.jar - -clobber_all:: - $(RM) -rf $(DEPTH)\dist\classes\org\w3c diff --git a/mozilla/java/makefiles b/mozilla/java/makefiles index a1311f6e5d4..ff07d0015cb 100644 --- a/mozilla/java/makefiles +++ b/mozilla/java/makefiles @@ -1,17 +1,8 @@ -java/Makefile -java/util/Makefile -java/util/classes/Makefile java/build/Makefile java/dom/Makefile java/dom/classes/Makefile java/dom/jni/Makefile java/dom/src/Makefile -java/xpcom/Makefile -java/webclient/Makefile -java/webclient/classes_spec/Makefile java/webclient/src_share/Makefile java/webclient/src_moz/Makefile java/webclient/src_moz/motif/Makefile -java/pluggable-jvm/wf_moz6/Makefile -java/pluggable-jvm/wf_moz6/public/Makefile -java/pluggable-jvm/wf_moz6/src/Makefile diff --git a/mozilla/java/util/Makefile.in b/mozilla/java/util/Makefile.in deleted file mode 100644 index 2786aecb529..00000000000 --- a/mozilla/java/util/Makefile.in +++ /dev/null @@ -1,47 +0,0 @@ -#!gmake -# The contents of this file are subject to the Netscape Public License -# Version 1.0 (the "NPL"); you may not use this file except in -# compliance with the NPL. You may obtain a copy of the NPL at -# http://www.mozilla.org/NPL/ -# -# Software distributed under the NPL is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL -# for the specific language governing rights and limitations under the -# NPL. -# -# The Initial Developer of this code under the NPL is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights -# Reserved. - -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java utility classes -#// -#//------------------------------------------------------------------------ - - -DEPTH = ../.. -topsrcdir = @top_srcdir@ -VPATH = @srcdir@ -srcdir = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -DIRS= \ - classes \ - $(NULL) - - -rm_java: -ifeq ($(PACKAGE_BUILD),) - rm -Rf $(topsrcdir)/dist/classes/org/mozilla/util -endif # PACKAGE_BUILD - - -clobber_all::rm_java - - -include $(topsrcdir)/config/rules.mk - - diff --git a/mozilla/java/util/Makefile.unix b/mozilla/java/util/Makefile.unix deleted file mode 100644 index 849cc8cf6ee..00000000000 --- a/mozilla/java/util/Makefile.unix +++ /dev/null @@ -1,18 +0,0 @@ -# PENDING(mark): We should be using the mozilla build system, but right now this -# will do the trick -# PENDING(mark): I need to make this makefile a little smarter. Right now -# it javac's all the java files each time you do a 'make' -# -# If you're using JDK 1.2 -JDK_LOCATION = ${JDKHOME} -JAVAC = ${JDK_LOCATION}/bin/javac -JAVAH = ${JDK_LOCATION}/bin/javah -OUTPUT_DIR = ../../dist/classes -# If you're using JDK 1.2 -CLASSES = ${OUTPUT_DIR}:${JDK_LOCATION}/lib/tools.jar:${JDK_LOCATION}/lib/rt.jar -JAVA_FILES = ./classes/org/mozilla/util/*.java -MKDIR = mkdir -p - -all: - ${MKDIR} ${OUTPUT_DIR} - ${JAVAC} -g -classpath ${CLASSES} -d ${OUTPUT_DIR} ${JAVA_FILES} diff --git a/mozilla/java/util/Makefile.win b/mozilla/java/util/Makefile.win deleted file mode 100644 index ba4bec07554..00000000000 --- a/mozilla/java/util/Makefile.win +++ /dev/null @@ -1,40 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is "The Lighthouse Foundation Classes (LFC)" -# -# The Initial Developer of the Original Code is Sun Microsystems, -# Inc. Portions created by Sun are -# Copyright (C) 1997, 1998, 1999 Sun Microsystems, Inc. All -# Rights Reserved. -# -# Contributor(s): - -IGNORE_MANIFEST=1 -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java utility classes -#// -#//------------------------------------------------------------------------ - - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH = ..\.. - -DIRS = classes - -include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/java/util/build.xml b/mozilla/java/util/build.xml index d0d1a75b17f..63aa6e8d751 100644 --- a/mozilla/java/util/build.xml +++ b/mozilla/java/util/build.xml @@ -52,12 +52,6 @@ - - - - - - diff --git a/mozilla/java/util/classes/Makefile.in b/mozilla/java/util/classes/Makefile.in deleted file mode 100644 index a95a678ce0c..00000000000 --- a/mozilla/java/util/classes/Makefile.in +++ /dev/null @@ -1,66 +0,0 @@ -#!gmake -# -# The contents of this file are subject to the Netscape Public License -# Version 1.0 (the "NPL"); you may not use this file except in -# compliance with the NPL. You may obtain a copy of the NPL at -# http://www.mozilla.org/NPL/ -# -# Software distributed under the NPL is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL -# for the specific language governing rights and limitations under the -# NPL. -# -# The Initial Developer of this code under the NPL is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights -# Reserved. - - - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = java-util - -JMODS = org/mozilla/util - -# -# JDIRS is dependant on JAVA_DESTPATH in config/rules.m[a]k. -# Be sure to touch that directory if you add a new directory to -# JDIRS, or else it will not build. FIXME -# -JDIRS = $(JMODS) - -JAR_JSJ = jsj10.jar -JAR_JSJ_CLASSES = $(JMODS) - -# -# jars to build at install time -# -JARS = $(JAR_JSJ) - -JAVA_OR_NSJVM = 1 - -include $(topsrcdir)/config/rules.mk - -JAVA_SOURCEPATH = $(topsrcdir)/java/util/classes - -doc:: - $(JAVADOC) -d $(DIST)/doc org.mozilla.util - -natives_list:: FORCE - rm -rf $@ - find . -name "*.class" -print | sed 's@\./\(.*\)\.class$$@\1@' | \ - sed 's@/@.@g' | xargs $(JVH) -natives | sort > $@ - -check_natives:: natives_list - rm -f found_natives - nm -B ../$(OBJDIR)/*.o \ - | egrep "Java.*_stub" | awk '{ print $$3; }' | sort > found_natives - diff found_natives natives_list - -FORCE: diff --git a/mozilla/java/util/classes/Makefile.win b/mozilla/java/util/classes/Makefile.win deleted file mode 100644 index 3a42bacb232..00000000000 --- a/mozilla/java/util/classes/Makefile.win +++ /dev/null @@ -1,59 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is "The Lighthouse Foundation Classes (LFC)" -# -# The Initial Developer of the Original Code is Sun Microsystems, -# Inc. Portions created by Sun are -# Copyright (C) 1997, 1998, 1999 Sun Microsystems, Inc. All -# Rights Reserved. -# -# Contributor(s): - -IGNORE_MANIFEST=1 -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java util classes -#// -#//------------------------------------------------------------------------ - - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH= ..\..\.. - -# PENDING(edburns): find out where this should really get defined -JAVA_OR_NSJVM=1 -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 -JDIRS = $(JAR_MJUTIL_CLASSES) -!endif - -MJUTIL_JAR_NAME=mjutil$(VERSION_NUMBER).jar - -JAVAC_PROG=$(JDKHOME)\bin\javac -include <$(DEPTH)\config\javarules.mak> -include <$(DEPTH)\config\rules.mak> - - diff --git a/mozilla/java/webclient/Makefile.in b/mozilla/java/webclient/Makefile.in deleted file mode 100644 index b1f62b000a2..00000000000 --- a/mozilla/java/webclient/Makefile.in +++ /dev/null @@ -1,43 +0,0 @@ -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java/webclient tree -#// -#//------------------------------------------------------------------------ - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH=../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -#//------------------------------------------------------------------------ -#// -#// Specify any "command" targets. (ie. DIRS, INSTALL_FILES, ...) -#// (these must come before the common makefiles are included) -#// -#// DIRS - There are subdirectories to process -#// -#//------------------------------------------------------------------------ - - -#//------------------------------------------------------------------------ -#// -#// Include the common makefile rules -#// -#//------------------------------------------------------------------------ -include $(topsrcdir)/config/rules.mk - -clobber_all:: clean - -clean:: - ant clean - -libs:: - ant diff --git a/mozilla/java/webclient/Makefile.win b/mozilla/java/webclient/Makefile.win deleted file mode 100644 index 69eeffe7a1d..00000000000 --- a/mozilla/java/webclient/Makefile.win +++ /dev/null @@ -1,65 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Sun Microsystems, -# Inc. Portions created by Sun are -# Copyright (C) 1999 Sun Microsystems, Inc. All -# Rights Reserved. -# -# Contributor(s): - -IGNORE_MANIFEST=1 -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java wrapper to mozilla -#// -#//------------------------------------------------------------------------ - - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH = ..\.. - -DIRS = classes_spec \ - src_share \ - $(NULL) - -# This macro makes it so if the environment var WC_IE is -# defined, then webclient will be built to use -# IE. Otherwise webclient will be built to use -# mozilla. - -!if defined(WC_IE) -DIRS = $(DIRS) \ - src_ie \ - $(NULL) -!else -DIRS = $(DIRS) \ - src_moz \ - $(NULL) -!endif - -!if defined(BAL_INTERFACE) -DIRS = $(DIRS) \ - bal_test \ - $(NULL) -!endif - -include <$(DEPTH)\config\rules.mak> - - diff --git a/mozilla/java/webclient/build.xml b/mozilla/java/webclient/build.xml index 0910d10240a..7ae613066a2 100644 --- a/mozilla/java/webclient/build.xml +++ b/mozilla/java/webclient/build.xml @@ -52,15 +52,12 @@ - - - - + - @@ -215,7 +212,7 @@ - + diff --git a/mozilla/java/webclient/classes_spec/Makefile.in b/mozilla/java/webclient/classes_spec/Makefile.in deleted file mode 100644 index a43d66c0446..00000000000 --- a/mozilla/java/webclient/classes_spec/Makefile.in +++ /dev/null @@ -1,86 +0,0 @@ -#!gmake -# -# The contents of this file are subject to the Netscape Public License -# Version 1.0 (the "NPL"); you may not use this file except in -# compliance with the NPL. You may obtain a copy of the NPL at -# http://www.mozilla.org/NPL/ -# -# Software distributed under the NPL is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL -# for the specific language governing rights and limitations under the -# NPL. -# -# The Initial Developer of this code under the NPL is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights -# Reserved. -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java portion of the java wrapper to mozilla -#// -#//------------------------------------------------------------------------ - - - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = webclient - -JMODS = org/mozilla/webclient \ - org/mozilla/webclient/stubs \ - org/mozilla/webclient/wrapper_native \ - org/mozilla/webclient/wrapper_native/motif \ - org/mozilla/webclient/test - -# -# JDIRS is dependant on JAVA_DESTPATH in config/rules.m[a]k. -# Be sure to touch that directory if you add a new directory to -# JDIRS, or else it will not build. FIXME -# -JDIRS = $(JMODS) - -JAR_JSJ = jsj10.jar -JAR_JSJ_CLASSES = $(JMODS) - -# -# jars to build at install time -# -JARS = $(JAR_JSJ) - -JAVA_OR_NSJVM = 1 - -include $(topsrcdir)/config/rules.mk - -JAVA_SOURCEPATH=$(topsrcdir)/java/webclient/classes_spec -JAVAC_FLAGS=-classpath $(CLASSPATH):$(JAVA_DESTPATH) -d $(JAVA_DESTPATH) - -rm_java: - rm -Rf $(topsrcdir)/dist/javadev - - -clobber_all::rm_java - -doc:: - $(JAVADOC) -d $(DIST)/doc org.mozilla.util - -natives_list:: FORCE - rm -rf $@ - find . -name "*.class" -print | sed 's@\./\(.*\)\.class$$@\1@' | \ - sed 's@/@.@g' | xargs $(JVH) -natives | sort > $@ - -check_natives:: natives_list - rm -f found_natives - nm -B ../$(OBJDIR)/*.o \ - | egrep "Java.*_stub" | awk '{ print $$3; }' | sort > found_natives - diff found_natives natives_list - -FORCE: - - - - diff --git a/mozilla/java/webclient/classes_spec/Makefile.win b/mozilla/java/webclient/classes_spec/Makefile.win deleted file mode 100644 index 74c4ab71eea..00000000000 --- a/mozilla/java/webclient/classes_spec/Makefile.win +++ /dev/null @@ -1,91 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Sun Microsystems, -# Inc. Portions created by Sun are -# Copyright (C) 1999 Sun Microsystems, Inc. All -# Rights Reserved. -# -# Contributor(s): - -IGNORE_MANIFEST=1 -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java portion of the java wrapper to mozilla -#// -#//------------------------------------------------------------------------ - - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH= ..\..\.. - -# PENDING(edburns): find out where this should really get defined -JAVA_OR_NSJVM=1 -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\wrapper_native \ - org\mozilla\webclient\wrapper_native\win32 \ - org\mozilla\webclient\test \ - $(NULL) - -!ifdef WEBCLIENT_ICE -JAR_WEBCLIENT_CLASSES = \ - $(JAR_WEBCLIENT_CLASSES) \ - org\mozilla\webclient\wrapper_nonnative \ - org\mozilla\webclient\test_nonnative \ - $(NULL) -!endif - - -# org\mozilla\webclient\test org\mozilla\webclient\win32 org\mozilla\webclient\test\swing - -!ifdef JAVA_OR_NSJVM -JDIRS = $(JAR_WEBCLIENT_CLASSES) -!endif - -WEBCLIENT_JAR_NAME=webclient(VERSION_NUMBER).jar - -JAVAC_PROG=$(JDKHOME)\bin\javac - -export:: - @echo +++ NOTE, you must have the org.w3c.dom classes in your classpath! - @echo +++ If you do not have org.w3c.dom classes, webclient will not build. - @echo +++ You can get the required dom classes at - @echo +++ http://www.mozilla.org/projects/blackwood/webclient/bin/m3/files.html - @echo +++ - @echo +++ checking that org.mozilla.dom classes have been built... - if not exist $(MOZ_SRC)\mozilla\dist\classes\org\mozilla\dom\DOMAccessor.class \ - stopbuild.exe - @echo +++ Checking that org.mozilla.util classes have been built... - if not exist $(MOZ_SRC)\mozilla\dist\classes\org\mozilla\util\Assert.class \ - stopbuild.exe - -!ifdef CLASSPATH -JAVAC_CLASSPATH=$(JAVAC_CLASSPATH);$(CLASSPATH) -!endif - -include <$(DEPTH)\config\javarules.mak> -include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/java/webclient/import/Makefile.in b/mozilla/java/webclient/import/Makefile.in deleted file mode 100644 index c05444268ed..00000000000 --- a/mozilla/java/webclient/import/Makefile.in +++ /dev/null @@ -1,53 +0,0 @@ -#!gmake -# -# The contents of this file are subject to the Netscape Public License -# Version 1.0 (the "NPL"); you may not use this file except in -# compliance with the NPL. You may obtain a copy of the NPL at -# http://www.mozilla.org/NPL/ -# -# Software distributed under the NPL is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL -# for the specific language governing rights and limitations under the -# NPL. -# -# The Initial Developer of this code under the NPL is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights -# Reserved. -# -# Contributor(s): -# Ashu Kulkarni -# -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java stubs for Webclient -#// -#//------------------------------------------------------------------------ - - - -DEPTH = ../../.. - -JAVAXPIDLSRCS = nsIProfile.idl \ - $(NULL) -include $(DEPTH)/config/rules.mk -include ../config/rules.mk - -.SUFFIXES: .idl .java -import: $(JAVAXPIDLSRCS) - -$(JAVAXPIDLSRCS) : - cp $(DEPTH)/dist/idl/$(@F) . - -mvjava2stubs: chPackageinStubs - if test ! -d ../classes_spec/org/mozilla/webclient/stubs ; then mkdir ../classes_spec/org/mozilla/webclient/stubs ; else true ; fi ; - mv *.java ../classes_spec/org/mozilla/webclient/stubs/. - -chPackageinStubs: idl2java - perl chPackage.pl unix nsIProfile.java "org.mozilla.webclient.stubs" - -export:: import idl2java chPackageinStubs mvjava2stubs - -clobber_all:: - rm -rf *.idl - rm -rf ../classes_spec/org/mozilla/webclient/stubs/*.java diff --git a/mozilla/java/webclient/import/Makefile.win b/mozilla/java/webclient/import/Makefile.win deleted file mode 100644 index b7a21e11b1e..00000000000 --- a/mozilla/java/webclient/import/Makefile.win +++ /dev/null @@ -1,53 +0,0 @@ -#!gmake -# -# The contents of this file are subject to the Netscape Public License -# Version 1.0 (the "NPL"); you may not use this file except in -# compliance with the NPL. You may obtain a copy of the NPL at -# http://www.mozilla.org/NPL/ -# -# Software distributed under the NPL is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL -# for the specific language governing rights and limitations under the -# NPL. -# -# The Initial Developer of this code under the NPL is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights -# Reserved. -# -# Contributor(s): -# Ashu Kulkarni -# -#//------------------------------------------------------------------------ -#// -#// Makefile to build the java stubs for Webclient -#// -#//------------------------------------------------------------------------ - - - -DEPTH = ..\..\.. - -JAVAXPIDLSRCS = nsIProfile.idl \ - $(NULL) -include <$(DEPTH)\config\rules.mak> -include ..\config\rules.mak - -.SUFFIXES: .idl .java -import: $(JAVAXPIDLSRCS) - -$(JAVAXPIDLSRCS) : - copy $(DEPTH)\dist\idl\$(@F) . - -mvjava2stubs: - -mkdir ..\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" - -export:: import idl2java chPackageinStubs mvjava2stubs - -clobber_all:: - rm -rf *.idl - rm -rf ..\classes_spec\org\mozilla\webclient\stubs\*.java diff --git a/mozilla/java/webclient/src_moz/motif/Makefile.in b/mozilla/java/webclient/src_moz/motif/Makefile.in deleted file mode 100644 index 84c6ecbc5a2..00000000000 --- a/mozilla/java/webclient/src_moz/motif/Makefile.in +++ /dev/null @@ -1,55 +0,0 @@ -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Sun Microsystems, -# Inc. Portions created by Sun are -# Copyright (C) 1999 Sun Microsystems, Inc. All -# Rights Reserved. -# -# Contributor(s): - -DEPTH = ../../../.. -topsrcdir = $(DEPTH) -srcdir = $(topsrcdir)/java/webclient/src_moz/motif -VPATH = $(topsrcdir)/java/webclient/src_moz/motif - -JAVAHOME = $(JDKHOME) - -include $(DEPTH)/config/autoconf.mk - -LIBRARY_NAME = webclientstub - -CPPSRCS = \ - MotifBrowserControlCanvasStub.cpp \ - NativeLoaderStub.cpp \ - $(NULL) - -include $(topsrcdir)/config/rules.mk - -ifdef MOZ_ENABLE_GTK -ifndef MOZ_MONOLITHIC_TOOLKIT -CXXFLAGS += $(MOZ_GTK_CFLAGS) -CFLAGS += $(MOZ_GTK_CFLAGS) -EXTRA_DSO_LDOPTS += -L$(DEPTH)/dist/lib -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt -else -CXXFLAGS += $(TK_CFLAGS) -CFLAGS += $(TK_CFLAGS) -EXTRA_DSO_LDOPTS += -L$(DEPTH)/dist/lib -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt -endif -endif - -# check for OS type -ifeq ($(OS_ARCH),Linux) -INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/linux -I.. -I../../src_share $(INCLUDES) -else -INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris -I.. -I../../src_share $(INCLUDES) -endif \ No newline at end of file