diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-05-29 09:07:04 +0000 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-05-29 09:07:04 +0000 |
| commit | 2ddf7d7afdb393d4d9deb92190bb9ad060194483 (patch) | |
| tree | c25c3b0ba8b48fb15360e719be6ed468079f2635 | |
| parent | 2511960092b08b21376cb283b5010deb0a5f0472 (diff) | |
| download | classpath-2ddf7d7afdb393d4d9deb92190bb9ad060194483.tar.gz | |
Generate META-INF/INDEX.LIST file for glibj.zip
This patch changes the glibj.zip packaging so that META-INF/INDEX.LIST is
generated to the file. This is needed for VMClassLoader.getBootPackages() to
work correctly:
private static String[] getBootPackages()
{
URL indexList = getResource("META-INF/INDEX.LIST");
if (indexList != null)
{
NOTE! This problem is only seen with Jato currently as it's the only VM I'm
aware of that doesn't override any of the classes in vm/reference. CACAO and
JamVM override the whole classloading parts themselves.
I asked about this on IRC and Mark Wielaard explained background on the issue:
< mjw> 2006-04-19 Olivier Jolly <olivier.jolly@pcedev.com>
< mjw> * vm/reference/java/lang/VMClassLoader.java (getBootPackages): Loads
< mjw> boot packages list from the META-INF/INDEX.LIST file if it exists.
< mjw> http://developer.classpath.org/pipermail/classpath-patches/2006-April/001704.html
< mjw> "the patch to support the -i option should be incorporated soon and we'll be able to add the creation of the index to the glibj.zip by default."
< mjw> soon just happens the be > 5 years...
2011-05-29 Pekka Enberg <penberg@kernel.org>
* lib/Makefile.am:
Generate META-INF/INDEX.LST for glibj.zip.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2011-05-29 Pekka Enberg <penberg@kernel.org> + + * lib/Makefile.am: + Generate META-INF/INDEX.LST for glibj.zip. + 2011-04-25 Pekka Enberg <penberg@kernel.org> * java/util/regex/Matcher.java: diff --git a/lib/Makefile.am b/lib/Makefile.am index 8104ee764..50d1baa9b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -71,7 +71,7 @@ glibj.zip: else if WITH_JAR -CREATE_GLIBJ_ZIP=$(JAR) cf glibj.zip gnu java javax org sun META-INF +CREATE_GLIBJ_ZIP=$(JAR) cf glibj.zip gnu java javax org sun META-INF && $(JAR) i glibj.zip else CREATE_GLIBJ_ZIP=$(ZIP) -r -D glibj.zip gnu java javax org sun META-INF > /dev/null endif |