From b9ab8f5855a9d72fead52b1785a86ea6d83e5b46 Mon Sep 17 00:00:00 2001
From: leper <leper@wildfiregames.com>
Date: Tue, 25 Aug 2015 12:55:05 +0000
Subject: [PATCH] Explicitly include public's mod.json in Windows packages.

Also clean up some unused options in the dist script.

This was SVN commit r16939.
---
 source/tools/dist/0ad.nsi  | 1 +
 source/tools/dist/build.sh | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/tools/dist/0ad.nsi b/source/tools/dist/0ad.nsi
index 48dab92fed..2414810a94 100644
--- a/source/tools/dist/0ad.nsi
+++ b/source/tools/dist/0ad.nsi
@@ -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"
 
diff --git a/source/tools/dist/build.sh b/source/tools/dist/build.sh
index ca0a4e6ad5..2a931359bc 100755
--- a/source/tools/dist/build.sh
+++ b/source/tools/dist/build.sh
@@ -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}