replace CustomTarget_odk/odkcommon/bin by Package

Change-Id: Ia57ed471294595f1a8ee0aa0af05f3b82d439393
Reviewed-on: https://gerrit.libreoffice.org/3529
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

8 files changed, 74 insertions, 46 deletions

diff --git a/odk/CustomTarget_bin.mk b/odk/CustomTarget_bin.mk
deleted file mode 100644
index 0a548a29f084..000000000000
--- a/odk/CustomTarget_bin.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- 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_CustomTarget_CustomTarget,odk/odkcommon/bin))
-
-odk_EXELIST := cppumaker \
-	regcompare \
-	idlc \
-	javamaker \
-	autodoc \
-	unoapploader \
-	uno-skeletonmaker \
-	$(if $(SYSTEM_UCPP),,ucpp) \
-	$(if $(filter WNT,$(OS)),climaker)
-
-define odk_exe
-odkcommon_ZIPLIST += bin/$(1)$(gb_Executable_EXT)
-$(call gb_CustomTarget_get_target,odk/odkcommon/bin): $(odk_WORKDIR)/bin/$(1)$(gb_Executable_EXT)
-$(odk_WORKDIR)/bin/$(1)$(gb_Executable_EXT): $(call gb_Executable_get_target,$(1))
-	mkdir -p $$(dir $$@)
-	$$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
-	cp $$< $$@
-endef
-
-$(foreach exe,$(odk_EXELIST),$(eval $(call odk_exe,$(exe))))
-
-ifeq ($(OS),MACOSX)
-odkcommon_ZIPLIST += bin/addsym-macosx.sh
-$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/bin,addsym-macosx.sh))
-$(odk_WORKDIR)/bin/addsym-macosx.sh: $(SRCDIR)/odk/pack/copying/addsym-macosx.sh
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
-	cp $< $@
-	chmod 755 $@
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index b7454d62777b..3f153f77c0dc 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -27,6 +27,8 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\
 
 $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(SRCDIR)/odk/util/check.pl \
+		$(call gb_Package_get_target,odk_bin) \
+		$(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \
 		$(call gb_CustomTarget_get_target,odk/odkcommon)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
 	touch $@
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 9ba2d6e44a99..b6cc3d242926 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -19,7 +19,6 @@ $(call gb_CustomTarget_get_target,odk/odkcommon): \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/docs/common/ref) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/settings) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/classes) \
-	$(call gb_CustomTarget_get_target,odk/odkcommon/bin) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/lib) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/include) \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index c18223ce8286..86778a455f75 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -14,14 +14,20 @@ $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(filter WNT,$(OS)),CustomTarget_cli) \
 	$(if $(DOXYGEN),CustomTarget_doxygen) \
 	CustomTarget_check \
-	CustomTarget_bin \
 	CustomTarget_lib \
 	CustomTarget_settings \
 	CustomTarget_autodoc \
 	Executable_unoapploader \
+	Package_bin \
 	Package_examples \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,odk,\
+	Package_macosx \
+))
+endif
+
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_unowinreg \
diff --git a/odk/Package_bin.mk b/odk/Package_bin.mk
new file mode 100644
index 000000000000..8c1200fed1b7
--- /dev/null
+++ b/odk/Package_bin.mk
@@ -0,0 +1,28 @@
+# -*- 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,odk_bin,$(OUTDIR)/bin))
+
+$(eval $(call gb_Package_set_outdir,odk_bin,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_bin,$(gb_Package_SDKDIRNAME)/bin,\
+    $(addsuffix $(gb_Executable_EXT),\
+	autodoc \
+	$(if $(filter WNT,$(OS)),climaker) \
+	cppumaker \
+	idlc \
+	javamaker \
+	regcompare \
+	$(if $(SYSTEM_UCPP),,ucpp) \
+	uno-skeletonmaker \
+	unoapploader \
+    ) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Package_macosx.mk b/odk/Package_macosx.mk
new file mode 100644
index 000000000000..4ff35013e950
--- /dev/null
+++ b/odk/Package_macosx.mk
@@ -0,0 +1,16 @@
+# -*- 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,odk_macosx,$(SRCDIR)/odk/pack/copying))
+
+$(eval $(call gb_Package_set_outdir,odk_macosx,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,odk_macosx,$(gb_Package_SDKDIRNAME)/bin/addsym-macosx.sh,addsym-macosx.sh))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
index d496611d5063..24b78c0172c3 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -33,7 +33,11 @@ Module gid_Module_Optional_Sdkoo
     Sortkey = "630";
     ParentID = gid_Module_Optional;
     Default = NO;
-    Files = (gid_File_Zip_Odkexamples, gid_File_Zip_Odkcommon,
+    Files = (
+        gid_File_Package_odk_bin,
+        gid_File_Package_odk_macosx,
+        gid_File_Zip_Odkexamples,
+        gid_File_Zip_Odkcommon,
         gid_File_Zip_OdkIdl_udkapi,
         gid_File_Zip_OdkIdl_offapi,
         gid_File_Zip_Odkheaders_sal_generated,
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index e64094978b08..d4e0b54d044f 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -116,6 +116,22 @@ File gid_File_Txt_Readme
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
+File gid_File_Package_odk_bin
+    TXT_FILE_BODY;
+    Dir = FILELIST_SDK_DIR;
+    Name = "odk_bin.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End
+
+#if defined(MACOSX)
+File gid_File_Package_odk_macosx
+    TXT_FILE_BODY;
+    Dir = FILELIST_SDK_DIR;
+    Name = "odk_macosx.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End
+#endif
+
 File gid_File_Zip_Odkexamples
     TXT_FILE_BODY;
     Dir = FILELIST_SDK_DIR;
@@ -123,7 +139,6 @@ File gid_File_Zip_Odkexamples
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
-
 File gid_File_Zip_Odkcommon
     TXT_FILE_BODY;
     Dir = gid_Dir_Basis_Sdk;