[Solar-svn] Revision 3277

[pmjones at solarphp.com]

Solar_Cli_MakeModel

* [CHG] Find support directory relative to current class, not the current file.
  This will help with extended classes.

* [CHG] Default --target directory is now $system/include, not just "up 2 levels".





Modified: trunk/Solar/Cli/MakeModel.php
===================================================================
--- trunk/Solar/Cli/MakeModel.php	2008-07-30 12:41:45 UTC (rev 3276)
+++ trunk/Solar/Cli/MakeModel.php	2008-07-30 12:42:20 UTC (rev 3277)
@@ -190,7 +190,7 @@
     protected function _loadTemplates()
     {
         $this->_tpl = array();
-        $dir = Solar_Dir::fix(dirname(__FILE__) . '/MakeModel/Data');
+        $dir = Solar_Class::dir($this, 'Data');
         $list = glob($dir . '*.php');
         foreach ($list as $file) {
             // strip .php off the end of the file name
@@ -214,9 +214,9 @@
     {
         $target = $this->_options['target'];
         if (! $target) {
-            // use the same target as 2 levels up from this class,
-            // should be the PEAR dir (or main Solar dir)
-            $target = Solar_Dir::name(__FILE__, 2);
+            // use the solar system "include" directory.
+            // that should automatically point to the right vendor for us.
+            $target = Solar::$system . "/include";
         }
         
         $this->_target = Solar_Dir::fix($target);