summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiro Mattia Gonano <ciromattia@gmail.com>2013-09-13 17:19:04 +0200
committerCiro Mattia Gonano <ciromattia@gmail.com>2013-09-13 17:19:04 +0200
commite6e7312b1ea0e7b02d2b6c56d5fd14ea41232f80 (patch)
tree8ea6e3d21a604fcd9497a7446889b5c12e30a2a9
parent67c02a59944b098b79f1d36158a8a2fb91b60199 (diff)
Revert back to root bindir
-rw-r--r--.travis.yml6
-rw-r--r--composer.json5
-rw-r--r--composer.lock2
3 files changed, 8 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 5b49309d..f82da592 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,10 @@ before_script:
- pear upgrade-all
- composer self-update
- composer install --prefer-source --dev
- - export PATH=./bin:./vendor/bin/:$PATH
+ - export PATH=./bin/:$PATH
script:
- - ./vendor/bin/phing test
+ - ./bin/phing test
#after_script:
-# - php ./vendor/bin/coveralls -v \ No newline at end of file
+# - php ./bin/coveralls -v \ No newline at end of file
diff --git a/composer.json b/composer.json
index a36a528b..71941da7 100644
--- a/composer.json
+++ b/composer.json
@@ -88,5 +88,8 @@
},
"bin" : [
"bin/prado-cli"
- ]
+ ],
+ "config" : {
+ "bin-dir" : "bin"
+ }
}
diff --git a/composer.lock b/composer.lock
index 5e765495..6713de34 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "95f56e197b8a573d5c2e50d9111091d5",
+ "hash": "416a71596ac601f0e2d5a922e0e2aa65",
"packages": [
],