walkero
/
blobwarsAttrition
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Add revision number to build folders.

This commit is contained in:
Steve 2018-04-16 19:11:41 +01:00
parent e140c525e2
commit 959621689f
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/buildAll.sh
View File

@ -1,10 +1,11 @@
#!/bin/bash -e #!/bin/bash -e
VERSION=`egrep 'VERSION = ([0-9.+])' ../common.mk | awk '{print $3}'` VERSION=`egrep 'VERSION = ([0-9.+])' ../common.mk | awk '{print $3}'`
REVISION=`egrep 'REVISION = ([0-9.+])' ../common.mk | awk '{print $3}'`
mkdir -p ../dist mkdir -p ../dist
rm -rf ../dist/* rm -rf ../dist/*
linux/build.sh $VERSION linux/build.sh $VERSION $REVISION
win32/build.sh $VERSION win32/build.sh $VERSION $REVISION

1
build/linux/build.sh
View File

@ -7,6 +7,7 @@ BUILDROOT="build/linux"
cd ../.. cd ../..
VERSION=$1 VERSION=$1
REVISION=$2
make clean make clean
make src-dist make src-dist

3
build/win32/build.sh
View File

@ -7,7 +7,8 @@ BUILDROOT="build/win32"
cd ../.. cd ../..
VERSION=$1 VERSION=$1
FOLDER="blobWarsAttrition-$1" REVISION=$2
FOLDER="blobWarsAttrition-$1.$2"
OUT="$BUILDROOT/$FOLDER" OUT="$BUILDROOT/$FOLDER"
make -f makefile.win32 clean make -f makefile.win32 clean

22
makefile
View File

@ -76,23 +76,23 @@ uninstall:
# prepare an archive for the program # prepare an archive for the program
dist: dist:
$(RM) -rf $(PROG)-$(VERSION) $(RM) -rf $(PROG)-$(VERSION).$(REVISION)
mkdir $(PROG)-$(VERSION) mkdir $(PROG)-$(VERSION).$(REVISION)
cp -rL $(DIST_FILES) $(PROG)-$(VERSION) cp -rL $(DIST_FILES) $(PROG)-$(VERSION).$(REVISION)
tar czf $(PROG)-$(VERSION)-$(REVISION).linux-x86.tar.gz $(PROG)-$(VERSION) tar czf $(PROG)-$(VERSION)-$(REVISION).linux-x86.tar.gz $(PROG)-$(VERSION).$(REVISION)
mkdir -p dist mkdir -p dist
mv $(PROG)-$(VERSION)-$(REVISION).linux-x86.tar.gz dist mv $(PROG)-$(VERSION)-$(REVISION).linux-x86.tar.gz dist
$(RM) -rf $(PROG)-$(VERSION) $(RM) -rf $(PROG)-$(VERSION).$(REVISION)
# prepare an archive for the program # prepare an archive for the program
src-dist: src-dist:
$(RM) -rf $(PROG)-$(VERSION) $(RM) -rf $(PROG)-$(VERSION).$(REVISION)
mkdir $(PROG)-$(VERSION) mkdir $(PROG)-$(VERSION).$(REVISION)
cp -rL $(SRC_DIST_FILES) $(PROG)-$(VERSION) cp -rL $(SRC_DIST_FILES) $(PROG)-$(VERSION).$(REVISION)
git log --pretty=format:"%h%x09%an%x09%ad%x09%s" --date=short >$(PROG)-$(VERSION)/CHANGELOG.raw git log --pretty=format:"%h%x09%an%x09%ad%x09%s" --date=short >$(PROG)-$(VERSION).$(REVISION)/CHANGELOG.raw
tar czf $(PROG)-$(VERSION)-$(REVISION).src.tar.gz $(PROG)-$(VERSION) tar czf $(PROG)-$(VERSION)-$(REVISION).src.tar.gz $(PROG)-$(VERSION).$(REVISION)
mkdir -p dist mkdir -p dist
mv $(PROG)-$(VERSION)-$(REVISION).src.tar.gz dist mv $(PROG)-$(VERSION)-$(REVISION).src.tar.gz dist
$(RM) -rf $(PROG)-$(VERSION) $(RM) -rf $(PROG)-$(VERSION).$(REVISION)
.PHONY: dist .PHONY: dist