update vendors management

PhilJ · Jul 13, 2010 · 8f779bc · 8f779bc
1 parent 8ae25c8
commit 8f779bc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/install_vendors.sh b/install_vendors.sh
@@ -12,12 +12,14 @@ cd vendor
 # Symfony
 git clone git://github.com/symfony/symfony.git symfony
 
-# 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

diff --git a/src/autoload.php b/src/autoload.php
@@ -9,10 +9,10 @@
     'Symfony'                    => __DIR__.'/vendor/symfony/src',
     'Application'                => __DIR__,
     'Bundle'                     => __DIR__,
-    '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\\ODM\\MongoDB'     => __DIR__.'/vendor/doctrine-mongodb/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',
 ));

diff --git a/update_vendors.sh b/update_vendors.sh
@@ -5,9 +5,15 @@ CURRENT=`pwd`/vendor
 # Symfony
 cd $CURRENT/symfony && git pull
 
-# 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