diff options
93 files changed, 522 insertions, 402 deletions
diff --git a/Repository.mk b/Repository.mk index 8e782d31a89e..ec9f19ee19cf 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 fad76286343b..121c3434a468 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 1d82c5f1bfc8..0f7af1d4b26e 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 3cefaa8f14cb..20be9f8b68b1 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 1b897a6d3bef..7e7391af579b 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 5eec323a3472..8c2e549dc649 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 575c51f6d831..23c287176ed6 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 ba5645c373f7..af9c3dba88d4 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 70b570ca60fb..d62ba5101021 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 9841bcb2712b..0f89c96629a7 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 c96d6886fd23..59fcdc6ef5e5 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 411ad9529932..fd1511e6fbab 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 6ca0c117108d..5897697faa54 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 591b7e0f2aed..84faeac59386 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 bbb45d81cf27..2c2024325015 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 c37354ccfe8e..b0c590a1be8c 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 736ca41a1c58..546b243630e2 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 ea4cb505a78b..063ad7b5aa7e 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 6e25351e5c7b..f07b279c19ef 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 e48f74098636..e00bc0efa1b6 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 085070879538..d95a8e5dddd6 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 1528c9284598..0c1757433dfd 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 b5211a3273d7..0931a84b4d19 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 e5f1c6a5e0a9..e9b880f39b7d 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 a9cc19009b04..a4a408986ecd 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 9a103af1651a..7cf13c586abc 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 0267930e768e..7133816ac45f 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 5c4303ba2e26..36e26d38927a 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 21739c6644fc..473059aa823b 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 206903648a53..54a614f9f9ec 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 342c02ca9b3c..0e155227d19b 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 25a011d2e977..2d89af1f3d66 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 1ebd0c886b7a..4aba3470a5d9 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 8b0b3de5b30f..94c92c1861d6 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 6de3757fa47b..513498a9fbd2 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 9b79ddbd632b..558855d72773 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 11fdba23d9ca..6b6faffba057 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 b3faf6e13c3c..54e55e626c5b 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 599bd5625080..0698ee87138e 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 baa8cdaa4ca3..a419871e4a6a 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 7bbfab9bfdd5..d166b9745986 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 4d27458a1cc0..e29a65bee199 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 ce0378c5e545..d7ff063a1473 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 60be3e10920d..0288b875c8e8 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 35caa13406d3..88f66e473a41 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 3ee827bf658f..c4f74a1ce385 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 1c3d71d7fce6..50ac581e020f 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 f29e5a79ce8b..4ddd380a72f2 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 228896d4c06a..84cbe7f10e97 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 74c9ddf308da..da33fd02e480 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 84dfe8301fc3..2a0f2ce8e4eb 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 e2a7f7bff648..119a88b17039 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 c0cdd4f5ae7b..abe36164b2d8 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 4b312a9c7449..436ed6e50004 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 b318380807a1..7a6f4cc8356d 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 0c241f639dc5..a43977b7a143 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 1985d3b5e269..352423bfbfbe 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 67e48e6f7a1e..c28875e87dfa 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 b49337e22368..590f8480581b 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 18f75817d797..96be0e9d5ea4 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 11ab16b93ec7..33254b0476e6 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 8ada8dbb77b5..531c1df93191 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 b79728d5408b..8381a96a3a4c 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 9266f9ede569..6189c05f86e5 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 c31b0278d585..cbf6fe00fc8a 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 d11a9638efb2..ec63c19a75d5 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 5707347e1ab3..6059c41d6e8a 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 498edd5e6df7..d30b1349c1b0 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 12eb369d3668..54b36e9ac554 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 7750f6cc6a10..74d4a42e7722 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 72e728a37144..77b061a92a78 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 23be65582935..86fcbdcd2321 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 9f718cc871cd..014a835016e2 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 44671ce2a596..cbba7254e859 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 43a79bfbcf41..a6c40156abc4 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 1d66d48f4f13..737e1cb73068 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 03ef000f39cc..22acb1b98927 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 3e48e4212ee2..ee3d68c3ddad 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 96a7fbbe5e7f..b65fd4d5a107 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 bd4cdba07132..ff2c99995f62 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 63d1105864ce..4b09fa7b96cd 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 1c9496f2b643..be133f5d616a 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 5fd3d26c6b56..f1f09648ffec 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 9148d34a94f1..a45a7f431e78 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 ba1608c61d85..30b99c4a0bc9 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 085c7693ceff..29ba003f66ba 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 360f86c01e0f..a2702246ffe4 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 5bc4c03f2d28..2b0270667ce7 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 8c079a99767c..282b339186ce 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 da2c47cf89ce..0f79852aa0b3 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 35ded736d617..2aba7807438a 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 34f644c5b546..03256d86768d 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 e506f9b47a44..963d83c2e8ae 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,\ |