gbuild: add group NONE for jars without comp. file

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

Change-Id: Ia5bab3155787b690bd915f3e83e6b6144715948b

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 \

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

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