diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-17 12:43:37 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-17 12:52:26 +0200 |
| commit | 87a723da66a16293b1611e08991fbf6925144448 (patch) | |
| tree | 8c0ce4aa129b49083b5531e4a4607af0a8551a73 | |
| parent | 05c90415587aa4d476fe8360b8e0edfdd56e586d (diff) | |
gbuild: in which the author discovers gb_Jar_set_componentfile
... which appears to have 3 layers, OOO, URE and OXT, so add OXT to jar
registration stuff to make it consistent.
Change-Id: I4d12185451bd043c39aa254ff581bc15824f1bbe
| -rw-r--r-- | Repository.mk | 13 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/Repository.mk b/Repository.mk index ec9f19ee19cf..2cb1b02bd0a9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -693,13 +693,13 @@ $(eval $(call gb_Helper_register_jars,URE, \ juh \ jurt \ ridl \ + testComponent \ unoil \ unoloader \ )) $(eval $(call gb_Helper_register_jars,OOO, \ ConnectivityTools \ - EvolutionarySolver \ FCFGMerge \ HelloWorld \ Highlight \ @@ -723,8 +723,6 @@ $(eval $(call gb_Helper_register_jars,OOO, \ java_accessibility \ java_uno_accessbridge \ letter \ - mediawiki \ - nlpsolver \ officebean \ pexcel \ pocketword \ @@ -732,13 +730,18 @@ $(eval $(call gb_Helper_register_jars,OOO, \ report \ reportbuilderwizard \ sdbc_hsqldb \ - sun-report-builder \ table \ test \ test-tools \ - testComponent \ web \ xmerge \ )) +$(eval $(call gb_Helper_register_jars,OXT, \ + EvolutionarySolver \ + mediawiki \ + nlpsolver \ + sun-report-builder \ +)) + # vim: set noet sw=4 ts=4: diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8383d9aecf4a..a2f165efa7a9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2067,7 +2067,7 @@ endef else # !SYSTEM_APACHE_COMMONS -$(eval $(call gb_Helper_register_jars,OOO,\ +$(eval $(call gb_Helper_register_jars,OXT,\ commons-codec-1.3 \ commons-httpclient-3.1 \ commons-lang-2.3 \ @@ -2141,7 +2141,7 @@ endef else # !SYSTEM_JFREEREPORT -$(eval $(call gb_Helper_register_jars,OOO,\ +$(eval $(call gb_Helper_register_jars,OXT,\ flow-engine-0.9.4 \ flute-1.1.6 \ libbase-1.1.6 \ diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index a43977b7a143..176f5ffb1173 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -106,7 +106,7 @@ define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS gb_StaticLibrary_VALIDGROUPS := PLAINLIBS -gb_Jar_VALIDGROUPS := URE OOO +gb_Jar_VALIDGROUPS := URE OOO OXT $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=)) $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(eval gb_Library_$$(group) :=)) |