Mercurial > hg > release > icedtea-web-1.2
changeset 349:08121ef055a2
backported : Omair's Add resources.jar to classpath
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Tue, 22 May 2012 17:37:25 +0200 |
| parents | fdf094ad9342 |
| children | 886414736595 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 20 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue May 22 17:33:08 2012 +0200 +++ b/ChangeLog Tue May 22 17:37:25 2012 +0200 @@ -1,3 +1,15 @@ +2012-05-22 Jiri Vanek <jvanek@redhat.com> + 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-05-22 Jiri Vanek <jvanek@redhat.com> * /tests/junit-runner/JunitLikeXmlOutputListener.java: fixed bug with
--- a/Makefile.am Tue May 22 17:33:08 2012 +0200 +++ b/Makefile.am Tue May 22 17:37:25 2012 +0200 @@ -38,7 +38,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) @@ -638,6 +638,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.*" \ @@ -699,6 +700,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.*" \ @@ -896,6 +898,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); \