From: Tom Tromey <tromey@redhat.com>
Date: Mon, 7 Feb 2005 20:19:58 +0000 (+0000)
Subject: re PR libgcj/19611 (create 'sources.zip' for use in eclipse)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f0d87cdad8ae2f4b34e4dfe313bc91e716636ba7;p=gcc.git

re PR libgcj/19611 (create 'sources.zip' for use in eclipse)

	PR libgcj/19611:
	* Makefile.in: Rebuilt.
	* Makefile.am (src.zip): New target.
	(install-src.zip): Likewise.
	(sourcesdir): New variable.

From-SVN: r94710
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b294c0b1a19..e093db43caa 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-07  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/19611:
+	* Makefile.in: Rebuilt.
+	* Makefile.am (src.zip): New target.
+	(install-src.zip): Likewise.
+	(sourcesdir): New variable.
+
 2005-02-06  Jerry Quinn  <jlquinn@optonline.net>
 
 	* javax/imageio/metadata/IIOMetadataNode.java:
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 44c29474c56..ba40f654675 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -3733,6 +3733,49 @@ texinfo: TexinfoDoclet.class
 
 ## ################################################################
 
+##
+## Creating and installing sources.zip
+##
+
+## Create a zip holding all the sources.  This can be meaningfully
+## used in Eclipse.
+src.zip:
+	-rm -f src.zip
+	here=`pwd`; \
+	( ( cd $(srcdir); \
+	  find java gnu javax org -name '*.java' -print | \
+	  while read file; do \
+## Ugly code to avoid "echo -C".  Must separate each entry by a newline
+## Gross but easy.
+	    echo "x-C" | sed -e 's/^.//'; \
+	    echo $(srcdir); \
+	    echo $$file; \
+	  done ); \
+## Now the build tree.
+	  find gnu java -name '*.java' -print) | \
+## Many of the above circumlocutions are because ZIP will most likely
+## be a relative path to fastjar.
+	$(ZIP) -cfM@ $$here/src.zip
+## Now include the files from external/.
+	for dir in sax w3c_dom; do \
+	  (cd $(srcdir)/external/$$dir; \
+	  find org -type f -name '*.java' -print | while read file; do \
+	    echo "x-C" | sed -e 's/^.//'; \
+	    echo $(srcdir)/external/$$dir; \
+	    echo $$file; \
+          done) | \
+	  $(ZIP) -ufM0E@ src.zip; \
+	done
+
+## We use a variable for this in case the user wants to override it.
+sourcesdir = $(jardir)
+
+install-src.zip: src.zip
+	$(INSTALL_DATA) src.zip $(DESTDIR)$(sourcesdir)/src-@gcc_version@.zip
+
+
+## ################################################################
+
 ##
 ## Dependency tracking madness.
 ##
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 72e8860278c..9b2d27477fc 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -7891,6 +7891,7 @@ gnu/gcj/xlib/natXExposeEvent.cc \
 gnu/gcj/xlib/natXImage.cc \
 gnu/gcj/xlib/natXUnmapEvent.cc
 
+sourcesdir = $(jardir)
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
@@ -26179,6 +26180,31 @@ texinfo: TexinfoDoclet.class
 	javadoc -outfile $(srcdir)/doc/java-util-jar.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/jar/*.java
 	javadoc -outfile $(srcdir)/doc/java-util-zip.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/zip/*.java
 
+src.zip:
+	-rm -f src.zip
+	here=`pwd`; \
+	( ( cd $(srcdir); \
+	  find java gnu javax org -name '*.java' -print | \
+	  while read file; do \
+	    echo "x-C" | sed -e 's/^.//'; \
+	    echo $(srcdir); \
+	    echo $$file; \
+	  done ); \
+	  find gnu java -name '*.java' -print) | \
+	$(ZIP) -cfM@ $$here/src.zip
+	for dir in sax w3c_dom; do \
+	  (cd $(srcdir)/external/$$dir; \
+	  find org -type f -name '*.java' -print | while read file; do \
+	    echo "x-C" | sed -e 's/^.//'; \
+	    echo $(srcdir)/external/$$dir; \
+	    echo $$file; \
+          done) | \
+	  $(ZIP) -ufM0E@ src.zip; \
+	done
+
+install-src.zip: src.zip
+	$(INSTALL_DATA) src.zip $(DESTDIR)$(sourcesdir)/src-@gcc_version@.zip
+
 all-recursive: classes.stamp $(nat_headers) $(xlib_nat_headers)
 
 # Multilib support.