Browse Source

updated vendors to not rely on Doctrine submodules

Fabien Potencier 15 years ago
parent
commit
79808650e9
3 changed files with 16 additions and 8 deletions
  1. 2 2
      autoload.php.dist
  2. 7 5
      install_vendors.sh
  3. 7 1
      update_vendors.sh

+ 2 - 2
autoload.php.dist

@@ -7,9 +7,9 @@ use Symfony\Framework\UniversalClassLoader;
 $loader = new UniversalClassLoader();
 $loader->registerNamespaces(array(
     'Symfony'                    => __DIR__.'/src',
-    'Doctrine\\Common'           => __DIR__.'/vendor/doctrine/lib/vendor/doctrine-common/lib',
+    'Doctrine\\Common'           => __DIR__.'/vendor/doctrine-common/lib',
     'Doctrine\\DBAL\\Migrations' => __DIR__.'/vendor/doctrine-migrations/lib',
-    'Doctrine\\DBAL'             => __DIR__.'/vendor/doctrine/lib/vendor/doctrine-dbal/lib',
+    'Doctrine\\DBAL'             => __DIR__.'/vendor/doctrine-dbal/lib',
     'Doctrine'                   => __DIR__.'/vendor/doctrine/lib',
     'Zend'                       => __DIR__.'/vendor/zend/library',
 ));

+ 7 - 5
install_vendors.sh

@@ -9,12 +9,14 @@ fi
 
 cd vendor
 
-# Doctrine
+# Doctrine ORM
 git clone git://github.com/doctrine/doctrine2.git doctrine
-cd doctrine
-git submodule init
-git submodule update
-cd ..
+
+# Doctrine DBAL
+git clone git://github.com/doctrine/dbal.git doctrine-dbal
+
+# Doctrine Common
+git clone git://github.com/doctrine/common.git doctrine-common
 
 # Doctrine migrations
 git clone git://github.com/doctrine/migrations.git doctrine-migrations

+ 7 - 1
update_vendors.sh

@@ -2,9 +2,15 @@
 
 CURRENT=`pwd`/vendor
 
-# Doctrine
+# Doctrine ORM
 cd $CURRENT/doctrine && git pull
 
+# Doctrine DBAL
+cd $CURRENT/doctrine-dbal && git pull
+
+# Doctrine common
+cd $CURRENT/doctrine-common && git pull
+
 # Doctrine migrations
 cd $CURRENT/doctrine-migrations && git pull