From f4e4473bb6d9d29a44cae3e210eb255e2547686d Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Sat, 5 Dec 2015 08:42:10 +0000
Subject: [PATCH] Updates to build system.

---
 build/buildAll.sh    | 13 ++++++++++++
 build/buildLinux.sh  | 49 --------------------------------------------
 build/control        | 11 ----------
 build/linux/build.sh | 48 +++++++++++++++++++++++++++++++++++++++++++
 build/win32/build.sh | 34 ++++++++++++++++++++++++++++++
 makefile             |  1 -
 6 files changed, 95 insertions(+), 61 deletions(-)
 create mode 100755 build/buildAll.sh
 delete mode 100755 build/buildLinux.sh
 delete mode 100644 build/control
 create mode 100755 build/linux/build.sh
 create mode 100755 build/win32/build.sh

diff --git a/build/buildAll.sh b/build/buildAll.sh
new file mode 100755
index 0000000..ddc1eaa
--- /dev/null
+++ b/build/buildAll.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+VERSION=`egrep 'VERSION = ([0-9.+])' ../common.mk | awk '{print $3}'`
+REVISION=`date +"%y%m%d"`
+
+mkdir -p ../dist
+rm -rf ../dist/*
+
+cd build
+
+linux/build.sh $VERSION $REVISION
+
+win32/build.sh $VERSION $REVISION
diff --git a/build/buildLinux.sh b/build/buildLinux.sh
deleted file mode 100755
index 804e86a..0000000
--- a/build/buildLinux.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash -e
-
-BUILDROOT="build/tbftss"
-
-VERSION=0.4
-REVISION=`date +"%y%m%d"`
-SIZE=0
-
-cd ..
-
-rm -rf dist/*
-
-make clean
-make
-make dist
-
-mkdir -p $BUILDROOT
-rm -rf $BUILDROOT/*
-
-mkdir -p $BUILDROOT/DEBIAN
-
-mkdir -p $BUILDROOT/usr/bin
-cp tbftss $BUILDROOT/usr/bin
-
-mkdir -p $BUILDROOT/opt/tbftss
-cp -r data $BUILDROOT/opt/tbftss
-cp -r gfx $BUILDROOT/opt/tbftss
-cp -r music $BUILDROOT/opt/tbftss
-cp -r sound $BUILDROOT/opt/tbftss
-cp -r manual $BUILDROOT/opt/tbftss
-
-SIZE=`du -bs $BUILDROOT | cut -f -1`
-SIZE=`expr $SIZE / 1024`
-
-sed \
--e "s/\${version}/$VERSION-$REVISION/" \
--e "s/\${size}/$SIZE/" \
-build/control > $BUILDROOT/DEBIAN/control
-
-cd build
-
-dpkg-deb --build tbftss
-
-mv tbftss.deb tbftss-${VERSION}-${REVISION}.i386.deb
-alien -r --bump=0 tbftss-${VERSION}-${REVISION}.i386.deb
-
-mv *.deb *.rpm ../dist
-
-rm -rf tbftss
diff --git a/build/control b/build/control
deleted file mode 100644
index 56e9fb9..0000000
--- a/build/control
+++ /dev/null
@@ -1,11 +0,0 @@
-Source: tbftss
-Package: tbftss
-Version: ${version}
-Section: games
-Priority: optional
-Installed-Size: ${size}
-Architecture: i386
-Depends: libsdl2-2.0-0, libsdl2-image-2.0-0, libsdl2-mixer-2.0-0, libsdl2-ttf-2.0-0
-Maintainer: stephenjsweeney@battleforthesolarsystem.com
-Description: 2D mission-based space shooter, based on the Battle for the Solar System space opera novel trilogy. 
-Homepage: www.battleforthesolarsystem.com/games/pw
diff --git a/build/linux/build.sh b/build/linux/build.sh
new file mode 100755
index 0000000..4b9b3f5
--- /dev/null
+++ b/build/linux/build.sh
@@ -0,0 +1,48 @@
+#!/bin/bash -e
+
+BUILDROOT="build/linux"
+OUT="$BUILDROOT/tbftss"
+
+cd ../..
+
+VERSION=$1
+REVISION=$2
+SIZE=0
+
+make clean
+make
+make dist
+
+mkdir -p $OUT
+rm -rf $OUT/*
+
+mkdir -p $OUT/DEBIAN
+
+mkdir -p $OUT/usr/bin
+cp tbftss $OUT/usr/bin
+
+mkdir -p $OUT/opt/tbftss
+cp -r data $OUT/opt/tbftss
+cp -r gfx $OUT/opt/tbftss
+cp -r music $OUT/opt/tbftss
+cp -r sound $OUT/opt/tbftss
+cp -r manual $OUT/opt/tbftss
+
+SIZE=`du -bs $OUT | cut -f -1`
+SIZE=`expr $SIZE / 1024`
+
+sed \
+-e "s/\${version}/$VERSION-$REVISION/" \
+-e "s/\${size}/$SIZE/" \
+$BUILDROOT/control > $OUT/DEBIAN/control
+
+cd $BUILDROOT
+
+dpkg-deb --build tbftss
+
+mv tbftss.deb tbftss-${VERSION}-${REVISION}.i386.deb
+alien -r --bump=0 tbftss-${VERSION}-${REVISION}.i386.deb
+
+mv *.deb *.rpm ../../dist
+
+rm -rf tbftss
diff --git a/build/win32/build.sh b/build/win32/build.sh
new file mode 100755
index 0000000..13c79d6
--- /dev/null
+++ b/build/win32/build.sh
@@ -0,0 +1,34 @@
+#!/bin/bash -e
+
+BUILDROOT="build/win32"
+OUT="$BUILDROOT/tbftss"
+
+cd ../..
+
+VERSION=$1
+REVISION=$2
+SIZE=0
+
+make -f makefile.win32 clean
+make -f makefile.win32
+
+mkdir -p $OUT
+rm -rf $OUT/*
+
+cp tbftss.exe $OUT
+
+cp -r data $OUT
+cp -r gfx $OUT
+cp -r music $OUT
+cp -r sound $OUT
+cp -r manual $OUT
+
+cp /usr/x86_64-w64-mingw32/bin/*.dll $OUT
+
+cd $BUILDROOT
+
+zip -r tbftss-${VERSION}-${REVISION}.zip tbftss
+
+mv *.zip ../../dist
+
+rm -rf tbftss
diff --git a/makefile b/makefile
index 1908e3f..c6eb1b3 100644
--- a/makefile
+++ b/makefile
@@ -41,7 +41,6 @@ dist:
 	git log --oneline --decorate >$(PROG)-$(VERSION)/CHANGELOG.raw
 	tar czf $(PROG)-$(VERSION)-$(REVISION).src.tar.gz $(PROG)-$(VERSION)
 	mkdir -p dist
-	$(RM) -rf dist/*
 	mv $(PROG)-$(VERSION)-$(REVISION).src.tar.gz dist
 	$(RM) -rf $(PROG)-$(VERSION)