diff options
| -rw-r--r-- | Repository.mk | 19 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/Repository.mk b/Repository.mk index 76d6662b5539..26d95f4f352c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -731,16 +731,10 @@ $(eval $(call gb_Helper_register_jars,URE, \ $(eval $(call gb_Helper_register_jars,OOO, \ ConnectivityTools \ - HelloWorld \ - Highlight \ - MemoryUsage \ - OOoRunner \ ScriptFramework \ ScriptProviderForBeanShell \ ScriptProviderForJava \ ScriptProviderForJavaScript \ - TestExtension \ - OOoRunnerLight \ XMergeBridge \ XSLTFilter \ XSLTValidate \ @@ -761,8 +755,6 @@ $(eval $(call gb_Helper_register_jars,OOO, \ reportbuilderwizard \ sdbc_hsqldb \ table \ - test \ - test-tools \ web \ xmerge \ )) @@ -774,6 +766,17 @@ $(eval $(call gb_Helper_register_jars,OXT, \ passive_java \ )) +$(eval $(call gb_Helper_register_jars,NONE,\ + HelloWorld \ + Highlight \ + MemoryUsage \ + OOoRunner \ + OOoRunnerLight \ + TestExtension \ + test \ + test-tools \ +)) + # External executables $(eval $(call gb_ExternalExecutable_register_executables,\ genbrk \ diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 3130bf704baa..e0a61ccb4a83 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -120,7 +120,7 @@ gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS gb_Library_VALIDINSTALLMODULES := OOO URE WRITER gb_StaticLibrary_VALIDGROUPS := PLAINLIBS -gb_Jar_VALIDGROUPS := URE OOO OXT +gb_Jar_VALIDGROUPS := URE OOO OXT NONE $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=)) $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(eval gb_Library_$$(group) :=)) diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index cdc6813502f9..17dfd3dfa09c 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -113,7 +113,7 @@ $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1)) $(call gb_Jar_get_outdir_target,$(1)) :| $(dir $(call gb_Jar_get_outdir_target,$(1))).dir ifneq ($(gb_RUNNABLE_INSTDIR),) -$(if $(filter-out OXT,$(call gb_Jar__get_layer,$(1))),\ +$(if $(filter OOO URE,$(call gb_Jar__get_layer,$(1))),\ $(call gb_Jar__Jar_package,$(1),$(call gb_Jar_get_packagename,$(1)),$(notdir $(call gb_Jar_get_target,$(1)))) \ ) endif |