diff options
Diffstat (limited to 'jurt')
-rw-r--r-- | jurt/Jar_jurt.mk | 4 | ||||
-rw-r--r-- | jurt/JunitTest_bridgefactory.mk | 2 | ||||
-rw-r--r-- | jurt/JunitTest_connections.mk | 2 | ||||
-rw-r--r-- | jurt/JunitTest_java.mk | 2 | ||||
-rw-r--r-- | jurt/JunitTest_java_remote.mk | 4 | ||||
-rw-r--r-- | jurt/JunitTest_remote.mk | 2 | ||||
-rw-r--r-- | jurt/JunitTest_uno.mk | 4 | ||||
-rw-r--r-- | jurt/JunitTest_urp.mk | 3 | ||||
-rw-r--r-- | jurt/JunitTest_util.mk | 2 |
9 files changed, 12 insertions, 13 deletions
diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk index 1528c9284598..0c1757433dfd 100644 --- a/jurt/Jar_jurt.mk +++ b/jurt/Jar_jurt.mk @@ -28,8 +28,8 @@ $(eval $(call gb_Jar_Jar,jurt)) $(eval $(call gb_Jar_use_jars,jurt,\ - $(OUTDIR)/bin/ridl.jar \ - $(OUTDIR)/bin/unoloader.jar \ + ridl \ + unoloader \ )) $(eval $(call gb_Jar_set_packageroot,jurt,com)) diff --git a/jurt/JunitTest_bridgefactory.mk b/jurt/JunitTest_bridgefactory.mk index b5211a3273d7..0931a84b4d19 100644 --- a/jurt/JunitTest_bridgefactory.mk +++ b/jurt/JunitTest_bridgefactory.mk @@ -28,7 +28,7 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_bridgefactory)) $(eval $(call gb_JunitTest_use_jars,jurt_bridgefactory,\ - $(OUTDIR)/bin/ridl.jar \ + ridl \ )) $(eval $(call gb_JunitTest_use_jar_classset,jurt_bridgefactory,jurt)) diff --git a/jurt/JunitTest_connections.mk b/jurt/JunitTest_connections.mk index e5f1c6a5e0a9..e9b880f39b7d 100644 --- a/jurt/JunitTest_connections.mk +++ b/jurt/JunitTest_connections.mk @@ -28,7 +28,7 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_connections)) $(eval $(call gb_JunitTest_use_jars,jurt_connections,\ - $(OUTDIR)/bin/ridl.jar \ + ridl \ )) $(eval $(call gb_JunitTest_use_jar_classset,jurt_connections,jurt)) diff --git a/jurt/JunitTest_java.mk b/jurt/JunitTest_java.mk index a9cc19009b04..a4a408986ecd 100644 --- a/jurt/JunitTest_java.mk +++ b/jurt/JunitTest_java.mk @@ -28,7 +28,7 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_java)) $(eval $(call gb_JunitTest_use_jars,jurt_java,\ - $(OUTDIR)/bin/ridl.jar \ + ridl \ )) $(eval $(call gb_JunitTest_use_jar_classset,jurt_java,jurt)) diff --git a/jurt/JunitTest_java_remote.mk b/jurt/JunitTest_java_remote.mk index 9a103af1651a..7cf13c586abc 100644 --- a/jurt/JunitTest_java_remote.mk +++ b/jurt/JunitTest_java_remote.mk @@ -28,8 +28,8 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_java_remote)) $(eval $(call gb_JunitTest_use_jars,jurt_java_remote,\ - $(OUTDIR)/bin/OOoRunnerLight.jar \ - $(OUTDIR)/bin/ridl.jar \ + OOoRunnerLight \ + ridl \ )) $(eval $(call gb_JunitTest_use_jar_classset,jurt_java_remote,jurt)) diff --git a/jurt/JunitTest_remote.mk b/jurt/JunitTest_remote.mk index 0267930e768e..7133816ac45f 100644 --- a/jurt/JunitTest_remote.mk +++ b/jurt/JunitTest_remote.mk @@ -28,7 +28,7 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_remote)) $(eval $(call gb_JunitTest_use_jars,jurt_remote,\ - $(OUTDIR)/bin/ridl.jar \ + ridl \ )) $(eval $(call gb_JunitTest_use_jar_classset,jurt_remote,jurt)) diff --git a/jurt/JunitTest_uno.mk b/jurt/JunitTest_uno.mk index 5c4303ba2e26..36e26d38927a 100644 --- a/jurt/JunitTest_uno.mk +++ b/jurt/JunitTest_uno.mk @@ -28,8 +28,8 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_uno)) $(eval $(call gb_JunitTest_use_jars,jurt_uno,\ - $(OUTDIR)/bin/OOoRunnerLight.jar \ - $(OUTDIR)/bin/ridl.jar \ + OOoRunnerLight \ + ridl \ )) $(eval $(call gb_JunitTest_use_jar_classset,jurt_uno,jurt)) diff --git a/jurt/JunitTest_urp.mk b/jurt/JunitTest_urp.mk index 21739c6644fc..473059aa823b 100644 --- a/jurt/JunitTest_urp.mk +++ b/jurt/JunitTest_urp.mk @@ -32,8 +32,7 @@ $(eval $(call gb_JunitTest_use_customtargets,jurt_urp,\ )) $(eval $(call gb_JunitTest_use_jars,jurt_urp,\ - $(OUTDIR)/bin/ridl.jar \ - $(WORKDIR)/CustomTarget/jurt/test/com/sun/star/lib/uno/protocols/urp \ + ridl \ )) $(eval $(call gb_JunitTest_use_jar_classset,jurt_urp,jurt)) diff --git a/jurt/JunitTest_util.mk b/jurt/JunitTest_util.mk index 206903648a53..54a614f9f9ec 100644 --- a/jurt/JunitTest_util.mk +++ b/jurt/JunitTest_util.mk @@ -28,7 +28,7 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_util)) $(eval $(call gb_JunitTest_use_jars,jurt_util,\ - $(OUTDIR)/bin/ridl.jar \ + ridl \ )) $(eval $(call gb_JunitTest_use_jar_classset,jurt_util,jurt)) |