Merge Package-Build 4.0.0-61-gc9f743cc

Author: tarsius

package-build/.gitignore

@@ -0,0 +1,3 @@
+*.elc
+/*-autoloads.el
+/config.mk

package-build/Makefile

@@ -1,29 +1,20 @@
 -include config.mk
+include default.mk
 
-PKG = package-build
-
-ELS   = package-recipe.el
-ELS  += package-build-badges.el
-ELS  += $(PKG).el
-ELS  += package-recipe-mode.el
-ELCS  = $(ELS:.el=.elc)
-
-DEPS  =
-
-EMACS      ?= emacs
-EMACS_ARGS ?=
-
-LOAD_PATH  ?= $(addprefix -L ../,$(DEPS))
-LOAD_PATH  += -L .
+.PHONY: test
 
 all: lisp
 
 help:
-	$(info make [all|lisp]   - generate byte-code and autoloads)
+	$(info make all          - generate byte-code and autoloads)
+	$(info make lisp         - generate byte-code and autoloads)
+	$(info make test         - run tests)
+	$(info make demo         - run tests showing their documentation)
 	$(info make clean        - remove generated files)
 	@printf "\n"
 
 lisp: $(ELCS) loaddefs check-declare
+	@$(MAKE) -C test lisp
 
 loaddefs: $(PKG)-autoloads.el
 
@@ -36,7 +27,13 @@ check-declare:
 	@$(EMACS) -Q --batch $(EMACS_ARGS) $(LOAD_PATH) \
 	--eval "(check-declare-directory default-directory)"
 
-CLEAN  = $(ELCS) $(PKG)-autoloads.el
+test:
+	@$(MAKE) -C test test
+
+demo:
+	@$(MAKE) -C test demo
+
+CLEAN = $(ELCS) $(PKG)-autoloads.el test/$(PKG)-tests.elc
 
 clean:
 	@printf " Cleaning...\n"

package-build/default.mk

@@ -0,0 +1,21 @@
+TOP := $(dir $(lastword $(MAKEFILE_LIST)))
+
+PKG = package-build
+
+ELS   = package-recipe.el
+ELS  += package-build-badges.el
+ELS  += package-build.el
+ELS  += package-recipe-mode.el
+ELCS  = $(ELS:.el=.elc)
+
+DEPS  =
+
+VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0 | cut -c2-)
+
+EMACS      ?= emacs
+EMACS_ARGS ?=
+
+LOAD_PATH  ?= $(addprefix -L $(TOP)../,$(DEPS))
+LOAD_PATH  += -L $(TOP)
+
+BATCH       = $(EMACS) -Q --batch $(EMACS_ARGS) $(LOAD_PATH)

package-build/package-build-badges.el

@@ -32,17 +32,16 @@
 
 ;;; Code:
 
-(defvar package-build-stable)
 (defvar package-build-badge-data)
 
 (defun package-build--write-badge-image ( name version target-dir
                                           &optional archive color)
   "Make badge svg file.
 This is essentially a copy of `elpaa--make-badge'."
   (let* ((file (expand-file-name (concat name "-badge.svg") target-dir))
-         (left (or archive (car package-build-badge-data)))
+         (left (or archive (car package-build-badge-data) "myElpa"))
          (right (url-hexify-string version))
-         (color (or color (cadr package-build-badge-data)))
+         (color (or color (cadr package-build-badge-data) "#ff491b"))
          (lw (package-build-badge--string-width left))
          (rw (package-build-badge--string-width right))
          (pad (package-build-badge--string-width "x"))