Bug 328901 - Rework file organization. Add rules for JAR creation. Split MozillaInterfaces.jar. r=bsmedberg. XULRunner only.

git-svn-id: svn://10.0.0.236/trunk@212712 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/java/xpcom/interfaces/Makefile.in

@@ -13,9 +13,8 @@
 #
 # The Original Code is Java XPCOM Bindings.
 #
-# The Initial Developer of the Original Code is
-# IBM Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2004
+# The Initial Developer of the Original Code is IBM Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2006
 # IBM Corporation. All Rights Reserved.
 #
 # Contributor(s):
@@ -38,47 +37,65 @@
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH		= @srcdir@ ; @srcdir@/..
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-JARFILE = MozillaInterfaces.jar
-JARFILE_SRC = $(patsubst %.jar,%-src.jar,$(JARFILE))
+JAVA_LIBRARY_NAME = MozillaGlue
+NO_DIST_INSTALL=1
+
+PACKAGE_DIR = org/mozilla/xpcom
 
 JAVA_SRCS = \
-		$(srcdir)/Mozilla.java \
-		$(srcdir)/GREVersionRange.java \
-		$(srcdir)/IGRE.java \
-		$(srcdir)/IXPCOM.java \
-		$(srcdir)/../XPCOMException.java \
-		$(srcdir)/IAppFileLocProvider.java \
-		$(srcdir)/INIParser.java \
-		$(srcdir)/VersionComparator.java \
+		$(PACKAGE_DIR)/Mozilla.java \
+		$(PACKAGE_DIR)/GREVersionRange.java \
+		$(PACKAGE_DIR)/IGRE.java \
+		$(PACKAGE_DIR)/IXPCOM.java \
+		$(PACKAGE_DIR)/XPCOMException.java \
+		$(PACKAGE_DIR)/IAppFileLocProvider.java \
+		$(PACKAGE_DIR)/INIParser.java \
+		$(PACKAGE_DIR)/VersionComparator.java \
+		$(PACKAGE_DIR)/IXPCOMError.java \
 		$(NULL)
 
-# install jars into SDK
-SDK_LIBRARY = $(JARFILE) $(JARFILE_SRC)
+IFACES_JAR = MozillaInterfaces.jar
+IFACES_JAR_SRC = $(patsubst %.jar,%-src.jar,$(IFACES_JAR))
 
-GARBAGE += $(JARFILE) $(JARFILE_SRC) java.files
+JAVA_CLASSPATH += $(IFACES_JAR)
+
+# install jars into SDK
+SDK_LIBRARY = $(JAVA_LIBRARY_NAME).jar $(IFACES_JAR) $(IFACES_JAR_SRC)
+
+GARBAGE += $(IFACES_JAR) $(IFACES_JAR_SRC) IXPCOMError.java java.files
 GARBAGE_DIRS += org
 
 include $(topsrcdir)/config/rules.mk
 
-# XXX Need to copy Java source files to correct directory structure, until
-# bug 328901 is fixed.
+# MozillaGlue.jar depends on MozillaInterfaces.jar, so make sure to generate
+# the Mozilla Java interfaces first.
+$(addprefix $(_JAVA_DIR)/,$(JAVA_SRCS:.java=.class)): $(IFACES_JAR)
 
-JAVA_SRCS_DIR = _java/org/mozilla/xpcom
-GARBAGE_DIRS += _java
+##
+# Generate IXPCOMError.java
+##
 
-$(JAVA_SRCS_DIR)::
+$(_JAVA_DIR)/$(PACKAGE_DIR)/Mozilla.class: $(PACKAGE_DIR)/IXPCOMError.java
+
+$(PACKAGE_DIR)::
 	$(NSINSTALL) -D $@
 
-$(JAVA_SRCS_DIR)/Mozilla.java: $(JAVA_SRCS_DIR)
-	@echo Copying Java source files
-	$(INSTALL) -m 644 $(JAVA_SRCS) $<
+$(PACKAGE_DIR)/IXPCOMError.java: $(topsrcdir)/xpcom/base/nsError.h gen-nsError.pl $(PACKAGE_DIR) Makefile Makefile.in
+	$(PERL) $(srcdir)/gen-nsError.pl < $< > $@
 
-$(JAVA_SRCS_DIR)/IXPCOMError.java: $(topsrcdir)/xpcom/base/nsError.h gen-nsError.pl Makefile Makefile.in $(JAVA_SRCS_DIR)
-	$(PERL) $(srcdir)/../gen-nsError.pl < $< > $@
+##
+# Compile generated Java interfaces
+##
+
+IFACES_DIR = _ifaces
+$(IFACES_DIR)::
+	$(NSINSTALL) -D $@
+
+GARBAGE_DIRS += $(IFACES_DIR)
 
 # Don't include the interface nsIPref, since it depends on the obsolete
 # interface nsIFileSpec.
@@ -89,20 +106,22 @@ endif
 
 # Using the temporary "java.files" avoids an "argument list too long"
 # error on Windows when using *.java
-org/mozilla/xpcom/Mozilla.class: $(JAVA_SRCS_DIR)/IXPCOMError.java $(JAVA_SRCS_DIR)/Mozilla.java
-	@echo Compiling Java classes
-	find _java -name "*.java" > java.files
-	find $(JAVA_DIST_DIR)/default -name "*.java" $(IGNORE_IFACES) >> java.files
-	$(JAVAC) $(JAVAC_FLAGS) -classpath . -d . -sourcepath _java -sourcepath $(JAVA_DIST_DIR)/default @java.files
+$(IFACES_DIR)/$(JAVA_IFACES_PKG_NAME)/nsISupports.class: $(IFACES_DIR) Makefile Makefile.in
+	@echo Compiling Java interfaces
+	find $(JAVA_DIST_DIR)/default -name "*.java" $(IGNORE_IFACES) > java.files
+	$(CYGWIN_WRAPPER) $(JAVAC) $(JAVAC_FLAGS) -classpath $(IFACES_DIR) 		\
+		-d $(IFACES_DIR) -sourcepath $(JAVA_DIST_DIR) 						\
+		-sourcepath $(JAVA_DIST_DIR)/default @java.files
 
-$(JARFILE): org/mozilla/xpcom/Mozilla.class Makefile
-	$(JAR) cf $@ org
+$(IFACES_JAR): $(IFACES_DIR)/$(JAVA_IFACES_PKG_NAME)/nsISupports.class Makefile
+	$(JAR) cf $@ -C $(IFACES_DIR) org
 
-$(JARFILE_SRC): $(JARFILE)
-	$(JAR) cf $@ -C _java org
-	$(JAR) uf $@ -C $(JAVA_DIST_DIR)/default org
+$(IFACES_JAR_SRC): $(IFACES_JAR)
+	$(JAR) cf $@ -C $(JAVA_DIST_DIR)/default org
 	$(ZIP) -d $@ $(patsubst %, $(JAVA_IFACES_PKG_NAME)/%.java, $(IGNORE_IFACES_NAMES))
 
+##
 # Build the implementation Java classes, which depend on these interfaces
-export:: $(JARFILE) $(JARFILE_SRC)
+##
+export:: $(IFACES_JAR) $(IFACES_JAR_SRC) $(JAVA_LIBRARY)
 	$(MAKE) -C ../src jarfile