forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject svn commit: rev 10426 - xml/forrest/branches/copyless/src/core/targets
Date Thu, 29 Apr 2004 17:38:47 GMT
Author: cheche
Date: Thu Apr 29 10:38:46 2004
New Revision: 10426

Modified:
   xml/forrest/branches/copyless/src/core/targets/site.xml
Log:
Fix discrepancy on skin images thanks to Rick Tessner


Modified: xml/forrest/branches/copyless/src/core/targets/site.xml
==============================================================================
--- xml/forrest/branches/copyless/src/core/targets/site.xml	(original)
+++ xml/forrest/branches/copyless/src/core/targets/site.xml	Thu Apr 29 10:38:46 2004
@@ -97,20 +97,30 @@
         <mkdir dir="${project.site-dir}/skin/images"/>
          <!-- FIXME: we will only be using either project skins or forrest skins - only
copy those necessary (don't forget common) -->
          <!-- Copy forrest skin images -->
+         <!-- Do the common ones first followed by those for the skin. -->
         <copy toDir="${project.site-dir}/skin/images" overwrite="true"
           failonerror="false">
            <fileset dir="${forrest.skins-dir}/common/images"/>
+        </copy>
+        <copy toDir="${project.site-dir}/skin/images" overwrite="true"
+          failonerror="false">
            <fileset dir="${forrest.skins-dir}/${project.skin}/images"/>
         </copy>
+
         <!-- Copy project skin images -->
+        <!-- Do the common ones first followed by those for the skin. -->
         <copy toDir="${project.site-dir}/skin/images" overwrite="true"
           failonerror="false">
           <fileset dir="${project.skins-dir}/common/images"/>
+        </copy>
+        <copy toDir="${project.site-dir}/skin/images" overwrite="true"
+          failonerror="false">
           <fileset dir="${project.skins-dir}/${project.skin}/images"/>
         </copy>
  
 
         <!-- Copy all other non-resource files -->
+        <!-- Do the common ones first followed by those for the skin. -->
         <copy toDir="${project.site-dir}/skin" 
           overwrite="true"
           failonerror="false">
@@ -119,13 +129,20 @@
             <exclude name="images/**"/>
             <exclude name="xslt/**"/>
           </fileset>
+        </copy>
+        <copy toDir="${project.site-dir}/skin" 
+          overwrite="true"
+          failonerror="false">
+          <mapper type="flatten"/>
           <fileset dir="${forrest.skins-dir}/${project.skin}">
             <exclude name="images/**"/>
             <exclude name="xslt/**"/>
           </fileset>
         </copy>
         
+        
         <!-- Copy all other non-resource files from project skins-->
+        <!-- Do the common ones first followed by those for the skin. -->
         <copy toDir="${project.site-dir}/skin" 
           overwrite="true"
           failonerror="false">
@@ -134,6 +151,11 @@
             <exclude name="images/**"/>
             <exclude name="xslt/**"/>
           </fileset>
+        </copy>
+        <copy toDir="${project.site-dir}/skin" 
+          overwrite="true"
+          failonerror="false">
+          <mapper type="flatten"/>
           <fileset dir="${project.skins-dir}/${project.skin}">
             <exclude name="images/**"/>
             <exclude name="xslt/**"/>

Mime
View raw message