[Libreoffice-commits] .: 5 commits - Repository.mk RepositoryExternal.mk accessibility/Jar_accessibility.mk accessibility/Jar_uno_accessbridge.mk bean/Jar_officebean.mk bean/JunitTest_bean_complex.mk chart2/JunitTest_chart2_unoapi.mk comphelper/JunitTest_comphelper_complex.mk configmgr/JunitTest_configmgr_unoapi.mk connectivity/Jar_ConnectivityTools.mk connectivity/JunitTest_complex.mk dbaccess/JunitTest_dbaccess_complex.mk dbaccess/JunitTest_dbaccess_unoapi.mk filter/Jar_XSLTFilter.mk filter/Jar_XSLTValidate.mk filter/JunitTest_filter_complex.mk forms/JunitTest_forms_complex.mk forms/JunitTest_forms_unoapi.mk framework/JunitTest_framework_complex.mk framework/JunitTest_framework_unoapi.mk javaunohelper/Jar_juh.mk jurt/Jar_jurt.mk jurt/JunitTest_bridgefactory.mk jurt/JunitTest_connections.mk jurt/JunitTest_java.mk jurt/JunitTest_java_remote.mk jurt/JunitTest_remote.mk jurt/JunitTest_uno.mk jurt/JunitTest_urp.mk jurt/JunitTest_util.mk linguistic/JunitTest_linguistic_complex.mk linguistic/J unitTest_linguistic_unoapi.mk nlpsolver/Jar_EvolutionarySolver.mk nlpsolver/Jar_nlpsolver.mk qadevOOo/Jar_OOoRunner.mk qadevOOo/Jar_OOoRunnerLight.mk qadevOOo/JunitTest_qadevOOo_unoapi.mk reportbuilder/Jar_reportbuilder.mk reportdesign/JunitTest_reportdesign_complex.mk ridljar/JunitTest_typedesc.mk ridljar/JunitTest_uno.mk ridljar/JunitTest_util.mk sc/JunitTest_sc_complex.mk sc/JunitTest_sc_unoapi.mk scripting/Jar_HelloWorld.mk scripting/Jar_Highlight.mk scripting/Jar_MemoryUsage.mk scripting/Jar_ScriptFramework.mk scripting/Jar_ScriptProviderForBeanShell.mk scripting/Jar_ScriptProviderForJava.mk scripting/Jar_ScriptProviderForJavaScript.mk sd/JunitTest_sd_unoapi.mk sfx2/JunitTest_sfx2_complex.mk sfx2/JunitTest_sfx2_unoapi.mk smoketest/Jar_TestExtension.mk solenv/gbuild sot/JunitTest_sot_complex.mk starmath/JunitTest_starmath_unoapi.mk svl/JunitTest_svl_complex.mk svtools/JunitTest_svtools_unoapi.mk svx/JunitTest_svx_unoapi.mk sw/JunitTest_sw_complex.mk sw/JunitTest_sw_unoap i.mk swext/Jar_mediawiki.mk testtools/Jar_testComponent.mk toolkit/JunitTest_toolkit_unoapi.mk ucb/JunitTest_ucb_complex.mk ucb/JunitTest_ucb_unoapi.mk unotest/Jar_test-tools.mk unotest/Jar_test.mk unotools/JunitTest_unotools_complex.mk unoxml/JunitTest_unordf_complex.mk unoxml/JunitTest_unoxml_complex.mk wizards/Jar_agenda.mk wizards/Jar_commonwizards.mk wizards/Jar_fax.mk wizards/Jar_form.mk wizards/Jar_letter.mk wizards/Jar_query.mk wizards/Jar_report.mk wizards/Jar_reportbuilder.mk wizards/Jar_table.mk wizards/Jar_web.mk writerfilter/JunitTest_writerfilter_complex.mk xmerge/Jar_XMergeBridge.mk xmerge/Jar_aportisdoc.mk xmerge/Jar_pexcel.mk xmerge/Jar_pocketword.mk xmerge/Jar_xmerge.mk xmloff/JunitTest_xmloff_unoapi.mk
Michael Stahl
mst at kemper.freedesktop.org
Fri Aug 17 03:55:44 PDT 2012
Repository.mk | 56 +++++++++++++++++
RepositoryExternal.mk | 81 +++++++++++++++++++------
accessibility/Jar_accessibility.mk | 6 -
accessibility/Jar_uno_accessbridge.mk | 8 +-
bean/Jar_officebean.mk | 8 +-
bean/JunitTest_bean_complex.mk | 10 +--
chart2/JunitTest_chart2_unoapi.mk | 10 +--
comphelper/JunitTest_comphelper_complex.mk | 10 +--
configmgr/JunitTest_configmgr_unoapi.mk | 10 +--
connectivity/Jar_ConnectivityTools.mk | 12 +--
connectivity/JunitTest_complex.mk | 16 ++--
dbaccess/JunitTest_dbaccess_complex.mk | 12 +--
dbaccess/JunitTest_dbaccess_unoapi.mk | 10 +--
filter/Jar_XSLTFilter.mk | 8 +-
filter/Jar_XSLTValidate.mk | 8 +-
filter/JunitTest_filter_complex.mk | 10 +--
forms/JunitTest_forms_complex.mk | 10 +--
forms/JunitTest_forms_unoapi.mk | 10 +--
framework/JunitTest_framework_complex.mk | 10 +--
framework/JunitTest_framework_unoapi.mk | 10 +--
javaunohelper/Jar_juh.mk | 6 -
jurt/Jar_jurt.mk | 4 -
jurt/JunitTest_bridgefactory.mk | 2
jurt/JunitTest_connections.mk | 2
jurt/JunitTest_java.mk | 2
jurt/JunitTest_java_remote.mk | 4 -
jurt/JunitTest_remote.mk | 2
jurt/JunitTest_uno.mk | 4 -
jurt/JunitTest_urp.mk | 3
jurt/JunitTest_util.mk | 2
linguistic/JunitTest_linguistic_complex.mk | 12 +--
linguistic/JunitTest_linguistic_unoapi.mk | 10 +--
nlpsolver/Jar_EvolutionarySolver.mk | 3
nlpsolver/Jar_nlpsolver.mk | 12 +--
qadevOOo/Jar_OOoRunner.mk | 10 +--
qadevOOo/Jar_OOoRunnerLight.mk | 10 +--
qadevOOo/JunitTest_qadevOOo_unoapi.mk | 10 +--
reportbuilder/Jar_reportbuilder.mk | 10 +--
reportdesign/JunitTest_reportdesign_complex.mk | 10 +--
ridljar/JunitTest_typedesc.mk | 2
ridljar/JunitTest_uno.mk | 2
ridljar/JunitTest_util.mk | 4 -
sc/JunitTest_sc_complex.mk | 10 +--
sc/JunitTest_sc_unoapi.mk | 10 +--
scripting/Jar_HelloWorld.mk | 8 +-
scripting/Jar_Highlight.mk | 8 +-
scripting/Jar_MemoryUsage.mk | 8 +-
scripting/Jar_ScriptFramework.mk | 8 +-
scripting/Jar_ScriptProviderForBeanShell.mk | 10 +--
scripting/Jar_ScriptProviderForJava.mk | 10 +--
scripting/Jar_ScriptProviderForJavaScript.mk | 10 +--
sd/JunitTest_sd_unoapi.mk | 10 +--
sfx2/JunitTest_sfx2_complex.mk | 12 +--
sfx2/JunitTest_sfx2_unoapi.mk | 10 +--
smoketest/Jar_TestExtension.mk | 8 +-
solenv/gbuild/Helper.mk | 18 +++++
solenv/gbuild/Jar.mk | 16 ++--
solenv/gbuild/JavaClassSet.mk | 13 ++--
solenv/gbuild/JunitTest.mk | 35 +++++++++-
sot/JunitTest_sot_complex.mk | 10 +--
starmath/JunitTest_starmath_unoapi.mk | 10 +--
svl/JunitTest_svl_complex.mk | 12 +--
svtools/JunitTest_svtools_unoapi.mk | 10 +--
svx/JunitTest_svx_unoapi.mk | 10 +--
sw/JunitTest_sw_complex.mk | 10 +--
sw/JunitTest_sw_unoapi.mk | 10 +--
swext/Jar_mediawiki.mk | 8 +-
testtools/Jar_testComponent.mk | 6 -
toolkit/JunitTest_toolkit_unoapi.mk | 10 +--
ucb/JunitTest_ucb_complex.mk | 10 +--
ucb/JunitTest_ucb_unoapi.mk | 10 +--
unotest/Jar_test-tools.mk | 6 -
unotest/Jar_test.mk | 8 +-
unotools/JunitTest_unotools_complex.mk | 12 +--
unoxml/JunitTest_unordf_complex.mk | 10 +--
unoxml/JunitTest_unoxml_complex.mk | 10 +--
wizards/Jar_agenda.mk | 12 +--
wizards/Jar_commonwizards.mk | 10 +--
wizards/Jar_fax.mk | 12 +--
wizards/Jar_form.mk | 12 +--
wizards/Jar_letter.mk | 12 +--
wizards/Jar_query.mk | 12 +--
wizards/Jar_report.mk | 12 +--
wizards/Jar_reportbuilder.mk | 14 ++--
wizards/Jar_table.mk | 12 +--
wizards/Jar_web.mk | 12 +--
writerfilter/JunitTest_writerfilter_complex.mk | 10 +--
xmerge/Jar_XMergeBridge.mk | 10 +--
xmerge/Jar_aportisdoc.mk | 2
xmerge/Jar_pexcel.mk | 2
xmerge/Jar_pocketword.mk | 2
xmerge/Jar_xmerge.mk | 8 +-
xmloff/JunitTest_xmloff_unoapi.mk | 10 +--
93 files changed, 559 insertions(+), 412 deletions(-)
New commits:
commit 87a723da66a16293b1611e08991fbf6925144448
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 17 12:43:37 2012 +0200
gbuild: in which the author discovers gb_Jar_set_componentfile
... which appears to have 3 layers, OOO, URE and OXT, so add OXT to jar
registration stuff to make it consistent.
Change-Id: I4d12185451bd043c39aa254ff581bc15824f1bbe
diff --git a/Repository.mk b/Repository.mk
index ec9f19e..2cb1b02 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -693,13 +693,13 @@ $(eval $(call gb_Helper_register_jars,URE, \
juh \
jurt \
ridl \
+ testComponent \
unoil \
unoloader \
))
$(eval $(call gb_Helper_register_jars,OOO, \
ConnectivityTools \
- EvolutionarySolver \
FCFGMerge \
HelloWorld \
Highlight \
@@ -723,8 +723,6 @@ $(eval $(call gb_Helper_register_jars,OOO, \
java_accessibility \
java_uno_accessbridge \
letter \
- mediawiki \
- nlpsolver \
officebean \
pexcel \
pocketword \
@@ -732,13 +730,18 @@ $(eval $(call gb_Helper_register_jars,OOO, \
report \
reportbuilderwizard \
sdbc_hsqldb \
- sun-report-builder \
table \
test \
test-tools \
- testComponent \
web \
xmerge \
))
+$(eval $(call gb_Helper_register_jars,OXT, \
+ EvolutionarySolver \
+ mediawiki \
+ nlpsolver \
+ sun-report-builder \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8383d9a..a2f165e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2067,7 +2067,7 @@ endef
else # !SYSTEM_APACHE_COMMONS
-$(eval $(call gb_Helper_register_jars,OOO,\
+$(eval $(call gb_Helper_register_jars,OXT,\
commons-codec-1.3 \
commons-httpclient-3.1 \
commons-lang-2.3 \
@@ -2141,7 +2141,7 @@ endef
else # !SYSTEM_JFREEREPORT
-$(eval $(call gb_Helper_register_jars,OOO,\
+$(eval $(call gb_Helper_register_jars,OXT,\
flow-engine-0.9.4 \
flute-1.1.6 \
libbase-1.1.6 \
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index a43977b..176f5ff 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -106,7 +106,7 @@ define gb_Helper_init_registries
gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
-gb_Jar_VALIDGROUPS := URE OOO
+gb_Jar_VALIDGROUPS := URE OOO OXT
$$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=))
$$(foreach group,$$(gb_Library_VALIDGROUPS),$$(eval gb_Library_$$(group) :=))
commit 05c90415587aa4d476fe8360b8e0edfdd56e586d
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 17 11:59:38 2012 +0200
gbuild: remove some cruft from java stuff
Change-Id: If1917d5aecfbb4cea230075d974d7f57a7a8ea4e
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 9e57be2..4527fcf 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -26,8 +26,6 @@
#
#*************************************************************************
-# if a jar prerequisite has changed, the ClassSet must be recompiled. How?
-
# Jar class
gb_Jar_JAVACOMMAND := $(JAVAINTERPRETER)
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index c28875e..3f65099 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -118,8 +118,6 @@ $$(call gb_Output_error,\
gb_JavaClassSet_add_jar: use gb_JavaClassSet_use_jar instead.)
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_use_jar
ifneq (,$$(filter-out $(gb_Jar_KNOWN),$(2)))
$$(eval $$(call gb_Output_info,currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL))
@@ -128,7 +126,6 @@ endif
$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_Jar_get_outdir_target,$(2))
$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(call gb_Jar_get_outdir_target,$(2))
$(call gb_JavaClassSet_add_classpath,$(1),$(call gb_Jar_get_outdir_target,$(2)))
-$(2) :| $(gb_Helper_PHONY)
endef
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 8a5ff45..8dbc1bf 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -40,6 +40,7 @@ $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_targe
ifneq (,$(strip $(OOO_JUNIT_JAR)))
# DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
+# DISABLE_SAL_DBGBOX is the same, for osl/diagnose.h on Windows only
.PHONY : $(call gb_JunitTest_get_target,%)
$(call gb_JunitTest_get_target,%) :
$(call gb_Output_announce,$*,$(true),JUT,2)
@@ -111,7 +112,6 @@ define gb_JunitTest_use_jar
$(call gb_JavaClassSet_use_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_Jar_get_outdir_target,$(2))
$(call gb_JunitTest_get_target,$(1)) : $(call gb_Jar_get_outdir_target,$(2))
-$(2) :| $(gb_Helper_PHONY)
endef
commit b254f4fb0a2d53da8f4c6a16ec7e393ee91620c4
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 17 11:47:29 2012 +0200
gbuild: add gb_Junit_use_external and clean up connectivity complex test
Change-Id: I8c4b6ff6b1993d1c4de68696089f86fbcf4cecc6
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 121c343..8383d9a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1973,6 +1973,9 @@ ifeq ($(SYSTEM_HSQLDB),YES)
define gb_Jar__use_hsqldb
$(call gb_Jar_use_system_jar,$(1),$(HSQLDB_JAR))
endef
+define gb_JunitTest__use_hsqldb
+$(call gb_JunitTest_use_system_jar,$(1),$(HSQLDB_JAR))
+endef
else # !SYSTEM_HSQLDB
@@ -1983,6 +1986,9 @@ $(eval $(call gb_Helper_register_jars,OOO,\
define gb_Jar__use_hsqldb
$(call gb_Jar_use_jar,$(1),hsqldb)
endef
+define gb_JunitTest__use_hsqldb
+$(call gb_JunitTest_use_jar,$(1),hsqldb)
+endef
endif # SYSTEM_HSQLDB
diff --git a/connectivity/JunitTest_complex.mk b/connectivity/JunitTest_complex.mk
index 59fcdc6..609f5ea 100644
--- a/connectivity/JunitTest_complex.mk
+++ b/connectivity/JunitTest_complex.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_JunitTest_set_defs,connectivity_complex,\
-Dorg.openoffice.test.arg.sce=$(SRCDIR)/connectivity/qa/scenearios.sce \
))
-# TODO: add use_externals to JunitTest
$(eval $(call gb_JunitTest_use_jars,connectivity_complex,\
jurt \
OOoRunner \
@@ -41,13 +40,9 @@ $(eval $(call gb_JunitTest_use_jars,connectivity_complex,\
unoil \
))
-ifeq ($(SYSTEM_HSQLDB),YES)
-$(eval $(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,connectivity_complex),$(HSQLDB_JAR)))
-else
-$(eval $(call gb_JunitTest_use_jars,connectivity_complex,\
+$(eval $(call gb_JunitTest_use_externals,connectivity_complex,\
hsqldb \
))
-endif
$(eval $(call gb_JunitTest_add_classes,connectivity_complex,\
org.openoffice.test.UnoApiTest \
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index ea98eaf..9e57be2 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -229,7 +229,7 @@ $$(call gb_Output_error,\
endef
define gb_Jar_use_system_jars
-$(call gb_JavaClassSet_use_system_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
+$(foreach jar,$(2),$(call gb_Jar_use_system_jar,$(1),$(jar)))
endef
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 590f848..8a5ff45 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -137,6 +137,30 @@ $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call
endef
+define gb_JunitTest_use_system_jar
+$(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
+
+endef
+
+define gb_JunitTest_use_system_jars
+$(foreach jar,$(2),$(call gb_JunitTest_use_system_jar,$(1),$(jar)))
+
+endef
+
+# this forwards to functions that must be defined in RepositoryExternal.mk.
+# $(eval $(call gb_JunitTest_use_external,jar,external))
+define gb_JunitTest_use_external
+$(if $(value gb_JunitTest__use_$(2)),\
+ $(call gb_JunitTest__use_$(2),$(1)),\
+ $(error gb_JunitTest_use_external: unknown external: $(2)))
+
+endef
+
+define gb_JunitTest_use_externals
+$(foreach external,$(2),$(call gb_JunitTest_use_external,$(1),$(external)))
+
+endef
+
define gb_JunitTest_add_customtarget_dependency
$$(call gb_Output_error,\
gb_JunitTest_add_customtarget_dependency: use gb_Jar_use_customtarget instead.)
@@ -177,6 +201,10 @@ gb_JunitTest_add_sourcefiles :=
gb_JunitTest_use_jar :=
gb_JunitTest_use_jars :=
gb_JunitTest_use_jar_classset :=
+gb_JunitTest_use_system_jar :=
+gb_JunitTest_use_system_jars :=
+gb_JunitTest_use_external :=
+gb_JunitTest_use_externals :=
gb_JunitTest_use_customtarget :=
gb_JunitTest_use_customtargets :=
commit 3e88d02082219c318555c0eaaa739de3d4ea8a5d
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 17 11:23:48 2012 +0200
gbuild: ignore the registered URE Jars for manifest classpath
Change-Id: If8daaf86973656df737daf1b82c3fd2a3f55d58b
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 352423b..ea98eaf 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -190,8 +190,8 @@ $$(call gb_Output_error,\
gb_Jar_add_jar: use gb_Jar_use_jar instead.)
endef
-# these are not added to manifest classpath
-gb_Jar_default_jars := unoloader ridl jurt unoil juh java_uno
+# URE jars are not added to manifest classpath
+gb_Jar_default_jars := $(gb_Jar_URE)
# remember: classpath is "inherited" to ClassSet
define gb_Jar_use_jar
commit 5a4bcd3b7578523af6a2754369231ca1cf413f82
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 17 11:02:49 2012 +0200
gbuild: register all jars
Change-Id: I9f49970e5e06d1afd3fc066a20d1671c93e262fc
diff --git a/Repository.mk b/Repository.mk
index 8e782d3..ec9f19e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -688,4 +688,57 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
))
endif
+$(eval $(call gb_Helper_register_jars,URE, \
+ java_uno \
+ juh \
+ jurt \
+ ridl \
+ unoil \
+ unoloader \
+))
+
+$(eval $(call gb_Helper_register_jars,OOO, \
+ ConnectivityTools \
+ EvolutionarySolver \
+ FCFGMerge \
+ HelloWorld \
+ Highlight \
+ MemoryUsage \
+ OOoRunner \
+ ScriptFramework \
+ ScriptProviderForBeanShell \
+ ScriptProviderForJava \
+ ScriptProviderForJavaScript \
+ TestExtension \
+ OOoRunnerLight \
+ XMergeBridge \
+ XSLTFilter \
+ XSLTValidate \
+ commonwizards \
+ agenda \
+ aportisdoc \
+ fax \
+ form \
+ htmlsoff \
+ java_accessibility \
+ java_uno_accessbridge \
+ letter \
+ mediawiki \
+ nlpsolver \
+ officebean \
+ pexcel \
+ pocketword \
+ query \
+ report \
+ reportbuilderwizard \
+ sdbc_hsqldb \
+ sun-report-builder \
+ table \
+ test \
+ test-tools \
+ testComponent \
+ web \
+ xmerge \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index fad7628..121c343 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1976,8 +1976,12 @@ endef
else # !SYSTEM_HSQLDB
+$(eval $(call gb_Helper_register_jars,OOO,\
+ hsqldb \
+))
+
define gb_Jar__use_hsqldb
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/hsqldb.jar)
+$(call gb_Jar_use_jar,$(1),hsqldb)
endef
endif # SYSTEM_HSQLDB
@@ -1990,8 +1994,12 @@ endef
else # !SYSTEM_SAXON
+$(eval $(call gb_Helper_register_jars,OOO,\
+ saxon9 \
+))
+
define gb_Jar__use_saxon
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/saxon9.jar)
+$(call gb_Jar_use_jar,$(1),saxon9)
endef
endif # SYSTEM_SAXON
@@ -2004,8 +2012,12 @@ endef
else # !SYSTEM_BSH
+$(eval $(call gb_Helper_register_jars,OOO,\
+ bsh \
+))
+
define gb_Jar__use_bsh
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/bsh.jar)
+$(call gb_Jar_use_jar,$(1),bsh)
endef
endif # SYSTEM_BSH
@@ -2019,8 +2031,12 @@ endef
else # !SYSTEM_RHINO
+$(eval $(call gb_Helper_register_jars,OOO,\
+ js \
+))
+
define gb_Jar__use_rhino
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/js.jar)
+$(call gb_Jar_use_jar,$(1),js)
endef
endif # SYSTEM_RHINO
@@ -2045,20 +2061,27 @@ endef
else # !SYSTEM_APACHE_COMMONS
+$(eval $(call gb_Helper_register_jars,OOO,\
+ commons-codec-1.3 \
+ commons-httpclient-3.1 \
+ commons-lang-2.3 \
+ commons-logging-1.1.1 \
+))
+
define gb_Jar__use_commons-codec
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-codec-1.3.jar)
+$(call gb_Jar_use_jar,$(1),commons-codec-1.3)
endef
define gb_Jar__use_commons-httpclient
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-httpclient-3.1.jar)
+$(call gb_Jar_use_jar,$(1),commons-httpclient-3.1)
endef
define gb_Jar__use_commons-lang
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-lang-2.3.jar)
+$(call gb_Jar_use_jar,$(1),commons-lang-2.3)
endef
define gb_Jar__use_commons-logging
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-logging-1.1.1.jar)
+$(call gb_Jar_use_jar,$(1),commons-logging-1.1.1)
endef
endif # SYSTEM_APACHE_COMMONS
@@ -2112,48 +2135,62 @@ endef
else # !SYSTEM_JFREEREPORT
+$(eval $(call gb_Helper_register_jars,OOO,\
+ flow-engine-0.9.4 \
+ flute-1.1.6 \
+ libbase-1.1.6 \
+ libfonts-1.1.6 \
+ libformula-1.1.7 \
+ liblayout-0.2.10 \
+ libloader-1.1.6 \
+ librepository-1.1.6 \
+ libserializer-1.1.6 \
+ libxml-1.1.7 \
+ sac \
+))
+
define gb_Jar__use_flow-engine
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/flow-engine-0.9.4.jar)
+$(call gb_Jar_use_jar,$(1),flow-engine-0.9.4)
endef
define gb_Jar__use_flute
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/flute-1.1.6.jar)
+$(call gb_Jar_use_jar,$(1),flute-1.1.6)
endef
define gb_Jar__use_libbase
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libbase-1.1.6.jar)
+$(call gb_Jar_use_jar,$(1),libbase-1.1.6)
endef
define gb_Jar__use_libfonts
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libfonts-1.1.6.jar)
+$(call gb_Jar_use_jar,$(1),libfonts-1.1.6)
endef
define gb_Jar__use_libformula
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libformula-1.1.7.jar)
+$(call gb_Jar_use_jar,$(1),libformula-1.1.7)
endef
define gb_Jar__use_liblayout
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/liblayout-0.2.10.jar)
+$(call gb_Jar_use_jar,$(1),liblayout-0.2.10)
endef
define gb_Jar__use_libloader
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libloader-1.1.6.jar)
+$(call gb_Jar_use_jar,$(1),libloader-1.1.6)
endef
define gb_Jar__use_librepository
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/librepository-1.1.6.jar)
+$(call gb_Jar_use_jar,$(1),librepository-1.1.6)
endef
define gb_Jar__use_libserializer
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libserializer-1.1.6.jar)
+$(call gb_Jar_use_jar,$(1),libserializer-1.1.6)
endef
define gb_Jar__use_libxml
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libxml-1.1.7.jar)
+$(call gb_Jar_use_jar,$(1),libxml-1.1.7)
endef
define gb_Jar__use_sac
-$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/sac.jar)
+$(call gb_Jar_use_jar,$(1),sac)
endef
endif # SYSTEM_JFREEREPORT
diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk
index 1d82c5f..0f7af1d 100644
--- a/accessibility/Jar_accessibility.mk
+++ b/accessibility/Jar_accessibility.mk
@@ -28,9 +28,9 @@
$(eval $(call gb_Jar_Jar,java_accessibility))
$(eval $(call gb_Jar_use_jars,java_accessibility,\
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
+ jurt \
+ ridl \
+ unoil \
))
$(eval $(call gb_Jar_set_packageroot,java_accessibility,org))
diff --git a/accessibility/Jar_uno_accessbridge.mk b/accessibility/Jar_uno_accessbridge.mk
index 3cefaa8..20be9f8 100644
--- a/accessibility/Jar_uno_accessbridge.mk
+++ b/accessibility/Jar_uno_accessbridge.mk
@@ -28,10 +28,10 @@
$(eval $(call gb_Jar_Jar,java_uno_accessbridge))
$(eval $(call gb_Jar_use_jars,java_uno_accessbridge,\
- $(OUTDIR)/bin/java_accessibility.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
+ java_accessibility \
+ jurt \
+ ridl \
+ unoil \
))
$(eval $(call gb_Jar_set_packageroot,java_uno_accessbridge,org))
diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk
index 1b897a6..7e7391a 100644
--- a/bean/Jar_officebean.mk
+++ b/bean/Jar_officebean.mk
@@ -30,10 +30,10 @@
$(eval $(call gb_Jar_Jar,officebean))
$(eval $(call gb_Jar_use_jars,officebean,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
))
$(eval $(call gb_Jar_set_packageroot,officebean,com))
diff --git a/bean/JunitTest_bean_complex.mk b/bean/JunitTest_bean_complex.mk
index 5eec323..8c2e549 100644
--- a/bean/JunitTest_bean_complex.mk
+++ b/bean/JunitTest_bean_complex.mk
@@ -30,11 +30,11 @@
$(eval $(call gb_JunitTest_JunitTest,bean_complex))
$(eval $(call gb_JunitTest_use_jars,bean_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/officebean.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ officebean \
))
$(eval $(call gb_JunitTest_add_sourcefiles,bean_complex,\
diff --git a/chart2/JunitTest_chart2_unoapi.mk b/chart2/JunitTest_chart2_unoapi.mk
index 575c51f..23c2871 100644
--- a/chart2/JunitTest_chart2_unoapi.mk
+++ b/chart2/JunitTest_chart2_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,chart2_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,chart2_unoapi,\
diff --git a/comphelper/JunitTest_comphelper_complex.mk b/comphelper/JunitTest_comphelper_complex.mk
index ba5645c..af9c3db 100644
--- a/comphelper/JunitTest_comphelper_complex.mk
+++ b/comphelper/JunitTest_comphelper_complex.mk
@@ -25,11 +25,11 @@ $(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\
))
$(eval $(call gb_JunitTest_use_jars,comphelper_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,comphelper_complex,\
diff --git a/configmgr/JunitTest_configmgr_unoapi.mk b/configmgr/JunitTest_configmgr_unoapi.mk
index 70b570c..d62ba51 100644
--- a/configmgr/JunitTest_configmgr_unoapi.mk
+++ b/configmgr/JunitTest_configmgr_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,configmgr_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,configmgr_unoapi,\
diff --git a/connectivity/Jar_ConnectivityTools.mk b/connectivity/Jar_ConnectivityTools.mk
index 9841bcb..0f89c96 100644
--- a/connectivity/Jar_ConnectivityTools.mk
+++ b/connectivity/Jar_ConnectivityTools.mk
@@ -28,12 +28,12 @@
$(eval $(call gb_Jar_Jar,ConnectivityTools))
$(eval $(call gb_Jar_use_jars,ConnectivityTools,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/OOoRunnerLight.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
+ OOoRunnerLight \
))
$(eval $(call gb_Jar_set_packageroot,ConnectivityTools,connectivity))
diff --git a/connectivity/JunitTest_complex.mk b/connectivity/JunitTest_complex.mk
index c96d688..59fcdc6 100644
--- a/connectivity/JunitTest_complex.mk
+++ b/connectivity/JunitTest_complex.mk
@@ -34,14 +34,21 @@ $(eval $(call gb_JunitTest_set_defs,connectivity_complex,\
# TODO: add use_externals to JunitTest
$(eval $(call gb_JunitTest_use_jars,connectivity_complex,\
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(if $(filter YES,$(SYSTEM_HSQLDB)),$(HSQLDB_JAR),$(OUTDIR)/bin/hsqldb.jar) \
+ jurt \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
))
+ifeq ($(SYSTEM_HSQLDB),YES)
+$(eval $(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,connectivity_complex),$(HSQLDB_JAR)))
+else
+$(eval $(call gb_JunitTest_use_jars,connectivity_complex,\
+ hsqldb \
+))
+endif
+
$(eval $(call gb_JunitTest_add_classes,connectivity_complex,\
org.openoffice.test.UnoApiTest \
))
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk
index 411ad95..fd1511e 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -10,12 +10,12 @@
$(eval $(call gb_JunitTest_JunitTest,dba_ju_complex))
$(eval $(call gb_JunitTest_use_jars,dba_ju_complex,\
- $(OUTDIR)/bin/ConnectivityTools.jar \
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
+ ConnectivityTools \
+ OOoRunner \
+ jurt \
+ ridl \
+ test \
+ unoil \
))
$(eval $(call gb_JunitTest_set_defs,dba_ju_complex,\
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk
index 6ca0c11..5897697 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,dba_ju_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,dba_ju_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
+ OOoRunner \
+ jurt \
+ ridl \
+ test \
+ unoil \
))
$(eval $(call gb_JunitTest_add_classes,dba_ju_unoapi,\
diff --git a/filter/Jar_XSLTFilter.mk b/filter/Jar_XSLTFilter.mk
index 591b7e0..84faeac 100644
--- a/filter/Jar_XSLTFilter.mk
+++ b/filter/Jar_XSLTFilter.mk
@@ -19,10 +19,10 @@
$(eval $(call gb_Jar_Jar,XSLTFilter))
$(eval $(call gb_Jar_use_jars,XSLTFilter,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
))
$(eval $(call gb_Jar_use_externals,XSLTFilter,saxon))
diff --git a/filter/Jar_XSLTValidate.mk b/filter/Jar_XSLTValidate.mk
index bbb45d8..2c20243 100644
--- a/filter/Jar_XSLTValidate.mk
+++ b/filter/Jar_XSLTValidate.mk
@@ -19,10 +19,10 @@
$(eval $(call gb_Jar_Jar,XSLTValidate))
$(eval $(call gb_Jar_use_jars,XSLTValidate,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
))
#$(eval $(call gb_Jar_use_externals,XSLTValidate,\
diff --git a/filter/JunitTest_filter_complex.mk b/filter/JunitTest_filter_complex.mk
index c37354c..b0c590a 100644
--- a/filter/JunitTest_filter_complex.mk
+++ b/filter/JunitTest_filter_complex.mk
@@ -19,11 +19,11 @@
$(eval $(call gb_JunitTest_JunitTest,filter_complex))
$(eval $(call gb_JunitTest_use_jars,filter_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,filter_complex,\
diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk
index 736ca41..546b243 100644
--- a/forms/JunitTest_forms_complex.mk
+++ b/forms/JunitTest_forms_complex.mk
@@ -29,11 +29,11 @@
$(eval $(call gb_JunitTest_JunitTest,forms_complex))
$(eval $(call gb_JunitTest_use_jars,forms_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,forms_complex,\
diff --git a/forms/JunitTest_forms_unoapi.mk b/forms/JunitTest_forms_unoapi.mk
index ea4cb50..063ad7b 100644
--- a/forms/JunitTest_forms_unoapi.mk
+++ b/forms/JunitTest_forms_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,forms_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,forms_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,forms_unoapi,\
diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk
index 6e25351..f07b279 100644
--- a/framework/JunitTest_framework_complex.mk
+++ b/framework/JunitTest_framework_complex.mk
@@ -34,11 +34,11 @@ $(eval $(call gb_JunitTest_set_defs,framework_complex,\
))
$(eval $(call gb_JunitTest_use_jars,framework_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,framework_complex,\
diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk
index e48f740..e00bc0e 100644
--- a/framework/JunitTest_framework_unoapi.mk
+++ b/framework/JunitTest_framework_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,framework_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,framework_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,framework_unoapi,\
diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
index 0850708..d95a8e5 100644
--- a/javaunohelper/Jar_juh.mk
+++ b/javaunohelper/Jar_juh.mk
@@ -28,9 +28,9 @@
$(eval $(call gb_Jar_Jar,juh))
$(eval $(call gb_Jar_use_jars,juh,\
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
+ jurt \
+ ridl \
+ unoil \
))
$(eval $(call gb_Jar_set_packageroot,juh,com))
diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk
index 1528c92..0c17574 100644
--- a/jurt/Jar_jurt.mk
+++ b/jurt/Jar_jurt.mk
@@ -28,8 +28,8 @@
$(eval $(call gb_Jar_Jar,jurt))
$(eval $(call gb_Jar_use_jars,jurt,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoloader.jar \
+ ridl \
+ unoloader \
))
$(eval $(call gb_Jar_set_packageroot,jurt,com))
diff --git a/jurt/JunitTest_bridgefactory.mk b/jurt/JunitTest_bridgefactory.mk
index b5211a3..0931a84 100644
--- a/jurt/JunitTest_bridgefactory.mk
+++ b/jurt/JunitTest_bridgefactory.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_JunitTest_JunitTest,jurt_bridgefactory))
$(eval $(call gb_JunitTest_use_jars,jurt_bridgefactory,\
- $(OUTDIR)/bin/ridl.jar \
+ ridl \
))
$(eval $(call gb_JunitTest_use_jar_classset,jurt_bridgefactory,jurt))
diff --git a/jurt/JunitTest_connections.mk b/jurt/JunitTest_connections.mk
index e5f1c6a..e9b880f 100644
--- a/jurt/JunitTest_connections.mk
+++ b/jurt/JunitTest_connections.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_JunitTest_JunitTest,jurt_connections))
$(eval $(call gb_JunitTest_use_jars,jurt_connections,\
- $(OUTDIR)/bin/ridl.jar \
+ ridl \
))
$(eval $(call gb_JunitTest_use_jar_classset,jurt_connections,jurt))
diff --git a/jurt/JunitTest_java.mk b/jurt/JunitTest_java.mk
index a9cc190..a4a4089 100644
--- a/jurt/JunitTest_java.mk
+++ b/jurt/JunitTest_java.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_JunitTest_JunitTest,jurt_java))
$(eval $(call gb_JunitTest_use_jars,jurt_java,\
- $(OUTDIR)/bin/ridl.jar \
+ ridl \
))
$(eval $(call gb_JunitTest_use_jar_classset,jurt_java,jurt))
diff --git a/jurt/JunitTest_java_remote.mk b/jurt/JunitTest_java_remote.mk
index 9a103af..7cf13c5 100644
--- a/jurt/JunitTest_java_remote.mk
+++ b/jurt/JunitTest_java_remote.mk
@@ -28,8 +28,8 @@
$(eval $(call gb_JunitTest_JunitTest,jurt_java_remote))
$(eval $(call gb_JunitTest_use_jars,jurt_java_remote,\
- $(OUTDIR)/bin/OOoRunnerLight.jar \
- $(OUTDIR)/bin/ridl.jar \
+ OOoRunnerLight \
+ ridl \
))
$(eval $(call gb_JunitTest_use_jar_classset,jurt_java_remote,jurt))
diff --git a/jurt/JunitTest_remote.mk b/jurt/JunitTest_remote.mk
index 0267930..7133816 100644
--- a/jurt/JunitTest_remote.mk
+++ b/jurt/JunitTest_remote.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_JunitTest_JunitTest,jurt_remote))
$(eval $(call gb_JunitTest_use_jars,jurt_remote,\
- $(OUTDIR)/bin/ridl.jar \
+ ridl \
))
$(eval $(call gb_JunitTest_use_jar_classset,jurt_remote,jurt))
diff --git a/jurt/JunitTest_uno.mk b/jurt/JunitTest_uno.mk
index 5c4303b..36e26d3 100644
--- a/jurt/JunitTest_uno.mk
+++ b/jurt/JunitTest_uno.mk
@@ -28,8 +28,8 @@
$(eval $(call gb_JunitTest_JunitTest,jurt_uno))
$(eval $(call gb_JunitTest_use_jars,jurt_uno,\
- $(OUTDIR)/bin/OOoRunnerLight.jar \
- $(OUTDIR)/bin/ridl.jar \
+ OOoRunnerLight \
+ ridl \
))
$(eval $(call gb_JunitTest_use_jar_classset,jurt_uno,jurt))
diff --git a/jurt/JunitTest_urp.mk b/jurt/JunitTest_urp.mk
index 21739c6..473059a 100644
--- a/jurt/JunitTest_urp.mk
+++ b/jurt/JunitTest_urp.mk
@@ -32,8 +32,7 @@ $(eval $(call gb_JunitTest_use_customtargets,jurt_urp,\
))
$(eval $(call gb_JunitTest_use_jars,jurt_urp,\
- $(OUTDIR)/bin/ridl.jar \
- $(WORKDIR)/CustomTarget/jurt/test/com/sun/star/lib/uno/protocols/urp \
+ ridl \
))
$(eval $(call gb_JunitTest_use_jar_classset,jurt_urp,jurt))
diff --git a/jurt/JunitTest_util.mk b/jurt/JunitTest_util.mk
index 2069036..54a614f 100644
--- a/jurt/JunitTest_util.mk
+++ b/jurt/JunitTest_util.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_JunitTest_JunitTest,jurt_util))
$(eval $(call gb_JunitTest_use_jars,jurt_util,\
- $(OUTDIR)/bin/ridl.jar \
+ ridl \
))
$(eval $(call gb_JunitTest_use_jar_classset,jurt_util,jurt))
diff --git a/linguistic/JunitTest_linguistic_complex.mk b/linguistic/JunitTest_linguistic_complex.mk
index 342c02c..0e15522 100644
--- a/linguistic/JunitTest_linguistic_complex.mk
+++ b/linguistic/JunitTest_linguistic_complex.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_JunitTest_set_defs,linguistic_complex,\
))
$(eval $(call gb_JunitTest_use_jars,linguistic_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/test-tools.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ test-tools \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,linguistic_complex,\
diff --git a/linguistic/JunitTest_linguistic_unoapi.mk b/linguistic/JunitTest_linguistic_unoapi.mk
index 25a011d..2d89af1 100644
--- a/linguistic/JunitTest_linguistic_unoapi.mk
+++ b/linguistic/JunitTest_linguistic_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,linguistic_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,linguistic_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,linguistic_unoapi,\
diff --git a/nlpsolver/Jar_EvolutionarySolver.mk b/nlpsolver/Jar_EvolutionarySolver.mk
index 1ebd0c8..4aba347 100644
--- a/nlpsolver/Jar_EvolutionarySolver.mk
+++ b/nlpsolver/Jar_EvolutionarySolver.mk
@@ -28,9 +28,6 @@
$(eval $(call gb_Jar_Jar,EvolutionarySolver))
-$(eval $(call gb_Jar_use_jars,EvolutionarySolver,\
-))
-
$(eval $(call gb_Jar_set_packageroot,EvolutionarySolver,net/adaptivebox))
$(eval $(call gb_Jar_set_manifest,EvolutionarySolver,$(SRCDIR)/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/Manifest.mf))
diff --git a/nlpsolver/Jar_nlpsolver.mk b/nlpsolver/Jar_nlpsolver.mk
index 8b0b3de..94c92c1 100644
--- a/nlpsolver/Jar_nlpsolver.mk
+++ b/nlpsolver/Jar_nlpsolver.mk
@@ -29,12 +29,12 @@
$(eval $(call gb_Jar_Jar,nlpsolver))
$(eval $(call gb_Jar_use_jars,nlpsolver,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/EvolutionarySolver.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
+ EvolutionarySolver \
))
$(eval $(call gb_Jar_set_packageroot,nlpsolver,com))
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 6de3757..513498a 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -40,11 +40,11 @@ $(eval $(call gb_Jar_add_manifest_classpath,OOoRunner,\
$(eval $(call gb_Jar_set_manifest,OOoRunner,$(SRCDIR)/qadevOOo/runner/manifest))
$(eval $(call gb_Jar_use_jars,OOoRunner,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
))
$(eval $(call gb_Jar_set_packageroot,OOoRunner,\
diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk
index 9b79ddb..558855d 100644
--- a/qadevOOo/Jar_OOoRunnerLight.mk
+++ b/qadevOOo/Jar_OOoRunnerLight.mk
@@ -40,11 +40,11 @@ $(eval $(call gb_Jar_add_manifest_classpath,OOoRunnerLight,\
$(eval $(call gb_Jar_set_manifest,OOoRunnerLight,$(SRCDIR)/qadevOOo/runner/manifest))
$(eval $(call gb_Jar_use_jars,OOoRunnerLight,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
))
$(eval $(call gb_Jar_set_packageroot,OOoRunnerLight,\
diff --git a/qadevOOo/JunitTest_qadevOOo_unoapi.mk b/qadevOOo/JunitTest_qadevOOo_unoapi.mk
index 11fdba2..6b6faff 100644
--- a/qadevOOo/JunitTest_qadevOOo_unoapi.mk
+++ b/qadevOOo/JunitTest_qadevOOo_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,qadevOOo_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,qadevOOo_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,qadevOOo_unoapi,\
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index b3faf6e..54e55e6 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -28,11 +28,11 @@
$(eval $(call gb_Jar_Jar,sun-report-builder))
$(eval $(call gb_Jar_use_jars,sun-report-builder,\
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
+ java_uno \
+ juh \
+ jurt \
+ ridl \
+ unoil \
))
$(eval $(call gb_Jar_use_externals,sun-report-builder,\
diff --git a/reportdesign/JunitTest_reportdesign_complex.mk b/reportdesign/JunitTest_reportdesign_complex.mk
index 599bd56..0698ee8 100644
--- a/reportdesign/JunitTest_reportdesign_complex.mk
+++ b/reportdesign/JunitTest_reportdesign_complex.mk
@@ -40,11 +40,11 @@ $(eval $(call gb_JunitTest_add_sourcefiles,reportdesign_complex,\
))
$(eval $(call gb_JunitTest_use_jars,reportdesign_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,reportdesign_complex,\
diff --git a/ridljar/JunitTest_typedesc.mk b/ridljar/JunitTest_typedesc.mk
index baa8cda..a419871 100644
--- a/ridljar/JunitTest_typedesc.mk
+++ b/ridljar/JunitTest_typedesc.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_JunitTest_JunitTest,ridljar_typedesc))
$(eval $(call gb_JunitTest_use_jars,ridljar_typedesc,\
- $(OUTDIR)/bin/ridl.jar \
+ ridl \
))
$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_typedesc,\
diff --git a/ridljar/JunitTest_uno.mk b/ridljar/JunitTest_uno.mk
index 7bbfab9..d166b97 100644
--- a/ridljar/JunitTest_uno.mk
+++ b/ridljar/JunitTest_uno.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_JunitTest_JunitTest,ridljar_uno))
$(eval $(call gb_JunitTest_use_jars,ridljar_uno,\
- $(OUTDIR)/bin/ridl.jar \
+ ridl \
))
$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_uno,\
diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk
index 4d27458..e29a65b 100644
--- a/ridljar/JunitTest_util.mk
+++ b/ridljar/JunitTest_util.mk
@@ -28,8 +28,8 @@
$(eval $(call gb_JunitTest_JunitTest,ridljar_util))
$(eval $(call gb_JunitTest_use_jars,ridljar_util,\
- $(OUTDIR)/bin/OOoRunnerLight.jar \
- $(OUTDIR)/bin/ridl.jar \
+ OOoRunnerLight \
+ ridl \
))
$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_util,\
diff --git a/sc/JunitTest_sc_complex.mk b/sc/JunitTest_sc_complex.mk
index ce0378c..d7ff063 100644
--- a/sc/JunitTest_sc_complex.mk
+++ b/sc/JunitTest_sc_complex.mk
@@ -37,11 +37,11 @@ $(eval $(call gb_JunitTest_add_classes,sc_complex, \
))
$(eval $(call gb_JunitTest_use_jars,sc_complex, \
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
+ OOoRunner \
+ jurt \
+ ridl \
+ test \
+ unoil \
))
$(eval $(call gb_JunitTest_add_sourcefiles,sc_complex, \
diff --git a/sc/JunitTest_sc_unoapi.mk b/sc/JunitTest_sc_unoapi.mk
index 60be3e1..0288b87 100644
--- a/sc/JunitTest_sc_unoapi.mk
+++ b/sc/JunitTest_sc_unoapi.mk
@@ -32,11 +32,11 @@ $(eval $(call gb_JunitTest_add_classes,sc_unoapi, \
))
$(eval $(call gb_JunitTest_use_jars,sc_unoapi, \
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
+ OOoRunner \
+ jurt \
+ ridl \
+ test \
+ unoil \
))
$(eval $(call gb_JunitTest_set_defs,sc_unoapi,\
diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk
index 35caa13..88f66e4 100644
--- a/scripting/Jar_HelloWorld.mk
+++ b/scripting/Jar_HelloWorld.mk
@@ -29,10 +29,10 @@
$(eval $(call gb_Jar_Jar,HelloWorld))
$(eval $(call gb_Jar_use_jars,HelloWorld,\
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
+ juh \
+ jurt \
+ ridl \
+ unoil \
))
$(eval $(call gb_Jar_add_sourcefiles,HelloWorld,\
diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk
index 3ee827b..c4f74a1 100644
--- a/scripting/Jar_Highlight.mk
+++ b/scripting/Jar_Highlight.mk
@@ -29,10 +29,10 @@
$(eval $(call gb_Jar_Jar,Highlight))
$(eval $(call gb_Jar_use_jars,Highlight,\
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
+ juh \
+ jurt \
+ ridl \
+ unoil \
))
$(eval $(call gb_Jar_add_sourcefiles,Highlight,\
diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk
index 1c3d71d..50ac581 100644
--- a/scripting/Jar_MemoryUsage.mk
+++ b/scripting/Jar_MemoryUsage.mk
@@ -29,10 +29,10 @@
$(eval $(call gb_Jar_Jar,MemoryUsage))
$(eval $(call gb_Jar_use_jars,MemoryUsage,\
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
+ juh \
+ jurt \
+ ridl \
+ unoil \
))
$(eval $(call gb_Jar_add_sourcefiles,MemoryUsage,\
diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk
index f29e5a7..4ddd380 100644
--- a/scripting/Jar_ScriptFramework.mk
+++ b/scripting/Jar_ScriptFramework.mk
@@ -29,10 +29,10 @@
$(eval $(call gb_Jar_Jar,ScriptFramework))
$(eval $(call gb_Jar_use_jars,ScriptFramework,\
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
+ juh \
+ jurt \
+ ridl \
+ unoil \
))
$(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO))
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index 228896d..84cbe7f 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -29,11 +29,11 @@
$(eval $(call gb_Jar_Jar,ScriptProviderForBeanShell))
$(eval $(call gb_Jar_use_jars,ScriptProviderForBeanShell,\
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/ScriptFramework.jar \
+ juh \
+ jurt \
+ ridl \
+ unoil \
+ ScriptFramework \
))
$(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\
diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk
index 74c9ddf..da33fd0 100644
--- a/scripting/Jar_ScriptProviderForJava.mk
+++ b/scripting/Jar_ScriptProviderForJava.mk
@@ -29,11 +29,11 @@
$(eval $(call gb_Jar_Jar,ScriptProviderForJava))
$(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/ScriptFramework.jar \
+ juh \
+ jurt \
+ ridl \
+ unoil \
+ ScriptFramework \
))
$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJava,scripting/java/ScriptProviderForJava,OOO))
diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk
index 84dfe83..2a0f2ce 100644
--- a/scripting/Jar_ScriptProviderForJavaScript.mk
+++ b/scripting/Jar_ScriptProviderForJavaScript.mk
@@ -29,11 +29,11 @@
$(eval $(call gb_Jar_Jar,ScriptProviderForJavaScript))
$(eval $(call gb_Jar_use_jars,ScriptProviderForJavaScript,\
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/ScriptFramework.jar \
+ juh \
+ jurt \
+ ridl \
+ unoil \
+ ScriptFramework \
))
$(eval $(call gb_Jar_use_externals,ScriptProviderForJavaScript,\
diff --git a/sd/JunitTest_sd_unoapi.mk b/sd/JunitTest_sd_unoapi.mk
index e2a7f7b..119a88b 100644
--- a/sd/JunitTest_sd_unoapi.mk
+++ b/sd/JunitTest_sd_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,sd_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,sd_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,sd_unoapi,\
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
index c0cdd4f..abe3616 100644
--- a/sfx2/JunitTest_sfx2_complex.mk
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -25,12 +25,12 @@ $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
))
$(eval $(call gb_JunitTest_use_jars,sfx2_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/test-tools.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ test-tools \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\
diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk
index 4b312a9..436ed6e 100644
--- a/sfx2/JunitTest_sfx2_unoapi.mk
+++ b/sfx2/JunitTest_sfx2_unoapi.mk
@@ -27,11 +27,11 @@ $(eval $(call gb_JunitTest_set_defs,sfx2_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,sfx2_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_unoapi,\
diff --git a/smoketest/Jar_TestExtension.mk b/smoketest/Jar_TestExtension.mk
index b318380..7a6f4cc 100644
--- a/smoketest/Jar_TestExtension.mk
+++ b/smoketest/Jar_TestExtension.mk
@@ -37,10 +37,10 @@ $(eval $(call gb_Jar_add_manifest_classpath,TestExtension,\
))
$(eval $(call gb_Jar_use_jars,TestExtension,\
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
+ juh \
+ jurt \
+ ridl \
+ unoil \
))
$(eval $(call gb_Jar_set_packageroot,TestExtension,com))
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 0c241f6..a43977b 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -106,10 +106,12 @@ define gb_Helper_init_registries
gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
+gb_Jar_VALIDGROUPS := URE OOO
$$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=))
$$(foreach group,$$(gb_Library_VALIDGROUPS),$$(eval gb_Library_$$(group) :=))
$$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(eval gb_StaticLibrary_$$(group) :=))
+$$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(eval gb_Jar_$$(group) :=))
endef
@@ -123,6 +125,7 @@ define gb_Helper_collect_knownlibs
gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
gb_Executable_KNOWN := $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(gb_Executable_$$(group)))
+gb_Jar_KNOWN := $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(gb_Jar_$$(group)))
endef
@@ -171,6 +174,21 @@ gb_StaticLibrary_$(1) += $(2)
endef
+define gb_Helper_register_jars
+ifeq ($$(filter $(1),$$(gb_Jar_VALIDGROUPS)),)
+$$(eval $$(call gb_Output_error,$(1) is not a valid group for jars. Valid groups are: $$(gb_Jar_VALIDGROUPS)))
+endif
+$(foreach group,$(gb_Jar_VALIDGROUPS),\
+ $(foreach target,$(2),\
+ $(if $(filter $(target),$(gb_Jar_$(group))),\
+ $(call gb_Output_error,gb_Helper_register_jars: already registered: $(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_jars: contains duplicates: $(2)))
+
+gb_Jar_$(1) += $(2)
+
+endef
+
define gb_Helper_execute
$(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
endef
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 1985d3b..352423b 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -88,6 +88,10 @@ $(call gb_Jar_get_target,%) : $(call gb_JavaClassSet_get_target,$(call gb_Jar_ge
# adds jar files to DeliverLogTarget
# adds dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk)
define gb_Jar_Jar
+ifeq (,$$(findstring $(1),$$(gb_Jar_KNOWN)))
+$$(eval $$(call gb_Output_info,Currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL))
+$$(eval $$(call gb_Output_error,Jar $(1) must be registered in Repository.mk))
+endif
$(call gb_Jar_get_target,$(1)) : MANIFEST :=
$(call gb_Jar_get_target,$(1)) : JARCLASSPATH :=
$(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
@@ -192,8 +196,8 @@ gb_Jar_default_jars := unoloader ridl jurt unoil juh java_uno
# remember: classpath is "inherited" to ClassSet
define gb_Jar_use_jar
$(call gb_JavaClassSet_use_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
-$(if $(filter-out $(gb_Jar_default_jars),$(basename $(notdir $(2)))),\
- $(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2))))
+$(if $(filter-out $(gb_Jar_default_jars),$(2)),\
+ $(call gb_Jar_add_manifest_classpath,$(1),$(2).jar))
endef
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 67e48e6..c28875e 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -121,9 +121,13 @@ 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_use_jar
-$(call gb_JavaClassSet_get_target,$(1)) : $(2)
-$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)
-$(call gb_JavaClassSet_add_classpath,$(1),$(2))
+ifneq (,$$(filter-out $(gb_Jar_KNOWN),$(2)))
+$$(eval $$(call gb_Output_info,currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL))
+$$(eval $$(call gb_Output_error,Cannot link against jar $$(filter-out $(gb_Jar_KNOWN),$(2)). Jars must be registered in Repository.mk))
+endif
+$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_Jar_get_outdir_target,$(2))
+$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(call gb_Jar_get_outdir_target,$(2))
+$(call gb_JavaClassSet_add_classpath,$(1),$(call gb_Jar_get_outdir_target,$(2)))
$(2) :| $(gb_Helper_PHONY)
endef
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index b49337e..590f848 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -109,8 +109,8 @@ endef
define gb_JunitTest_use_jar
$(call gb_JavaClassSet_use_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
-$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(2)
-$(call gb_JunitTest_get_target,$(1)) : $(2)
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_Jar_get_outdir_target,$(2))
+$(call gb_JunitTest_get_target,$(1)) : $(call gb_Jar_get_outdir_target,$(2))
$(2) :| $(gb_Helper_PHONY)
endef
@@ -144,6 +144,7 @@ endef
define gb_JunitTest_use_customtarget
$(call gb_JavaClassSet_use_customtarget,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_CustomTarget_get_workdir,$(2))
endef
diff --git a/sot/JunitTest_sot_complex.mk b/sot/JunitTest_sot_complex.mk
index 18f7581..96be0e9 100644
--- a/sot/JunitTest_sot_complex.mk
+++ b/sot/JunitTest_sot_complex.mk
@@ -27,11 +27,11 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\
))
$(eval $(call gb_JunitTest_use_jars,sot_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,sot_complex,\
diff --git a/starmath/JunitTest_starmath_unoapi.mk b/starmath/JunitTest_starmath_unoapi.mk
index 11ab16b..33254b0 100644
--- a/starmath/JunitTest_starmath_unoapi.mk
+++ b/starmath/JunitTest_starmath_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,starmath_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,starmath_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,starmath_unoapi,\
diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk
index 8ada8db..531c1df 100644
--- a/svl/JunitTest_svl_complex.mk
+++ b/svl/JunitTest_svl_complex.mk
@@ -25,12 +25,12 @@ $(eval $(call gb_JunitTest_set_defs,svl_complex,\
))
$(eval $(call gb_JunitTest_use_jars,svl_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ConnectivityTools.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
+ ConnectivityTools \
))
$(eval $(call gb_JunitTest_add_sourcefiles,svl_complex,\
diff --git a/svtools/JunitTest_svtools_unoapi.mk b/svtools/JunitTest_svtools_unoapi.mk
index b79728d..8381a96 100644
--- a/svtools/JunitTest_svtools_unoapi.mk
+++ b/svtools/JunitTest_svtools_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,svtools_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,svtools_unoapi,\
diff --git a/svx/JunitTest_svx_unoapi.mk b/svx/JunitTest_svx_unoapi.mk
index 9266f9e..6189c05 100644
--- a/svx/JunitTest_svx_unoapi.mk
+++ b/svx/JunitTest_svx_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,svx_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,svx_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,svx_unoapi,\
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index c31b027..cbf6fe0 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -49,11 +49,11 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
))
$(eval $(call gb_JunitTest_use_jars,sw_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,sw_complex,\
diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi.mk
index d11a963..ec63c19 100644
--- a/sw/JunitTest_sw_unoapi.mk
+++ b/sw/JunitTest_sw_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,sw_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,sw_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,sw_unoapi,\
diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk
index 5707347..6059c41 100644
--- a/swext/Jar_mediawiki.mk
+++ b/swext/Jar_mediawiki.mk
@@ -41,10 +41,10 @@ $(eval $(call gb_Jar_use_externals,mediawiki,\
))
$(eval $(call gb_Jar_use_jars,mediawiki,\
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
+ juh \
+ jurt \
+ ridl \
+ unoil \
))
$(eval $(call gb_Jar_add_sourcefiles,mediawiki,\
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index 498edd5..d30b134 100644
--- a/testtools/Jar_testComponent.mk
+++ b/testtools/Jar_testComponent.mk
@@ -27,9 +27,9 @@
$(eval $(call gb_Jar_Jar,testComponent))
$(eval $(call gb_Jar_use_jars,testComponent,\
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/juh.jar \
+ jurt \
+ ridl \
+ juh \
))
$(eval $(call gb_Jar_use_customtargets,testComponent,\
diff --git a/toolkit/JunitTest_toolkit_unoapi.mk b/toolkit/JunitTest_toolkit_unoapi.mk
index 12eb369..54b36e9 100644
--- a/toolkit/JunitTest_toolkit_unoapi.mk
+++ b/toolkit/JunitTest_toolkit_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,toolkit_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,toolkit_unoapi,\
diff --git a/ucb/JunitTest_ucb_complex.mk b/ucb/JunitTest_ucb_complex.mk
index 7750f6c..74d4a42 100644
--- a/ucb/JunitTest_ucb_complex.mk
+++ b/ucb/JunitTest_ucb_complex.mk
@@ -34,11 +34,11 @@ $(eval $(call gb_JunitTest_set_defs,ucb_complex,\
))
$(eval $(call gb_JunitTest_use_jars,ucb_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,ucb_complex,\
diff --git a/ucb/JunitTest_ucb_unoapi.mk b/ucb/JunitTest_ucb_unoapi.mk
index 72e728a..77b061a 100644
--- a/ucb/JunitTest_ucb_unoapi.mk
+++ b/ucb/JunitTest_ucb_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,ucb_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,ucb_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,ucb_unoapi,\
diff --git a/unotest/Jar_test-tools.mk b/unotest/Jar_test-tools.mk
index 23be655..86fcbdc 100644
--- a/unotest/Jar_test-tools.mk
+++ b/unotest/Jar_test-tools.mk
@@ -34,9 +34,9 @@ $(eval $(call gb_Jar_add_manifest_classpath,test-tools,\
))
$(eval $(call gb_Jar_use_jars,test-tools,\
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
+ juh \
+ ridl \
+ unoil \
))
$(eval $(call gb_Jar_set_packageroot,test-tools,org))
diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk
index 9f718cc..014a835 100644
--- a/unotest/Jar_test.mk
+++ b/unotest/Jar_test.mk
@@ -34,10 +34,10 @@ $(eval $(call gb_Jar_add_manifest_classpath,test,\
))
$(eval $(call gb_Jar_use_jars,test,\
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/OOoRunner.jar \
+ juh \
+ ridl \
+ unoil \
+ OOoRunner \
))
$(eval $(call gb_Jar_use_system_jars,test,\
diff --git a/unotools/JunitTest_unotools_complex.mk b/unotools/JunitTest_unotools_complex.mk
index 44671ce..cbba725 100644
--- a/unotools/JunitTest_unotools_complex.mk
+++ b/unotools/JunitTest_unotools_complex.mk
@@ -10,12 +10,12 @@
$(eval $(call gb_JunitTest_JunitTest,unotools_complex))
$(eval $(call gb_JunitTest_use_jars,unotools_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test-tools.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
+ OOoRunner \
+ jurt \
+ ridl \
+ test-tools \
+ test \
+ unoil \
))
$(eval $(call gb_JunitTest_set_defs,unotools_complex,\
diff --git a/unoxml/JunitTest_unordf_complex.mk b/unoxml/JunitTest_unordf_complex.mk
index 43a79bf..a6c4015 100644
--- a/unoxml/JunitTest_unordf_complex.mk
+++ b/unoxml/JunitTest_unordf_complex.mk
@@ -25,11 +25,11 @@ $(eval $(call gb_JunitTest_set_defs,unordf_complex,\
))
$(eval $(call gb_JunitTest_use_jars,unordf_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,unordf_complex,\
diff --git a/unoxml/JunitTest_unoxml_complex.mk b/unoxml/JunitTest_unoxml_complex.mk
index 1d66d48..737e1cb 100644
--- a/unoxml/JunitTest_unoxml_complex.mk
+++ b/unoxml/JunitTest_unoxml_complex.mk
@@ -25,11 +25,11 @@ $(eval $(call gb_JunitTest_set_defs,unoxml_complex,\
))
$(eval $(call gb_JunitTest_use_jars,unoxml_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,unoxml_complex,\
diff --git a/wizards/Jar_agenda.mk b/wizards/Jar_agenda.mk
index 03ef000..22acb1b 100644
--- a/wizards/Jar_agenda.mk
+++ b/wizards/Jar_agenda.mk
@@ -29,12 +29,12 @@
$(eval $(call gb_Jar_Jar,agenda))
$(eval $(call gb_Jar_use_jars,agenda,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/commonwizards.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
+ commonwizards \
))
$(eval $(call gb_Jar_set_manifest,agenda,$(SRCDIR)/wizards/com/sun/star/wizards/agenda/MANIFEST.MF))
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index 3e48e42..ee3d68c 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -29,11 +29,11 @@
$(eval $(call gb_Jar_Jar,commonwizards))
$(eval $(call gb_Jar_use_jars,commonwizards,\
- $(OUTDIR_FOR_BUILD)/bin/ridl.jar \
- $(OUTDIR_FOR_BUILD)/bin/unoil.jar \
- $(OUTDIR_FOR_BUILD)/bin/jurt.jar \
- $(OUTDIR_FOR_BUILD)/bin/juh.jar \
- $(OUTDIR_FOR_BUILD)/bin/java_uno.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
))
$(eval $(call gb_Jar_set_packageroot,commonwizards,com))
diff --git a/wizards/Jar_fax.mk b/wizards/Jar_fax.mk
index 96a7fbb..b65fd4d 100644
--- a/wizards/Jar_fax.mk
+++ b/wizards/Jar_fax.mk
@@ -29,12 +29,12 @@
$(eval $(call gb_Jar_Jar,fax))
$(eval $(call gb_Jar_use_jars,fax,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/commonwizards.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
+ commonwizards \
))
$(eval $(call gb_Jar_set_packageroot,fax,com))
diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk
index bd4cdba..ff2c999 100644
--- a/wizards/Jar_form.mk
+++ b/wizards/Jar_form.mk
@@ -29,12 +29,12 @@
$(eval $(call gb_Jar_Jar,form))
$(eval $(call gb_Jar_use_jars,form,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/commonwizards.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
+ commonwizards \
))
$(eval $(call gb_Jar_set_manifest,form,$(SRCDIR)/wizards/com/sun/star/wizards/form/MANIFEST.MF))
diff --git a/wizards/Jar_letter.mk b/wizards/Jar_letter.mk
index 63d1105..4b09fa7 100644
--- a/wizards/Jar_letter.mk
+++ b/wizards/Jar_letter.mk
@@ -29,12 +29,12 @@
$(eval $(call gb_Jar_Jar,letter))
$(eval $(call gb_Jar_use_jars,letter,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/commonwizards.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
+ commonwizards \
))
$(eval $(call gb_Jar_set_manifest,letter,$(SRCDIR)/wizards/com/sun/star/wizards/letter/MANIFEST.MF))
diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk
index 1c9496f..be133f5 100644
--- a/wizards/Jar_query.mk
+++ b/wizards/Jar_query.mk
@@ -29,12 +29,12 @@
$(eval $(call gb_Jar_Jar,query))
$(eval $(call gb_Jar_use_jars,query,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/commonwizards.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
+ commonwizards \
))
$(eval $(call gb_Jar_set_manifest,query,$(SRCDIR)/wizards/com/sun/star/wizards/query/MANIFEST.MF))
diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
index 5fd3d26..f1f0964 100644
--- a/wizards/Jar_report.mk
+++ b/wizards/Jar_report.mk
@@ -29,12 +29,12 @@
$(eval $(call gb_Jar_Jar,report))
$(eval $(call gb_Jar_use_jars,report,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/commonwizards.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
+ commonwizards \
))
$(eval $(call gb_Jar_set_manifest,report,$(SRCDIR)/wizards/com/sun/star/wizards/report/MANIFEST.MF))
diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk
index 9148d34..a45a7f4 100644
--- a/wizards/Jar_reportbuilder.mk
+++ b/wizards/Jar_reportbuilder.mk
@@ -29,13 +29,13 @@
$(eval $(call gb_Jar_Jar,reportbuilderwizard))
$(eval $(call gb_Jar_use_jars,reportbuilderwizard,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/commonwizards.jar \
- $(OUTDIR)/bin/report.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
+ commonwizards \
+ report \
))
$(eval $(call gb_Jar_set_packageroot,reportbuilderwizard,com))
diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk
index ba1608c..30b99c4 100644
--- a/wizards/Jar_table.mk
+++ b/wizards/Jar_table.mk
@@ -29,12 +29,12 @@
$(eval $(call gb_Jar_Jar,table))
$(eval $(call gb_Jar_use_jars,table,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/commonwizards.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
+ commonwizards \
))
$(eval $(call gb_Jar_set_packageroot,table,com))
diff --git a/wizards/Jar_web.mk b/wizards/Jar_web.mk
index 085c769..29ba003 100644
--- a/wizards/Jar_web.mk
+++ b/wizards/Jar_web.mk
@@ -29,12 +29,12 @@
$(eval $(call gb_Jar_Jar,web))
$(eval $(call gb_Jar_use_jars,web,\
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
- $(OUTDIR)/bin/java_uno.jar \
- $(OUTDIR)/bin/commonwizards.jar \
+ ridl \
+ unoil \
+ jurt \
+ juh \
+ java_uno \
+ commonwizards \
))
$(eval $(call gb_Jar_set_packageroot,web,com))
diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk
index 360f86c..a270224 100644
--- a/writerfilter/JunitTest_writerfilter_complex.mk
+++ b/writerfilter/JunitTest_writerfilter_complex.mk
@@ -34,11 +34,11 @@ $(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\
))
$(eval $(call gb_JunitTest_use_jars,writerfilter_complex,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,writerfilter_complex,\
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk
index 5bc4c03..2b02706 100644
--- a/xmerge/Jar_XMergeBridge.mk
+++ b/xmerge/Jar_XMergeBridge.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_Jar_set_manifest,XMergeBridge,$(SRCDIR)/xmerge/source/bridge/ma
$(eval $(call gb_Jar_set_packageroot,XMergeBridge,*.class))
$(eval $(call gb_Jar_use_jars,XMergeBridge,\
- $(OUTDIR)/bin/xmerge.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
+ xmerge \
+ unoil \
+ ridl \
+ jurt \
+ juh \
))
$(eval $(call gb_Jar_add_sourcefiles,XMergeBridge,\
diff --git a/xmerge/Jar_aportisdoc.mk b/xmerge/Jar_aportisdoc.mk
index 8c079a9..282b339 100644
--- a/xmerge/Jar_aportisdoc.mk
+++ b/xmerge/Jar_aportisdoc.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Jar_add_packagefile,aportisdoc,META-INF/converter.xml,$(SRCDIR)
$(eval $(call gb_Jar_set_packageroot,aportisdoc,org))
$(eval $(call gb_Jar_use_jars,aportisdoc,\
- $(OUTDIR)/bin/xmerge.jar \
+ xmerge \
))
$(eval $(call gb_Jar_add_sourcefiles,aportisdoc,\
diff --git a/xmerge/Jar_pexcel.mk b/xmerge/Jar_pexcel.mk
index da2c47c..0f79852 100644
--- a/xmerge/Jar_pexcel.mk
+++ b/xmerge/Jar_pexcel.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Jar_add_packagefile,pexcel,META-INF/converter.xml,$(SRCDIR)/xme
$(eval $(call gb_Jar_set_packageroot,pexcel,org))
$(eval $(call gb_Jar_use_jars,pexcel,\
- $(OUTDIR)/bin/xmerge.jar \
+ xmerge \
))
$(eval $(call gb_Jar_add_sourcefiles,pexcel,\
diff --git a/xmerge/Jar_pocketword.mk b/xmerge/Jar_pocketword.mk
index 35ded73..2aba780 100644
--- a/xmerge/Jar_pocketword.mk
+++ b/xmerge/Jar_pocketword.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Jar_add_packagefile,pocketword,META-INF/converter.xml,$(SRCDIR)
$(eval $(call gb_Jar_set_packageroot,pocketword,org))
$(eval $(call gb_Jar_use_jars,pocketword,\
- $(OUTDIR)/bin/xmerge.jar \
+ xmerge \
))
$(eval $(call gb_Jar_add_sourcefiles,pocketword,\
diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk
index 34f644c..03256d8 100644
--- a/xmerge/Jar_xmerge.mk
+++ b/xmerge/Jar_xmerge.mk
@@ -32,10 +32,10 @@ $(eval $(call gb_Jar_Jar,xmerge))
$(eval $(call gb_Jar_set_manifest,xmerge,$(SRCDIR)/xmerge/source/xmerge/xmerge.mf))
$(eval $(call gb_Jar_use_jars,xmerge,\
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/jurt.jar \
- $(OUTDIR)/bin/juh.jar \
+ unoil \
+ ridl \
+ jurt \
+ juh \
))
$(eval $(call gb_Jar_set_packageroot,xmerge,org))
diff --git a/xmloff/JunitTest_xmloff_unoapi.mk b/xmloff/JunitTest_xmloff_unoapi.mk
index e506f9b..963d83c 100644
--- a/xmloff/JunitTest_xmloff_unoapi.mk
+++ b/xmloff/JunitTest_xmloff_unoapi.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_JunitTest_set_defs,xmloff_unoapi,\
))
$(eval $(call gb_JunitTest_use_jars,xmloff_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
))
$(eval $(call gb_JunitTest_add_classes,xmloff_unoapi,\
More information about the Libreoffice-commits
mailing list