diff options
| author | David Tardon <dtardon@redhat.com> | 2012-05-25 11:49:02 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:35:21 +0200 |
| commit | 53c361b8cb8c523e0bb5f160aee38259802aac7b (patch) | |
| tree | 00441daed1a1199140d940b5adb228bdc220779b /testtools/CustomTarget_bridgetest.mk | |
| parent | 3bd076f3e029173ee2d6fba6227ebaccd6cae7ca (diff) | |
do not use gb_Helper_*native* functions
Change-Id: Iba3e4b97efe9dde7bb26e0e78ec7ec60ae642634
Diffstat (limited to 'testtools/CustomTarget_bridgetest.mk')
| -rw-r--r-- | testtools/CustomTarget_bridgetest.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index c1f4317211d0..4452c8e51f02 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -47,7 +47,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest) : \ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \ $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ echo "$(UNO_EXE)" \ "-ro $(OUTDIR)/xml/uno_services.rdb" \ "-ro $(OUTDIR)/bin/udkapi.rdb" \ @@ -60,13 +60,13 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \ ifneq ($(SOLAR_JAVA),) # how to do it more elegantly? -MY_CLASSPATH := $(call gb_Helper_native_path,$(OUTDIR)/bin/ridl.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/java_uno.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/jurt.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/juh.jar) +MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar # which other prerequisites do we need here? $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \ $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ echo "java" \ "-classpath $(MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \ "com.sun.star.comp.bridge.TestComponentMain" \ @@ -78,7 +78,7 @@ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \ $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : \ $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ echo "JAVA_HOME=$(JAVA_HOME)" \ "LD_LIBRARY_PATH=$(OUTDIR)/lib" \ "$(UNO_EXE)" \ @@ -98,7 +98,7 @@ endif $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \ $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - $(call gb_Helper_abbreviate_dirs_native,\ + $(call gb_Helper_abbreviate_dirs,\ echo "$(UNO_EXE)" \ "-ro $(OUTDIR)/xml/ure/services.rdb" \ "-ro $(OUTDIR)/xml/uno_services.rdb" \ |