diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-02-07 20:19:58 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-02-07 20:19:58 +0000 |
| commit | f0d87cdad8ae2f4b34e4dfe313bc91e716636ba7 (patch) | |
| tree | 2d4549689a45b5995bffa702a7340b860cb99df4 /libjava | |
| parent | b950a32e341adc4457bc428e9b261764ed8456ef (diff) | |
| download | gcc-f0d87cdad8ae2f4b34e4dfe313bc91e716636ba7.zip gcc-f0d87cdad8ae2f4b34e4dfe313bc91e716636ba7.tar.gz gcc-f0d87cdad8ae2f4b34e4dfe313bc91e716636ba7.tar.bz2 | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/Makefile.am | 43 | ||||
| -rw-r--r-- | libjava/Makefile.in | 26 |
3 files changed, 77 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b294c0b..e093db4 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 44c2947..ba40f65 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -3734,6 +3734,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 72e8860..9b2d274 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. |