diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-15 20:10:10 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-15 21:29:14 +0200 |
| commit | cdbd6957a59183667f65dcb233bd9ddffd7b6e91 (patch) | |
| tree | fc0e31ba2960284d0be72e7c88f133e84b20215b /scripting | |
| parent | 8b8e749fae45ba41e361897b447173fb6a26eb38 (diff) | |
gbuild: remove most uses of gb_Jar_set_jarclasspath:
With gb_Jar_add_jar and gb_Jar_add_system_jar adding to the manifest
classpath automatically it is no longer necessary to call
gb_Jar_set_jarclasspath manually except for the URE jars, which
are apparently not supposed to be added automatically.
Change-Id: I1e743e7ecb9cb5651e02005aa09e127bea1b0a29
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/Jar_ScriptProviderForBeanShell.mk | 5 | ||||
| -rw-r--r-- | scripting/Jar_ScriptProviderForJava.mk | 3 | ||||
| -rw-r--r-- | scripting/Jar_ScriptProviderForJavaScript.mk | 5 |
3 files changed, 0 insertions, 13 deletions
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index dc6f4dc7f931..228896d4c06a 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -42,11 +42,6 @@ $(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_jarclasspath,ScriptProviderForBeanShell, \ - ScriptFramework.jar \ - $(if $(filter-out YES,$(SYSTEM_BSH)),bsh.jar) \ -)) - $(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO)) $(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com)) diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk index bcff02d6f6f1..74c9ddf308da 100644 --- a/scripting/Jar_ScriptProviderForJava.mk +++ b/scripting/Jar_ScriptProviderForJava.mk @@ -38,9 +38,6 @@ $(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\ $(eval $(call gb_Jar_set_componentfile,ScriptProviderForJava,scripting/java/ScriptProviderForJava,OOO)) -$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJava, \ - ScriptFramework.jar)) - $(eval $(call gb_Jar_set_manifest,ScriptProviderForJava,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF)) $(eval $(call gb_Jar_set_packageroot,ScriptProviderForJava,com)) diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk index 16c2cf4eb458..84dfe8301fc3 100644 --- a/scripting/Jar_ScriptProviderForJavaScript.mk +++ b/scripting/Jar_ScriptProviderForJavaScript.mk @@ -42,11 +42,6 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForJavaScript,\ $(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF)) -$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJavaScript, \ - ScriptFramework.jar \ - $(if $(filter-out YES,$(SYSTEM_RHINO)),js.jar) \ -)) - $(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO)) $(eval $(call gb_Jar_set_packageroot,ScriptProviderForJavaScript,com)) |