diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-17 11:02:49 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-17 12:52:25 +0200 |
| commit | 5a4bcd3b7578523af6a2754369231ca1cf413f82 (patch) | |
| tree | 6d055022ed60cb89e8419f97610eb465a46cb91b /connectivity/JunitTest_complex.mk | |
| parent | 79c9ea3818334b39eda6996cf488143a5dc586d4 (diff) | |
gbuild: register all jars
Change-Id: I9f49970e5e06d1afd3fc066a20d1671c93e262fc
Diffstat (limited to 'connectivity/JunitTest_complex.mk')
| -rw-r--r-- | connectivity/JunitTest_complex.mk | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/connectivity/JunitTest_complex.mk b/connectivity/JunitTest_complex.mk index c96d6886fd23..59fcdc6ef5e5 100644 --- a/connectivity/JunitTest_complex.mk +++ b/connectivity/JunitTest_complex.mk @@ -34,14 +34,21 @@ $(eval $(call gb_JunitTest_set_defs,connectivity_complex,\ # TODO: add use_externals to JunitTest $(eval $(call gb_JunitTest_use_jars,connectivity_complex,\ - $(OUTDIR)/bin/jurt.jar \ - $(OUTDIR)/bin/OOoRunner.jar \ - $(OUTDIR)/bin/ridl.jar \ - $(OUTDIR)/bin/test.jar \ - $(OUTDIR)/bin/unoil.jar \ - $(if $(filter YES,$(SYSTEM_HSQLDB)),$(HSQLDB_JAR),$(OUTDIR)/bin/hsqldb.jar) \ + jurt \ + OOoRunner \ + ridl \ + test \ + unoil \ )) +ifeq ($(SYSTEM_HSQLDB),YES) +$(eval $(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,connectivity_complex),$(HSQLDB_JAR))) +else +$(eval $(call gb_JunitTest_use_jars,connectivity_complex,\ + hsqldb \ +)) +endif + $(eval $(call gb_JunitTest_add_classes,connectivity_complex,\ org.openoffice.test.UnoApiTest \ )) |