Skip to content

Commit 127d526

Browse files
author
Michael Babker
committed
Vendor update, move Composer path, rebuild packaging script
1 parent a4fcc3a commit 127d526

File tree

5 files changed

+78
-66
lines changed

5 files changed

+78
-66
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
/.idea
1919

2020
# Composer Install #
21-
/vendor
21+
/administrator/components/com_patchtester/vendor

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ before_script:
2121
- composer install
2222

2323
script:
24-
- if [[ $RUN_PHPCS == "yes" ]]; then vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla --ignore=./*tmpl/* administrator/components/com_patchtester; fi
25-
- if [[ $UPDATE_CROWDIN == "yes" && $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_BRANCH == "master" ]]; then vendor/bin/crowdin --upload; fi
24+
- if [[ $RUN_PHPCS == "yes" ]]; then administrator/components/com_patchtester/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla --ignore=./*tmpl/* administrator/components/com_patchtester; fi
25+
- if [[ $UPDATE_CROWDIN == "yes" && $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_BRANCH == "master" ]]; then administrator/components/com_patchtester/vendor/bin/crowdin --upload; fi

build/patchtester/build.sh

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
#!/bin/sh
2-
rm -rf ../packaging && mkdir ../packaging
3-
rm -rf ../packages && mkdir ../packages
4-
cp -r ../../administrator/components/com_patchtester ../packaging/admin
5-
cp -r ../../administrator/templates/hathor/html/com_patchtester ../packaging/hathor
6-
cp -r ../../media/com_patchtester ../packaging/media
7-
rm -rf ../packaging/admin/backups/*.txt
8-
mv ../packaging/admin/patchtester.xml ../packaging/patchtester.xml
9-
mv ../packaging/admin/script.php ../packaging/script.php
10-
cd ../packaging
11-
tar jcf ../packages/com_patchtester.tar.bz2 admin/ hathor/ media/ patchtester.xml script.php
12-
tar zcf ../packages/com_patchtester.tar.gz admin/ hathor/ media/ patchtester.xml script.php
13-
zip -r ../packages/com_patchtester.zip admin/ hathor/ media/ patchtester.xml script.php
2+
cd ../../
3+
rm -rf packaging && mkdir packaging
4+
rm -rf packages && mkdir packages
5+
composer install --no-dev
6+
cp -r administrator/components/com_patchtester packaging/admin
7+
cp -r administrator/templates/hathor/html/com_patchtester packaging/hathor
8+
cp -r media/com_patchtester packaging/media
9+
rm -rf packaging/admin/backups/*.txt
10+
mv packaging/admin/patchtester.xml packaging/patchtester.xml
11+
mv packaging/admin/script.php packaging/script.php
12+
cd packaging
13+
tar jcf packages/com_patchtester.tar.bz2 admin/ hathor/ media/ patchtester.xml script.php
14+
tar zcf packages/com_patchtester.tar.gz admin/ hathor/ media/ patchtester.xml script.php
15+
zip -r packages/com_patchtester.zip admin/ hathor/ media/ patchtester.xml script.php
16+
composer install

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
"keywords": ["joomla", "cms"],
66
"homepage": "https://github.com/joomla-extensions/patchtester",
77
"license": "GPL-2.0+",
8+
"config": {
9+
"vendor-dir": "administrator/components/com_patchtester/vendor"
10+
},
811
"require": {
912
"php": ">=5.3.10"
1013
},

composer.lock

Lines changed: 57 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)