Explicitly include public's mod.json in Windows packages.

Also clean up some unused options in the dist script.

This was SVN commit r16939.
This commit is contained in:
leper 2015-08-25 12:55:05 +00:00
parent 217a478ac7
commit b9ab8f5855
2 changed files with 3 additions and 4 deletions

View File

@ -85,6 +85,7 @@ Section "!Game and data files" GameSection
SetOutPath "$INSTDIR\binaries\data\mods\public"
File "${CHECKOUTPATH}\binaries\data\mods\public\public.zip"
File "${CHECKOUTPATH}\binaries\data\mods\public\mod.json"
SetOutPath "$INSTDIR\binaries\data\mods\mod"
File "${CHECKOUTPATH}\binaries\data\mods\mod\mod.zip"

View File

@ -12,8 +12,6 @@ SVNREV=`svnversion -n ${SVNWC}`
PREFIX=0ad-0.0.XXX-alpha
XZOPTS="-9 -e"
BZ2OPTS="-9"
GZIPOPTS="-9"
GZIP7ZOPTS="-mx=9"
# Export files with appropriate line-endings
@ -59,7 +57,7 @@ xz -kv ${XZOPTS} $PREFIX-unix-data.tar
makensis -nocd -dcheckoutpath=export-win32 -drevision=${SVNREV} -dprefix=${PREFIX} export-win32/source/tools/dist/0ad.nsi
# Fix permissions
chmod -f 644 ${PREFIX}-{unix-{build,data}.tar.{xz,bz2,gz},win32.exe}
chmod -f 644 ${PREFIX}-{unix-{build,data}.tar.{xz,gz},win32.exe}
# Print digests for copying into wiki page
sha1sum ${PREFIX}-{unix-{build,data}.tar.{xz,bz2,gz},win32.exe}
sha1sum ${PREFIX}-{unix-{build,data}.tar.{xz,gz},win32.exe}