From cc18a78a87469ffe204f3e8196663613b390499a Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Mon, 17 Jun 2019 14:58:06 +0200 Subject: [PATCH 1/5] Added distro target --- Makefile | 22 ++++++++++++++++++++++ res/composer-dist-installed.json | 5 +++++ res/composer-dist.json | 12 ++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 res/composer-dist-installed.json create mode 100644 res/composer-dist.json diff --git a/Makefile b/Makefile index 7269f15..0707225 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,28 @@ coverage: ## Executes the test suite and creates code coverage reports view-coverage: ## Shows the code coverage report open build/coverage/index.html +api: ## Generates api-docs + wget -O vendor/bin/phpdoc http://www.phpdoc.org/phpDocumentor.phar + chmod +x vendor/bin/phpdoc + vendor/bin/phpdoc + +distro: ## Generates distribution + mkdir distro + touch .libpairtwo-distro + git add -A + git commit -m "Commit before release" + cp res/composer-dist.json distro/composer.json + cd distro && composer install + rm distro/composer.json + cp res/composer-dist-installed.json distro/composer.json + git reset --soft HEAD^ + wget -O vendor/bin/phpdoc http://www.phpdoc.org/phpDocumentor.phar + chmod +x vendor/bin/phpdoc + vendor/bin/phpdoc + mkdir -p distro/doc + cp -r doc/api distro/doc + cd distro && zip -r ../libpairtwo-distro * + cs: ## Fixes coding standard problems vendor/bin/php-cs-fixer fix || true diff --git a/res/composer-dist-installed.json b/res/composer-dist-installed.json new file mode 100644 index 0000000..ca48629 --- /dev/null +++ b/res/composer-dist-installed.json @@ -0,0 +1,5 @@ +{ + "require": { + "jeroened/libpairtwo": "^1.0" + }, +} \ No newline at end of file diff --git a/res/composer-dist.json b/res/composer-dist.json new file mode 100644 index 0000000..7aece67 --- /dev/null +++ b/res/composer-dist.json @@ -0,0 +1,12 @@ +{ + "repositories": [ + { + "type": "git", + "url": "../" + } + ], + "require": { + "jeroened/libpairtwo": "*" + }, + "minimum-stability": "dev" +} \ No newline at end of file From cac38331c8847e1326f713f770f371bece027284 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Mon, 17 Jun 2019 15:17:52 +0200 Subject: [PATCH 2/5] Added distro files to gitignore --- .gitignore | 4 ++++ .libpairtwo-distro | 0 2 files changed, 4 insertions(+) create mode 100644 .libpairtwo-distro diff --git a/.gitignore b/.gitignore index 5703522..7ae4f63 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,7 @@ composer.lock /res/protected/ /.idea doc/api/* + +libpairtwo-distro\.zip + +distro/ diff --git a/.libpairtwo-distro b/.libpairtwo-distro new file mode 100644 index 0000000..e69de29 From 907ddb137df5089d7369696ae52a95a6bafb7273 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Mon, 17 Jun 2019 15:23:26 +0200 Subject: [PATCH 3/5] Added boilerplate.php to distro --- Makefile | 1 + res/boilerplate.php | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 res/boilerplate.php diff --git a/Makefile b/Makefile index 0707225..fe0f3eb 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ distro: ## Generates distribution vendor/bin/phpdoc mkdir -p distro/doc cp -r doc/api distro/doc + cp -r res/boilerplate.php distro/libpairtwo.php cd distro && zip -r ../libpairtwo-distro * cs: ## Fixes coding standard problems diff --git a/res/boilerplate.php b/res/boilerplate.php new file mode 100644 index 0000000..66d06f9 --- /dev/null +++ b/res/boilerplate.php @@ -0,0 +1,12 @@ +read('your pairing-file.sws'); + +// From here on you can start. Please use the examples on https://github.com/jeroened/libpairtwo/wiki +// You can also use the doc/api folder to get all possible methods and fields From d97bafea65e1a63095b702f3e538415efc25d905 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Mon, 17 Jun 2019 15:25:06 +0200 Subject: [PATCH 4/5] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c66e60..af60c28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # CHANGELOG ## vx.x.x (Released: xx-xxx-xx) +* NEW FEATURE: Libpairtwo distribution releases (use these if you don't have knowledge of composer or dependency management) * NEW FEATURE: Soccer Kashdan (aka: kashdan using 3-1-0 scoring) * CHANGE: Deprecated `sws::class` was removed * CHANGE: Added a logo to the project From aee90453309f8b444f12528c1c6d57b154f0f5fb Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Mon, 17 Jun 2019 15:30:17 +0200 Subject: [PATCH 5/5] invalid json --- res/composer-dist-installed.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/composer-dist-installed.json b/res/composer-dist-installed.json index ca48629..beccd86 100644 --- a/res/composer-dist-installed.json +++ b/res/composer-dist-installed.json @@ -1,5 +1,5 @@ { "require": { "jeroened/libpairtwo": "^1.0" - }, + } } \ No newline at end of file