Skip to content

Commit

Permalink
Revert "renamed 'vendor' to 'tools'"
Browse files Browse the repository at this point in the history
I hate this word, but it become a standard :-/

This reverts commit 65d4f85.
  • Loading branch information
dg committed Mar 15, 2013
1 parent 6ee8531 commit 769e172
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/tools
/vendor
/composer.lock
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
"require-dev": {
"nette/tester": "@dev"
},
"config": {
"vendor-dir": "tools"
},
"autoload": {
"files": ["Nette/loader.php"]
},
Expand Down
2 changes: 1 addition & 1 deletion tests/Nette/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/


if (@!include __DIR__ . '/../../tools/autoload.php') {
if (@!include __DIR__ . '/../../vendor/autoload.php') {
echo 'Install Nette Tester using `composer update --dev`';
exit(1);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/RunTests.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@ECHO OFF

SET testRunner="%~dp0..\tools\nette\tester\Tester\tester.php"
SET testRunner="%~dp0..\vendor\nette\tester\Tester\tester.php"

IF NOT EXIST %testRunner% (
ECHO Nette Tester is missing. You can install it using Composer:
Expand Down
2 changes: 1 addition & 1 deletion tests/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
dir=$(cd `dirname $0` && pwd)

# Path to test runner script
runnerScript="$dir/../tools/nette/tester/Tester/tester.php"
runnerScript="$dir/../vendor/nette/tester/Tester/tester.php"
if [ ! -f "$runnerScript" ]; then
echo "Nette Tester is missing. You can install it using Composer:" >&2
echo "php composer.phar update --dev." >&2
Expand Down

0 comments on commit 769e172

Please sign in to comment.