Mercurial > hg > release > icedtea-web-1.3
changeset 368:82e908d46d70
Add resources.jar to classpath
2012-04-24 Omair Majid <omajid@redhat.com>
* Makefile.am
(RUNTIME): Add resources.jar.
(stamps/run-unit-test-code-coverage.stamp) [WITH_EMMA]: Add resouces.jar
to classpath.
(stamps/run-reproducers-test-code-coverage.stamp) [WITH_EMMA]: Include
resources.jar in classpath.
(stamps/bootstrap-directory.stamp): Create a link to resources.jar in
BOOT_DIR.
author | Omair Majid <omajid@redhat.com> |
---|---|
date | Tue, 24 Apr 2012 14:43:34 -0400 |
parents | a1c138829627 |
children | 11029e99d733 |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 20 17:17:59 2012 +0200 +++ b/ChangeLog Tue Apr 24 14:43:34 2012 -0400 @@ -1,3 +1,14 @@ +2012-04-24 Omair Majid <omajid@redhat.com> + + * Makefile.am + (RUNTIME): Add resources.jar. + (stamps/run-unit-test-code-coverage.stamp) [WITH_EMMA]: Add resouces.jar + to classpath. + (stamps/run-reproducers-test-code-coverage.stamp) [WITH_EMMA]: Include + resources.jar in classpath. + (stamps/bootstrap-directory.stamp): Create a link to resources.jar in + BOOT_DIR. + 2012-04-19 Omair Majid <omajid@redhat.com> PR918: java applet windows uses a low resulution black/white icon
--- a/Makefile.am Fri Apr 20 17:17:59 2012 +0200 +++ b/Makefile.am Tue Apr 24 14:43:34 2012 -0400 @@ -45,7 +45,7 @@ RHINO_RUNTIME= endif -RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar$(RHINO_RUNTIME) +RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar$(RHINO_RUNTIME):$(BOOT_DIR)/jre/lib/resources.jar # Flags IT_CFLAGS=$(CFLAGS) $(ARCHFLAG) @@ -661,6 +661,7 @@ -cp $(JUNIT_RUNNER_JAR) \ -cp $(BOOT_DIR)/jre/lib/rt.jar \ -cp $(BOOT_DIR)/jre/lib/jsse.jar \ + -cp $(BOOT_DIR)/jre/lib/resources.jar \ -cp $(RHINO_RUNTIME) \ -cp . \ -ix "-org.junit.*" \ @@ -723,6 +724,7 @@ -cp $(JUNIT_RUNNER_JAR) \ -cp $(BOOT_DIR)/jre/lib/rt.jar \ -cp $(BOOT_DIR)/jre/lib/jsse.jar \ + -cp $(BOOT_DIR)/jre/lib/resources.jar \ -cp $(RHINO_RUNTIME) \ -cp . \ -ix "-org.junit.*" \ @@ -921,6 +923,11 @@ else \ ln -s rt.jar $(BOOT_DIR)/jre/lib/jsse.jar ; \ fi + if [ -e $(SYSTEM_JRE_DIR)/lib/resources.jar ] ; then \ + ln -s $(SYSTEM_JRE_DIR)/lib/resources.jar $(BOOT_DIR)/jre/lib ; \ + else \ + ln -s rt.jar $(BOOT_DIR)/jre/lib/resources.jar ; \ + fi ln -sf $(SYSTEM_JRE_DIR)/lib/$(JRE_ARCH_DIR) \ $(BOOT_DIR)/jre/lib/ && \ if ! test -d $(BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \