strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gbuild: add group NONE for jars without comp. file

Browse source 
This is mainly to avoid polluting instdir because these jars are only
used during build.

Change-Id: Ia5bab3155787b690bd915f3e83e6b6144715948b
This commit is contained in:
David Tardon 2013-05-01 15:04:48 +02:00
parent f45c3418d1
commit 0773c8c77a
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Repository.mk
View file

@ -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 \

2
solenv/gbuild/Helper.mk
View file

@ -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) :=))

2
solenv/gbuild/Jar.mk
View file

@ -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