[PATCH] replace CustomTarget_odk/odkcommon/bin by Package

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3529

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/3529/1

replace CustomTarget_odk/odkcommon/bin by Package

Change-Id: Ia57ed471294595f1a8ee0aa0af05f3b82d439393
---
D odk/CustomTarget_bin.mk
M odk/CustomTarget_check.mk
M odk/CustomTarget_odkcommon.mk
M odk/Module_odk.mk
A odk/Package_bin.mk
A odk/Package_macosx.mk
M scp2/source/sdkoo/module_sdkoo.scp
M scp2/source/sdkoo/sdkoo.scp
8 files changed, 74 insertions(+), 46 deletions(-)



diff --git a/odk/CustomTarget_bin.mk b/odk/CustomTarget_bin.mk
deleted file mode 100644
index 0a548a2..0000000
--- 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 b7454d6..326d5f0 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -27,6 +27,8 @@
 
 $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
                $(SRCDIR)/odk/util/check.pl \
+               $(call gb_Package_get_target,odk_bin) \
+               $(if $(filter MACOSX,$(OS)),macosx,$(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 9ba2d6e..b6cc3d2 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -19,7 +19,6 @@
        $(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 c18223c..86778a4 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -14,14 +14,20 @@
        $(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 0000000..8c1200f
--- /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 0000000..4ff3501
--- /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 d496611..24b78c0 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -33,7 +33,11 @@
     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 e640949..d4e0b54 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -116,13 +116,28 @@
     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;
     Name = "odk_examples.filelist";
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
-
 
 File gid_File_Zip_Odkcommon
     TXT_FILE_BODY;

-- 
To view, visit https://gerrit.libreoffice.org/3529
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia57ed471294595f1a8ee0aa0af05f3b82d439393
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon@redhat.com>