From 8d8d48a2bbdb5db61a210e123d99515ca4a9f52a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 20 Jul 2016 10:44:46 +0200 Subject: [PATCH] Remove binary from repo Since Composer 1.2, binaries are re-installed from vendors if there aren't found. This avoid us to commit binaries vendors into the repo. :warning: You have to update your Composer to the 1.2 (`composer selfupdate`) --- .gitignore | 3 +++ README.md | 2 +- bin/doctrine | 1 - bin/doctrine-dbal | 1 - bin/doctrine-migrations | 1 - bin/doctrine.php | 1 - bin/php-cs-fixer | 1 - bin/security-checker | 1 - docs/en/user/installation.rst | 2 +- docs/fr/user/installation.rst | 2 +- 10 files changed, 6 insertions(+), 9 deletions(-) delete mode 120000 bin/doctrine delete mode 120000 bin/doctrine-dbal delete mode 120000 bin/doctrine-migrations delete mode 120000 bin/doctrine.php delete mode 120000 bin/php-cs-fixer delete mode 120000 bin/security-checker diff --git a/.gitignore b/.gitignore index 02e921f8d..f596c7b8f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,9 @@ /var/sessions/* !var/sessions/.gitkeep !var/SymfonyRequirements.php +/bin/* +!/bin/console +!/bin/symfony_requirements # Parameters /app/config/parameters.yml diff --git a/README.md b/README.md index 2a7b54bf7..0d87d7bb3 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ More informations on our website: [wallabag.org](https://wallabag.org) # Install wallabag -If you don't have it yet, please [install composer](https://getcomposer.org/download/). +If you don't have it yet, please [install composer](https://getcomposer.org/download/) or be sure to use Composer 1.2 (`composer selfupdate` can help you about that). Then you can install wallabag by executing the following commands: ``` diff --git a/bin/doctrine b/bin/doctrine deleted file mode 120000 index 0f72e36f9..000000000 --- a/bin/doctrine +++ /dev/null @@ -1 +0,0 @@ -../vendor/doctrine/orm/bin/doctrine \ No newline at end of file diff --git a/bin/doctrine-dbal b/bin/doctrine-dbal deleted file mode 120000 index 110e93c53..000000000 --- a/bin/doctrine-dbal +++ /dev/null @@ -1 +0,0 @@ -../vendor/doctrine/dbal/bin/doctrine-dbal \ No newline at end of file diff --git a/bin/doctrine-migrations b/bin/doctrine-migrations deleted file mode 120000 index 7184da719..000000000 --- a/bin/doctrine-migrations +++ /dev/null @@ -1 +0,0 @@ -../vendor/doctrine/migrations/bin/doctrine-migrations \ No newline at end of file diff --git a/bin/doctrine.php b/bin/doctrine.php deleted file mode 120000 index b22b74da5..000000000 --- a/bin/doctrine.php +++ /dev/null @@ -1 +0,0 @@ -../vendor/doctrine/orm/bin/doctrine.php \ No newline at end of file diff --git a/bin/php-cs-fixer b/bin/php-cs-fixer deleted file mode 120000 index 4d771203d..000000000 --- a/bin/php-cs-fixer +++ /dev/null @@ -1 +0,0 @@ -../vendor/friendsofphp/php-cs-fixer/php-cs-fixer \ No newline at end of file diff --git a/bin/security-checker b/bin/security-checker deleted file mode 120000 index 85f6e8ed6..000000000 --- a/bin/security-checker +++ /dev/null @@ -1 +0,0 @@ -../vendor/sensiolabs/security-checker/security-checker \ No newline at end of file diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 58d9fb7e0..bd3095e03 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -37,7 +37,7 @@ Installation On a dedicated web server (recommended way) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -wallabag uses a large number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you have not already done so. +wallabag uses a large number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you have not already done so and be sure to use the 1.2 version (if you already have Composer, run a ``composer selfupdate``). Install Composer: diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index b1136c12b..0693fc5d3 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -35,7 +35,7 @@ Installation Sur un serveur dédié (méthode conseillée) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -wallabag utilise un grand nombre de bibliothèques pour fonctionner. Ces bibliothèques doivent être installées à l'aide d'un outil nommé Composer. Vous devez l'installer si ce n'est déjà fait. +wallabag utilise un grand nombre de bibliothèques pour fonctionner. Ces bibliothèques doivent être installées à l'aide d'un outil nommé Composer. Vous devez l'installer si ce n'est déjà fait et vous assurer que vous utilisez bien la version 1.2 (si vous avez déjà Composer, faite un ``composer selfupdate``). Installation de Composer :