summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkonablend <[email protected]>2013-03-11 22:20:20 +0000
committerkonablend <[email protected]>2013-03-11 22:20:20 +0000
commitde6c4ab0fe08e765c4e4498e73d6d3b09af582ad (patch)
tree951689d5803d174c046ae7b3d027984012c2887b
parent287c85bf19c44037426c0e8d8a30f75a0005c492 (diff)
packaging: add new target: pkg.createx
Target will do pkg.create plus creation of -contrib.tar.bz2 tarball containing all contrib tarballs. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5324 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--pkg/module.defs5
-rw-r--r--pkg/module.rules6
2 files changed, 9 insertions, 2 deletions
diff --git a/pkg/module.defs b/pkg/module.defs
index 11dae99f7..2bc6081c4 100644
--- a/pkg/module.defs
+++ b/pkg/module.defs
@@ -3,8 +3,9 @@ $(eval $(call import.MODULE.defs,PKG,pkg))
PKG.in/ = $(SRC/)pkg/
PKG.out/ = $(BUILD/)pkg/
-PKG.basename = $(HB.name)-$(HB.version)
-PKG.src.tar.bz2 = $(PKG.out/)$(PKG.basename).tar.bz2
+PKG.basename = $(HB.name)-$(HB.version)
+PKG.src.tar.bz2 = $(PKG.out/)$(PKG.basename).tar.bz2
+PKG.src-contrib.tar.bz2 = $(PKG.out/)$(PKG.basename)-contrib.tar.bz2
STAGE.out/ = $(BUILD/)stage/
STAGE.out.src/ = $(STAGE.out/)src/
diff --git a/pkg/module.rules b/pkg/module.rules
index f841fd93b..da46620f1 100644
--- a/pkg/module.rules
+++ b/pkg/module.rules
@@ -6,6 +6,8 @@ $(eval $(call import.MODULE.rules,PKG))
pkg.create:: $(PKG.src.tar.bz2)
+pkg.createx:: pkg.create $(PKG.src-contrib.tar.bz2)
+
pkg.clean:
$(RM.exe) -fr $(STAGE.out/)
$(RM.exe) -fr $(PKG.out/)
@@ -20,6 +22,10 @@ $(STAGE.out.src/):
$@/$(PKG.basename)/make/configure.py > $@/$(PKG.basename)/make/configure.py.tmp
$(MV.exe) $@/$(PKG.basename)/make/configure.py.tmp $@/$(PKG.basename)/make/configure.py
+$(PKG.src-contrib.tar.bz2):
+ $(TAR.exe) cjf $@ -C $(CONTRIB.download/) \
+ $(foreach f,$(MODULES.NAMES),$(notdir $($f.FETCH.tar)))
+
###############################################################################
## include optional platform packaging