JeroenED/libpairtwo
1
0
Fork 0
mirror of https://github.com/JeroenED/libpairtwo.git synced 2024-11-22 14:36:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/dists-no-branch' into develop

Browse Source
This commit is contained in:
Jeroen De Meerleer 2019-09-28 00:40:50 +02:00
commit 8b5215f5de
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@
* BUGFIX: `Tournament::calculateMutualResult()` returned NULL if result was invalid * BUGFIX: `Tournament::calculateMutualResult()` returned NULL if result was invalid
* BUGFIX: `Tournament::calculateBaumbach()` treated bye as won * BUGFIX: `Tournament::calculateBaumbach()` treated bye as won
* BUGFIX: `Tournament::calculateAverageRating()` returned NaN if no games were played * BUGFIX: `Tournament::calculateAverageRating()` returned NaN if no games were played
* BUGFIX: Distributions could be created from a branch other than master
## v1.1.2 (Release: 21-jun-2019) ## v1.1.2 (Release: 21-jun-2019)
* ENHANCEMENT: Added update section to dist/readme.md * ENHANCEMENT: Added update section to dist/readme.md

8
Makefile
View File

@ -1,7 +1,7 @@
.PHONY: help tests dist .PHONY: help tests dist
.DEFAULT_GOAL := help .DEFAULT_GOAL := help
BRANCH := $(shell git rev-parse --abbrev-ref HEAD) BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
VERSION := $(if $(TAG),$(TAG),$(BRANCH)) VERSION := $(if $(TAG),$(TAG),dev-$(BRANCH))
help: help:
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-12s\033[0m %s\n", $$1, $$2}' @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-12s\033[0m %s\n", $$1, $$2}'
@ -19,11 +19,9 @@ api: ## Generates api-docs
VERSIONTAG=$(VERSION) doxygen VERSIONTAG=$(VERSION) doxygen
dist: ## Generates distribution dist: ## Generates distribution
touch .libpairtwo-dist
git add .libpairtwo-dist
git commit -m "Commit before release"
cp dist/composer* res/ cp dist/composer* res/
mv dist/composer-dist.json dist/composer.json mv dist/composer-dist.json dist/composer.json
sed -i -e "s%//VERSION//%$(VERSION)%g" dist/composer.json
cd dist && composer install cd dist && composer install
rm dist/composer.json rm dist/composer.json
rm dist/composer.lock rm dist/composer.lock
@ -32,7 +30,7 @@ dist: ## Generates distribution
mkdir -p dist/doc mkdir -p dist/doc
cp -r doc/api dist/doc cp -r doc/api dist/doc
cd dist && zip -r ../libpairtwo-$(VERSION)-dist.zip * cd dist && zip -r ../libpairtwo-$(VERSION)-dist.zip *
git reset --hard HEAD^ git reset --hard HEAD
mv res/composer* dist/ mv res/composer* dist/
clean: clean-dist clean-dev clean: clean-dist clean-dev

2
dist/composer-dist.json vendored
View File

@ -6,7 +6,7 @@
} }
], ],
"require": { "require": {
"jeroened/libpairtwo": "*" "jeroened/libpairtwo": "//VERSION//"
}, },
"minimum-stability": "dev" "minimum-stability": "dev"
} }