diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-04 18:28:46 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-04 21:16:16 +0100 |
| commit | 4f346c9c1610a1c4b7ecc11ff3b99980763635a0 (patch) | |
| tree | 09deeb53d4d30e687d0895d018a149a2d8222dc7 | |
| parent | scp2: move URE jars to AutoInstall (diff) | |
| download | core-4f346c9c1610a1c4b7ecc11ff3b99980763635a0.tar.gz core-4f346c9c1610a1c4b7ecc11ff3b99980763635a0.zip | |
gbuild: component files for Jars in NONE layer and move testComponent
... from URE to NONE.
Change-Id: If43e07b88f2ab0e845f77d1f1a835627e5c48dd7
| -rw-r--r-- | Repository.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 3 | ||||
| -rw-r--r-- | testtools/Jar_testComponent.mk | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Repository.mk b/Repository.mk index 576e5a4c9011..98c9da5e464c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -645,10 +645,6 @@ $(eval $(call gb_Helper_register_jars_for_install,URE,ure, \ unoloader \ )) -$(eval $(call gb_Helper_register_jars,URE, \ - testComponent \ -)) - $(eval $(call gb_Helper_register_jars,OOO, \ ConnectivityTools \ ScriptFramework \ @@ -697,6 +693,7 @@ $(eval $(call gb_Helper_register_jars,NONE,\ TestExtension \ test \ test-tools \ + testComponent \ )) endif diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 1253c2234ce9..56a4ef842b10 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -255,8 +255,9 @@ gb_Jar_COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \ URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \ OXT:./ \ + NONE:$(call gb_Helper_make_url,$(WORKDIR)/Jar) \ -# get component prefix from layer name ("OOO", "URE", "OXT", "INTERN") +# get component prefix from layer name ("OOO", "URE", "OXT", "NONE") gb_Jar__get_componentprefix = \ $(patsubst $(1):%,%,$(or \ $(filter $(1):%,$(gb_Jar_COMPONENTPREFIXES)), \ diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk index ab2a50cedebc..b2df55100afb 100644 --- a/testtools/Jar_testComponent.mk +++ b/testtools/Jar_testComponent.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Jar_set_packageroot,testComponent,com)) $(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/manifest)) -$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,URE)) +$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,NONE)) $(eval $(call gb_Jar_add_packagedirs,testComponent,\ $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)/test \ |