[icedtea-web] RFC: do not add unneeded files to netx.jar

Deepak Bhole dbhole at redhat.com
Fri Feb 25 13:54:46 PST 2011


* Dr Andrew John Hughes <ahughes at redhat.com> [2011-02-25 16:53]:
> On 16:31 Fri 25 Feb     , Omair Majid wrote:
> > Hi,
> > 
> > The attached patch remove the addition of unrequired files to netx.jar. 
> > Currently a number of uneeded files (html files, man pages) are added to 
> > netx.jar.
> > 
> > The diff in the file list for netx.jar with the patch applied looks like 
> > this:
> > 
> >   net/sourceforge/jnlp/runtime/JNLPProxySelector.class
> >   net/sourceforge/jnlp/DefaultLaunchHandler.class
> >   net/sourceforge/jnlp/StreamEater.class
> > -net/sourceforge/jnlp/cache/package.html
> > -net/sourceforge/jnlp/event/package.html
> > -net/sourceforge/jnlp/services/package.html
> > -net/sourceforge/jnlp/package.html
> > -net/sourceforge/jnlp/runtime/package.html
> > -javaws.1
> > 
> > As you can seen, only html files and the man page is removed. Okay to 
> > commit?
> > 
> 
> Looks fine.  That code dates back to when we used the OpenJDK import mechanism.
> If they weren't in classes.jar then, they wouldn't have been used.
> 

Tis will also require reversal of 9dfc0ff64b70:
http://icedtea.classpath.org/hg/icedtea-web/rev/9dfc0ff64b70

Which looks in the jar by default for the jnlp.

Cheers,
Deepak


> > Cheers,
> > Omair
> 
> > diff -r d7fee305bd4f Makefile.am
> > --- a/Makefile.am	Wed Feb 23 13:37:10 2011 -0500
> > +++ b/Makefile.am	Fri Feb 25 16:25:49 2011 -0500
> > @@ -266,8 +266,6 @@
> >  	 cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \
> >  	 find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
> >  	 cd src ; \
> > -	 $(BOOT_DIR)/bin/jar uf $(NETX_DIR)/lib/classes.jar \
> > -	  `find . -type f -not -name '*.java'` ; \
> >  	 $(ZIP) -qr $(NETX_DIR)/lib/src.zip javax net )
> >  	mkdir -p stamps
> >  	touch $@
> 
> 
> -- 
> Andrew :)
> 
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
> 
> Support Free Java!
> Contribute to GNU Classpath and IcedTea
> http://www.gnu.org/software/classpath
> http://icedtea.classpath.org
> PGP Key: F5862A37 (https://keys.indymedia.org/)
> Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37



More information about the distro-pkg-dev mailing list