Mercurial > hg > release > icedtea7-2.1
changeset 2217:fbb21c9f53fe
Use ICEDTEA_RT in place of system rt.jar. Add additional bootstrap classes.
2010-03-29 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(NETX_BOOTSTRAP_CLASSES): Classes required to
bootstrap NetX (only partial so far).
(ICEDTEA_BOOTSTRAP_CLASSES): Include
NETX_BOOTSTRAP_CLASSES.
(extra-class-files.stamp): Use ICEDTEA_RT as bootclasspath.
Drop use of SOURCEPATH_DIRS.
(pulse-java-class.stamp): Use ICEDTEA_RT on bootclasspath.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 04 Jun 2010 18:54:00 +0100 |
| parents | b9d1edf5ac2c |
| children | c5f446ebb083 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 24 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 22 15:34:55 2010 -0400 +++ b/ChangeLog Fri Jun 04 18:54:00 2010 +0100 @@ -1,3 +1,14 @@ +2010-03-29 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (NETX_BOOTSTRAP_CLASSES): Classes required to + bootstrap NetX (only partial so far). + (ICEDTEA_BOOTSTRAP_CLASSES): Include + NETX_BOOTSTRAP_CLASSES. + (extra-class-files.stamp): Use ICEDTEA_RT as bootclasspath. + Drop use of SOURCEPATH_DIRS. + (pulse-java-class.stamp): Use ICEDTEA_RT on bootclasspath. + 2010-03-22 Deepak Bhole <dbhole@redhat.com> * plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/Makefile.am Mon Mar 22 15:34:55 2010 -0400 +++ b/Makefile.am Fri Jun 04 18:54:00 2010 +0100 @@ -136,11 +136,20 @@ ICEDTEA_BOOTSTRAP_RESOURCES = \ $(LANGTOOLS)/com/sun/tools/javac/resources +# PR43578 - java.security.CodeSource.getCodeSigners() missing +# PR43582 - Missing javax.swing.JTable.setFillsViewportHeight +# PR43585 - java.security.KeyStore.TrustedCertificateEntry class missing +NETX_BOOTSTRAP_CLASSES = \ + $(SHARE)/java/security/CodeSource.java \ + $(SHARE)/javax/swing/JTable.java \ + $(SHARE)/java/security/KeyStore.java + # PR42003 - javax.swing.plaf.basic.BasicDirectoryModel # PR43389 - javax.management.StandardMBean ICEDTEA_BOOTSTRAP_CLASSES = \ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \ - $(SHARE)/javax/management/StandardMBean.java + $(SHARE)/javax/management/StandardMBean.java \ + $(NETX_BOOTSTRAP_CLASSES) endif @@ -2135,10 +2144,8 @@ stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp mkdir -p extra-lib $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \ - -classpath $(ICEDTEA_RT):$(NETX_CLASSES) \ - -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \ - -bootclasspath \'\' \ - @extra-source-files.txt + -sourcepath $(abs_top_srcdir)/extra \ + -bootclasspath $(ICEDTEA_RT) @extra-source-files.txt cp -r $(NETX_EXTRA_DIR) extra-lib/net/sourceforge/jnlp/about find extra-lib/net/sourceforge/jnlp/about -type f -exec chmod 640 '{}' ';' \ -o -type d -exec chmod 750 '{}' ';' @@ -2165,8 +2172,7 @@ mkdir -p $(PULSE_JAVA_CLASS_DIR) (cd $(PULSE_JAVA_JAVA_SRCDIR); \ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d $(PULSE_JAVA_CLASS_DIR) \ - -bootclasspath '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \ - org/classpath/icedtea/pulseaudio/*.java\ + -bootclasspath $(ICEDTEA_RT) org/classpath/icedtea/pulseaudio/*.java \ ) cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR) chmod -R ug+w $(PULSE_JAVA_CLASS_DIR)/META-INF