diff options
| author | Tom Tromey <tromey@redhat.com> | 2003-11-08 20:44:04 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-11-08 20:44:04 +0000 |
| commit | b9bc36658cc8bd055ea64cfc8b3623ee736b10b3 (patch) | |
| tree | 39eb8d87fbed3679a31bbfe048c4fcafc6cdee9f /gcc/java | |
| parent | cdc9103cba6f914981e3ba352d22db578c4aa209 (diff) | |
| download | gcc-b9bc36658cc8bd055ea64cfc8b3623ee736b10b3.zip gcc-b9bc36658cc8bd055ea64cfc8b3623ee736b10b3.tar.gz gcc-b9bc36658cc8bd055ea64cfc8b3623ee736b10b3.tar.bz2 | |
re PR libgcj/12894 (META-INF entries should be incoluded as --resource entries when compiling jars)
PR java/12894:
* jcf-parse.c (classify_zip_file): Only skip MANIFEST.MF file.
From-SVN: r73376
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/jcf-parse.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 4de89c5..6d5c29a 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2003-11-08 Tom Tromey <tromey@redhat.com> + + PR java/12894: + * jcf-parse.c (classify_zip_file): Only skip MANIFEST.MF file. + 2003-11-06 Andrew Haley <aph@redhat.com> * expr.c (java_stack_swap): Make sure destination stack slots are diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index fa77efe..016e974 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -1172,10 +1172,9 @@ classify_zip_file (struct ZipDirectory *zdir) ".class", 6)) return 1; - /* For now we drop the manifest and other information. Maybe it - would make more sense to compile it in? */ + /* For now we drop the manifest, but not other information. */ if (zdir->filename_length > 8 - && !strncmp (class_name_in_zip_dir, "META-INF/", 9)) + && !strncmp (class_name_in_zip_dir, "META-INF/MANIFEST.MF", 20)) return 0; /* Drop directory entries. */ |