[Libreoffice-commits] .: 3 commits - javaunohelper/Jar_juh.mk jurt/Jar_jurt.mk scripting/Jar_ScriptFramework.mk scripting/Jar_ScriptProviderForBeanShell.mk scripting/Jar_ScriptProviderForJava.mk scripting/Jar_ScriptProviderForJavaScript.mk scripting/java solenv/gbuild

[Stephan Bergmann]

 javaunohelper/Jar_juh.mk                                               |    2 ++
 jurt/Jar_jurt.mk                                                       |    3 +++
 scripting/Jar_ScriptFramework.mk                                       |    2 ++
 scripting/Jar_ScriptProviderForBeanShell.mk                            |    4 ++--
 scripting/Jar_ScriptProviderForJava.mk                                 |    5 +++++
 scripting/Jar_ScriptProviderForJavaScript.mk                           |    2 +-
 scripting/java/Framework/MANIFEST.MF                                   |    2 ++
 scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF |    2 ++
 solenv/gbuild/Jar.mk                                                   |    2 +-
 9 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 2413fd4f9f784fbde821b087b78ecf3a6afb4f31
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 22 23:28:06 2012 +0100

    Fix URE jar manifests after gbuild'ification

diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
index 142805d..ef319ba 100644
--- a/javaunohelper/Jar_juh.mk
+++ b/javaunohelper/Jar_juh.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Jar_add_jars,juh,\
 
 $(eval $(call gb_Jar_set_packageroot,juh,com))
 
+$(eval $(call gb_Jar_set_jarclasspath,juh,ridl.jar jurt.jar ../../lib/ ../bin/))
+
 $(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest))
 
 $(eval $(call gb_Jar_set_componentfile,juh,javaunohelper/util/juh,URE))
diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk
index 8a6a87d..4cd6bb8 100644
--- a/jurt/Jar_jurt.mk
+++ b/jurt/Jar_jurt.mk
@@ -36,6 +36,9 @@ $(eval $(call gb_Jar_set_packageroot,jurt,com))
 
 $(eval $(call gb_Jar_set_manifest,jurt,$(SRCDIR)/jurt/util/manifest))
 
+$(eval $(call gb_Jar_set_jarclasspath,jurt, \
+    ridl.jar unoloader.jar ../../lib/ ../bin/))
+
 $(eval $(call gb_Jar_add_sourcefiles,jurt,\
     jurt/com/sun/star/comp/bridgefactory/BridgeFactory \
     jurt/com/sun/star/comp/connections/Acceptor \
commit 91d60be7eeafa1f7872bda452bfb38936003f517
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 22 23:27:32 2012 +0100

    fdo#46102: Fix scripting jar manifests after gbuild'ification

diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk
index 05774b9..1e6a4be 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 753ea10..aee4ad5 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 39b747b..19e1995 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 5f69085..bd405cc 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 0000000..4945b96
--- /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 0000000..f2056d0
--- /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: 
commit 5e8c9887651334cede2f42c0578f993f74135b84
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 22 23:14:54 2012 +0100

    Produce more beautiful jar manifests

diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 70c14c5..d07467e 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -59,7 +59,7 @@ define gb_Jar__command
 	$(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(call gb_Jar_get_workdir,$(1))/META-INF && \
 	echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \
-	echo "Class-Path: $(JARCLASSPATH)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
+	$(if $(JARCLASSPATH),echo "Class-Path: $(strip $(JARCLASSPATH))" >> $(call gb_Jar_get_manifest_target,$(1)) &&) \
 	echo "Solar-Version: $(RSCREVISION)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
 	cat $(if $(MANIFEST),$(MANIFEST),$(gb_Helper_MISCDUMMY)) >> $(call gb_Jar_get_manifest_target,$(1)) && \
 	mkdir -p $(dir $(2)) && cd $(call gb_Jar_get_workdir,$(1)) && \