1
0
Fork 0

Revert "Generalize building of multifile packages"

This reverts commit cd067e3673.

On the build runner this ends up trying to build ‘oni-scheme.el’ as a multifile
package. It doesn’t seem to notice the distinction between the regular files and
directories.
This commit is contained in:
Tom Willemse 2020-10-19 13:42:28 -07:00
parent cd067e3673
commit 3f753fa618

View file

@ -1,8 +1,6 @@
FILES := $(wildcard oni-*.el) FILES := $(wildcard oni-*.el)
DIRECTORIES := $(wildcard oni-*/)
PACKAGE_TARGETS := $(addprefix package-,$(FILES)) PACKAGE_TARGETS := $(addprefix package-,$(FILES))
MULTIPACKAGE_TARGETS := $(addprefix multipackage-,$(subst /, ,$(DIRECTORIES)))
define upload = define upload =
emacs --batch \ emacs --batch \
@ -16,13 +14,49 @@ define upload-multi-file =
cp $1/dist/$1-readme.txt bin/ cp $1/dist/$1-readme.txt bin/
endef endef
package: $(PACKAGE_TARGETS) $(MULTIPACKAGE_TARGETS) package: $(PACKAGE_TARGETS) package-oni-conf package-oni-css package-oni-elisp \
package-oni-haml package-oni-html package-oni-nxml package-oni-org \
package-oni-php package-oni-python package-oni-ruby package-oni-twig \
package-oni-csharp
package-%: % package-%: %
$(call upload,\"$^\") $(call upload,\"$^\")
multipackage-%: % package-oni-conf:
$(call upload-multi-file,$^) $(call upload-multi-file,oni-conf)
package-oni-css:
$(call upload-multi-file,oni-css)
package-oni-elisp:
$(call upload-multi-file,oni-elisp)
package-oni-haml:
$(call upload-multi-file,oni-haml)
package-oni-html:
$(call upload-multi-file,oni-html)
package-oni-nxml:
$(call upload-multi-file,oni-nxml)
package-oni-org:
$(call upload-multi-file,oni-org)
package-oni-php:
$(call upload-multi-file,oni-php)
package-oni-python:
$(call upload-multi-file,oni-python)
package-oni-ruby:
$(call upload-multi-file,oni-ruby)
package-oni-twig:
$(call upload-multi-file,oni-twig)
package-oni-csharp:
$(call upload-multi-file,oni-csharp)
install-%: install-%:
emacs --batch \ emacs --batch \