Merge pull request #1 from VitexSoftware/master

Master
VitexSoftware · Oct 15, 2020 · a1984c4 · a1984c4
2 parents e3a63d6 + e0f3413
commit a1984c4
Show file tree

Hide file tree

Showing 249 changed files with 441,178 additions and 48 deletions.
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -1,4 +1,4 @@
-name: DebianPackage
+name: Ubuntu Packaging
 
 on:
   release:
@@ -13,11 +13,15 @@ jobs:
     - uses: actions/checkout@master
       env: 
         DEBIAN_FRONTEND: "noninteractive"
-    - name: Prepare Debuild Environment
+    - name: Prepare Environment
       run: |
         echo "deb http://repo.vitexsoftware.cz $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/vitexsoftware.list
         sudo wget -O /etc/apt/trusted.gpg.d/vitexsoftware.gpg http://repo.vitexsoftware.cz/keyring.gpg
         sudo apt-get update
-        sudo apt-get install -y aptitude composer exim4 pbuilder ubuntu-dev-tools apt-file debhelper 
-    - name: Build Package
-      run: debuild-pbuilder
+        sudo apt-get install -y aptitude moreutils composer exim4 pbuilder ubuntu-dev-tools apt-file debhelper phpdocumentor
+    - name: Build Debian package
+      uses: dawidd6/action-debian-package@v1
+      with:
+        source_directory: .
+        artifacts_directory: dist
+
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ clean:
 	rm -rf debian/php-ease-html
 	rm -rf debian/php-ease-html-doc
 	rm -rf debian/*.log debian/tmp
-	rm -rf docs/* .phpunit.result.cache tests/*.xml
+	rm -rf .phpunit.result.cache tests/*.xml
 
 apigen:
 	VERSION=`cat debian/composer.json | grep version | awk -F'"' '{print $4}'`; \

diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "vitexsoftware/ease-core": "^1.2"
+        "vitexsoftware/ease-core": ">= 1.8"
     },
     "autoload": {
         "psr-4": {

diff --git a/debian/changelog b/debian/changelog
@@ -1,21 +1,11 @@
-php-ease-html (1.24) UNRELEASED; urgency=medium
+php-ease-html (1.25) UNRELEASED; urgency=medium
 
   * Remove empty tHead and tFoot
   * Form params unified with others
   * Recurisive Form Select setting value fixed
   * twbootstrap renamed to bootstrap
-  * Release v1.20
-  * Release v1.20
-  * Release v1.20
-  * Release v1.20
-  * Release v1.21
-  * Merge branch 'master' of github.com:VitexSoftware/ease-html
-  * All tests pass
-  * Release v1.23
-  * Require stable version of ease core
-  * Release v1.23
 
- -- CyberVitexus <[email protected]>  Mon, 10 Aug 2020 15:25:56 +0200
+ -- CyberVitexus <[email protected]>  Thu, 15 Oct 2020 23:45:32 +0200
 
 php-ease-html (1.16) EXPERIMENTAL; urgency=medium
 

diff --git a/debian/composer.json b/debian/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "deb/ease-html",
   "description": "An Core of PHP Framework for Ease of writing Applications (debianized)",
-  "version": "0.16",
+  "version": "1.25",
   "authors": [
     {
       "name": "Vítězslav Dvořák",

diff --git a/debian/control b/debian/control
@@ -1,24 +1,23 @@
 Source: php-ease-html
-Build-Depends: debhelper (>= 7.0.50~), php-ease-core 
-#, composer, php-apigen
+Build-Depends: debhelper (>= 7.0.50~), php-ease-core, phpdocumentor
 Section: web
 Standards-Version: 3.9.8
 Maintainer: Vítězslav Dvořák <[email protected]>
 Uploaders: Vitex <[email protected]>
 Priority: optional
 Homepage: https://github.com/VitexSoftware/php-ease-html
 
-Package: php-ease-html
-Depends: ${misc:Depends},libjs-jquery (>= 1.4), php-mail, php-mail-mime, php-ease-core
+Package: php-vitexsoftware-ease-html
+Depends: ${misc:Depends},libjs-jquery (>= 1.4), php-mail, php-mail-mime, php-vitexsoftware-ease-core
 Architecture: all
 Conflicts: ease-framework
-Suggests: php-ease-bootstrap
+Suggests: php-vitexsoftware-ease-bootstrap
 Section: web
 Priority: optional
 Description: EasePHP Framework HTML support
  HTML classes for Ease Framework. 
 
-Package: php-ease-html-dev
+Package: php-vitexsoftware-ease-html-dev
 Depends: ${misc:Depends}, php-ease-core-dev
 Architecture: all
 Conflicts: ease-framework
@@ -27,12 +26,12 @@ Priority: optional
 Description: EasePHP Framework HTML unit tests
  HTML classes for Ease Framework. 
 
-#Package: php-vitexsoftware-ease-html-dev
-#Depends: ${misc:Depends}, php-ease-core-dev
-#Architecture: all
-#Conflicts: ease-framework-doc
-#Section: devel
-#Priority: optional
-#Description: EasePHP Framework HTML unit documentation
-# HTML classes for Ease Framework documentation generated by apigen
+Package: php-vitexsoftware-ease-html-doc
+Depends: ${misc:Depends}, php-vitexsoftware-ease-core-dev
+Architecture: all
+Conflicts: ease-framework-doc
+Section: devel
+Priority: optional
+Description: EasePHP Framework HTML unit documentation
+ HTML classes for Ease Framework documentation generated by apigen
 
diff --git a/debian/debhelper-build-stamp b/debian/debhelper-build-stamp
@@ -1,3 +1,3 @@
-php-ease-html
-php-ease-html-dev
+php-vitexsoftware-ease-html
 php-vitexsoftware-ease-html-dev
+php-vitexsoftware-ease-html-doc
diff --git a/debian/php-vitexsoftware-ease-html-doc.install b/debian/php-vitexsoftware-ease-html-doc.install
@@ -1,4 +1,15 @@
-docs/*				usr/share/doc/ease-html/html
-docs/resources/*		usr/share/doc/ease-html/html/resources
-debian/php-vitexsoftware-ease-html-doc.conf	usr/share/doc/ease-html-doc/apache
-README.md			usr/share/doc/ease-html
+docs/classes/*		usr/share/doc/php-vitexsoftware-ease-html/html/classes
+docs/css/*		usr/share/doc/php-vitexsoftware-ease-html/html/css
+docs/files/*		usr/share/doc/php-vitexsoftware-ease-html/html/files
+docs/graphs/*		usr/share/doc/php-vitexsoftware-ease-html/html/graphs
+docs/index.html		usr/share/doc/php-vitexsoftware-ease-html/html/
+docs/indices/*		usr/share/doc/php-vitexsoftware-ease-html/html/indices
+docs/js/*		usr/share/doc/php-vitexsoftware-ease-html/html/js
+docs/namespaces/*		usr/share/doc/php-vitexsoftware-ease-html/html/namespaces
+docs/packages/*		usr/share/doc/php-vitexsoftware-ease-html/html/packages
+docs/reports/*		usr/share/doc/php-vitexsoftware-ease-html/html/reports
+
+debian/php-vitexsoftware-ease-html-doc.conf	usr/share/doc/php-vitexsoftware-ease-html-doc/apache
+README.md			usr/share/doc/php-vitexsoftware-ease-html
+
+
diff --git a/debian/rules b/debian/rules
@@ -4,13 +4,14 @@
 	dh $@
 
 override_dh_clean:
-	rm -rf debian/test/vendor docs
+	rm -rf debian/test/vendor .phpdoc
 	dh_clean
 
-#override_dh_prep:
-#	composer update
-#	apigen generate --destination=docs -- src
-#	dh_prep
+override_dh_prep:
+	rm docs/* -r
+	phpdoc -d src --title "Vitex Software's Ease Html"
+	mv .phpdoc/build/* docs
+	dh_prep
 
 
 #override_dh_test:
@@ -19,8 +20,8 @@ override_dh_clean:
 #	dh_test
 
 override_dh_install:
-	jq '.address = "'`dpkg-parsechangelog | sed -n 's/^Version: //p'`'"' debian/composer.json |sponge debian/composer.json
+	jq '.version = "'`dpkg-parsechangelog | sed -n 's/^Version: //p'`'"' debian/composer.json |sponge debian/composer.json
 	dh_install
-	echo "require_once 'Mail.php';"  >> debian/php-ease-html/usr/share/php/EaseHtml/HtmlMailer.php
-	echo "require_once 'Mail/mime.php';" >> debian/php-ease-html/usr/share/php/EaseHtml/HtmlMailer.php
+	echo "require_once 'Mail.php';"  >> debian/php-vitexsoftware-ease-html/usr/share/php/EaseHtml/HtmlMailer.php
+	echo "require_once 'Mail/mime.php';" >> debian/php-vitexsoftware-ease-html/usr/share/php/EaseHtml/HtmlMailer.php