Skip to content

Commit

Permalink
Merge pull request add-ons#36 from dagwieers/makefile-zip
Browse files Browse the repository at this point in the history
Make use of git archive
  • Loading branch information
piejanssens committed Jan 30, 2021
2 parents 8d8f6d2 + 49138a2 commit 9da87e0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ ifdef release
else
zip_name = $(name)-$(version)-$(git_branch)-$(git_hash).zip
endif

include_files = addon.xml LICENSE README.md resources/
include_paths = $(patsubst %,$(name)/%,$(include_files))
exclude_files = \*.new \*.orig \*.pyc \*.pyo
zip_dir = $(name)/

languages = $(filter-out en_gb, $(patsubst resources/language/resource.language.%, %, $(wildcard resources/language/*)))
Expand Down Expand Up @@ -74,7 +70,7 @@ profile:
build: clean
@printf "$(white)=$(blue) Building new package$(reset)\n"
@rm -f ../$(zip_name)
cd ..; zip -r $(zip_name) $(include_paths) -x $(exclude_files)
@git archive --format zip --worktree-attributes -v -o ../$(zip_name) --prefix $(zip_dir) $(or $(shell git stash create), HEAD)
@printf "$(white)=$(blue) Successfully wrote package as: $(white)../$(zip_name)$(reset)\n"

multizip: clean
Expand Down
6 changes: 3 additions & 3 deletions addon.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.redbull.tv" name="Red Bull TV" version="3.2.2" provider-name="piejanssens">
<requires>
<import addon="script.module.dateutil" version="2.8.0" />
<import addon="script.module.routing" version="0.2.0" />
<import addon="xbmc.python" version="2.26.0" />
<import addon="script.module.dateutil" version="2.8.0"/>
<import addon="script.module.routing" version="0.2.0"/>
<import addon="xbmc.python" version="2.25.0"/>
</requires>
<extension point="xbmc.python.pluginsource" library="resources/lib/addon_entry.py">
<provides>video</provides>
Expand Down

0 comments on commit 9da87e0

Please sign in to comment.