diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-22 23:27:32 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-22 23:28:37 +0100 |
commit | 91d60be7eeafa1f7872bda452bfb38936003f517 (patch) | |
tree | 4e563c6a781c7462e9bdbfcd3b3b29985573b072 | |
parent | 5e8c9887651334cede2f42c0578f993f74135b84 (diff) |
fdo#46102: Fix scripting jar manifests after gbuild'ification
-rw-r--r-- | scripting/Jar_ScriptFramework.mk | 2 | ||||
-rw-r--r-- | scripting/Jar_ScriptProviderForBeanShell.mk | 4 | ||||
-rw-r--r-- | scripting/Jar_ScriptProviderForJava.mk | 5 | ||||
-rw-r--r-- | scripting/Jar_ScriptProviderForJavaScript.mk | 2 | ||||
-rw-r--r-- | scripting/java/Framework/MANIFEST.MF | 2 | ||||
-rw-r--r-- | scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF | 2 |
6 files changed, 14 insertions, 3 deletions
diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk index 05774b9a89b6..1e6a4be32d49 100644 --- a/scripting/Jar_ScriptFramework.mk +++ b/scripting/Jar_ScriptFramework.mk @@ -37,6 +37,8 @@ $(eval $(call gb_Jar_add_jars,ScriptFramework,\ $(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO)) +$(eval $(call gb_Jar_set_manifest,ScriptFramework,$(SRCDIR)/scripting/java/Framework/MANIFEST.MF)) + $(eval $(call gb_Jar_set_packageroot,ScriptFramework,com)) $(eval $(call gb_Jar_add_sourcefiles,ScriptFramework,\ diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index 753ea101546a..aee4ad5d5a60 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -45,10 +45,10 @@ $(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting #TODO: Ensure "file://$(BSH_JAR)" is a proper file URL: ifeq ($(SYSTEM_BSH),YES) $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ - unoil.jar ScriptFramework.jar file://$(BSH_JAR))) + ScriptFramework.jar file://$(BSH_JAR))) else $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ - unoil.jar ScriptFramework.jar bsh.jar)) + ScriptFramework.jar bsh.jar)) endif $(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO)) diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk index 39b747b113d2..19e19952c97e 100644 --- a/scripting/Jar_ScriptProviderForJava.mk +++ b/scripting/Jar_ScriptProviderForJava.mk @@ -38,6 +38,11 @@ $(eval $(call gb_Jar_add_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)) $(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForJava,\ diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk index 5f690858ec16..bd405cc850e0 100644 --- a/scripting/Jar_ScriptProviderForJavaScript.mk +++ b/scripting/Jar_ScriptProviderForJavaScript.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Jar_add_jars,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, \ - unoil.jar ScriptFramework.jar js.jar)) + ScriptFramework.jar js.jar)) $(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO)) diff --git a/scripting/java/Framework/MANIFEST.MF b/scripting/java/Framework/MANIFEST.MF new file mode 100644 index 000000000000..4945b96d1a55 --- /dev/null +++ b/scripting/java/Framework/MANIFEST.MF @@ -0,0 +1,2 @@ +RegistrationClassName: com.sun.star.script.framework.security.SecurityDialog +UNO-Type-Path: diff --git a/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF b/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF new file mode 100644 index 000000000000..f2056d0c4214 --- /dev/null +++ b/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF @@ -0,0 +1,2 @@ +RegistrationClassName: com.sun.star.script.framework.provider.java.ScriptProviderForJava +UNO-Type-Path: |