From b9bc36658cc8bd055ea64cfc8b3623ee736b10b3 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 8 Nov 2003 20:44:04 +0000 Subject: [PATCH] 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 --- gcc/java/ChangeLog | 5 +++++ 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 + + PR java/12894: + * jcf-parse.c (classify_zip_file): Only skip MANIFEST.MF file. + 2003-11-06 Andrew Haley * 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. */ -- 2.7.4