diff options
| author | Omair Majid <[email protected]> | 2012-04-24 14:43:34 -0400 |
|---|---|---|
| committer | Omair Majid <[email protected]> | 2012-04-24 14:43:34 -0400 |
| commit | c2a298870319ea43a406a068dab2f6afc02bef90 (patch) | |
| tree | eabce4f2843e18e4dc299ddbd09b293b5cee0449 /Makefile.am | |
| parent | bb5c8d0993ce7f385c56f21b506cf7e26195ddfd (diff) | |
Add resources.jar to classpath
2012-04-24 Omair Majid <[email protected]>
* 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.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index b3601c3..5320846 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,7 +45,7 @@ else 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 @@ if WITH_EMMA -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 @@ if WITH_EMMA -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 @@ stamps/bootstrap-directory.stamp: stamps/native-ecj.stamp 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); \ |