| 1 |
commit: 35c9ad10b0903d9cf367550dd69f7680ba54a02f |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Thu Apr 3 19:15:41 2014 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Thu Apr 3 19:15:41 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=35c9ad10 |
| 7 |
|
| 8 |
Makefile, "dist": create a separate -doc tarball |
| 9 |
|
| 10 |
--- |
| 11 |
Makefile | 29 ++++++++++++++++++++++------- |
| 12 |
1 file changed, 22 insertions(+), 7 deletions(-) |
| 13 |
|
| 14 |
diff --git a/Makefile b/Makefile |
| 15 |
index 090841a..2b973f5 100644 |
| 16 |
--- a/Makefile |
| 17 |
+++ b/Makefile |
| 18 |
@@ -43,6 +43,7 @@ COMPRESSED_CONFIG := n |
| 19 |
RELEASE_NOT_DIRTY := n |
| 20 |
RELEASE_DIRTY_SUFFIX := -dirty |
| 21 |
VBUMP_COMMIT := y |
| 22 |
+DIST_PYDOC := y |
| 23 |
|
| 24 |
MANIFEST := $(S)/MANIFEST |
| 25 |
LICENSES_FILE := $(S)/files/licenses |
| 26 |
@@ -87,6 +88,12 @@ SELFDOC := $(SRC_DOCDIR)/pydoc |
| 27 |
|
| 28 |
_TRUE_WORDS := y Y 1 yes YES true TRUE |
| 29 |
|
| 30 |
+ifeq ($(DIST_PYDOC),$(filter $(DIST_PYDOC),$(_TRUE_WORDS))) |
| 31 |
+_DIST_PYDOC_DEP := $(SELFDOC) |
| 32 |
+else |
| 33 |
+_DIST_PYDOC_DEP := |
| 34 |
+endif |
| 35 |
+ |
| 36 |
# _f_recursive_install ( src_root, src_names, dest_root, file_mode ) |
| 37 |
# |
| 38 |
# Recursively installs files from <src_root>/<%name> to <dest_root>/<%name> |
| 39 |
@@ -260,7 +267,7 @@ generate-files-commit: gemerate-files |
| 40 |
|
| 41 |
# creates a src tarball (.tar.bz2) |
| 42 |
PHONY += dist |
| 43 |
-dist: distclean generate-files | $(PKG_DISTDIR) |
| 44 |
+dist: distclean generate-files $(_DIST_PYDOC_DEP) | $(PKG_DISTDIR) |
| 45 |
ifeq ($(X_BZIP2)$(X_GZIP)$(X_XZ),) |
| 46 |
$(error at least one of X_BZIP2, X_GZIP, X_XZ must be set) |
| 47 |
endif |
| 48 |
@@ -280,19 +287,24 @@ else |
| 49 |
endif |
| 50 |
|
| 51 |
$(eval MY_$@_FILE := $(PKG_DISTDIR)/$(DISTNAME)_$(MY_$@_VER).tar) |
| 52 |
- |
| 53 |
+ $(eval MY_$@_DOCFILE := $(PKG_DISTDIR)/$(DISTNAME)-doc_$(MY_$@_VER).tar) |
| 54 |
|
| 55 |
$(X_GIT) archive --worktree-attributes --format=tar HEAD \ |
| 56 |
--prefix=$(DISTNAME)_$(MY_$@_VER)/ > $(MY_$@_FILE).make_tmp |
| 57 |
|
| 58 |
+ tar c -C $(SRC_DOCDIR)/ . -f $(MY_$@_DOCFILE).make_tmp |
| 59 |
+ |
| 60 |
ifneq ($(X_BZIP2),) |
| 61 |
- $(X_BZIP2) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).bz2 |
| 62 |
+ $(X_BZIP2) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).bz2 |
| 63 |
+ $(X_BZIP2) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).bz2 |
| 64 |
endif |
| 65 |
ifneq ($(X_GZIP),) |
| 66 |
- $(X_GZIP) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).gz |
| 67 |
+ $(X_GZIP) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).gz |
| 68 |
+ $(X_GZIP) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).gz |
| 69 |
endif |
| 70 |
ifneq ($(X_XZ),) |
| 71 |
- $(X_XZ) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).xz |
| 72 |
+ $(X_XZ) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).xz |
| 73 |
+ $(X_XZ) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).xz |
| 74 |
endif |
| 75 |
rm -- $(MY_$@_FILE).make_tmp |
| 76 |
|
| 77 |
@@ -439,8 +451,9 @@ help: |
| 78 |
@echo ' (default: $(VBUMP_COMMIT))' |
| 79 |
@echo ' setver - set $(MY_$@_GENITIVE) version to VER' |
| 80 |
@echo ' (default: <not set>)' |
| 81 |
- @echo ' dist - create source tarball(s) in PKG_DISTDIR:' |
| 82 |
- @echo ' DISTNAME_<version>.tar.<compression suffix>' |
| 83 |
+ @echo ' dist - create source tarballs in PKG_DISTDIR:' |
| 84 |
+ @echo ' DISTNAME_<version>.tar.<suffix>' |
| 85 |
+ @echo ' DISTNAME-doc_<version>.tar.<suffix>' |
| 86 |
@echo ' (implies "distclean" and "generate-files")' |
| 87 |
@echo ' (PKG_DISTDIR: $(PKG_DISTDIR:$(CURDIR)/%=%))' |
| 88 |
@echo ' (DISTNAME: $(DISTNAME))' |
| 89 |
@@ -497,6 +510,8 @@ endif |
| 90 |
@echo ' matches its version (n) or not (y) [$(RELEASE_NOT_DIRTY)]' |
| 91 |
@echo '* RELEASE_DIRTY_SUFFIX - suffix for "dirty" dist tarballs [$(RELEASE_DIRTY_SUFFIX)]' |
| 92 |
@echo '* DISTNAME - base name for source tarballs [$(DISTNAME)]' |
| 93 |
+ @echo '* DIST_PYDOC - whether to include pydoc files in the doc' |
| 94 |
+ @echo ' tarball (y) or not (n) [$(DIST_PYDOC)]' |
| 95 |
@echo '* PKG_DISTDIR - directory for storing source tarballs' |
| 96 |
@echo ' [$(PKG_DISTDIR:$(CURDIR)/%=%)]' |
Archives