Switch the Test and Package stages

In order to simplify the testing of each package, do the packaging step first so
that when it gets to the testing stage it can load the packaged files from the
local repository and manage the interdependencies that way.

1 files changed, 2 insertions, 97 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 342a533..ee727b4 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -58,97 +58,9 @@ install-%:
 	emacs --batch \
 	    --load oni-package.el \
 	    --funcall package-initialize \
+	    --eval "(add-to-list 'package-archives '(\"test\" . \"$(TEST_ARCHIVE)\"))" \
 	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file \"$*.el\")"
-
-install-oni-conf:
-	emacs --batch \
-	    --load oni-package.el \
-	    --funcall package-initialize \
-	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-conf/dist/*.tar\") #'string>)))"
-
-install-oni-css:
-	emacs --batch \
-	    --load oni-package.el \
-	    --funcall package-initialize \
-	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-css/dist/*.tar\") #'string>)))"
-
-install-oni-elisp:
-	emacs --batch \
-	    --load oni-package.el \
-	    --funcall package-initialize \
-	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-elisp/dist/*.tar\") #'string>)))"
-
-install-oni-haml:
-	emacs --batch \
-	    --load oni-package.el \
-	    --funcall package-initialize \
-	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-haml/dist/*.tar\") #'string>)))"
-
-install-oni-html:
-	emacs --batch \
-	    --load oni-package.el \
-	    --funcall package-initialize \
-	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-html/dist/*.tar\") #'string>)))"
-
-install-oni-nxml:
-	emacs --batch \
-	    --load oni-package.el \
-	    --funcall package-initialize \
-	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-nxml/dist/*.tar\") #'string>)))"
-
-install-oni-org:
-	emacs --batch \
-	    --load oni-package.el \
-	    --funcall package-initialize \
-	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-org/dist/*.tar\") #'string>)))"
-
-install-oni-php:
-	emacs --batch \
-	    --load oni-package.el \
-	    --funcall package-initialize \
-	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-php/dist/*.tar\") #'string>)))"
-
-install-oni-python:
-	emacs --batch \
-	    --load oni-package.el \
-	    --funcall package-initialize \
-	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-python/dist/*.tar\") #'string>)))"
-
-install-oni-ruby:
-	emacs --batch \
-	    --load oni-package.el \
-	    --funcall package-initialize \
-	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-ruby/dist/*.tar\") #'string>)))"
-
-install-oni-twig:
-	emacs --batch \
-	    --load oni-package.el \
-	    --funcall package-initialize \
-	    --eval '(package-refresh-contents)' \
-	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
-	    --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-twig/dist/*.tar\") #'string>)))"
+	    --eval "(package-install '$*)"
 
 test-%: install-%
 	emacs --batch \
@@ -159,12 +71,5 @@ test-%: install-%
 	    --eval "(setq ert-batch-backtrace-right-margin nil)" \
 	    --funcall ert-run-tests-batch-and-exit
 
-test-oni-bookmark: DEPS := oni-data-dir
-test-oni-conf: DEPS := oni-yasnippet
-test-oni-css: DEPS := oni-company oni-fci
-test-oni-php: DEPS := oni-flycheck oni-company oni-fci
-test-oni-elisp: DEPS := oni-company oni-flycheck oni-paredit oni-fci \
-    oni-yasnippet
-
 clean:
 	rm -fv $(FILES)