install example java scripts using filelist

Change-Id: I3f5df5be726fe0788a17d632fe1021ccaf4c1951

4 files changed, 43 insertions, 51 deletions

diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 094a3ac5d0b1..bfe5702f48e2 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -26,7 +26,8 @@ $(eval $(call gb_Module_add_targets,scripting,\
 			Jar_ScriptProviderForJavaScript \
 			Rdb_scriptproviderforjavascript \
 		) \
-		Zip_ScriptsJava \
+		Package_java \
+		Package_java_jars \
 	) \
 	Package_scriptbindinglib \
 	Package_scriptproviderforpython \
diff --git a/scripting/Package_java.mk b/scripting/Package_java.mk
new file mode 100644
index 000000000000..a840e2096dbc
--- /dev/null
+++ b/scripting/Package_java.mk
@@ -0,0 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,scripting_java,$(SRCDIR)/scripting/examples/java))
+
+$(eval $(call gb_Package_set_outdir,scripting_java,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,scripting_java,share/Scripts/java,\
+    HelloWorld/HelloWorld.java \
+    HelloWorld/parcel-descriptor.xml \
+    Highlight/HighlightText.java \
+    Highlight/parcel-descriptor.xml \
+    MemoryUsage/MemoryUsage.java \
+    MemoryUsage/parcel-descriptor.xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Package_java_jars.mk b/scripting/Package_java_jars.mk
new file mode 100644
index 000000000000..4e7ba203c00d
--- /dev/null
+++ b/scripting/Package_java_jars.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,scripting_java_jars,$(OUTDIR)/bin))
+
+$(eval $(call gb_Package_set_outdir,scripting_java_jars,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,scripting_java_jars,share/Scripts/java/HelloWorld/HelloWorld.jar,HelloWorld.jar))
+$(eval $(call gb_Package_add_file,scripting_java_jars,share/Scripts/java/Highlight/Highlight.jar,Highlight.jar))
+$(eval $(call gb_Package_add_file,scripting_java_jars,share/Scripts/java/MemoryUsage/MemoryUsage.jar,MemoryUsage.jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Zip_ScriptsJava.mk b/scripting/Zip_ScriptsJava.mk
deleted file mode 100644
index 0084bf5632b0..000000000000
--- a/scripting/Zip_ScriptsJava.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Zip_Zip,ScriptsJava,$(WORKDIR)/Zip/ScriptsJava))
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/HelloWorld/HelloWorld.jar,\
-	$(OUTDIR)/bin/HelloWorld.jar \
-))
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/HelloWorld/HelloWorld.java,\
-	$(SRCDIR)/scripting/examples/java/HelloWorld/HelloWorld.java \
-))
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/HelloWorld/parcel-descriptor.xml,\
-	$(SRCDIR)/scripting/examples/java/HelloWorld/parcel-descriptor.xml \
-))
-
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/Highlight/Highlight.jar,\
-	$(OUTDIR)/bin/Highlight.jar \
-))
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/Highlight/HighlightText.java,\
-	$(SRCDIR)/scripting/examples/java/Highlight/HighlightText.java \
-))
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/Highlight/parcel-descriptor.xml,\
-	$(SRCDIR)/scripting/examples/java/Highlight/parcel-descriptor.xml \
-))
-
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/MemoryUsage/MemoryUsage.jar,\
-	$(OUTDIR)/bin/MemoryUsage.jar \
-))
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/MemoryUsage/MemoryUsage.java,\
-	$(SRCDIR)/scripting/examples/java/MemoryUsage/MemoryUsage.java \
-))
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/MemoryUsage/parcel-descriptor.xml,\
-	$(SRCDIR)/scripting/examples/java/MemoryUsage/parcel-descriptor.xml \
-))
-
-# vim: set noet sw=4 ts=4: