Changeset 7296
- Timestamp:
- 02/03/08 21:10:32 (1 year ago)
- Files:
-
- branches/1.1/lib/autoload/sfCoreAutoload.class.php (modified) (1 diff)
- branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateCrudTask.class.php (modified) (2 diffs)
- branches/1.1/lib/task/generator/sfGenerateAppTask.class.php (modified) (2 diffs)
- branches/1.1/lib/task/generator/sfGenerateControllerTask.class.php (modified) (1 diff)
- branches/1.1/lib/task/generator/sfGenerateModuleTask.class.php (modified) (1 diff)
- branches/1.1/lib/task/generator/sfGenerateProjectTask.class.php (modified) (1 diff)
- branches/1.1/lib/task/generator/skeleton (moved) (moved from branches/1.1/data/skeleton)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.1/lib/autoload/sfCoreAutoload.class.php
r7247 r7296 282 282 'sfGenerateProjectTask' => 'task/generator', 283 283 'sfGeneratorBaseTask' => 'task/generator', 284 'myUser' => 'task/generator/skeleton/app/app/lib', 285 'actions' => 'task/generator/skeleton/module/module/actions', 284 286 'sfCommandApplicationTask' => 'task/help', 285 287 'sfHelpTask' => 'task/help', branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateCrudTask.class.php
r7247 r7296 128 128 129 129 // create basic test 130 $this->filesystem->copy(sfConfig::get('sf_symfony_ data_dir').'/skeleton/module/test/actionsTest.php', sfConfig::get('sf_root_dir').'/test/functional/'.$arguments['application'].'/'.$arguments['module'].'ActionsTest.php');130 $this->filesystem->copy(sfConfig::get('sf_symfony_lib_dir').'/task/generator/skeleton/module/test/actionsTest.php', sfConfig::get('sf_root_dir').'/test/functional/'.$arguments['application'].'/'.$arguments['module'].'ActionsTest.php'); 131 131 132 132 // customize test file … … 154 154 155 155 // create basic test 156 $this->filesystem->copy(sfConfig::get('sf_symfony_ data_dir').'/skeleton/module/test/actionsTest.php', sfConfig::get('sf_root_dir').'/test/functional/'.$arguments['application'].'/'.$arguments['module'].'ActionsTest.php');156 $this->filesystem->copy(sfConfig::get('sf_symfony_lib_dir').'/task/generator/skeleton/module/test/actionsTest.php', sfConfig::get('sf_root_dir').'/test/functional/'.$arguments['application'].'/'.$arguments['module'].'ActionsTest.php'); 157 157 158 158 // customize test file branches/1.1/lib/task/generator/sfGenerateAppTask.class.php
r7247 r7296 84 84 // Create basic application structure 85 85 $finder = sfFinder::type('any')->ignore_version_control()->discard('.sf'); 86 $this->filesystem->mirror( sfConfig::get('sf_symfony_data_dir').'/skeleton/app/app', $appDir, $finder);86 $this->filesystem->mirror(dirname(__FILE__).'/skeleton/app/app', $appDir, $finder); 87 87 88 88 // Create $app.php or index.php if it is our first app … … 98 98 $this->filesystem->replaceTokens($finder->in($appDir.'/'.sfConfig::get('sf_app_config_dir_name')), '##', '##', array('NO_SCRIPT_NAME' => ($firstApp ? 'on' : 'off'))); 99 99 100 $this->filesystem->copy( sfConfig::get('sf_symfony_data_dir').'/skeleton/app/web/index.php', sfConfig::get('sf_web_dir').'/'.$indexName.'.php');101 $this->filesystem->copy( sfConfig::get('sf_symfony_data_dir').'/skeleton/app/web/index_dev.php', sfConfig::get('sf_web_dir').'/'.$app.'_dev.php');100 $this->filesystem->copy(dirname(__FILE__).'/skeleton/app/web/index.php', sfConfig::get('sf_web_dir').'/'.$indexName.'.php'); 101 $this->filesystem->copy(dirname(__FILE__).'/skeleton/app/web/index_dev.php', sfConfig::get('sf_web_dir').'/'.$app.'_dev.php'); 102 102 103 103 $finder = sfFinder::type('file')->name($indexName.'.php', $app.'_dev.php'); branches/1.1/lib/task/generator/sfGenerateControllerTask.class.php
r7247 r7296 79 79 ); 80 80 81 $this->filesystem->copy( sfConfig::get('sf_symfony_data_dir').'/skeleton/controller/controller.php', sfConfig::get('sf_web_dir').'/'.$controller.'.php');81 $this->filesystem->copy(dirname(__FILE__).'/skeleton/controller/controller.php', sfConfig::get('sf_web_dir').'/'.$controller.'.php'); 82 82 $this->filesystem->replaceTokens(sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.$controller.'.php', '##', '##', $constants); 83 83 } branches/1.1/lib/task/generator/sfGenerateModuleTask.class.php
r7247 r7296 92 92 else 93 93 { 94 $skeletonDir = sfConfig::get('sf_symfony_data_dir').'/skeleton/module';94 $skeletonDir = dirname(__FILE__).'/skeleton/module'; 95 95 } 96 96 branches/1.1/lib/task/generator/sfGenerateProjectTask.class.php
r7247 r7296 69 69 // Create basic project structure 70 70 $finder = sfFinder::type('any')->ignore_version_control()->discard('.sf'); 71 $this->filesystem->mirror( sfConfig::get('sf_symfony_data_dir').'/skeleton/project', sfConfig::get('sf_root_dir'), $finder);71 $this->filesystem->mirror(dirname(__FILE__).'/skeleton/project', sfConfig::get('sf_root_dir'), $finder); 72 72 73 73 // Update project name and directory
