Make --disable-liveconnect build on icedtea7

[Mark Wielaard]

On Sat, 2009-05-23 at 23:23 +0200, Mark Wielaard wrote:
> The lib/rt/net directory is only there with --enable-liveconnect (which
> is now called --enable-plugin in icedtea6 btw) or --enable-npplugin. So
> the following patch makes sure it is only included in those cases,
> otherwise the jar command will fail because it cannot find the
> directory.
> 
> 2009-05-23  Mark Wielaard  <mark at klomp.org>
> 
>     * Makefile.am (LIVECONNECT_DIR): Add -C lib/rt net.
>     (rt-closed.jar): Don't unconditionally add -C lib/rt net.

But that isn't the whole story.
IcedTea7 has diverged a bit from IcedTea6. In IcedTea7 the netx/javaws
classes are only compiled when the plugin is enabled. That is not
completely correct, since the javaws support is independently useful.
Also the Makefile contained a bug in that the jibx files depended on the
netx about.jar. This patch fixes that and makes it so that all parts of
netx aren't compiled unless a plugin is enabled.

2009-05-24  Mark Wielaard  <mark at klomp.org>

    * configure.ac (JNLP_ABOUT_NEEDED): New check.
    * Makefile.am (JNLP_ABOUT_TARGET): Set to extra-lib/about.jar
    when needed.
    (stamps/icedtea.stamp): Depend on JNLP_ABOUT_TARGET. Only copy
    about.jar and jnlp resources when needed.
    (stamps/icedtea-debug.stamp): Likewise.
    (stamps/jibx.stamp): Don't depend on extra-lib/about.jar.

This just makes how the plugin/no-plugin compiles against the
javaws/netx support consistent. Ultimately it this should be merged with
how IcedTea6 does it and build the javaws netx support independently
from whether a plugin is enabled.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: about.patch
Type: text/x-patch
Size: 3340 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20090524/a8eab9ac/about.patch