[packages/composer/1.0.0-alpha11-dev: 5/7] skip the composer install hackery
glen
glen at pld-linux.org
Wed Nov 25 21:10:20 CET 2015
commit dbc6fb4166c3970b61db1c23f7391b31575ad263
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Nov 25 19:05:20 2015 +0200
skip the composer install hackery
nogit.patch | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/nogit.patch b/nogit.patch
index 2025bbf..12726d8 100644
--- a/nogit.patch
+++ b/nogit.patch
@@ -25,18 +25,26 @@
if ($process->run() == 0) {
$this->version = trim($process->getOutput());
} else {
---- composer-1.0.0-14.alpha11/bin/compile~ 2015-11-25 18:30:24.000000000 +0200
-+++ composer-1.0.0-14.alpha11/bin/compile 2015-11-25 18:32:33.718541181 +0200
-@@ -3,11 +3,7 @@
+--- composer-1.0.0-14.alpha11/bin/compile 2015-11-25 18:32:33.718541181 +0200
++++ composer-1.0.0-14.alpha11/bin/compile 2015-11-25 19:04:02.596489328 +0200
+@@ -1,20 +1,6 @@
+ #!/usr/bin/php
+ <?php
- $cwd = getcwd();
- chdir(__DIR__.'/../');
+-$cwd = getcwd();
+-chdir(__DIR__.'/../');
-$ts = rtrim(shell_exec('git log -n1 --pretty=%ct HEAD'));
-if (!is_numeric($ts)) {
- echo 'Could not detect date using "git log -n1 --pretty=%ct HEAD"'.PHP_EOL;
- exit(1);
-}
-+$ts = filemtime(__DIR__.'/composer');
- // Install with the current version to force it having the right ClassLoader version
- // Install without dev packages to clean up the included classmap from phpunit classes
- shell_exec('php bin/composer config autoloader-suffix ComposerPhar' . $ts);
+-// Install with the current version to force it having the right ClassLoader version
+-// Install without dev packages to clean up the included classmap from phpunit classes
+-shell_exec('php bin/composer config autoloader-suffix ComposerPhar' . $ts);
+-shell_exec('php bin/composer install -q --no-dev');
+-shell_exec('php bin/composer config autoloader-suffix --unset');
+-chdir($cwd);
+-
+ require __DIR__.'/../src/bootstrap.php';
+
+ use Composer\Compiler;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/composer.git/commitdiff/b4e74b61056acbaba0feb842bf6534137b1683a6
More information about the pld-cvs-commit
mailing list