Skip to content

Commit 1cf4994

Browse files
Jo ShieldsJo Shields
authored andcommitted
Switch package-oss output from Zip to BZip2
The file size should be smaller, it's just as available on OSX, and it massively simplifies the process of building .deb releases (as sources must be provided in .tar.* format, not .zip)
1 parent 57d966f commit 1cf4994

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

build-tools/scripts/BuildEverything.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GIT_COMMIT = $(shell LANG=C git log --no-color --first-parent -n1 --prett
1111
-num-commits-since-version-change = $(shell LANG=C git log $(-commit-of-last-version-change)..HEAD --oneline 2>/dev/null | wc -l | sed 's/ //g')
1212

1313
ZIP_OUTPUT_BASENAME = oss-xamarin.android_v$(PRODUCT_VERSION).$(-num-commits-since-version-change)_$(OS)-$(OS_ARCH)_$(GIT_BRANCH)_$(GIT_COMMIT)
14-
ZIP_OUTPUT = $(ZIP_OUTPUT_BASENAME).zip
14+
ZIP_OUTPUT = $(ZIP_OUTPUT_BASENAME).tar.bz2
1515

1616

1717
## The following values *must* use SPACE, **not** TAB, to separate values.
@@ -165,7 +165,5 @@ package-oss $(ZIP_OUTPUT):
165165
echo "$(ZIP_OUTPUT_BASENAME)/bin/$$c/lib/xamarin.android/xbuild/$$f" >> "$$_exclude_list"; \
166166
done; \
167167
done; \
168-
zip -r "$(ZIP_OUTPUT)" \
169-
`ls -1d $(_BUNDLE_ZIPS_INCLUDE) 2>/dev/null` \
170-
"-x@$$_exclude_list"
168+
tar $(_BUNDLE_ZIPS_EXCLUDE:%=--exclude=%) -cjhvf "$(ZIP_OUTPUT)" `ls -1d $(_BUNDLE_ZIPS_INCLUDE) 2>/dev/null`
171169
-rm ".__exclude_list.txt"

0 commit comments

Comments
 (0)