da85248be7
- updated to libreoffice-3.5.5.2 (3.5.2-rc2) - did some clean up OBS-URL: https://build.opensuse.org/request/show/112476 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=30
58 lines
2.3 KiB
Diff
58 lines
2.3 KiB
Diff
--- solenv/gbuild/Jar.mk.old 2012-02-24 16:34:51.000000000 +0100
|
|
+++ solenv/gbuild/Jar.mk 2012-03-20 19:54:16.000000000 +0100
|
|
@@ -145,6 +145,11 @@ define gb_Jar_add_system_jar
|
|
$(call gb_JavaClassSet_add_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
|
|
endef
|
|
|
|
+# specify Xbootclasspath/p
|
|
+define gb_Jar_prepend_xboot_jars
|
|
+$(call gb_JavaClassSet_prepend_xboot_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
|
|
+endef
|
|
+
|
|
# specify jars with imported modules
|
|
define gb_Jar_add_jars
|
|
$(call gb_JavaClassSet_add_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
|
|
--- solenv/gbuild/JavaClassSet.mk.old 2012-02-24 16:34:51.000000000 +0100
|
|
+++ solenv/gbuild/JavaClassSet.mk 2012-03-20 19:55:15.000000000 +0100
|
|
@@ -43,6 +43,8 @@ $(call gb_Helper_abbreviate_dirs_native,
|
|
$(filter-out $(JARDEPS),$(4))))) && \
|
|
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
|
|
$(gb_JavaClassSet_JAVACDEBUG) \
|
|
+ $(gb_JavaClassSet_XBOOTCLASSPATH) \
|
|
+ -Xbootclasspath/p:$(XBOOT_CP_P) \
|
|
-cp "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
|
|
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
|
|
@$$RESPONSEFILE &&) \
|
|
@@ -85,6 +87,18 @@ $(eval $(call gb_JavaClassSet_get_target
|
|
|
|
endef
|
|
|
|
+
|
|
+# Xbootclasspath
|
|
+define gb_JavaClassSet_prepend_xboot_jar
|
|
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
|
|
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : XBOOT_CP_P := $$(XBOOT_CP_P)$(gb_CLASSPATHSEP)$(strip $(2)))
|
|
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
|
|
+endef
|
|
+
|
|
+define gb_JavaClassSet_prepend_xboot_jars
|
|
+$(foreach jar,$(2),$(call gb_JavaClassSet_prepend_xboot_jar,$(1),$(jar)))
|
|
+endef
|
|
+
|
|
# problem: currently we can't get these dependencies to work
|
|
# build order dependency is a hack to get these prerequisites out of the way in the build command
|
|
define gb_JavaClassSet_add_jar
|
|
--- scripting/Jar_ScriptProviderForJavaScript.mk.old 2012-03-20 19:17:32.000000000 +0100
|
|
+++ scripting/Jar_ScriptProviderForJavaScript.mk 2012-03-20 19:49:17.000000000 +0100
|
|
@@ -37,6 +37,10 @@ $(eval $(call gb_Jar_add_jars,ScriptProv
|
|
$(OUTDIR)/bin/js.jar \
|
|
))
|
|
|
|
+$(eval $(call gb_Jar_prepend_xboot_jars,ScriptProviderForJavaScript,\
|
|
+ $(OUTDIR)/bin/js.jar \
|
|
+))
|
|
+
|
|
$(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, \
|