From f0740fc2a81a6442e3bf2f7b4d51d22c51e281d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20Dvo=C5=99=C3=A1k?= Date: Wed, 19 Aug 2020 00:02:40 +0200 Subject: [PATCH] v1.0 release --- .gitignore | 6 +- Makefile | 16 ++++- README.md | 42 +++++------ composer.json | 6 +- debian/changelog | 5 +- debian/composer.json | 70 +++++++++---------- debian/control | 13 ++-- debian/install | 2 - debian/lastversion | 1 - ...> php-ease-bootstrap4-widgets-doc.install} | 0 debian/php-ease-bootstrap4-widgets.install | 4 ++ ...t => php-ease-bootstrap4-widgets.postinst} | 4 +- debian/rules | 10 ++- nbproject/project.xml | 2 +- 14 files changed, 103 insertions(+), 78 deletions(-) delete mode 100644 debian/install delete mode 100644 debian/lastversion rename debian/{php-ease-twbootstrap4-widgets-doc.install => php-ease-bootstrap4-widgets-doc.install} (100%) create mode 100644 debian/php-ease-bootstrap4-widgets.install rename debian/{php-ease-twbootstrap4-widgets.postinst => php-ease-bootstrap4-widgets.postinst} (89%) diff --git a/.gitignore b/.gitignore index eb4a4d5..335840e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,8 @@ composer.lock /debian/php-ease-bricks-doc/ /debian/php-ease-bricks/ /debian/files -/debian/debhelper-build-stamp \ No newline at end of file +/debian/debhelper-build-stamp +/tmp/ +debian/.debhelper/ +/debian/php-ease-bootstrap4-widgets.debhelper.log +/debian/php-ease-bootstrap4-widgets.substvars diff --git a/Makefile b/Makefile index 030173a..400aeef 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,10 @@ +repoversion=$(shell LANG=C aptitude show php-ease-bootstrap4-widgets | grep Version: | awk '{print $$2}') +nextversion=$(shell echo $(repoversion) | perl -ne 'chomp; print join(".", splice(@{[split/\./,$$_]}, 0, -1), map {++$$_} pop @{[split/\./,$$_]}), "\n";') + + clean: - rm -rf debian/php-ease-twbootstrap4-widgets - rm -rf debian/php-ease-twbootstrap4-widgets-doc + rm -rf debian/php-ease-bootstrap4-widgets + rm -rf debian/php-ease-bootstrap4-widgets-doc rm -rf debian/*.log rm -rf docs/* rm -rf vendor/* composer.lock @@ -13,6 +17,14 @@ test: phpunit --bootstrap tests/Bootstrap.php --configuration tests/configuration.xml tests codecept run +release: + echo Release v$(nextversion) + dch -v $(nextversion) `git log -1 --pretty=%B | head -n 1` + debuild -i -us -uc -b + git commit -a -m "Release v$(nextversion)" + git tag -a $(nextversion) -m "version $(nextversion)" + + deb: debuild -i -us -uc -b diff --git a/README.md b/README.md index 70a0047..c69049f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![EasePHP TWB4 Widgets Logo](https://raw.githubusercontent.com/VitexSoftware/php-ease-twbootstrap4-widgets/master/project-logo.png "Project Logo") +![EasePHP TWB4 Widgets Logo](https://raw.githubusercontent.com/VitexSoftware/php-ease-bootstrap4-widgets/master/project-logo.png "Project Logo") EasePHP Twitter Bootstrap4 Widgets ================================== @@ -6,20 +6,20 @@ EasePHP Twitter Bootstrap4 Widgets Object oriented PHP Framework for easy&fast writing small/middle sized apps. -[![Latest Stable Version](https://poser.pugx.org/vitexsoftware/ease-twbootstrap4-widgets/v/stable)](https://packagist.org/packages/vitexsoftware/ease-twbootstrap4-widgets) -[![Total Downloads](https://poser.pugx.org/vitexsoftware/ease-twbootstrap4-widgets/downloads)](https://packagist.org/packages/vitexsoftware/ease-twbootstrap4-widgets) -[![Latest Unstable Version](https://poser.pugx.org/vitexsoftware/ease-twbootstrap4-widgets/v/unstable)](https://packagist.org/packages/vitexsoftware/ease-twbootstrap4-widgets) -[![License](https://poser.pugx.org/vitexsoftware/ease-twbootstrap4-widgets/license)](https://packagist.org/packages/vitexsoftware/ease-twbootstrap4-widgets) -[![Monthly Downloads](https://poser.pugx.org/vitexsoftware/ease-twbootstrap4-widgets/d/monthly)](https://packagist.org/packages/vitexsoftware/ease-twbootstrap4-widgets) -[![Daily Downloads](https://poser.pugx.org/vitexsoftware/ease-twbootstrap4-widgets/d/daily)](https://packagist.org/packages/vitexsoftware/ease-twbootstrap4-widgets) +[![Latest Stable Version](https://poser.pugx.org/vitexsoftware/ease-bootstrap4-widgets/v/stable)](https://packagist.org/packages/vitexsoftware/ease-bootstrap4-widgets) +[![Total Downloads](https://poser.pugx.org/vitexsoftware/ease-bootstrap4-widgets/downloads)](https://packagist.org/packages/vitexsoftware/ease-bootstrap4-widgets) +[![Latest Unstable Version](https://poser.pugx.org/vitexsoftware/ease-bootstrap4-widgets/v/unstable)](https://packagist.org/packages/vitexsoftware/ease-bootstrap4-widgets) +[![License](https://poser.pugx.org/vitexsoftware/ease-bootstrap4-widgets/license)](https://packagist.org/packages/vitexsoftware/ease-bootstrap4-widgets) +[![Monthly Downloads](https://poser.pugx.org/vitexsoftware/ease-bootstrap4-widgets/d/monthly)](https://packagist.org/packages/vitexsoftware/ease-bootstrap4-widgets) +[![Daily Downloads](https://poser.pugx.org/vitexsoftware/ease-bootstrap4-widgets/d/daily)](https://packagist.org/packages/vitexsoftware/ease-bootstrap4-widgets) -[![Latest Version](https://img.shields.io/github/release/VitexSoftware/php-ease-twbootstrap4-widgets.svg?style=flat-square)](https://github.com/VitexSoftware/php-ease-twbootstrap4-widgets/releases) -[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat-square)](https://github.com/VitexSoftware/php-ease-twbootstrap4-widgets/blob/master/LICENSE) -[![Build Status](https://img.shields.io/travis/VitexSoftware/php-ease-twbootstrap4-widgets/master.svg?style=flat-square)](https://travis-ci.org/VitexSoftware/php-ease-twbootstrap4-widgets) -[![Total Downloads](https://img.shields.io/packagist/dt/vitexsoftware/php-ease-twbootstrap4-widgets.svg?style=flat-square)](https://packagist.org/packages/vitexsoftware/php-ease-twbootstrap4-widgets) -[![Docker pulls](https://img.shields.io/docker/pulls/vitexsoftware/php-ease-twbootstrap4-widgets.svg)](https://hub.docker.com/r/vitexsoftware/php-ease-twbootstrap4-widgets/) -[![Downloads](https://img.shields.io/packagist/dt/vitexsoftware/php-ease-twbootstrap4-widgets.svg?style=flat-square)](https://packagist.org/packages/vitexsoftware/php-ease-twbootstrap4-widgets) -[![Latest stable](https://img.shields.io/packagist/v/vitexsoftware/php-ease-twbootstrap4-widgets.svg?style=flat-square)](https://packagist.org/packages/vitexsoftware/php-ease-twbootstrap4-widgets) +[![Latest Version](https://img.shields.io/github/release/VitexSoftware/php-ease-bootstrap4-widgets.svg?style=flat-square)](https://github.com/VitexSoftware/php-ease-bootstrap4-widgets/releases) +[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat-square)](https://github.com/VitexSoftware/php-ease-bootstrap4-widgets/blob/master/LICENSE) +[![Build Status](https://img.shields.io/travis/VitexSoftware/php-ease-bootstrap4-widgets/master.svg?style=flat-square)](https://travis-ci.org/VitexSoftware/php-ease-bootstrap4-widgets) +[![Total Downloads](https://img.shields.io/packagist/dt/vitexsoftware/php-ease-bootstrap4-widgets.svg?style=flat-square)](https://packagist.org/packages/vitexsoftware/php-ease-bootstrap4-widgets) +[![Docker pulls](https://img.shields.io/docker/pulls/vitexsoftware/php-ease-bootstrap4-widgets.svg)](https://hub.docker.com/r/vitexsoftware/php-ease-bootstrap4-widgets/) +[![Downloads](https://img.shields.io/packagist/dt/vitexsoftware/php-ease-bootstrap4-widgets.svg?style=flat-square)](https://packagist.org/packages/vitexsoftware/php-ease-bootstrap4-widgets) +[![Latest stable](https://img.shields.io/packagist/v/vitexsoftware/php-ease-bootstrap4-widgets.svg?style=flat-square)](https://packagist.org/packages/vitexsoftware/php-ease-bootstrap4-widgets) --- @@ -36,7 +36,7 @@ MainPageMenu Well framed large icons -![MainPageMenu](https://raw.githubusercontent.com/VitexSoftware/php-ease-twbootstrap4-widgets/master/MainPageMenu.png "Main Page Menu screenshot") +![MainPageMenu](https://raw.githubusercontent.com/VitexSoftware/php-ease-bootstrap4-widgets/master/MainPageMenu.png "Main Page Menu screenshot") ```php $mpmenu = new \Ease\ui\MainPageMenu(); @@ -48,7 +48,7 @@ TwitterBootstrap Toggle Ease support for http://bootstrapswitch.com/ -![Toggle](https://raw.githubusercontent.com/VitexSoftware/php-ease-twbootstrap4-widgets/master/Toggle.png "Main Page Menu screenshot") +![Toggle](https://raw.githubusercontent.com/VitexSoftware/php-ease-bootstrap4-widgets/master/Toggle.png "Main Page Menu screenshot") ```php new Ease\ui\Toggle('swname', true, 1,['onText' => 'YES', 'offText' => 'NO']); @@ -73,7 +73,7 @@ Installation Composer: --------- - composer require vitexsoftware/php-ease-twbootstrap4-widgets + composer require vitexsoftware/php-ease-bootstrap4-widgets Older versions and its requirements https://packagist.org/packages/vitexsoftware/ @@ -84,7 +84,7 @@ For Debian, Ubuntu & friends please use repo: wget -O - http://v.s.cz/info@vitexsoftware.cz.gpg.key|sudo apt-key add - echo deb http://v.s.cz/ stable main > /etc/apt/sources.list.d/ease.list aptitude update - aptitude install php-ease-twbootstrap4-widgets + aptitude install php-ease-bootstrap4-widgets In this case please add this to your app composer.json: @@ -94,7 +94,7 @@ In this case please add this to your app composer.json: "repositories": [ { "type": "path", - "url": "/usr/share/php/Ease", + "url": "/usr/share/php/EaseCore", "options": { "symlink": true } @@ -113,6 +113,6 @@ Links Homepage: https://www.vitexsoftware.cz/ease.php -GitHub: https://github.com/VitexSoftware/php-ease-twbootstrap4-widgets +GitHub: https://github.com/VitexSoftware/php-ease-bootstrap4-widgets -Apigen Docs: https://www.vitexsoftware.cz/php-ease-twbootstrap4-widgets/ +Apigen Docs: https://www.vitexsoftware.cz/php-ease-bootstrap4-widgets/ diff --git a/composer.json b/composer.json index 0170492..25848cd 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "vitexsoftware/ease-twbootstrap4-widgets", + "name": "vitexsoftware/ease-bootstrap4-widgets", "description": "EasePHP framework addons and code snipplets", "authors": [ { @@ -19,9 +19,9 @@ "Test\\Ease\\TWB4\\": "vendor/vitexsoftware/ease-framework/tests/src/Ease/TWB4" } }, - "minimum-stability": "dev", + "minimum-stability": "stable", "require": { - "vitexsoftware/ease-twbootstrap4": "dev-master" + "vitexsoftware/ease-twbootstrap4": "^0.7.5" }, "require-dev": { "phpunit/phpunit": "^8" diff --git a/debian/changelog b/debian/changelog index c9c2145..9a9db04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -php-ease-twbootstrap4-widgets (0.10) UNRELEASED; urgency=medium +php-ease-bootstrap4-widgets (1.0) UNRELEASED; urgency=medium [ Vítězslav Dvořák ] * Non-maintainer upload. @@ -7,5 +7,6 @@ php-ease-twbootstrap4-widgets (0.10) UNRELEASED; urgency=medium * package fix * composer fix * Menu Fixed + * Toggle assets added - -- CyberVitexus Thu, 30 Apr 2020 20:02:18 +0200 + -- CyberVitexus Tue, 18 Aug 2020 23:58:50 +0200 diff --git a/debian/composer.json b/debian/composer.json index 4f25542..dbb6ba9 100644 --- a/debian/composer.json +++ b/debian/composer.json @@ -1,39 +1,39 @@ { - "name": "deb/ease-twbootstrap4-widgets", - "description": "Twitter Bootstrap4 Widgets for PHP Framework (debianized)", - "version": "0.9.3", - "authors": [ - { - "name": "Vítězslav Dvořák", - "email": "info@vitexsoftware.cz", - "homepage": "http://v.s.cz/" - } - ], - "autoload": { - "psr-4": { - "Ease\\TWB4\\Widgets\\": "./" - } - + "name": "deb/ease-bootstrap4-widgets", + "description": "Twitter Bootstrap4 Widgets for PHP Framework (debianized)", + "version": "0.9.3", + "authors": [ + { + "name": "Vítězslav Dvořák", + "email": "info@vitexsoftware.cz", + "homepage": "http://v.s.cz/" + } + ], + "autoload": { + "psr-4": { + "Ease\\TWB4\\Widgets\\": "./" + } + }, + "minimum-stability": "dev", + "require": { + "deb/ease-bootstrap4": "*" + }, + "repositories": [ + { + "type": "path", + "url": "/usr/share/php/EaseCore" }, - "minimum-stability": "dev", - "require": { - "deb/ease-twbootstrap4": "*" + { + "type": "path", + "url": "/usr/share/php/EaseHtml" }, - "repositories": [ - { - "type": "path", - "url": "/usr/share/php/Ease" - }, - { - "type": "path", - "url": "/usr/share/php/EaseHtml" - }, - { - "type": "path", - "url": "/usr/share/php/EaseTWB4" - } - ], - "type": "library", - "homepage": "http://v.s.cz/ease.php", - "license": "GPL-2.0+" + { + "type": "path", + "url": "/usr/share/php/EaseTWB4" + } + ], + "type": "library", + "homepage": "http://v.s.cz/ease.php", + "license": "GPL-2.0+", + "address": "1.0" } diff --git a/debian/control b/debian/control index 847688a..1bb4511 100644 --- a/debian/control +++ b/debian/control @@ -1,20 +1,21 @@ -Source: php-ease-twbootstrap4-widgets -Build-Depends: debhelper (>= 7.0.50~) +Source: php-ease-bootstrap4-widgets +Build-Depends: debhelper (>= 7.0.50~), npm Standards-Version: 4.3.0 Maintainer: Vítězslav Dvořák Uploaders: Vitex Priority: optional -Homepage: https://github.com/Vitexus/php-ease-twbootstrap4-widgets +Section: devel +Homepage: https://github.com/Vitexus/php-ease-bootstrap4-widgets -Package: php-ease-twbootstrap4-widgets -Depends: ${misc:Depends},php-ease-twbootstrap4 +Package: php-ease-bootstrap4-widgets +Depends: ${misc:Depends},php-ease-bootstrap4 Architecture: all Section: web Priority: optional Description: Simple PHP framework TWB4 Widgets Twitter Bootstrap4 Widgets for EasePHP Framework -#Package: php-ease-twbootstrap4-widgets-doc +#Package: php-ease-bootstrap4-widgets-doc #Depends: ${misc:Depends}, #Suggests: www-browser #Architecture: all diff --git a/debian/install b/debian/install deleted file mode 100644 index f86fbb3..0000000 --- a/debian/install +++ /dev/null @@ -1,2 +0,0 @@ -src/Ease/TWB4/Widgets/*.php /usr/share/php/EaseTWB4Widgets -debian/composer.json /usr/share/php/EaseTWB4Widgets diff --git a/debian/lastversion b/debian/lastversion deleted file mode 100644 index 49d5957..0000000 --- a/debian/lastversion +++ /dev/null @@ -1 +0,0 @@ -0.1 diff --git a/debian/php-ease-twbootstrap4-widgets-doc.install b/debian/php-ease-bootstrap4-widgets-doc.install similarity index 100% rename from debian/php-ease-twbootstrap4-widgets-doc.install rename to debian/php-ease-bootstrap4-widgets-doc.install diff --git a/debian/php-ease-bootstrap4-widgets.install b/debian/php-ease-bootstrap4-widgets.install new file mode 100644 index 0000000..c547e43 --- /dev/null +++ b/debian/php-ease-bootstrap4-widgets.install @@ -0,0 +1,4 @@ +src/Ease/TWB4/Widgets/*.php /usr/share/php/EaseTWB4Widgets +debian/composer.json /usr/share/php/EaseTWB4Widgets +tmp/node_modules/bootstrap4-toggle/css/bootstrap4-toggle.min.css /usr/share/javascript/bootstrap4/css/ +tmp/node_modules/bootstrap4-toggle/js/bootstrap4-toggle.min.js /usr/share/javascript/bootstrap4/js/ diff --git a/debian/php-ease-twbootstrap4-widgets.postinst b/debian/php-ease-bootstrap4-widgets.postinst similarity index 89% rename from debian/php-ease-twbootstrap4-widgets.postinst rename to debian/php-ease-bootstrap4-widgets.postinst index 9654857..9cf4624 100644 --- a/debian/php-ease-twbootstrap4-widgets.postinst +++ b/debian/php-ease-bootstrap4-widgets.postinst @@ -2,7 +2,7 @@ #DEBHELPER# -# postinst script for ease-twbootstrap4-widgets +# postinst script for ease-bootstrap4-widgets # # see: dh_installdeb(1) @@ -24,7 +24,7 @@ set -e case "$1" in configure) - composer-global-update deb/ease-twbootstrap4-widgets + composer-global-update deb/ease-bootstrap4-widgets ;; diff --git a/debian/rules b/debian/rules index 34ac699..22bc8d5 100755 --- a/debian/rules +++ b/debian/rules @@ -9,8 +9,14 @@ BUILD_DIR:=build override_dh_auto_test: echo tests temporarly skipped for now in rules file +override_dh_clean: + rm -rf tmp + dh_clean + override_dh_install: ./debian/apigendoc.sh + jq '.address = "'`dpkg-parsechangelog | sed -n 's/^Version: //p'`'"' debian/composer.json |sponge debian/composer.json + npm install --prefix tmp bootstrap4-toggle dh_install - sed -e "/includeCss/c\ \$$this->includeCss(\'\/javascript\/bootstrap4\/css\/bootstrap4-toggle.min.css\');" -i debian/php-ease-twbootstrap4-widgets/usr/share/php/EaseTWB4Widgets/Toggle.php - sed -e "/includeJavascript/c\ \$$this->includeJavascript(\'\/javascript\/bootstrap4\/js\/bootstrap4-toggle.min.js\');" -i debian/php-ease-twbootstrap4-widgets/usr/share/php/EaseTWB4Widgets/Toggle.php + sed -e "/includeCss/c\ \$$this->includeCss(\'\/javascript\/bootstrap4\/css\/bootstrap4-toggle.min.css\');" -i debian/php-ease-bootstrap4-widgets/usr/share/php/EaseTWB4Widgets/Toggle.php + sed -e "/includeJavascript/c\ \$$this->includeJavascript(\'\/javascript\/bootstrap4\/js\/bootstrap4-toggle.min.js\');" -i debian/php-ease-bootstrap4-widgets/usr/share/php/EaseTWB4Widgets/Toggle.php diff --git a/nbproject/project.xml b/nbproject/project.xml index 14864b3..8ff580c 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -3,7 +3,7 @@ org.netbeans.modules.php.project - ease-twbootstrap4-widgets + ease-bootstrap4-widgets