[PATCH] replace CustomTarget_odk/odkcommon/settings by Package

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3534

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/3534/1

replace CustomTarget_odk/odkcommon/settings by Package

Change-Id: Iee97a510be822836b2115f50d0b1c9e7e14b5e1a
---
M odk/CustomTarget_check.mk
M odk/CustomTarget_odkcommon.mk
M odk/CustomTarget_settings.mk
M odk/Module_odk.mk
A odk/Package_settings.mk
A odk/Package_settings_generated.mk
M scp2/source/sdkoo/module_sdkoo.scp
M scp2/source/sdkoo/sdkoo.scp
8 files changed, 61 insertions(+), 19 deletions(-)



diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 37504b5..159bb3c 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -38,6 +38,8 @@
                $(call gb_Package_get_target,odk_html) \
                $(call gb_Package_get_target,odk_lib) \
                $(if $(filter MACOSX,$(OS)),macosx,$(call gb_Package_get_target,odk_macosx)) \
+               $(call gb_Package_get_target,odk_settings) \
+               $(call gb_Package_get_target,odk_settings_generated) \
                $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \
                $(call gb_CustomTarget_get_target,odk/odkcommon)
        $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 246247a..6b500e8 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -17,7 +17,6 @@
        $(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)) \
        $(if $(SOLAR_JAVA),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/java/ref)) \
        $(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/idl) \
        $(call gb_CustomTarget_get_target,odk/odkcommon/include)
diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk
index 358561b..581d522 100644
--- a/odk/CustomTarget_settings.mk
+++ b/odk/CustomTarget_settings.mk
@@ -9,25 +9,9 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/settings))
 
-odk_SETTINGSLIST := settings.mk \
-       std.mk \
-       stdtarget.mk \
-       $(if $(filter WNT,$(OS)),component.uno.def)
-
-define odk_settings
-odkcommon_ZIPLIST += settings/$(1)
-$(call gb_CustomTarget_get_target,odk/odkcommon/settings): $(odk_WORKDIR)/settings/$(1)
-$(odk_WORKDIR)/settings/$(1): $(SRCDIR)/odk/settings/$(1)
-       mkdir -p $$(dir $$@)
-       $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
-       cp $$< $$@
-endef
-
-$(foreach setting,$(odk_SETTINGSLIST),$(eval $(call odk_settings,$(setting))))
-
-odkcommon_ZIPLIST += settings/dk.mk
 $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,dk.mk))
-$(odk_WORKDIR)/settings/dk.mk: $(SRCDIR)/odk/pack/copying/dk.mk
+
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk
        $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1)
        tr -d "\015" < $< | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \
                -e 
's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/'
 \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 6a51a13..36eacef 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -24,6 +24,8 @@
        Package_html \
        Package_examples \
        Package_lib \
+       Package_settings \
+       Package_settings_generated \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/odk/Package_settings.mk b/odk/Package_settings.mk
new file mode 100644
index 0000000..ff01fd2
--- /dev/null
+++ b/odk/Package_settings.mk
@@ -0,0 +1,21 @@
+# -*- 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_settings,$(SRCDIR)/odk/settings))
+
+$(eval $(call gb_Package_set_outdir,odk_settings,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_settings,$(gb_Package_SDKDIRNAME)/settings,\
+       $(if $(filter WNT,$(OS)),component.uno.def) \
+       settings.mk \
+       std.mk \
+       stdtarget.mk \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Package_settings_generated.mk b/odk/Package_settings_generated.mk
new file mode 100644
index 0000000..3813d98
--- /dev/null
+++ b/odk/Package_settings_generated.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,odk_settings_generated,$(call 
gb_CustomTarget_get_workdir,odk/odkcommon/settings)))
+
+$(eval $(call gb_Package_set_outdir,odk_settings_generated,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_settings_generated,$(gb_Package_SDKDIRNAME)/settings,\
+       dk.mk \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
index 10edb72..2c965ea 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -43,6 +43,8 @@
         gid_File_Package_odk_html,
         gid_File_Package_odk_lib,
         gid_File_Package_odk_macosx,
+        gid_File_Package_odk_settings,
+        gid_File_Package_odk_settings_generated,
         gid_File_Package_odk_unowinreg,
         gid_File_Zip_Odkexamples,
         gid_File_Zip_Odkcommon,
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index a29c8fc..69b6fd8 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -185,6 +185,20 @@
 End
 #endif
 
+File gid_File_Package_odk_settings
+    TXT_FILE_BODY;
+    Dir = FILELIST_SDK_DIR;
+    Name = "odk_settings.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Package_odk_settings_generated
+    TXT_FILE_BODY;
+    Dir = FILELIST_SDK_DIR;
+    Name = "odk_settings_generated.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End
+
 #if defined(SOLAR_JAVA)
 File gid_File_Package_odk_unowinreg
     TXT_FILE_BODY;

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

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