summaryrefslogtreecommitdiffstats
path: root/ct2n/UnpackedTarball_ct2n.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-10-23 18:46:31 +0200
committerMichael Stahl <mstahl@redhat.com>2012-10-23 19:42:36 +0200
commit76146f2f8d537c1942aa3a3288893363cadb1390 (patch)
tree5583e93c034d56c1e7f9fd478a25185e9f025d9b /ct2n/UnpackedTarball_ct2n.mk
parentgbuildification of ct2n (diff)
downloadcore-76146f2f8d537c1942aa3a3288893363cadb1390.tar.gz
core-76146f2f8d537c1942aa3a3288893363cadb1390.zip
gbuild: make ct2n module work
- add a preparation target to ExtensionTarget so added files can depend on unpacked tarball or custom target - add a "nodefaults" mode to Extension to disable some stuff Change-Id: I1fce6e948cef0a6d976e2e6555ef5c5f8e90cffb
Diffstat (limited to 'ct2n/UnpackedTarball_ct2n.mk')
-rw-r--r--ct2n/UnpackedTarball_ct2n.mk11
1 files changed, 3 insertions, 8 deletions
diff --git a/ct2n/UnpackedTarball_ct2n.mk b/ct2n/UnpackedTarball_ct2n.mk
index 7239d8ac969a..633436caa0bc 100644
--- a/ct2n/UnpackedTarball_ct2n.mk
+++ b/ct2n/UnpackedTarball_ct2n.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,ConvertTextToNumber))
$(eval $(call gb_UnpackedTarball_set_tarball,ConvertTextToNumber,$(CT2N_TARBALL),0))
-# Extension class requires description-en-US.txt file
-$(eval $(call gb_UnpackedTarball_add_file,ConvertTextToNumber,\
- description-en-US.txt,ct2n/description-en-US.txt))
-
$(eval $(call gb_UnpackedTarball_add_patches,ConvertTextToNumber,\
ct2n/ConvertTextToNumber-1.3.2-no-license.patch \
ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \
@@ -22,12 +18,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,ConvertTextToNumber,\
# adjustments for using Extension class
# 1. manifest.xml is expected in root directory
-# 2. LICENSE file is required, reuse existing COPYING
$(eval $(call gb_UnpackedTarball_set_post_action,ConvertTextToNumber,\
mv $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/META-INF/manifest.xml \
- $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber) && \
- mv $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/registration/COPYING \
- $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/registration/LICENSE \
+ $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber) \
))
+$(eval $(call gb_UnpackedTarball_mark_output_file,ConvertTextToNumber,description.xml))
+
# vim: set noet sw=4 ts=4: