Changeset 1229

Timestamp:

11/03/06 11:16:38 (2 years ago)

Author:

david

Message:

build property 'templates.suffix' is now called 'template.extension', now also used for the template file name (e.g. 'Template.tpl.tmpl' => 'IndexSuccess?.tpl' if 'template.extension' is set to '.tpl'). added 'app.dirname' build property to specify the name of the app dir, defaults to 'app'. based on original patch by eremit.

Location:

trunk/src

Files:

• build.xml (modified) (14 diffs)
• buildtools/phing/AgaviFixPathsTask.php (modified) (4 diffs)

trunk/src/build.xml

@@ -27 +27 @@
 
   <property name="app.dir" value=""/>
+  <property name="app.dirname" value="app" override="false"/>
   <property name="tests.dir" value=""/>
   <property name="tests2.dir" value="${agavi.dir}/../tests2/"/>
@@ -32 +33 @@
   <property name="templates.dir.default" value="buildtools/code_templates" />
 
-  <property name="templates.suffix" value=".php" override="false"/>
+  <property name="template.extension" value=".php" override="false" />
 
   <!-- fileset for -dist files -->
@@ -47 +48 @@
     <input propertyname="project.dir" promptChar="?" message="Full path to your new project (no trailing slash!)"/>
     <mkdir dir="${project.dir}"/>
-    <fixpaths base="${project.dir}" new="true"/>
+    <fixpaths base="${project.dir}" new="true" appdir="${app.dirname}"/>
     <echo msg="project dir: ${project.dir}, app dir: ${app.dir}, tests dir: ${tests.dir}"/>
     <mkdir dir="${project.dir}"/>
@@ -99 +100 @@
   <!-- create tests directory structure which mimics the app structure -->
   <target name="projecttests" description="create tests structure for project">
-    <fixpaths base="${project.dir}"/>
+    <fixpaths base="${project.dir}"/ appdir="${app.dirname}">
     <mkdir dir="${tests.dir}" />
     <mkdir dir="${tests.dir}/lib" />
@@ -110 +111 @@
   <!-- create a new module in an existing project -->
   <target name="module" description="create a new module in an existing project.">
-    <fixpaths base="${project.dir}"/>
+    <fixpaths base="${project.dir}" appdir="${app.dirname}"/>
     <available file="${app.dir}/modules" type="dir" property="is_app" value="true"/>
     <fail unless="is_app" message="Must be called in the root of an app directory. (${app.dir})"/>
@@ -146 +147 @@
 
   <target name="buildmoduletests">
-    <fixpaths base="${project.dir}"/>
+    <fixpaths base="${project.dir}" appdir="${app.dirname}"/>
     <property name="moduletests.dir" value="${tests.dir}/modules/${module}"/>
     <mkdir dir="${moduletests.dir}"/>
@@ -159 +160 @@
   <!-- Action creation -->
   <target name="action" description="create a new action">
-    <fixpaths base="${project.dir}" defaultmodule="true"/>
+    <fixpaths base="${project.dir}" defaultmodule="true" appdir="${app.dirname}"/>
     <!--
     <available file="${module.dir}/config/module.xml" property="is_module" value="true"/>
@@ -176 +177 @@
   <!-- Default actions -->
   <target name="defaultactions" description="create a default action">
-    <fixpaths base="${project.dir}" />
+    <fixpaths base="${project.dir}" appdir="${app.dirname}" />
 
     <!-- DEFAULT -->
@@ -216 +217 @@
 
     <!-- 404 template -->
-    <available file="${templates.dir}/default_actions/templates/Error404Success${templates.suffix}" property="templates.dir.current" value="${templates.dir}" />
-    <copy file="${templates.dir.current}/default_actions/templates/Error404Success${templates.suffix}" tofile="${app.dir}/modules/${module.404}/templates/${404.actionPath}Success${templates.suffix}" overwrite="false" />
+    <available file="${templates.dir}/default_actions/templates/Error404Success${template.extension}" property="templates.dir.current" value="${templates.dir}" />
+    <copy file="${templates.dir.current}/default_actions/templates/Error404Success${template.extension}" tofile="${app.dir}/modules/${module.404}/templates/${404.actionPath}Success${template.extension}" overwrite="false" />
 
 <!-- Login -->
@@ -270 +271 @@
 
     <!-- Secure template -->
-    <available file="${templates.dir}/default_actions/templates/SecureSuccess${templates.suffix}" property="templates.dir.current" value="${templates.dir}" />
-    <copy file="${templates.dir.current}/default_actions/templates/SecureSuccess${templates.suffix}" tofile="${app.dir}/modules/${module.secure}/templates/${secure.actionPath}Success${templates.suffix}" overwrite="false" />
+    <available file="${templates.dir}/default_actions/templates/SecureSuccess${template.extension}" property="templates.dir.current" value="${templates.dir}" />
+    <copy file="${templates.dir.current}/default_actions/templates/SecureSuccess${template.extension}" tofile="${app.dir}/modules/${module.secure}/templates/${secure.actionPath}Success${template.extension}" overwrite="false" />
 
 <!-- Disabled -->
@@ -305 +306 @@
 
     <!-- Disabled template -->
-    <available file="${templates.dir}/default_actions/templates/ModuleDisabledSuccess${templates.suffix}" property="templates.dir.current" value="${templates.dir}" />
-    <copy file="${templates.dir.current}/default_actions/templates/ModuleDisabledSuccess${templates.suffix}" tofile="${app.dir}/modules/${module.disabled}/templates/${disabled.actionPath}Success${templates.suffix}" overwrite="false" />
+    <available file="${templates.dir}/default_actions/templates/ModuleDisabledSuccess${template.extension}" property="templates.dir.current" value="${templates.dir}" />
+    <copy file="${templates.dir.current}/default_actions/templates/ModuleDisabledSuccess${template.extension}" tofile="${app.dir}/modules/${module.disabled}/templates/${disabled.actionPath}Success${template.extension}" overwrite="false" />
 
 <!-- Unavailable -->
@@ -340 +341 @@
 
     <!-- Unavailable template -->
-    <available file="${templates.dir}/default_actions/templates/UnavailableSuccess${templates.suffix}" property="templates.dir.current" value="${templates.dir}" />
-    <copy file="${templates.dir.current}/default_actions/templates/UnavailableSuccess${templates.suffix}" tofile="${app.dir}/modules/${module.unavailable}/templates/${unavailable.actionPath}Success${templates.suffix}" overwrite="false" />
+    <available file="${templates.dir}/default_actions/templates/UnavailableSuccess${template.extension}" property="templates.dir.current" value="${templates.dir}" />
+    <copy file="${templates.dir.current}/default_actions/templates/UnavailableSuccess${template.extension}" tofile="${app.dir}/modules/${module.unavailable}/templates/${unavailable.actionPath}Success${template.extension}" overwrite="false" />
 
 <!-- settings.xml -->
@@ -435 +436 @@
     <available file="${templates.dir}/Template.php.tmpl" property="templates.dir.current" value="${templates.dir}" />
     <available file="${templates.dir}/modules/${module}/Template.php.tmpl" property="templates.dir.current" value="${templates.dir}/modules/${module}" />
-    <copy file="${templates.dir.current}/Template.php.tmpl" tofile="${module.dir}/templates/${actionPath}${view}.php">
+    <copy file="${templates.dir.current}/Template${template.extension}.tmpl" tofile="${module.dir}/templates/${actionPath}${view}${template.extension}">
       <filterchain>
         <replacetokens begintoken="%%" endtoken="%%">
@@ -478 +479 @@
   <!-- Model creation -->
   <target name="model" description="create a new model">
-    <fixpaths base="${project.dir}" defaultmodule="true"/>
+    <fixpaths base="${project.dir}" defaultmodule="true" appdir="${app.dirname}"/>
 
     <listModules app="${app.dir}" property="current.modules"/>

trunk/src/buildtools/phing/AgaviFixPathsTask.php

@@ -31 +31 @@
           $testing = false;
 
+  private $appdir = 'app';
+
+  public function setAppdir($appdir)
+  {
+    $this->appdir = $appdir;
+  }
   public function setBase($base) {
     $this->base = $base;
@@ -59 +65 @@
   }
 
-  private function getDir($pattern = '/app/modules') {
+  private function getDir($pattern = 'modules') {
+    if($pattern == 'modules')
+    {
+      $pattern = '/'.$this->appdir.'/'.$pattern;
+    }
     if ($this->newproject) { 
       return realpath($this->base);
@@ -69 +79 @@
 
     preg_match('#(.*?)' . $pattern . '#', $base . '/' . $needle, $matches);
-    
     if (isset($matches[1]) && file_exists($matches[1] . $pattern)) {
       return realpath($matches[1]);
@@ -87 +96 @@
       echo "Project dir: $pdir\n";
       $this->project->setProperty('project.dir', $pdir);
-      $this->project->setProperty('app.dir', realpath($pdir) . '/app');
+      $this->project->setProperty('app.dir', realpath($pdir) . '/' . $this->appdir);
       $this->project->setProperty('tests.dir', realpath($pdir) . '/tests');
       if ($this->parseModulePath) {