ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

gbuild: register all jars

Browse Source 
Change-Id: I9f49970e5e06d1afd3fc066a20d1671c93e262fc
This commit is contained in:
Michael Stahl
2012-08-17 12:52:25 +02:00
parent 79c9ea3818
commit 5a4bcd3b75
93 changed files with 522 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Repository.mk
+53
View File
@@ -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:
RepositoryExternal.mk
+56 -19
View File
@@ -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
accessibility/Jar_accessibility.mk
+3 -3
View File
@@ -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))
accessibility/Jar_uno_accessbridge.mk
+4 -4
View File
@@ -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))
bean/Jar_officebean.mk
+4 -4
View File
@@ -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))
bean/JunitTest_bean_complex.mk
+5 -5
View File
@@ -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,\
chart2/JunitTest_chart2_unoapi.mk
+5 -5
View File
@@ -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,\
comphelper/JunitTest_comphelper_complex.mk
+5 -5
View File
@@ -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,\
configmgr/JunitTest_configmgr_unoapi.mk
+5 -5
View File
@@ -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,\
connectivity/Jar_ConnectivityTools.mk
+6 -6
View File
@@ -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))
connectivity/JunitTest_complex.mk
+13 -6
View File
@@ -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 \
))
dbaccess/JunitTest_dbaccess_complex.mk
+6 -6
View File
@@ -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,\
dbaccess/JunitTest_dbaccess_unoapi.mk
+5 -5
View File
@@ -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,\
filter/Jar_XSLTFilter.mk
+4 -4
View File
@@ -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))
filter/Jar_XSLTValidate.mk
+4 -4
View File
@@ -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,\
filter/JunitTest_filter_complex.mk
+5 -5
View File
@@ -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,\
forms/JunitTest_forms_complex.mk
+5 -5
View File
@@ -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,\
forms/JunitTest_forms_unoapi.mk
+5 -5
View File
@@ -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,\
framework/JunitTest_framework_complex.mk
+5 -5
View File
@@ -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,\
framework/JunitTest_framework_unoapi.mk
+5 -5
View File
@@ -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,\
javaunohelper/Jar_juh.mk
+3 -3
View File
@@ -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))
jurt/Jar_jurt.mk
+2 -2
View File
@@ -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))
jurt/JunitTest_bridgefactory.mk
+1 -1
View File
@@ -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))
jurt/JunitTest_connections.mk
+1 -1
View File
@@ -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))
jurt/JunitTest_java.mk
+1 -1
View File
@@ -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))
jurt/JunitTest_java_remote.mk
+2 -2
View File
@@ -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))
jurt/JunitTest_remote.mk
+1 -1
View File
@@ -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))
jurt/JunitTest_uno.mk
+2 -2
View File
@@ -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))
jurt/JunitTest_urp.mk
+1 -2
View File
@@ -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))
jurt/JunitTest_util.mk
+1 -1
View File
@@ -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))
linguistic/JunitTest_linguistic_complex.mk
+6 -6
View File
@@ -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,\
linguistic/JunitTest_linguistic_unoapi.mk
+5 -5
View File
@@ -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,\
nlpsolver/Jar_EvolutionarySolver.mk
-3
View File
@@ -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))
nlpsolver/Jar_nlpsolver.mk
+6 -6
View File
@@ -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))
qadevOOo/Jar_OOoRunner.mk
+5 -5
View File
@@ -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,\
qadevOOo/Jar_OOoRunnerLight.mk
+5 -5
View File
@@ -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,\
qadevOOo/JunitTest_qadevOOo_unoapi.mk
+5 -5
View File
@@ -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,\
reportbuilder/Jar_reportbuilder.mk
+5 -5
View File
@@ -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,\
reportdesign/JunitTest_reportdesign_complex.mk
+5 -5
View File
@@ -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,\
ridljar/JunitTest_typedesc.mk
+1 -1
View File
@@ -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,\
ridljar/JunitTest_uno.mk
+1 -1
View File
@@ -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,\
ridljar/JunitTest_util.mk
+2 -2
View File
@@ -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,\
sc/JunitTest_sc_complex.mk
+5 -5
View File
@@ -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, \
sc/JunitTest_sc_unoapi.mk
+5 -5
View File
@@ -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,\
scripting/Jar_HelloWorld.mk
+4 -4
View File
@@ -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,\
scripting/Jar_Highlight.mk
+4 -4
View File
@@ -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,\
scripting/Jar_MemoryUsage.mk
+4 -4
View File
@@ -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,\
scripting/Jar_ScriptFramework.mk
+4 -4
View File
@@ -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))
scripting/Jar_ScriptProviderForBeanShell.mk
+5 -5
View File
@@ -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,\
scripting/Jar_ScriptProviderForJava.mk
+5 -5
View File
@@ -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))
scripting/Jar_ScriptProviderForJavaScript.mk
+5 -5
View File
@@ -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,\
sd/JunitTest_sd_unoapi.mk
+5 -5
View File
@@ -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,\
sfx2/JunitTest_sfx2_complex.mk
+6 -6
View File
@@ -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,\
sfx2/JunitTest_sfx2_unoapi.mk
+5 -5
View File
@@ -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,\
smoketest/Jar_TestExtension.mk
+4 -4
View File
@@ -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))
solenv/gbuild/Helper.mk
+18
View File
@@ -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
solenv/gbuild/Jar.mk
+6 -2
View File
@@ -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
solenv/gbuild/JavaClassSet.mk
+7 -3
View File
@@ -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
solenv/gbuild/JunitTest.mk
+3 -2
View File
@@ -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
sot/JunitTest_sot_complex.mk
+5 -5
View File
@@ -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,\
starmath/JunitTest_starmath_unoapi.mk
+5 -5
View File
@@ -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,\
svl/JunitTest_svl_complex.mk
+6 -6
View File
@@ -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,\
svtools/JunitTest_svtools_unoapi.mk
+5 -5
View File
@@ -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,\
svx/JunitTest_svx_unoapi.mk
+5 -5
View File
@@ -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,\
sw/JunitTest_sw_complex.mk
+5 -5
View File
@@ -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,\
sw/JunitTest_sw_unoapi.mk
+5 -5
View File
@@ -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,\
swext/Jar_mediawiki.mk
+4 -4
View File
@@ -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,\
testtools/Jar_testComponent.mk
+3 -3
View File
@@ -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,\
toolkit/JunitTest_toolkit_unoapi.mk
+5 -5
View File
@@ -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,\
ucb/JunitTest_ucb_complex.mk
+5 -5
View File
@@ -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,\
ucb/JunitTest_ucb_unoapi.mk
+5 -5
View File
@@ -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,\
unotest/Jar_test-tools.mk
+3 -3
View File
@@ -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))
unotest/Jar_test.mk
+4 -4
View File
@@ -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,\
unotools/JunitTest_unotools_complex.mk
+6 -6
View File
@@ -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,\
unoxml/JunitTest_unordf_complex.mk
+5 -5
View File
@@ -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,\
unoxml/JunitTest_unoxml_complex.mk
+5 -5
View File
@@ -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,\
wizards/Jar_agenda.mk
+6 -6
View File
@@ -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))
wizards/Jar_commonwizards.mk
+5 -5
View File
@@ -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))
wizards/Jar_fax.mk
+6 -6
View File
@@ -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))
wizards/Jar_form.mk
+6 -6
View File
@@ -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))
wizards/Jar_letter.mk
+6 -6
View File
@@ -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))
wizards/Jar_query.mk
+6 -6
View File
@@ -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))
wizards/Jar_report.mk
+6 -6
View File
@@ -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))
wizards/Jar_reportbuilder.mk
+7 -7
View File
@@ -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))
wizards/Jar_table.mk
+6 -6
View File
@@ -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))
wizards/Jar_web.mk
+6 -6
View File
@@ -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))
writerfilter/JunitTest_writerfilter_complex.mk
+5 -5
View File
@@ -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,\
xmerge/Jar_XMergeBridge.mk
+5 -5
View File
@@ -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,\
xmerge/Jar_aportisdoc.mk
+1 -1
View File
@@ -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,\
xmerge/Jar_pexcel.mk
+1 -1
View File
@@ -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,\
xmerge/Jar_pocketword.mk
+1 -1
View File
@@ -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,\
xmerge/Jar_xmerge.mk
+4 -4
View File
@@ -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))
xmloff/JunitTest_xmloff_unoapi.mk
+5 -5
View File
@@ -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,\