Kaydet (Commit) a4f4e513 authored tarafından Matúš Kukan's avatar Matúš Kukan

use gb_Helper_make_url here

üst 803b1840
...@@ -42,10 +42,9 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\ ...@@ -42,10 +42,9 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\
$(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF)) $(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF))
#TODO: Ensure "file://$(BSH_JAR)" is a proper file URL:
ifeq ($(SYSTEM_BSH),YES) ifeq ($(SYSTEM_BSH),YES)
$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
ScriptFramework.jar file://$(BSH_JAR))) ScriptFramework.jar $(call gb_Helper_make_url,$(BSH_JAR))))
else else
$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
ScriptFramework.jar bsh.jar)) ScriptFramework.jar bsh.jar))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment