Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3542

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3542/1

add a check to catch typos in Package names

Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236
---
M solenv/gbuild/Package.mk
1 file changed, 15 insertions(+), 0 deletions(-)



diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 493748d..a5ecf37 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -106,17 +106,27 @@
 
 endef
 
+# Ensure that the package is defined.
+#
+# gb_Package__check package
+define gb_Package__check
+$$(if $$(gb_Package_SOURCEDIR_$(1)),,$$(call gb_Output_error,gb_Package__check: Package $(1) has 
not been defined))
+
+endef
+
 # Set output dir for the package files.
 #
 # Default is $(OUTDIR).
 #
 # gb_Package_set_outdir package outdir
 define gb_Package_set_outdir
+$(call gb_Package__check,$(1))
 gb_Package_OUTDIR_$(1) := $(2)
 
 endef
 
 define gb_Package_add_file
+$(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_file requires 3 arguments))
 $(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
 $(call gb_Package_get_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
@@ -134,6 +144,7 @@
 # $(eval $(call gb_Package_add_files,foo_inc,inc/foo,foo/bar/foo.hxx))
 # # -> inc/foo/foo.hxx
 define gb_Package_add_files
+$(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(if $(filter 1,$(words $(2))),,$(call gb_Output_error,gb_Package_add_files: 
it looks like either pkg name or dest. dir is missing)))
 $(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(notdir $(file)),$(file)))
 
@@ -148,6 +159,7 @@
 # $(eval $(call gb_Package_add_files,foo_inc,inc,foo/bar/foo.hxx))
 # # -> inc/foo/bar/foo.hxx
 define gb_Package_add_files_with_dir
+$(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(if $(filter 1,$(words $(2))),,$(call gb_Output_error,gb_Package_add_files: 
it looks like either pkg name or dest. dir is missing)))
 $(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(file),$(file)))
 
@@ -155,18 +167,21 @@
 
 # Package files from custom target
 define gb_Package_use_custom_target
+$(call gb_Package__check,$(1))
 $(call gb_Package_get_preparation_target,$(1)) :| $(call gb_CustomTarget_get_target,$(2))
 
 endef
 
 # Package files from unpacked tarball of an external project
 define gb_Package_use_unpacked
+$(call gb_Package__check,$(1))
 $(call gb_Package_get_preparation_target,$(1)) :| $(call gb_UnpackedTarball_get_target,$(2))
 
 endef
 
 # Package files from build of an external project
 define gb_Package_use_external_project
+$(call gb_Package__check,$(1))
 $(call gb_Package_get_preparation_target,$(1)) :| $(call gb_ExternalProject_get_target,$(2))
 
 endef

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

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


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.