From 7e6d6f229bc9985e5c40801c8e334ce98164f19d Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 2 May 2018 18:29:40 +0100 Subject: [PATCH] Removed build directory and make dist. Causes a bit of confusion. --- build/buildAll.sh | 11 ----------- build/linux/build.sh | 20 -------------------- build/win32/build.sh | 40 ---------------------------------------- makefile | 21 --------------------- 4 files changed, 92 deletions(-) delete mode 100755 build/buildAll.sh delete mode 100755 build/linux/build.sh delete mode 100755 build/win32/build.sh diff --git a/build/buildAll.sh b/build/buildAll.sh deleted file mode 100755 index b9315ab..0000000 --- a/build/buildAll.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -e - -VERSION=`egrep 'VERSION = ([0-9.+])' ../common.mk | awk '{print $3}'` -REVISION=`egrep 'REVISION = ([0-9.+])' ../common.mk | awk '{print $3}'` - -mkdir -p ../dist -rm -rf ../dist/* - -linux/build.sh $VERSION $REVISION - -win32/build.sh $VERSION $REVISION diff --git a/build/linux/build.sh b/build/linux/build.sh deleted file mode 100755 index d48d59c..0000000 --- a/build/linux/build.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -e - -cd `dirname $0` - -BUILDROOT="build/linux" - -cd ../.. - -VERSION=$1 -REVISION=$2 -SIZE=0 - -make clean -make src-dist - -make clean -make LOCALE_DIR=locale -make dist - -rm -rf tbftss diff --git a/build/win32/build.sh b/build/win32/build.sh deleted file mode 100755 index 0409024..0000000 --- a/build/win32/build.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -e - -cd `dirname $0` - -BUILDROOT="build/win32" - -cd ../.. - -VERSION=$1 -REVISION=$2 -FOLDER="tbftss-$1" -OUT="$BUILDROOT/$FOLDER" - -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 -r locale $OUT -cp LICENSE $OUT -cp CHANGELOG $OUT -cp README.md $OUT - -cp /usr/x86_64-w64-mingw32/bin/*.dll $OUT - -cd $BUILDROOT - -zip -r tbftss-${VERSION}-${REVISION}.win32.zip $FOLDER - -mv *.zip ../../dist - -rm -rf $FOLDER diff --git a/makefile b/makefile index 5a6973f..bfb0b2b 100644 --- a/makefile +++ b/makefile @@ -72,26 +72,5 @@ uninstall: lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \ $(RM) -v $(LOCALE_DIR)/$$lang/LC_MESSAGES/$(PROG).mo; \ done - -# prepare an archive for the program -dist: - $(RM) -rf $(PROG)-$(VERSION) - mkdir $(PROG)-$(VERSION) - cp -r $(DIST_FILES) $(PROG)-$(VERSION) - tar czf $(PROG)-$(VERSION)-$(REVISION).linux-x86.tar.gz $(PROG)-$(VERSION) - mkdir -p dist - mv $(PROG)-$(VERSION)-$(REVISION).linux-x86.tar.gz dist - $(RM) -rf $(PROG)-$(VERSION) -# prepare an archive for the program -src-dist: - $(RM) -rf $(PROG)-$(VERSION) - mkdir $(PROG)-$(VERSION) - cp -r $(SRC_DIST_FILES) $(PROG)-$(VERSION) - git log --pretty=format:"%h%x09%an%x09%ad%x09%s" --date=short >$(PROG)-$(VERSION)/CHANGELOG.raw - tar czf $(PROG)-$(VERSION)-$(REVISION).src.tar.gz $(PROG)-$(VERSION) - mkdir -p dist - mv $(PROG)-$(VERSION)-$(REVISION).src.tar.gz dist - $(RM) -rf $(PROG)-$(VERSION) - .PHONY: dist